statemanager: fix shallow copy logic

ethereumjs · Aug 9, 2024 · bba928b · bba928b
1 parent 31c94af
commit bba928b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 21 deletions.
diff --git a/packages/client/src/execution/vmexecution.ts b/packages/client/src/execution/vmexecution.ts
@@ -4,7 +4,7 @@ import {
   DBSetHashToNumber,
   DBSetTD,
 } from '@ethereumjs/blockchain'
-import { CacheType, ConsensusType, Hardfork } from '@ethereumjs/common'
+import { ConsensusType, Hardfork } from '@ethereumjs/common'
 import { MCLBLS, RustBN254 } from '@ethereumjs/evm'
 import { getGenesis } from '@ethereumjs/genesis'
 import {

diff --git a/packages/statemanager/src/stateManager.ts b/packages/statemanager/src/stateManager.ts
@@ -975,9 +975,7 @@ export class DefaultStateManager implements StateManagerInterface {
       trie,
       prefixStorageTrieKeys,
       prefixCodeHashes,
-      accountCacheOpts,
-      storageCacheOpts,
-      codeCacheOpts,
+      cachesOpts: { accountCacheOpts, storageCacheOpts, codeCacheOpts },
     })
   }
 

diff --git a/packages/statemanager/src/types.ts b/packages/statemanager/src/types.ts
@@ -31,7 +31,7 @@ export interface RPCStateManagerOpts extends BaseStateManagerOpts {
 /**
  * Options for constructing a {@link StateManager}.
  */
-export interface DefaultStateManagerOpts extends BaseStateManagerOpts, CachesStateManagerOpts {
+export interface DefaultStateManagerOpts extends BaseStateManagerOpts {
   /**
    * A {@link Trie} instance
    */

diff --git a/packages/statemanager/test/stateManager.spec.ts b/packages/statemanager/test/stateManager.spec.ts
@@ -82,35 +82,37 @@ describe('StateManager -> General', () => {
 
     sm = new DefaultStateManager({
       trie,
-      accountCacheOpts: {
-        type: CacheType.LRU,
-      },
-      storageCacheOpts: {
-        type: CacheType.LRU,
+      cachesOpts: {
+        accountCacheOpts: {
+          type: CacheType.LRU,
+        },
+        storageCacheOpts: {
+          type: CacheType.LRU,
+        },
       },
     })
 
     smCopy = sm.shallowCopy()
     assert.equal(
-      smCopy['_accountCacheSettings'].type,
+      smCopy['_caches'].settings.account.type,
       CacheType.ORDERED_MAP,
       'should switch to ORDERED_MAP account cache on copy()',
     )
     assert.equal(
-      smCopy['_storageCacheSettings'].type,
+      smCopy['_caches'].settings.storage.type,
       CacheType.ORDERED_MAP,
       'should switch to ORDERED_MAP storage cache on copy()',
     )
     assert.equal(smCopy['_trie']['_opts'].cacheSize, 0, 'should set trie cache size to 0')
 
     smCopy = sm.shallowCopy(false)
     assert.equal(
-      smCopy['_accountCacheSettings'].type,
+      smCopy['_caches'].settings.account.type,
       CacheType.LRU,
       'should retain account cache type when deactivate cache downleveling',
     )
     assert.equal(
-      smCopy['_storageCacheSettings'].type,
+      smCopy['_caches'].settings.storage.type,
       CacheType.LRU,
       'should retain storage cache type when deactivate cache downleveling',
     )

diff --git a/packages/statemanager/test/statelessVerkleStateManager.spec.ts b/packages/statemanager/test/statelessVerkleStateManager.spec.ts
@@ -144,11 +144,13 @@ describe('StatelessVerkleStateManager: Kaustinen Verkle Block', () => {
 
   it(`copy()`, async () => {
     const stateManager = new StatelessVerkleStateManager({
-      accountCacheOpts: {
-        type: CacheType.ORDERED_MAP,
-      },
-      storageCacheOpts: {
-        type: CacheType.ORDERED_MAP,
+      cachesOpts: {
+        accountCacheOpts: {
+          type: CacheType.ORDERED_MAP,
+        },
+        storageCacheOpts: {
+          type: CacheType.ORDERED_MAP,
+        },
       },
       common,
       verkleCrypto,
@@ -158,12 +160,12 @@ describe('StatelessVerkleStateManager: Kaustinen Verkle Block', () => {
     const stateManagerCopy = stateManager.shallowCopy() as StatelessVerkleStateManager
 
     assert.equal(
-      (stateManagerCopy as any)['_accountCacheSettings'].type,
+      stateManagerCopy['_caches'].settings.account.type,
       CacheType.ORDERED_MAP,
       'should switch to ORDERED_MAP account cache on copy()',
     )
     assert.equal(
-      (stateManagerCopy as any)['_storageCacheSettings'].type,
+      stateManagerCopy['_caches'].settings.storage.type,
       CacheType.ORDERED_MAP,
       'should switch to ORDERED_MAP storage cache on copy()',
     )