small refactor

src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs

@@ -136,7 +136,7 @@ protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch?
 
             TrieStore trieStore = new(stateDb, _logManager);
             IWorldState stateProvider = new WorldState(trieStore, codeDb, _logManager);
-            var worldStateManager = new WorldStateManager(stateProvider, trieStore, dbProvider, null, _logManager);
+            var worldStateManager = new WorldStateManager(stateProvider, trieStore, dbProvider, _logManager);
             IBlockTree blockTree = Build.A.BlockTree()
                 .WithSpecProvider(specProvider)
                 .WithoutSettingHead

src/Nethermind/Nethermind.AuRa.Test/AuraBlockProcessorTests.cs

@@ -149,7 +149,7 @@ void Process(AuRaBlockProcessor auRaBlockProcessor, int blockNumber, Hash256 sta
             TrieStore trieStore = new(dbProvider.StateDb, LimboLogs.Instance);
             IWorldState stateProvider = new WorldState(trieStore, dbProvider.CodeDb, LimboLogs.Instance);
             var worldStateManager =
-                new WorldStateManager(stateProvider, trieStore, dbProvider, null, LimboLogs.Instance);
+                new WorldStateManager(stateProvider, trieStore, dbProvider, LimboLogs.Instance);
             ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();
             AuRaBlockProcessor processor = new AuRaBlockProcessor(
                 HoleskySpecProvider.Instance,

src/Nethermind/Nethermind.Blockchain.Test/BlockProcessorTests.cs

@@ -41,7 +41,7 @@ public void Prepared_block_contains_author_field()
             TrieStore trieStore = new(dbProvider.StateDb, LimboLogs.Instance);
             IWorldState stateProvider = new WorldState(trieStore, dbProvider.CodeDb, LimboLogs.Instance);
             var worldStateManger =
-                new WorldStateManager(stateProvider, trieStore, dbProvider, null, LimboLogs.Instance);
+                new WorldStateManager(stateProvider, trieStore, dbProvider, LimboLogs.Instance);
 
             ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();
             BlockProcessor processor = new(
@@ -72,7 +72,7 @@ public void Recovers_state_on_cancel()
             TrieStore trieStore = new(dbProvider.StateDb, LimboLogs.Instance);
             IWorldState stateProvider = new WorldState(trieStore, dbProvider.CodeDb, LimboLogs.Instance);
             var worldStateManger =
-                new WorldStateManager(stateProvider, trieStore, dbProvider, null, LimboLogs.Instance);
+                new WorldStateManager(stateProvider, trieStore, dbProvider, LimboLogs.Instance);
             ITransactionProcessor transactionProcessor = Substitute.For<ITransactionProcessor>();
             BlockProcessor processor = new(
                 HoleskySpecProvider.Instance,

src/Nethermind/Nethermind.Blockchain.Test/BlockhashProviderTests.cs

@@ -28,7 +28,7 @@ private static IWorldStateManager CreateWorldStateManager()
             var worldState = new WorldState(trieStore, dbProvider.CodeDb, LimboLogs.Instance);
             worldState.CreateAccount(Eip2935Constants.BlockHashHistoryAddress, 0, 1);
             worldState.Commit(Frontier.Instance);
-            return new WorldStateManager(worldState, trieStore, dbProvider, null, LimboLogs.Instance);
+            return new WorldStateManager(worldState, trieStore, dbProvider, LimboLogs.Instance);
         }
 
         private static BlockhashProvider CreateBlockHashProvider(IBlockFinder tree, IReleaseSpec spec)

src/Nethermind/Nethermind.Blockchain.Test/Producers/DevBlockproducerTests.cs

@@ -57,7 +57,7 @@ public void Test()
                 dbProvider.RegisteredDbs[DbNames.Code],
                 LimboLogs.Instance);
             var worldStateManager =
-                new WorldStateManager(stateProvider, trieStore, dbProvider, null, LimboLogs.Instance);
+                new WorldStateManager(stateProvider, trieStore, dbProvider, LimboLogs.Instance);
             StateReader stateReader = new(trieStore, dbProvider.GetDb<IDb>(DbNames.State), LimboLogs.Instance);
             BlockhashProvider blockhashProvider = new(blockTree, specProvider, worldStateManager, LimboLogs.Instance);
             CodeInfoRepository codeInfoRepository = new();

src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs

@@ -39,7 +39,7 @@ public void Setup()
         WorldState stateProvider = new(trieStore, memDbProvider.CodeDb, LimboLogs.Instance);
         StateReader stateReader = new(trieStore, memDbProvider.CodeDb, LimboLogs.Instance);
         var worldStateManager =
-            new WorldStateManager(stateProvider, trieStore, memDbProvider, null, LimboLogs.Instance);
+            new WorldStateManager(stateProvider, trieStore, memDbProvider, LimboLogs.Instance);
         ISpecProvider specProvider = MainnetSpecProvider.Instance;
         EthereumEcdsa ecdsa = new(1);
         ITransactionComparerProvider transactionComparerProvider =

src/Nethermind/Nethermind.Clique.Test/CliqueBlockProducerTests.cs

@@ -96,7 +96,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                 stateProvider.Commit(goerliSpecProvider.GenesisSpec);
                 stateProvider.CommitTree(0);
                 var worldStateManager =
-                    new WorldStateManager(stateProvider, trieStore, dbProvider, null, LimboLogs.Instance);
+                    new WorldStateManager(stateProvider, trieStore, dbProvider, LimboLogs.Instance);
 
                 BlockTree blockTree = Build.A.BlockTree()
                     .WithSpecProvider(goerliSpecProvider)
@@ -149,7 +149,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                 IReadOnlyTrieStore minerTrieStore = trieStore.AsReadOnly();
 
                 WorldState minerStateProvider = new(minerTrieStore, dbProvider.CodeDb, nodeLogManager);
-                var minerWorldStateManager = new WorldStateManager(minerStateProvider, minerTrieStore, dbProvider, null,
+                var minerWorldStateManager = new WorldStateManager(minerStateProvider, minerTrieStore, dbProvider,
                     LimboLogs.Instance);
                 VirtualMachine minerVirtualMachine = new(blockhashProvider, specProvider, codeInfoRepository, nodeLogManager);
                 TransactionProcessor minerTransactionProcessor = new(goerliSpecProvider, minerVirtualMachine, codeInfoRepository, nodeLogManager);

src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs

@@ -159,7 +159,7 @@ protected virtual async Task<TestBlockchain> Build(ISpecProvider? specProvider =
         State.CommitTree(0);
 
         ReadOnlyTrieStore = TrieStore.AsReadOnly(new NodeStorage(StateDb));
-        WorldStateManager = new WorldStateManager(State, TrieStore, DbProvider, null, LimboLogs.Instance);
+        WorldStateManager = new WorldStateManager(State, TrieStore, DbProvider, LimboLogs.Instance);
         StateReader = new StateReader(ReadOnlyTrieStore, CodeDb, LogManager);
 
         ChainLevelInfoRepository = new ChainLevelInfoRepository(this.DbProvider.BlockInfosDb);

src/Nethermind/Nethermind.Facade.Test/BlockchainBridgeTests.cs

@@ -80,7 +80,7 @@ public async Task SetUp()
             IReadOnlyTrieStore trieStore = new TrieStore(_dbProvider.StateDb, LimboLogs.Instance).AsReadOnly();
 
             IWorldStateManager readOnlyWorldStateManager =
-                new ReadOnlyWorldStateManager(dbProvider, trieStore, null, LimboLogs.Instance);
+                new ReadOnlyWorldStateManager(dbProvider, trieStore, LimboLogs.Instance);
 
             IReadOnlyBlockTree readOnlyBlockTree = _blockTree.AsReadOnly();
             ReadOnlyTxProcessingEnv processingEnv = new TestReadOnlyTxProcessingEnv(
@@ -221,7 +221,7 @@ public void Bridge_head_is_correct(long headNumber)
             IReadOnlyTrieStore trieStore = new TrieStore(_dbProvider.StateDb, LimboLogs.Instance).AsReadOnly();
 
             IWorldStateManager readOnlyWorldStateManager =
-                new ReadOnlyWorldStateManager(dbProvider, trieStore, null, LimboLogs.Instance);
+                new ReadOnlyWorldStateManager(dbProvider, trieStore, LimboLogs.Instance);
             IReadOnlyBlockTree roBlockTree = _blockTree.AsReadOnly();
             ReadOnlyTxProcessingEnv processingEnv = new(
                 readOnlyWorldStateManager,

src/Nethermind/Nethermind.Init/InitializeStateDb.cs

@@ -165,8 +165,7 @@ public Task Execute(CancellationToken cancellationToken)
             worldState,
             trieStore,
             getApi.DbProvider,
-            preBlockCaches,
-            getApi.LogManager);
+            getApi.LogManager, preBlockCaches);
 
         // TODO: Don't forget this
         TrieStoreBoundaryWatcher trieStoreBoundaryWatcher = new(stateManager, _api.BlockTree!, _api.LogManager);

src/Nethermind/Nethermind.JsonRpc.Test/Modules/Proof/ProofRpcModuleTests.cs

@@ -72,7 +72,7 @@ public async Task Setup()
                 .OfChainLength(10)
                 .TestObject;
 
-            _worldStateManager = new WorldStateManager(worldState, trieStore, _dbProvider, null, LimboLogs.Instance);
+            _worldStateManager = new WorldStateManager(worldState, trieStore, _dbProvider, LimboLogs.Instance);
             ProofModuleFactory moduleFactory = new(
                 _worldStateManager,
                 _blockTree,

src/Nethermind/Nethermind.JsonRpc.Test/Modules/Trace/ParityStyleTracerTests.cs

@@ -64,7 +64,7 @@ public async Task Setup()
             _stateReader = new StateReader(trieStore, _dbProvider.CodeDb, LimboLogs.Instance);
 
             var worldStateManager =
-                new WorldStateManager(stateProvider, trieStore, _dbProvider, null, LimboLogs.Instance);
+                new WorldStateManager(stateProvider, trieStore, _dbProvider, LimboLogs.Instance);
 
             BlockhashProvider blockhashProvider = new(_blockTree, specProvider, worldStateManager, LimboLogs.Instance);
             CodeInfoRepository codeInfoRepository = new();

src/Nethermind/Nethermind.Runner.Test/Ethereum/ContextWithMocks.cs

@@ -121,7 +121,7 @@ public static NethermindApi ContextWithMocks()
                 BadBlocksStore = Substitute.For<IBlockStore>()
             };
 
-            api.WorldStateManager = new ReadOnlyWorldStateManager(api.DbProvider, Substitute.For<IReadOnlyTrieStore>(), null, LimboLogs.Instance);
+            api.WorldStateManager = new ReadOnlyWorldStateManager(api.DbProvider, Substitute.For<IReadOnlyTrieStore>(), LimboLogs.Instance);
             api.NodeStorageFactory = new NodeStorageFactory(INodeStorage.KeyScheme.HalfPath, LimboLogs.Instance);
             return api;
         }

src/Nethermind/Nethermind.State.Test/WorldStateManagerTests.cs

@@ -23,7 +23,7 @@ public void ShouldProxyGlobalWorldState()
         IWorldState worldState = Substitute.For<IWorldState>();
         ITrieStore trieStore = Substitute.For<ITrieStore>();
         IDbProvider dbProvider = TestMemDbProvider.Init();
-        WorldStateManager worldStateManager = new WorldStateManager(worldState, trieStore, dbProvider, null, LimboLogs.Instance);
+        WorldStateManager worldStateManager = new WorldStateManager(worldState, trieStore, dbProvider, LimboLogs.Instance);
 
         worldStateManager.GlobalWorldState.Should().Be(worldState);
     }
@@ -34,7 +34,7 @@ public void ShouldProxyReorgBoundaryEvent()
         IWorldState worldState = Substitute.For<IWorldState>();
         ITrieStore trieStore = Substitute.For<ITrieStore>();
         IDbProvider dbProvider = TestMemDbProvider.Init();
-        WorldStateManager worldStateManager = new WorldStateManager(worldState, trieStore, dbProvider, null, LimboLogs.Instance);
+        WorldStateManager worldStateManager = new WorldStateManager(worldState, trieStore, dbProvider, LimboLogs.Instance);
 
         bool gotEvent = false;
         worldStateManager.ReorgBoundaryReached += (sender, reached) => gotEvent = true;

src/Nethermind/Nethermind.State/OverlayWorldStateManager.cs

@@ -14,10 +14,11 @@ namespace Nethermind.State;
 public class OverlayWorldStateManager(
     IReadOnlyDbProvider dbProvider,
     OverlayTrieStore overlayTrieStore,
-    ILogManager? logManager)
+    ILogManager? logManager,
+    PreBlockCaches? caches = null)
     : IWorldStateManager
 {
-    public PreBlockCaches Caches { get; }
+    public PreBlockCaches? Caches { get; } = caches;
 
     private readonly IDb _codeDb = dbProvider.GetDb<IDb>(DbNames.Code);
 

src/Nethermind/Nethermind.State/ReadOnlyWorldStateManager.cs

@@ -22,12 +22,10 @@ public class ReadOnlyWorldStateManager : IWorldStateManager
 
     public PreBlockCaches? Caches { get; }
 
-    public ReadOnlyWorldStateManager(
-        IDbProvider dbProvider,
+    public ReadOnlyWorldStateManager(IDbProvider dbProvider,
         IReadOnlyTrieStore readOnlyTrieStore,
-        PreBlockCaches? preBlockCaches,
-        ILogManager logManager
-    )
+        ILogManager logManager,
+        PreBlockCaches? preBlockCaches = null)
     {
         _readOnlyTrieStore = readOnlyTrieStore;
         _logManager = logManager;

src/Nethermind/Nethermind.State/WorldStateManager.cs

@@ -13,9 +13,9 @@ public class WorldStateManager(
     IWorldState worldState,
     ITrieStore trieStore,
     IDbProvider dbProvider,
-    PreBlockCaches? preBlockCaches,
-    ILogManager logManager)
-    : ReadOnlyWorldStateManager(dbProvider, trieStore.AsReadOnly(), preBlockCaches, logManager)
+    ILogManager logManager,
+    PreBlockCaches? preBlockCaches = null)
+    : ReadOnlyWorldStateManager(dbProvider, trieStore.AsReadOnly(), logManager, preBlockCaches)
 {
     public override IWorldState GlobalWorldState => worldState;
 

src/Nethermind/Nethermind.Synchronization.Test/SyncThreadTests.cs

@@ -261,7 +261,7 @@ private SyncTestContext CreateSyncManager(int index)
             stateProvider.CommitTree(0);
             stateProvider.RecalculateStateRoot();
             var worldStateManager =
-                new WorldStateManager(stateProvider, trieStore, dbProvider, null, LimboLogs.Instance);
+                new WorldStateManager(stateProvider, trieStore, dbProvider, LimboLogs.Instance);
 
             InMemoryReceiptStorage receiptStorage = new();
 
@@ -315,7 +315,7 @@ private SyncTestContext CreateSyncManager(int index)
             SyncPeerPool syncPeerPool = new(tree, nodeStatsManager, new TotalDifficultyBetterPeerStrategy(LimboLogs.Instance), logManager, 25);
 
             WorldState devState = new(trieStore, codeDb, logManager);
-            var devWorldStateManager = new WorldStateManager(devState, trieStore, dbProvider, null, LimboLogs.Instance);
+            var devWorldStateManager = new WorldStateManager(devState, trieStore, dbProvider, LimboLogs.Instance);
             VirtualMachine devEvm = new(blockhashProvider, specProvider, codeInfoRepository, logManager);
             TransactionProcessor devTxProcessor = new(specProvider, devEvm, codeInfoRepository, logManager);