clear cache is the vmhead not at parent stateroot

ethereumjs · May 30, 2023 · 810aa54 · 810aa54
1 parent 36b564b
commit 810aa54
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/client/src/execution/vmexecution.ts b/packages/client/src/execution/vmexecution.ts
@@ -280,6 +280,11 @@ export class VMExecution extends Execution {
     let parentState: Uint8Array | undefined
     let errorBlock: Block | undefined
 
+    // flag for vm to clear statemanager cache on runBlock
+    //  i) If on start of iterator the last run state is not same as the block's parent
+    //  ii) If reorg happens on the block iterator
+    let clearCache = false
+
     while (
       this.started &&
       !this.config.shutdown &&
@@ -305,10 +310,17 @@ export class VMExecution extends Execution {
               parentState = headBlock.header.stateRoot
 
               if (reorg) {
+                clearCache = true
                 this.config.logger.info(
-                  `Chain reorg happened, set new head to block number=${headBlock.header.number}, clearing state cache for VM execution.`
+                  `VM run: Chain reorged, setting new head to block number=${headBlock.header.number} clearCache=${clearCache}.`
                 )
+              } else {
+                const prevVMStateRoot = await this.vm.stateManager.getStateRoot()
+                clearCache = !equalsBytes(prevVMStateRoot, parentState)
               }
+            } else {
+              // Continuation of last vm run, no need to clearCache
+              clearCache = false
             }
 
             // run block, update head if valid
@@ -356,7 +368,7 @@ export class VMExecution extends Execution {
                 const result = await this.vm.runBlock({
                   block,
                   root: parentState,
-                  clearCache: reorg ? true : false,
+                  clearCache,
                   skipBlockValidation,
                   skipHeaderValidation: true,
                 })

diff --git a/packages/vm/src/runBlock.ts b/packages/vm/src/runBlock.ts
@@ -79,7 +79,7 @@ export async function runBlock(this: VM, opts: RunBlockOpts): Promise<RunBlockRe
   // Set state root if provided
   if (root) {
     if (this.DEBUG) {
-      debug(`Set provided state root ${bytesToHex(root)}`)
+      debug(`Set provided state root ${bytesToHex(root)} clearCache=${clearCache}`)
     }
     await state.setStateRoot(root, clearCache)
   }