fix verkle tests

ethereumjs · Jul 29, 2024 · 7f59280 · 7f59280
1 parent 6ca851a
commit 7f59280
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/packages/statemanager/test/statelessVerkleStateManager.spec.ts b/packages/statemanager/test/statelessVerkleStateManager.spec.ts
@@ -33,8 +33,9 @@ describe('StatelessVerkleStateManager: Kaustinen Verkle Block', () => {
     chain: 'customChain',
     eips: [2935, 4895, 6800],
   })
+
   const decodedTxs = verkleBlockJSON.default.transactions.map((tx) =>
-    createTxFromSerializedData(hexToBytes(tx as PrefixedHexString)),
+    createTxFromSerializedData(hexToBytes(tx as PrefixedHexString), { common }),
   )
   const block = createBlockFromBlockData(
     { ...verkleBlockJSON, transactions: decodedTxs } as BlockData,

diff --git a/packages/vm/test/api/EIPs/eip-6800-verkle.spec.ts b/packages/vm/test/api/EIPs/eip-6800-verkle.spec.ts
@@ -18,8 +18,8 @@ const common = createCustomCommon(customChainParams, Mainnet, {
   hardfork: Hardfork.Cancun,
   eips: [2935, 4895, 6800],
 })
-const decodedTxs = verkleBlockJSON.transactions.map((tx) =>
-  createTxFromSerializedData(hexToBytes(tx as PrefixedHexString)),
+const decodedTxs = verkleBlockJSON.default.transactions.map((tx) =>
+  createTxFromSerializedData(hexToBytes(tx as PrefixedHexString), { common }),
 )
 
 const parentStateRoot = hexToBytes(

diff --git a/packages/vm/test/api/customChain.spec.ts b/packages/vm/test/api/customChain.spec.ts
@@ -1,6 +1,6 @@
 import { createBlockFromBlockData } from '@ethereumjs/block'
 import { createBlockchain } from '@ethereumjs/blockchain'
-import { Common, Hardfork, Mainnet, createCustomCommon } from '@ethereumjs/common'
+import { Hardfork, Mainnet, createCustomCommon } from '@ethereumjs/common'
 import { createTxFromTxData } from '@ethereumjs/tx'
 import {
   bytesToHex,
@@ -17,7 +17,6 @@ import { VM } from '../../src/vm.js'
 import * as testChain from './testdata/testnet.json'
 import * as testnetMerge from './testdata/testnetMerge.json'
 
-import type { ChainConfig } from '@ethereumjs/common'
 import type { AccountState, GenesisState, PrefixedHexString } from '@ethereumjs/util'
 
 const storage: Array<[PrefixedHexString, PrefixedHexString]> = [
@@ -52,7 +51,7 @@ const genesisState: GenesisState = {
 
 // @ts-ignore PrefixedHesString type is too strict
 const common = createCustomCommon(testChain.default, Mainnet, {
-  chain: 'testnet',
+  name: 'testnet',
   hardfork: Hardfork.Chainstart,
 })
 const block = createBlockFromBlockData(
@@ -118,8 +117,11 @@ describe('VM initialized with custom state', () => {
   })
 
   it('setHardfork', async () => {
-    const customChains = [testnetMerge] as ChainConfig[]
-    const common = new Common({ chain: 'testnetMerge', hardfork: Hardfork.Istanbul, customChains })
+    // @ts-ignore PrefixedHexString type is too strict
+    const common = createCustomCommon(testnetMerge.default, Mainnet, {
+      name: 'testnetMerge',
+      hardfork: Hardfork.Istanbul,
+    })
 
     let vm = await VM.create({ common, setHardfork: true })
     assert.equal((vm as any)._setHardfork, true, 'should set setHardfork option')

diff --git a/packages/vm/test/api/tester/tester.config.spec.ts b/packages/vm/test/api/tester/tester.config.spec.ts
@@ -3,7 +3,7 @@ import { assert, describe, it } from 'vitest'
 
 import { getCommon } from '../../tester/config.js'
 
-describe('bloom', () => {
+describe('test runner config tests', () => {
   it('should initialize common with the right hardfork', () => {
     const common = getCommon('byzantium')
     assert.ok(common.hardfork() === Hardfork.Byzantium)

diff --git a/packages/vm/test/tester/config.ts b/packages/vm/test/tester/config.ts
@@ -1,8 +1,8 @@
 import { Common, Hardfork, Mainnet, createCustomCommon } from '@ethereumjs/common'
+import { type Kzg, intToHex } from '@ethereumjs/util'
 import * as path from 'path'
 
 import type { HardforkTransitionConfig } from '@ethereumjs/common'
-import type { Kzg } from '@ethereumjs/util'
 
 /**
  * Default tests path (git submodule: ethereum-tests)
@@ -254,7 +254,7 @@ function setupCommonWithNetworks(network: string, ttd?: number, timestamp?: numb
         testHardforks.push({
           name: hf.name,
           block: null,
-          ttd: BigInt(ttd),
+          ttd: intToHex(ttd),
         })
       }
       if (timestamp !== undefined && hf.name !== Hardfork.Dao) {