Update ethereum-tests to v15.0 (#3871)

jochem-brouwer · ScottyPoi · web-flow · commit cfc530919ddd · 2025-02-21T01:28:57.000+01:00
* Update eth-tests to v15.0

* Use Osaka testdata in test

* Update error messages to expected

* remove eip-4200 test

* evm: ensure ethereum-tests/EOFTests container tests are  being ran

* evm: exclude eof header validation from browser tests

* revert change error text

* revert direct exception compare

---------

Co-authored-by: ScottyPoi &lt;scott.simpson@ethereum.org&gt;
diff --git a/packages/ethereum-tests b/packages/ethereum-tests
@@ -1 +1 @@
-Subproject commit 9201075490807f58811078e9bb5ec895b4ac01a5
+Subproject commit e2d83cf0946a3ecbf0a28381ab0939cbe0df4d3b
diff --git a/packages/evm/test/eips/eip-4200.spec.ts b/packages/evm/test/eips/eip-4200.spec.ts
diff --git a/packages/evm/test/eips/eip-5450.spec.ts b/packages/evm/test/eips/eip-5450.spec.ts
@@ -1,7 +1,9 @@
 import { hexToBytes } from '@ethereumjs/util'
 import { assert, describe, it } from 'vitest'
 
-import { default as testData } from '../../../ethereum-tests/EOFTests/EIP5450/validInvalid.json'
+import { default as testData } from '../../../ethereum-tests/EOFTests/EIP5450/validInvalid.json' assert {
+  type: 'json',
+}
 import { validateEOF } from '../../src/eof/container.js'
 import { createEVM } from '../../src/index.js'
 
@@ -23,8 +25,8 @@ describe('EIP 5450 tests', async () => {
       const input = testData.validInvalid.vectors[key]
       const code = hexToBytes(input.code)
 
-      const expected = input.results.Prague.result
-      const _exception = input.results.Prague.exception
+      const expected = input.results.Osaka.result
+      const _exception = input.results.Osaka.exception
 
       if (expected === true) {
         validateEOF(code, evm)
diff --git a/packages/evm/test/eips/eof-header-validation.spec.ts b/packages/evm/test/eips/eof-header-validation.spec.ts
@@ -11,7 +11,7 @@ import { getCommon } from './eof-utils.js'
 
 // Rename this test dir to the location of EOF header tests
 // To test, use `npx vitest run ./scripts/eof-header-validation.spec.ts
-const testDir = path.resolve('../ethereum-tests/EOFStuff/fixtures/eof_tests')
+const testDir = path.resolve('../ethereum-tests/EOFTests')
 
 async function getEVM() {
   const common = getCommon()
diff --git a/packages/evm/vitest.config.browser.mts b/packages/evm/vitest.config.browser.mts
@@ -9,6 +9,7 @@ export default mergeConfig(
         ...configDefaults.exclude,
         // readDirSync method not provided fs mock for vite
         'test/precompiles/eip-2537-bls.spec.ts',
+        'test/eips/eof-header-validation.spec.ts',
       ],
     },
   }),
