Add verkle execution support to executeBlocks (#3406)

* Add verkle execution support to executeBlocks * use block witness instead of parent block * Shut down client after execution completes * Fix test timing
ethereumjs · May 7, 2024 · 9ec6bd2 · 9ec6bd2
1 parent 0ed0a07
commit 9ec6bd2
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/packages/client/src/execution/vmexecution.ts b/packages/client/src/execution/vmexecution.ts
@@ -989,6 +989,24 @@ export class VMExecution extends Execution {
    */
   async executeBlocks(first: number, last: number, txHashes: string[]) {
     this.config.logger.info('Preparing for block execution (debug mode, no services started)...')
+
+    const block = await this.vm.blockchain.getBlock(first)
+    const parentBlock = await this.vm.blockchain.getBlock(block.header.parentHash)
+    const startExecutionParentTd = await this.chain.getTd(block.hash(), parentBlock.header.number)
+
+    const startExecutionHardfork = this.config.execCommon.getHardforkBy({
+      blockNumber: block.header.number,
+      td: startExecutionParentTd,
+      timestamp: block.header.timestamp,
+    })
+
+    // Setup VM with verkle state manager if Osaka is active
+    if (
+      this.config.execCommon.hardforkGteHardfork(startExecutionHardfork, Hardfork.Osaka) &&
+      this.config.statelessVerkle
+    ) {
+      await this.transitionToVerkle(block.header.stateRoot, true)
+    }
     const vm = await this.vm.shallowCopy(false)
 
     for (let blockNumber = first; blockNumber <= last; blockNumber++) {

diff --git a/packages/client/test/execution/vmexecution.spec.ts b/packages/client/test/execution/vmexecution.spec.ts
@@ -85,7 +85,7 @@ const shanghaiPayload = {
   ],
 }
 
-describe('[VMExecution]', async () => {
+describe('[VMExecution]', () => {
   it('Initialization', async () => {
     const vm = await VM.create()
     const config = new Config({ vm, accountCache: 10000, storageCache: 1000 })
@@ -140,7 +140,9 @@ describe('[VMExecution]', async () => {
       validateBlocks: true,
       validateConsensus: false,
     })
+
     exec = await testSetup(blockchain)
+
     await exec.run()
 
     assert.doesNotThrow(
@@ -234,4 +236,4 @@ describe('[VMExecution]', async () => {
 
     closeRPC(server)
   })
-})
+}, 30000)
diff --git a/packages/statemanager/src/statelessVerkleStateManager.ts b/packages/statemanager/src/statelessVerkleStateManager.ts
@@ -372,7 +372,6 @@ export class StatelessVerkleStateManager implements EVMStateManagerInterface {
    */
   shallowCopy(): EVMStateManagerInterface {
     const stateManager = new StatelessVerkleStateManager({ verkleCrypto: this.verkleCrypto })
-    stateManager.initVerkleExecutionWitness(this._blockNum, this._executionWitness!)
     return stateManager
   }