fix AuRa pre-warmer issues

LukaszRozmej · LukaszRozmej · commit 5dc10e7e4921 · 2024-07-22T17:15:17.000+02:00
diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs b/src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs
@@ -45,7 +45,8 @@ public AuRaBlockProcessor(
             IAuRaValidator? auRaValidator,
             ITxFilter? txFilter = null,
             AuRaContractGasLimitOverride? gasLimitOverride = null,
-            ContractRewriter? contractRewriter = null)
+            ContractRewriter? contractRewriter = null,
+            IBlockCachePreWarmer? preWarmer = null)
             : base(
                 specProvider,
                 blockValidator,
@@ -55,7 +56,8 @@ public AuRaBlockProcessor(
                 receiptStorage,
                 new BlockhashStore(blockTree, specProvider, stateProvider),
                 logManager,
-                withdrawalProcessor)
+                withdrawalProcessor,
+                preWarmer: preWarmer)
         {
             _specProvider = specProvider;
             _blockTree = blockTree ?? throw new ArgumentNullException(nameof(blockTree));
diff --git a/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs b/src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs
@@ -71,7 +71,7 @@ protected override async Task InitBlockchain()
         }
     }
 
-    protected override BlockProcessor CreateBlockProcessor()
+    protected override BlockProcessor CreateBlockProcessor(BlockCachePreWarmer? preWarmer)
     {
         if (_api.SpecProvider is null) throw new StepDependencyException(nameof(_api.SpecProvider));
         if (_api.ChainHeadStateProvider is null) throw new StepDependencyException(nameof(_api.ChainHeadStateProvider));
@@ -89,10 +89,10 @@ protected override BlockProcessor CreateBlockProcessor()
             _api,
             new ServiceTxFilter(_api.SpecProvider));
 
-        return NewAuraBlockProcessor(auRaTxFilter);
+        return NewAuraBlockProcessor(auRaTxFilter, preWarmer);
     }
 
-    protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)
+    protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter, BlockCachePreWarmer? preWarmer)
     {
         IDictionary<long, IDictionary<Address, byte[]>> rewriteBytecode = _api.ChainSpec.AuRa.RewriteBytecode;
         ContractRewriter? contractRewriter = rewriteBytecode?.Count > 0 ? new ContractRewriter(rewriteBytecode) : null;
@@ -112,7 +112,8 @@ protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)
             CreateAuRaValidator(),
             txFilter,
             GetGasLimitCalculator(),
-            contractRewriter
+            contractRewriter,
+            preWarmer: preWarmer
         );
     }
 
diff --git a/src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs b/src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs
@@ -116,9 +116,9 @@ the previous head state.*/
                 }
 
                 using CancellationTokenSource cancellationTokenSource = new();
-                Task? preWarmTask = suggestedBlock.Transactions.Length < 3 ?
-                    null :
-                    _preWarmer?.PreWarmCaches(suggestedBlock, preBlockStateRoot!, cancellationTokenSource.Token);
+                Task? preWarmTask = suggestedBlock.Transactions.Length < 3
+                    ? null
+                    : _preWarmer?.PreWarmCaches(suggestedBlock, preBlockStateRoot!, cancellationTokenSource.Token);
                 (Block processedBlock, TxReceipt[] receipts) = ProcessOne(suggestedBlock, options, blockTracer);
                 cancellationTokenSource.Cancel();
                 preWarmTask?.GetAwaiter().GetResult();
@@ -159,9 +159,12 @@ the previous head state.*/
         {
             _logger.Trace($"Encountered exception {ex} while processing blocks.");
             RestoreBranch(previousBranchStateRoot);
-            _preWarmer?.ClearCaches();
             throw;
         }
+        finally
+        {
+            _preWarmer?.ClearCaches();
+        }
     }
 
     public event EventHandler<BlocksProcessingEventArgs>? BlocksProcessing;
