EIP1559 + EIP2718 support

src/ethObject.js

@@ -1,7 +1,9 @@
 const { encode, toHex } = require('eth-util-lite')
 
 class EthObject extends Array{
-
+  set objtype(typeIn) {
+    this.type = typeIn;
+  }
   constructor(fields, raw){
 //raw array
     super(...raw)
@@ -27,8 +29,14 @@ class EthObject extends Array{
       get: function(){ return toHex(this.buffer) },
     });
     Object.defineProperty(this, 'raw', {
+      // only commit to data from fields that exist, since we have multiple transaction formats now we will be missing data depending on the tx type
+      // so we need to skip so the root's are correctly calculated still
       get: function(){ 
-        return this.fields.map((field, i)=>{ return this[i] })
+        return this.fields.filter((field, i) => {
+          return this[i] !== undefined;
+        }).map((field, i) => {
+          return this[i];
+        })
       },
     });
     Object.defineProperty(this, 'object', {
@@ -50,8 +58,22 @@ class EthObject extends Array{
   }
 
 // aliases
-  serialize(){ return this.buffer }
-  toBuffer() { return this.buffer }
+  serialize(){ 
+    // if type is defined, concat type and RLP buffer seperately (for receipts/transactions following EIP2718)
+    if(this.type) {
+      return Buffer.concat([this.type, this.buffer ])
+    } else {
+      return this.buffer 
+    }
+  }
+  toBuffer(){ 
+    // if type is defined, concat type and RLP buffer seperately (for receipts/transactions following EIP2718)
+    if(this.type) {
+      return Buffer.concat([this.type, this.buffer ])
+    } else {
+      return this.buffer 
+    }
+  }
   toHex(){     return this.hex }
   toObject(){  return this.object }
   toString(){  return this.json }

src/header.js

@@ -19,6 +19,7 @@ class Header extends EthObject{
     'extraData',
     'mixHash',
     'nonce',
+    'baseFeePerGas',
   ]}
 
   constructor(raw = this.NULL){
@@ -31,7 +32,7 @@ class Header extends EthObject{
   static fromObject(rpcResult){ return this.fromRpc(rpcResult) }
   static fromRpc(rpcResult){
     if(rpcResult){
-      return new this([
+      let data = [
         toBuffer(rpcResult.parentHash),
         toBuffer(rpcResult.sha3Uncles) || KECCAK256_RLP_ARRAY,
         toBuffer(rpcResult.miner),
@@ -47,7 +48,12 @@ class Header extends EthObject{
         toBuffer(rpcResult.extraData),
         toBuffer(rpcResult.mixHash),
         toBuffer(rpcResult.nonce)
-      ])
+      ]
+      // https://eips.ethereum.org/EIPS/eip-1559
+      if(rpcResult.baseFeePerGas){
+        data.push(toBuffer(rpcResult.baseFeePerGas));
+      }
+      return new this(data)
     }else{
       return new this()
     }

src/receipt.js

@@ -15,21 +15,40 @@ class Receipt extends EthObject{
     super(Receipt.fields, raw)
   }
 
-  static fromBuffer(buf){ return buf ? new Receipt(decode(buf)) : new Receipt() }
-  static fromHex(hex){ return hex ? new Receipt(decode(hex)) : new Receipt() }
+  static fromBuffer(buf){ 
+    if(buf) {
+      // marker for EIP2718 TX Envelope type - anything under is type followed by RLP, over is standard RLP
+      if(buf[0] > 0x7f) {
+        return new Receipt(decode(buf))
+      } else {
+        let receipt = new Receipt(decode(buf.slice(1)))
+        receipt.objtype = toBuffer(buf[0])
+        return receipt
+      }
+    } else {
+      return new Receipt() 
+    }
+  }
+  static fromHex(hex){ 
+    return this.fromBuffer(toBuffer(hex))
+  }
   static fromRaw(raw){ return new Receipt(raw) }
   static fromObject(rpcResult){ return Receipt.fromRpc(rpcResult) }
   static fromRpc(rpcResult){
     let logs = []
     for (var i = 0; i < rpcResult.logs.length; i++) {
        logs.push(Log.fromRpc(rpcResult.logs[i]))
     }
-    return new Receipt([
+    let receipt = new Receipt([
       toBuffer(rpcResult.status || rpcResult.root),
       toBuffer(rpcResult.cumulativeGasUsed),
       toBuffer(rpcResult.logsBloom),
       logs
     ])
+    if(rpcResult.type) {
+      receipt.objtype = toBuffer(rpcResult.type)
+    }
+    return receipt
   }
 }
 

src/transaction.js

@@ -4,12 +4,15 @@ const EthObject = require('./ethObject')
 class Transaction extends EthObject{
 
   static get fields(){ return [
+    'chainId',
     'nonce',
-    'gasPrice',
+    'maxPriorityFeePerGas',
+    'maxFeePerGas',
     'gasLimit',
     'to',
     'value',
     'data',
+    'accessList',
     'v',
     'r',
     's',
@@ -18,23 +21,95 @@ class Transaction extends EthObject{
   constructor(raw = Transaction.NULL){
     super(Transaction.fields, raw)
   }
+  static fromBuffer(buf){ 
+    if(buf) {
+      // marker for EIP2718 TX Envelope type - anything under is type followed by RLP, over is standard RLP
+      if(buf[0] > 0x7f) {
+        return new Transaction(decode(buf))
+      } else {
+        let tx = new Transaction(decode(buf.slice(1)))
+        tx.objtype = toBuffer(buf[0])
+        return tx
+      }
+    } else {
+      return new Transaction() 
+    }
+  }
 
-  static fromBuffer(buf){ return buf ? new Transaction(decode(buf)) : new Transaction() }
-  static fromHex(hex){ return hex ? new Transaction(decode(hex)) : new Transaction() }
+  static fromHex(hex){ 
+    return this.fromBuffer(toBuffer(hex))
+  }
   static fromRaw(raw){ return new Transaction(raw) }
   static fromObject(rpcResult){ return Transaction.fromRpc(rpcResult) }
   static fromRpc(rpcResult){
-    return new Transaction([
-      toBuffer(rpcResult.nonce),
-      toBuffer(rpcResult.gasPrice),
-      toBuffer(rpcResult.gas || rpcResult.gasLimit),
-      toBuffer(rpcResult.to),
-      toBuffer(rpcResult.value),
-      toBuffer(rpcResult.input || rpcResult.data),
-      toBuffer(rpcResult.v),
-      toBuffer(rpcResult.r),
-      toBuffer(rpcResult.s)
-    ])
+    // see definitions: https://eips.ethereum.org/EIPS/eip-1559
+    // https://eips.ethereum.org/EIPS/eip-2718 1559-payload
+    if(rpcResult.type == "0x2") {
+      let accessList = []
+      for (var i = 0; i < rpcResult.accessList.length; i++) {
+        var listObjAtIndex = rpcResult.accessList[i]
+        var storageKeys = []
+        for (var j = 0; j < listObjAtIndex.storageKeys.length; j++) {
+          storageKeys.push(toBuffer(listObjAtIndex.storageKeys[j]))
+        }
+        accessList.push([toBuffer(listObjAtIndex.address), storageKeys])
+      }
+      let tx = new Transaction([
+        toBuffer(rpcResult.chainId),
+        toBuffer(rpcResult.nonce),
+        toBuffer(rpcResult.maxPriorityFeePerGas),
+        toBuffer(rpcResult.maxFeePerGas),
+        toBuffer(rpcResult.gas || rpcResult.gasLimit),
+        toBuffer(rpcResult.to),
+        toBuffer(rpcResult.value),
+        toBuffer(rpcResult.input || rpcResult.data),
+        accessList,
+        toBuffer(rpcResult.v),
+        toBuffer(rpcResult.r),
+        toBuffer(rpcResult.s)
+      ])
+      tx.objtype = toBuffer(rpcResult.type)
+      return tx
+    // https://eips.ethereum.org/EIPS/eip-2718 2930-payload
+    } else if(rpcResult.type == "0x1") {
+      let accessList = []
+      for (var i = 0; i < rpcResult.accessList.length; i++) {
+        var listObjAtIndex = rpcResult.accessList[i]
+        var storageKeys = []
+        for (var j = 0; j < listObjAtIndex.storageKeys.length; j++) {
+          storageKeys.push(toBuffer(listObjAtIndex.storageKeys[j]))
+        }
+        accessList.push([toBuffer(listObjAtIndex.address), storageKeys])
+      }
+      let tx = new Transaction([
+        toBuffer(rpcResult.chainId),
+        toBuffer(rpcResult.nonce),
+        toBuffer(rpcResult.gasPrice),
+        toBuffer(rpcResult.gas || rpcResult.gasLimit),
+        toBuffer(rpcResult.to),
+        toBuffer(rpcResult.value),
+        toBuffer(rpcResult.input || rpcResult.data),
+        accessList,
+        toBuffer(rpcResult.v),
+        toBuffer(rpcResult.r),
+        toBuffer(rpcResult.s)
+      ])
+      tx.objtype = toBuffer(rpcResult.type)
+      return tx
+    }
+    else {
+      return new Transaction([
+        toBuffer(rpcResult.nonce),
+        toBuffer(rpcResult.gasPrice),
+        toBuffer(rpcResult.gas || rpcResult.gasLimit),
+        toBuffer(rpcResult.to),
+        toBuffer(rpcResult.value),
+        toBuffer(rpcResult.input || rpcResult.data),
+        toBuffer(rpcResult.v),
+        toBuffer(rpcResult.r),
+        toBuffer(rpcResult.s)
+      ])  
+    }
   }
 }