Revert previous fix and force clear cache after processing each block.

status-im · Mar 14, 2024 · 40bf10e · 40bf10e
1 parent 66ec9f4
commit 40bf10e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/nimbus/core/executor/process_block.nim b/nimbus/core/executor/process_block.nim
@@ -117,7 +117,7 @@ proc procBlkEpilogue(vmState: BaseVMState;
     if vmState.generateWitness:
       db.collectWitnessData()
     let clearEmptyAccount = vmState.determineFork >= FkSpurious
-    db.persist(clearEmptyAccount, ClearCache in vmState.flags)
+    db.persist(clearEmptyAccount, clearCache = true)
 
   let stateDb = vmState.stateDB
   if header.stateRoot != stateDb.rootHash:

diff --git a/nimbus/db/ledger/accounts_cache.nim b/nimbus/db/ledger/accounts_cache.nim
@@ -596,7 +596,6 @@ proc persist*(ac: AccountsCache,
 
   if clearCache:
     ac.savePoint.cache.clear()
-    ac.witnessCache.clear()
   else:
     for x in cleanAccounts:
       ac.savePoint.cache.del x
@@ -695,6 +694,10 @@ proc makeMultiKeys*(ac: AccountsCache): MultiKeysRef =
     result.add(k, v.codeTouched, multiKeys(v.storageKeys))
   result.sort()
 
+  # reset the witness cache after collecting the witness data
+  # so it is clean before executing the next block
+  ac.witnessCache.clear()
+
 proc accessList*(ac: AccountsCache, address: EthAddress) {.inline.} =
   ac.savePoint.accessList.add(address)
 

diff --git a/nimbus/db/ledger/accounts_ledger.nim b/nimbus/db/ledger/accounts_ledger.nim
@@ -627,7 +627,6 @@ proc persist*(ac: AccountsLedgerRef,
 
   if clearCache:
     ac.savePoint.cache.clear()
-    ac.witnessCache.clear()
   else:
     for x in cleanAccounts:
       ac.savePoint.cache.del x