From d8bd18b992bb80f4fe964bb595f637d14b5efe2a Mon Sep 17 00:00:00 2001 From: Jochem Brouwer Date: Wed, 6 Mar 2024 18:53:12 +0100 Subject: [PATCH] update ethereum/tests to 13.1 (#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 <17355484+acolytec3@users.noreply.github.com> --- .github/workflows/vm-pr.yml | 20 ++++++-------------- package-lock.json | 28 ++++++++++++++-------------- package.json | 2 +- packages/block/package.json | 2 +- packages/client/package.json | 2 +- packages/ethereum-tests | 2 +- packages/evm/package.json | 2 +- packages/tx/package.json | 2 +- packages/util/package.json | 2 +- packages/vm/test/tester/config.ts | 6 +----- packages/vm/test/util.ts | 4 ++++ 11 files changed, 32 insertions(+), 40 deletions(-) diff --git a/.github/workflows/vm-pr.yml b/.github/workflows/vm-pr.yml index be8a28070e..15cd31d8c1 100644 --- 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 index 7c2995cc31..8b346f4509 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,7 +30,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", @@ -9399,9 +9399,9 @@ } }, "node_modules/kzg-wasm": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/kzg-wasm/-/kzg-wasm-0.1.0.tgz", - "integrity": "sha512-K0Y0qmpyc/fhW5Xn8UMh20armhuzgerTZfyx4S75dqD+bpTbeJt6rTWwILgFZ34Bc8VgvuMmG4RGhMocEvwkCw==" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/kzg-wasm/-/kzg-wasm-0.2.0.tgz", + "integrity": "sha512-Gv54Edtv7GnzZ253t1ooEtPuD+pCa5SavNmyQ7MQPdlMpLZZHXzX8vIvNIWlMHfPy+TvPX8ubRUzy1AoPxl5jA==" }, "node_modules/language-subtag-registry": { "version": "0.3.22", @@ -15670,7 +15670,7 @@ "ethereum-cryptography": "^2.1.3" }, "devDependencies": { - "kzg-wasm": "^0.1.0" + "kzg-wasm": "^0.2.0" }, "engines": { "node": ">=18" @@ -15690,7 +15690,7 @@ "@ethereumjs/util": "^9.0.2", "debug": "^4.3.3", "ethereum-cryptography": "^2.1.3", - "lru-cache": "^10.0.0" + "lru-cache": "10.1.0" }, "devDependencies": {}, "engines": { @@ -15731,7 +15731,7 @@ "jayson": "^4.0.0", "js-sdsl": "^4.4.0", "jwt-simple": "^0.5.6", - "kzg-wasm": "^0.1.0", + "kzg-wasm": "^0.2.0", "level": "^8.0.0", "memory-level": "^1.0.0", "multiaddr": "^10.0.1", @@ -15993,7 +15993,7 @@ "@scure/base": "1.1.1", "debug": "^4.3.3", "ethereum-cryptography": "^2.1.3", - "lru-cache": "^10.0.0", + "lru-cache": "10.1.0", "multiaddr": "^10.0.1", "scanf": "1.1.2", "snappyjs": "^0.6.1" @@ -16060,7 +16060,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", @@ -16113,7 +16113,7 @@ "debug": "^4.3.3", "ethereum-cryptography": "^2.1.3", "js-sdsl": "^4.1.4", - "lru-cache": "^10.0.0" + "lru-cache": "10.1.0" }, "devDependencies": { "@ethereumjs/block": "^5.1.1", @@ -16131,7 +16131,7 @@ "@types/readable-stream": "^2.3.13", "debug": "^4.3.4", "ethereum-cryptography": "^2.1.3", - "lru-cache": "^10.0.0", + "lru-cache": "10.1.0", "readable-stream": "^3.6.0" }, "devDependencies": { @@ -16163,7 +16163,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" }, @@ -16180,7 +16180,7 @@ "ethereum-cryptography": "^2.1.3" }, "devDependencies": { - "kzg-wasm": "^0.1.0" + "kzg-wasm": "^0.2.0" }, "engines": { "node": ">=18" @@ -16193,7 +16193,7 @@ "dependencies": { "@ethereumjs/rlp": "5.0.2", "@ethereumjs/util": "9.0.2", - "lru-cache": "^10.0.0", + "lru-cache": "10.1.0", "rust-verkle-wasm": "^0.0.1" }, "engines": { diff --git a/package.json b/package.json index 92c2490cb6..09faaf340a 100644 --- 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 index bf4a6eebe4..8fe29e3685 100644 --- 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 index 45a0835509..79082ee5a7 100644 --- 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 index 428f218d7d..853b1e03b1 160000 --- a/packages/ethereum-tests +++ b/packages/ethereum-tests @@ -1 +1 @@ -Subproject commit 428f218d7d6f4a52544e12684afbfe6e2882ffbf +Subproject commit 853b1e03b1078d370614002851ba1ee9803d9fcf diff --git a/packages/evm/package.json b/packages/evm/package.json index dadc38cbe4..856deb0b8c 100644 --- 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 index 983feddfb3..eec17eecfe 100644 --- 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 index 39e0a516bd..9a7b4ae329 100644 --- 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 index cf78393ca5..87346c2aa9 100644 --- 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 index a8cc4ae1fe..3bebca978e 100644 --- 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) }