diff --git a/src/Nethermind/Nethermind.Init/Steps/InitializeBlockchain.cs b/src/Nethermind/Nethermind.Init/Steps/InitializeBlockchain.cs
@@ -104,7 +104,11 @@ protected virtual Task InitBlockchain()
 
             setApi.TxPoolInfoProvider = new TxPoolInfoProvider(chainHeadInfoProvider.AccountStateProvider, txPool);
             setApi.GasPriceOracle = new GasPriceOracle(getApi.BlockTree!, getApi.SpecProvider, _api.LogManager, blocksConfig.MinGasPrice);
-            IBlockProcessor mainBlockProcessor = setApi.MainBlockProcessor = CreateBlockProcessor();
+            PreBlockCaches? preBlockCaches = (_api.WorldState as IPreBlockCaches)?.Caches;
+            BlockCachePreWarmer? preWarmer = blocksConfig.PreWarmStateOnBlockProcessing
+                ? new(new(_api.WorldStateManager!, _api.BlockTree!, _api.SpecProvider, _api.LogManager, preBlockCaches), _api.SpecProvider, _api.LogManager, preBlockCaches)
+                : null;
+            IBlockProcessor mainBlockProcessor = setApi.MainBlockProcessor = CreateBlockProcessor(preWarmer);
 
             BlockchainProcessor blockchainProcessor = new(
                 getApi.BlockTree,
@@ -212,7 +216,7 @@ protected virtual TxPool.TxPool CreateTxPool() =>
             _api.LogManager);
 
         // TODO: remove from here - move to consensus?
-        protected virtual BlockProcessor CreateBlockProcessor()
+        protected virtual BlockProcessor CreateBlockProcessor(BlockCachePreWarmer? preWarmer)
         {
             if (_api.DbProvider is null) throw new StepDependencyException(nameof(_api.DbProvider));
             if (_api.RewardCalculatorSource is null) throw new StepDependencyException(nameof(_api.RewardCalculatorSource));
@@ -221,13 +225,7 @@ protected virtual BlockProcessor CreateBlockProcessor()
             if (_api.WorldStateManager is null) throw new StepDependencyException(nameof(_api.WorldStateManager));
             if (_api.SpecProvider is null) throw new StepDependencyException(nameof(_api.SpecProvider));
 
-            IBlocksConfig blocksConfig = _api.Config<IBlocksConfig>();
             IWorldState worldState = _api.WorldState!;
-
-            PreBlockCaches? preBlockCaches = (worldState as IPreBlockCaches)?.Caches;
-            BlockCachePreWarmer? preWarmer = blocksConfig.PreWarmStateOnBlockProcessing
-                ? new(new(_api.WorldStateManager, _api.BlockTree, _api.SpecProvider, _api.LogManager, preBlockCaches), _api.SpecProvider, _api.LogManager, preBlockCaches)
-                : null;
             return new BlockProcessor(
                 _api.SpecProvider,
                 _api.BlockValidator,
diff --git a/src/Nethermind/Nethermind.Merge.AuRa/AuRaMergeBlockProcessor.cs b/src/Nethermind/Nethermind.Merge.AuRa/AuRaMergeBlockProcessor.cs
@@ -33,7 +33,8 @@ public AuRaMergeBlockProcessor(
         IAuRaValidator? validator,
         ITxFilter? txFilter = null,
         AuRaContractGasLimitOverride? gasLimitOverride = null,
-        ContractRewriter? contractRewriter = null
+        ContractRewriter? contractRewriter = null,
+        IBlockCachePreWarmer? preWarmer = null
     ) : base(
             specProvider,
             blockValidator,
@@ -47,7 +48,8 @@ public AuRaMergeBlockProcessor(
             validator,
             txFilter,
             gasLimitOverride,
-            contractRewriter
+            contractRewriter,
+            preWarmer
         )
     { }
 
diff --git a/src/Nethermind/Nethermind.Merge.AuRa/InitializationSteps/InitializeBlockchainAuRaMerge.cs b/src/Nethermind/Nethermind.Merge.AuRa/InitializationSteps/InitializeBlockchainAuRaMerge.cs
@@ -24,7 +24,7 @@ public InitializeBlockchainAuRaMerge(AuRaNethermindApi api) : base(api)
             _api = api;
         }
 
-        protected override AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)
+        protected override AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter, BlockCachePreWarmer? preWarmer)
         {
             IDictionary<long, IDictionary<Address, byte[]>> rewriteBytecode = _api.ChainSpec.AuRa.RewriteBytecode;
             ContractRewriter? contractRewriter = rewriteBytecode?.Count > 0 ? new ContractRewriter(rewriteBytecode) : null;
@@ -47,7 +47,8 @@ protected override AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)
                 CreateAuRaValidator(),
                 txFilter,
                 GetGasLimitCalculator(),
