fix tests

ethereumjs · Nov 20, 2022 · c5dd4c9 · c5dd4c9
1 parent 6b5d7df
commit c5dd4c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/client/lib/miner/pendingBlock.ts b/packages/client/lib/miner/pendingBlock.ts
@@ -56,7 +56,6 @@ export class PendingBlock {
       throw new Error('cannot get iterator head: blockchain has no getTotalDifficulty function')
     }
     const td = await vm.blockchain.getTotalDifficulty(parentBlock.hash())
-    vm._common.setHardforkByBlockNumber(parentBlock.header.number, td)
 
     const builder = await vm.buildBlock({
       parentBlock,
@@ -69,6 +68,7 @@ export class PendingBlock {
       withdrawals,
       blockOpts: {
         putBlockIntoBlockchain: false,
+        hardforkByTTD: td,
       },
     })
 

diff --git a/packages/vm/test/api/EIPs/eip-4895-withdrawals.spec.ts b/packages/vm/test/api/EIPs/eip-4895-withdrawals.spec.ts
@@ -189,6 +189,7 @@ tape('EIP4895 tests', (t) => {
       validateBlocks: false,
       validateConsensus: false,
       genesisState,
+      hardforkByHeadBlockNumber: true,
     })
     const genesisBlock = blockchain.genesisBlock
     st.equal(
@@ -204,11 +205,16 @@ tape('EIP4895 tests', (t) => {
     const withdrawals = (gethBlockBufferArray[3] as WithdrawalBuffer[]).map((wa) =>
       Withdrawal.fromValuesArray(wa)
     )
+    const td = await blockchain.getTotalDifficulty(genesisBlock.hash())
 
     const blockBuilder = await vm.buildBlock({
       parentBlock: genesisBlock,
       withdrawals,
-      blockOpts: { calcDifficultyFromHeader: genesisBlock.header, freeze: false },
+      blockOpts: {
+        calcDifficultyFromHeader: genesisBlock.header,
+        freeze: false,
+        hardforkByTTD: td,
+      },
     })
 
     const block = await blockBuilder.build()