Merge pull request #1048 from ethereumjs/eip2718-eip2930

Implement EIP2718 and EIP2930

Author: holgerd77

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "ethereum-tests"]
 	path = packages/ethereum-tests
-	url = https://github.com/ethereum/tests.git
+	url = https://github.com/qbzzt/tests.git
 	branch = develop

packages/block/CHANGELOG.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 (modification: no type change headlines) and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## UNRELEASED
+
+- Integration of [EIP2718](https://eips.ethereum.org/EIPS/eip-2718) (Typed Transactions) and [EIP2930](https://eips.ethereum.org/EIPS/eip-2930) (Access List Transaction), PR [#1048](https://github.com/ethereumjs/ethereumjs-monorepo/pull/1048). It is now possible to create blocks with access list transactions.
+
 ## 3.1.0 - 2021-02-22
 
 ### Clique/PoA Support

packages/block/src/block.ts

@@ -3,7 +3,7 @@
 import { BaseTrie as Trie } from 'merkle-patricia-tree'
 import { BN, rlp, keccak256, KECCAK256_RLP } from 'ethereumjs-util'
 import Common from '@ethereumjs/common'
-import { Transaction, TxOptions } from '@ethereumjs/tx'
+import { TransactionFactory, Transaction, TxOptions } from '@ethereumjs/tx'
 import { BlockHeader } from './header'
 import { BlockData, BlockOptions, JsonBlock, BlockBuffer, Blockchain } from './types'
 
@@ -31,7 +31,7 @@ export class Block {
     // parse transactions
     const transactions = []
     for (const txData of txsData || []) {
-      const tx = Transaction.fromTxData(txData, {
+      const tx = TransactionFactory.fromTxData(txData, {
         ...opts,
         // Use header common in case of hardforkByBlockNumber being activated
         common: header._common,
@@ -91,7 +91,7 @@ export class Block {
     const transactions = []
     for (const txData of txsData || []) {
       transactions.push(
-        Transaction.fromValuesArray(txData, {
+        TransactionFactory.fromBlockBodyData(txData, {
           ...opts,
           // Use header common in case of hardforkByBlockNumber being activated
           common: header._common,
@@ -154,7 +154,7 @@ export class Block {
   raw(): BlockBuffer {
     return [
       this.header.raw(),
-      this.transactions.map((tx) => tx.raw()),
+      this.transactions.map((tx) => <Buffer[]>tx.raw()),
       this.uncleHeaders.map((uh) => uh.raw()),
     ]
   }
@@ -223,7 +223,7 @@ export class Block {
     const errors: string[] = []
 
     this.transactions.forEach(function (tx, i) {
-      const errs = tx.validate(true)
+      const errs = <string[]>tx.validate(true)
       if (errs.length > 0) {
         errors.push(`errors at tx ${i}: ${errs.join(', ')}`)
       }

packages/block/src/from-rpc.ts

@@ -1,4 +1,4 @@
-import { Transaction, TxData } from '@ethereumjs/tx'
+import { TransactionFactory, Transaction, TxData } from '@ethereumjs/tx'
 import { toBuffer, setLengthLeft } from 'ethereumjs-util'
 import { Block, BlockOptions } from './index'
 
@@ -37,7 +37,7 @@ export default function blockFromRpc(blockParams: any, uncles: any[] = [], optio
     const opts = { common: header._common }
     for (const _txParams of blockParams.transactions) {
       const txParams = normalizeTxParams(_txParams)
-      const tx = Transaction.fromTxData(txParams as TxData, opts)
+      const tx = TransactionFactory.fromTxData(txParams as TxData, opts)
       transactions.push(tx)
     }
   }

packages/common/src/eips/2718.json

@@ -0,0 +1,12 @@
+{
+    "name": "EIP-2718",
+    "comment": "Typed Transaction Envelope",
+    "url": "https://eips.ethereum.org/EIPS/eip-2718",
+    "status": "Draft",
+    "minimumHardfork": "chainstart",
+    "gasConfig": {},
+    "gasPrices": {},
+    "vm": {},
+    "pow": {}
+  }
+  

packages/common/src/eips/2930.json

@@ -0,0 +1,22 @@
+{
+    "name": "EIP-2929",
+    "comment": "Optional access lists",
+    "url": "https://eips.ethereum.org/EIPS/eip-2930",
+    "status": "Draft",
+    "minimumHardfork": "istanbul",
+    "requiredEIPs": [2718, 2929],
+    "gasConfig": {},
+    "gasPrices": {
+      "accessListStorageKeyCost": {
+        "v": 1900,
+        "d": "Gas cost per storage key in an Access List transaction"
+      },
+      "accessListAddressCost": {
+        "v": 2400,
+        "d": "Gas cost per storage key in an Access List transaction"
+      }
+    },
+    "vm": {},
+    "pow": {}
+  }
+  

packages/common/src/eips/index.ts

@@ -4,5 +4,7 @@ export const EIPs: eipsType = {
   2315: require('./2315.json'),
   2537: require('./2537.json'),
   2565: require('./2565.json'),
+  2718: require('./2718.json'),
   2929: require('./2929.json'),
+  2930: require('./2930.json'),
 }

packages/common/src/hardforks/berlin.json

@@ -3,5 +3,5 @@
   "comment": "HF targeted for July 2020 following the Muir Glacier HF",
   "url": "https://eips.ethereum.org/EIPS/eip-2070",
   "status": "Draft",
-  "eips": [ 2315, 2565, 2929 ]
+  "eips": [ 2315, 2565, 2929, 2718, 2930 ]
 }

packages/common/src/index.ts

@@ -274,6 +274,14 @@ export default class Common extends EventEmitter {
           `${eip} cannot be activated on hardfork ${this.hardfork()}, minimumHardfork: ${minHF}`
         )
       }
+      if (EIPs[eip].requiredEIPs) {
+        // eslint-disable-next-line prettier/prettier
+        (<number[]>EIPs[eip].requiredEIPs).forEach((elem: number) => {
+          if (!(eips.includes(elem) || this.isActivatedEIP(elem))) {
+            throw new Error(`${eip} requires EIP ${elem}, but is not included in the EIP list`)
+          }
+        })
+      }
     }
     this._eips = eips
   }

packages/common/tests/eips.spec.ts

@@ -3,9 +3,22 @@ import Common from '../src/'
 
 tape('[Common]: Initialization / Chain params', function (t: tape.Test) {
   t.test('Correct initialization', function (st: tape.Test) {
-    const eips = [2537, 2929]
+    let eips = [2537, 2929]
     const c = new Common({ chain: 'mainnet', eips })
     st.equal(c.eips(), eips, 'should initialize with supported EIP')
+
+    eips = [2718, 2929, 2930]
+    new Common({ chain: 'mainnet', eips, hardfork: 'istanbul' })
+    st.pass('Should not throw when initializing with a consistent EIP list')
+
+    eips = [2930]
+    const msg =
+      'should throw when initializing with an EIP with required EIPs not being activated along'
+    const f = () => {
+      new Common({ chain: 'mainnet', eips, hardfork: 'istanbul' })
+    }
+    st.throws(f, msg)
+
     st.end()
   })