-                contractRewriter
+                contractRewriter,
+                preWarmer: preWarmer
             );
         }
 
diff --git a/src/Nethermind/Nethermind.Optimism/InitializeBlockchainOptimism.cs b/src/Nethermind/Nethermind.Optimism/InitializeBlockchainOptimism.cs
@@ -6,9 +6,11 @@
 using Nethermind.Blockchain.Blocks;
 using Nethermind.Blockchain.Services;
 using Nethermind.Config;
+using Nethermind.Consensus.AuRa.Withdrawals;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Producers;
 using Nethermind.Consensus.Validators;
+using Nethermind.Consensus.Withdrawals;
 using Nethermind.Evm;
 using Nethermind.Evm.TransactionProcessing;
 using Nethermind.Init.Steps;
@@ -82,7 +84,7 @@ protected override IBlockValidator CreateBlockValidator()
         return new InvalidBlockInterceptor(blockValidator, _api.InvalidChainTracker, _api.LogManager);
     }
 
-    protected override BlockProcessor CreateBlockProcessor()
+    protected override BlockProcessor CreateBlockProcessor(BlockCachePreWarmer? preWarmer)
     {
         if (_api.DbProvider is null) throw new StepDependencyException(nameof(_api.DbProvider));
         if (_api.RewardCalculatorSource is null) throw new StepDependencyException(nameof(_api.RewardCalculatorSource));
@@ -105,7 +107,9 @@ protected override BlockProcessor CreateBlockProcessor()
             new BlockhashStore(_api.BlockTree, _api.SpecProvider, _api.WorldState),
             _api.LogManager,
             _api.SpecHelper,
-            contractRewriter);
+            contractRewriter,
+            new BlockProductionWithdrawalProcessor(new NullWithdrawalProcessor()),
+            preWarmer: preWarmer);
     }
 
     protected override IUnclesValidator CreateUnclesValidator() => Always.Valid;
