update ethereum/tests to 13.1 (ethereumjs#3302)

* update ethereum/tests to 13.1 * vm: fix config * update ci test runner for vm * Update to fixed kzg wasm ver * vm/test: add excessBlobGas to state runner * Update kzg-wasm * update package-lock --------- Co-authored-by: acolytec3 <[email protected]>
wighawag · Mar 6, 2024 · d8bd18b · d8bd18b
1 parent 41a7468
commit d8bd18b
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 40 deletions.
diff --git a/.github/workflows/vm-pr.yml b/.github/workflows/vm-pr.yml
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        fork: ['London', 'Berlin', 'Paris', 'MuirGlacier', 'Istanbul', 'Shanghai', 'Cancun']
+        fork: ['Berlin', 'London', 'Paris', 'Shanghai', 'Cancun']
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -108,19 +108,11 @@ jobs:
         # Tests were split with --dir and --excludeDir to balance execution times below the 9min mark.
         args:
           [
-            '--fork=Berlin --dir=GeneralStateTests/stTimeConsuming',
-            '--fork=Berlin --excludeDir=stTimeConsuming',
-            '--fork=London --dir=GeneralStateTests/stTimeConsuming',
-            '--fork=London --excludeDir=stTimeConsuming',
-            '--fork=Istanbul --dir=GeneralStateTests/stTimeConsuming --expected-test-amount=15561',
-            '--fork=Istanbul --excludeDir=stTimeConsuming --expected-test-amount=19817',
-            '--fork=Paris --dir=GeneralStateTests/stTimeConsuming',
-            '--fork=Paris --excludeDir=stTimeConsuming',
-            '--fork=ArrowGlacierToMergeAtDiffC0000',
-            '--fork=Shanghai --dir=GeneralStateTests/stTimeConsuming',
-            '--fork=Shanghai --excludeDir=stTimeConsuming',
-            '--fork=Cancun --dir=GeneralStateTests/stTimeConsuming',
-            '--fork=Cancun --excludeDir=stTimeConsuming',
+            '--fork=Berlin --verify-test-amount-alltests',
+            '--fork=London --verify-test-amount-alltests',
+            '--fork=Paris --verify-test-amount-alltests',
+            '--fork=Shanghai --verify-test-amount-alltests',
+            '--fork=Cancun --verify-test-amount-alltests',
           ]
       fail-fast: false
     steps:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-simple-import-sort": "7.0.0",
     "eslint-plugin-sonarjs": "0.19.0",
-    "kzg-wasm": "^0.1.0",
+    "kzg-wasm": "^0.2.0",
     "lint-staged": "13.0.3",
     "lockfile-lint-api": "^5.5.1",
     "prettier": "2.7.1",

diff --git a/packages/block/package.json b/packages/block/package.json
@@ -54,7 +54,7 @@
     "ethereum-cryptography": "^2.1.3"
   },
   "devDependencies": {
-    "kzg-wasm": "^0.1.0"
+    "kzg-wasm": "^0.2.0"
   },
   "engines": {
     "node": ">=18"

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -74,7 +74,7 @@
     "@polkadot/wasm-crypto": "^7.3.2",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.2",
-    "kzg-wasm": "^0.1.0",
+    "kzg-wasm": "^0.2.0",
     "chalk": "^4.1.2",
     "connect": "^3.7.0",
     "cors": "^2.8.5",

diff --git a/packages/ethereum-tests b/packages/ethereum-tests
diff --git a/packages/evm/package.json b/packages/evm/package.json
@@ -69,7 +69,7 @@
     "@types/minimist": "^1.2.2",
     "@types/node-dir": "^0.0.34",
     "benchmark": "^2.1.4",
-    "kzg-wasm": "^0.1.0",
+    "kzg-wasm": "^0.2.0",
     "level": "^8.0.0",
     "memory-level": "^1.0.0",
     "minimist": "^1.2.5",

diff --git a/packages/tx/package.json b/packages/tx/package.json
@@ -65,7 +65,7 @@
   "devDependencies": {
     "@types/minimist": "^1.2.0",
     "@types/node-dir": "^0.0.34",
-    "kzg-wasm": "^0.1.0",
+    "kzg-wasm": "^0.2.0",
     "minimist": "^1.2.0",
     "node-dir": "^0.1.16"
   },

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -95,7 +95,7 @@
     "ethereum-cryptography": "^2.1.3"
   },
   "devDependencies": {
-    "kzg-wasm": "^0.1.0"
+    "kzg-wasm": "^0.2.0"
   },
   "engines": {
     "node": ">=18"

diff --git a/packages/vm/test/tester/config.ts b/packages/vm/test/tester/config.ts
@@ -81,10 +81,6 @@ export function getRequiredForkConfigAlias(forkConfig: string) {
   if (String(forkConfig).match(/^petersburg$/i)) {
     return 'ConstantinopleFix' + remainder
   }
-  // Paris is named Merge
-  if (String(forkConfig).match(/^paris/i)) {
-    return 'Merge' + remainder
-  }
   return forkConfig
 }
 
@@ -397,7 +393,7 @@ const expectedTestsFull: {
     MuirGlacier: 12271,
     Berlin: 13214,
     London: 19449,
-    Paris: 19598,
+    Paris: 19727,
     Shanghai: 19564,
     ByzantiumToConstantinopleFixAt5: 0,
     EIP158ToByzantiumAt5: 0,

diff --git a/packages/vm/test/util.ts b/packages/vm/test/util.ts
@@ -284,6 +284,7 @@ export function makeBlockHeader(data: any, opts?: BlockOptions) {
     previousHash,
     currentCoinbase,
     currentDifficulty,
+    currentExcessBlobGas,
     currentNumber,
     currentBaseFee,
     currentRandom,
@@ -317,6 +318,9 @@ export function makeBlockHeader(data: any, opts?: BlockOptions) {
     headerData['mixHash'] = currentRandom
     headerData['difficulty'] = 0
   }
+  if (opts?.common && opts.common.gteHardfork('cancun')) {
+    headerData['excessBlobGas'] = currentExcessBlobGas
+  }
   return BlockHeader.fromHeaderData(headerData, opts)
 }