diff --git a/src/Nethermind/Nethermind.Optimism/OptimismBlockProcessor.cs b/src/Nethermind/Nethermind.Optimism/OptimismBlockProcessor.cs
@@ -34,9 +34,11 @@ public OptimismBlockProcessor(
         ILogManager? logManager,
         IOPConfigHelper opConfigHelper,
         Create2DeployerContractRewriter contractRewriter,
-        IWithdrawalProcessor? withdrawalProcessor = null)
+        IWithdrawalProcessor? withdrawalProcessor = null,
+        IBlockCachePreWarmer? preWarmer = null)
         : base(specProvider, blockValidator, rewardCalculator, blockTransactionsExecutor,
-            stateProvider, receiptStorage, blockhashStore, logManager, withdrawalProcessor, ReceiptsRootCalculator.Instance)
+            stateProvider, receiptStorage, blockhashStore, logManager, withdrawalProcessor,
+            ReceiptsRootCalculator.Instance, preWarmer)
     {
         ArgumentNullException.ThrowIfNull(stateProvider);
         _contractRewriter = contractRewriter;

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ protected override async Task InitBlockchain()`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- protected override BlockProcessor CreateBlockProcessor()`
	`74`	`+ protected override BlockProcessor CreateBlockProcessor(BlockCachePreWarmer? preWarmer)`
`75`	`75`	`{`
`76`	`76`	`if (_api.SpecProvider is null) throw new StepDependencyException(nameof(_api.SpecProvider));`
`77`	`77`	`if (_api.ChainHeadStateProvider is null) throw new StepDependencyException(nameof(_api.ChainHeadStateProvider));`
`@@ -89,10 +89,10 @@ protected override BlockProcessor CreateBlockProcessor()`
`89`	`89`	`_api,`
`90`	`90`	`new ServiceTxFilter(_api.SpecProvider));`
`91`	`91`
`92`		`- return NewAuraBlockProcessor(auRaTxFilter);`
	`92`	`+ return NewAuraBlockProcessor(auRaTxFilter, preWarmer);`
`93`	`93`	`}`
`94`	`94`
`95`		`- protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)`
	`95`	`+ protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter, BlockCachePreWarmer? preWarmer)`
`96`	`96`	`{`
`97`	`97`	`IDictionary<long, IDictionary<Address, byte[]>> rewriteBytecode = _api.ChainSpec.AuRa.RewriteBytecode;`
`98`	`98`	`ContractRewriter? contractRewriter = rewriteBytecode?.Count > 0 ? new ContractRewriter(rewriteBytecode) : null;`
`@@ -112,7 +112,8 @@ protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)`
`112`	`112`	`CreateAuRaValidator(),`
`113`	`113`	`txFilter,`
`114`	`114`	`GetGasLimitCalculator(),`
`115`		`- contractRewriter`
	`115`	`+ contractRewriter,`
	`116`	`+ preWarmer: preWarmer`
`116`	`117`	`);`
`117`	`118`	`}`
`118`	`119`
Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ the previous head state.*/`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`using CancellationTokenSource cancellationTokenSource = new();`
`119`		`- Task? preWarmTask = suggestedBlock.Transactions.Length < 3 ?`
`120`		`- null :`
`121`		`- _preWarmer?.PreWarmCaches(suggestedBlock, preBlockStateRoot!, cancellationTokenSource.Token);`
	`119`	`+ Task? preWarmTask = suggestedBlock.Transactions.Length < 3`
	`120`	`+ ? null`
	`121`	`+ : _preWarmer?.PreWarmCaches(suggestedBlock, preBlockStateRoot!, cancellationTokenSource.Token);`
`122`	`122`	`(Block processedBlock, TxReceipt[] receipts) = ProcessOne(suggestedBlock, options, blockTracer);`
`123`	`123`	`cancellationTokenSource.Cancel();`
`124`	`124`	`preWarmTask?.GetAwaiter().GetResult();`
`@@ -159,9 +159,12 @@ the previous head state.*/`
`159`	`159`	`{`
`160`	`160`	`_logger.Trace($"Encountered exception {ex} while processing blocks.");`
`161`	`161`	`RestoreBranch(previousBranchStateRoot);`
`162`		`- _preWarmer?.ClearCaches();`
`163`	`162`	`throw;`
`164`	`163`	`}`
	`164`	`+ finally`
	`165`	`+ {`
	`166`	`+ _preWarmer?.ClearCaches();`
	`167`	`+ }`
`165`	`168`	`}`
`166`	`169`
`167`	`170`	`public event EventHandler<BlocksProcessingEventArgs>? BlocksProcessing;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public InitializeBlockchainAuRaMerge(AuRaNethermindApi api) : base(api)`
`24`	`24`	`_api = api;`
`25`	`25`	`}`
`26`	`26`
`27`		`- protected override AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)`
	`27`	`+ protected override AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter, BlockCachePreWarmer? preWarmer)`
`28`	`28`	`{`
`29`	`29`	`IDictionary<long, IDictionary<Address, byte[]>> rewriteBytecode = _api.ChainSpec.AuRa.RewriteBytecode;`
`30`	`30`	`ContractRewriter? contractRewriter = rewriteBytecode?.Count > 0 ? new ContractRewriter(rewriteBytecode) : null;`
`@@ -47,7 +47,8 @@ protected override AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)`
`47`	`47`	`CreateAuRaValidator(),`
`48`	`48`	`txFilter,`
`49`	`49`	`GetGasLimitCalculator(),`
`50`		`- contractRewriter`
	`50`	`+ contractRewriter,`
	`51`	`+ preWarmer: preWarmer`
`51`	`52`	`);`
`52`	`53`	`}`
`53`	`54`