- Fix default behavior of beaconBlockRootHandler argument in BlockProcessor.ctor

Author: Demuirgos

src/Nethermind/Nethermind.AccountAbstraction.Test/AccountAbstractionRpcModuleTests.TestAccountAbstractionRpcBlockchain.cs

@@ -193,8 +193,7 @@ protected override BlockProcessor CreateBlockProcessor()
                     State,
                     ReceiptStorage,
                     NullWitnessCollector.Instance,
-                    LogManager,
-                    beaconBlockRootHandler: new BeaconBlockRootHandler());
+                    LogManager);
 
                 var parser = new AbiDefinitionParser();
                 parser.RegisterAbiTypeFactory(new AbiTuple<UserOperationAbi>());

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

@@ -52,8 +52,7 @@ public void Prepared_block_contains_author_field()
                 stateProvider,
                 NullReceiptStorage.Instance,
                 NullWitnessCollector.Instance,
-                LimboLogs.Instance,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                LimboLogs.Instance);
 
             BlockHeader header = Build.A.BlockHeader.WithAuthor(TestItem.AddressD).TestObject;
             Block block = Build.A.Block.WithHeader(header).TestObject;
@@ -84,8 +83,7 @@ public void Can_store_a_witness()
                 stateProvider,
                 NullReceiptStorage.Instance,
                 witnessCollector,
-                LimboLogs.Instance,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                LimboLogs.Instance);
 
             BlockHeader header = Build.A.BlockHeader.WithAuthor(TestItem.AddressD).TestObject;
             Block block = Build.A.Block.WithHeader(header).TestObject;
@@ -114,8 +112,7 @@ public void Recovers_state_on_cancel()
                 stateProvider,
                 NullReceiptStorage.Instance,
                 NullWitnessCollector.Instance,
-                LimboLogs.Instance,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                LimboLogs.Instance);
 
             BlockHeader header = Build.A.BlockHeader.WithNumber(1).WithAuthor(TestItem.AddressD).TestObject;
             Block block = Build.A.Block.WithTransactions(1, MuirGlacier.Instance).WithHeader(header).TestObject;

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

@@ -77,8 +77,7 @@ public void Test()
                 stateProvider,
                 NullReceiptStorage.Instance,
                 NullWitnessCollector.Instance,
-                LimboLogs.Instance,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                LimboLogs.Instance);
             BlockchainProcessor blockchainProcessor = new(
                 blockTree,
                 blockProcessor,

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

@@ -86,8 +86,7 @@ public void Setup()
                 stateProvider,
                 NullReceiptStorage.Instance,
                 new WitnessCollector(memDbProvider.StateDb, LimboLogs.Instance),
-                LimboLogs.Instance,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                LimboLogs.Instance);
             _blockchainProcessor = new BlockchainProcessor(
                 _blockTree,
                 blockProcessor,

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

@@ -133,8 +133,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                     stateProvider,
                     NullReceiptStorage.Instance,
                     NullWitnessCollector.Instance,
-                    nodeLogManager,
-                    beaconBlockRootHandler: new BeaconBlockRootHandler());
+                    nodeLogManager);
 
                 BlockchainProcessor processor = new(blockTree, blockProcessor, new AuthorRecoveryStep(snapshotManager), stateReader, nodeLogManager, BlockchainProcessor.Options.NoReceipts);
                 processor.Start();
@@ -153,8 +152,7 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
                     minerStateProvider,
                     NullReceiptStorage.Instance,
                     NullWitnessCollector.Instance,
-                    nodeLogManager,
-                    beaconBlockRootHandler: new BeaconBlockRootHandler());
+                    nodeLogManager);
 
                 BlockchainProcessor minerProcessor = new(blockTree, minerBlockProcessor, new AuthorRecoveryStep(snapshotManager), stateReader, nodeLogManager, BlockchainProcessor.Options.NoReceipts);
 

src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs

@@ -57,7 +57,7 @@ public BlockProcessor(
         IWitnessCollector? witnessCollector,
         ILogManager? logManager,
         IWithdrawalProcessor? withdrawalProcessor = null,
-        IBeaconBlockRootHandler? beaconBlockRootHandler = null)
+        IBeaconBlockRootHandler beaconBlockRootHandler = null)
     {
         _logger = logManager?.GetClassLogger() ?? throw new ArgumentNullException(nameof(logManager));
         _specProvider = specProvider ?? throw new ArgumentNullException(nameof(specProvider));
@@ -68,7 +68,7 @@ public BlockProcessor(
         _withdrawalProcessor = withdrawalProcessor ?? new WithdrawalProcessor(stateProvider, logManager);
         _rewardCalculator = rewardCalculator ?? throw new ArgumentNullException(nameof(rewardCalculator));
         _blockTransactionsExecutor = blockTransactionsExecutor ?? throw new ArgumentNullException(nameof(blockTransactionsExecutor));
-        _beaconBlockRootHandler = beaconBlockRootHandler ?? throw new ArgumentNullException(nameof(beaconBlockRootHandler));
+        _beaconBlockRootHandler = beaconBlockRootHandler ?? new BeaconBlockRootHandler();
 
         _receiptsTracer = new BlockReceiptsTracer();
     }

src/Nethermind/Nethermind.Consensus/Processing/ReadOnlyChainProcessingEnv.cs

@@ -51,8 +51,7 @@ public ReadOnlyChainProcessingEnv(
                 StateProvider,
                 receiptStorage,
                 NullWitnessCollector.Instance,
-                logManager,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                logManager);
 
             _blockProcessingQueue = new BlockchainProcessor(_txEnv.BlockTree, BlockProcessor, recoveryStep, _txEnv.StateReader, logManager, BlockchainProcessor.Options.NoReceipts);
             BlockProcessingQueue = _blockProcessingQueue;

src/Nethermind/Nethermind.Consensus/Producers/BlockProducerEnvFactory.cs

@@ -150,8 +150,7 @@ protected virtual BlockProcessor CreateBlockProcessor(ReadOnlyTxProcessingEnv re
                 receiptStorage,
                 NullWitnessCollector.Instance,
                 logManager,
-                new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(readOnlyTxProcessingEnv.StateProvider, logManager)),
-                new BeaconBlockRootHandler());
+                new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(readOnlyTxProcessingEnv.StateProvider, logManager)));
 
     }
 }

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

@@ -352,8 +352,7 @@ protected virtual IBlockProcessor CreateBlockProcessor() =>
             State,
             ReceiptStorage,
             NullWitnessCollector.Instance,
-            LogManager,
-            beaconBlockRootHandler: BeaconBlockRootHandler);
+            LogManager);
 
     public async Task WaitForNewHead()
     {

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

@@ -77,8 +77,7 @@ public void Setup()
                 stateProvider,
                 NullReceiptStorage.Instance,
                 NullWitnessCollector.Instance,
-                LimboLogs.Instance,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                LimboLogs.Instance);
 
             RecoverSignatures txRecovery = new(new EthereumEcdsa(TestBlockchainIds.ChainId, LimboLogs.Instance), NullTxPool.Instance, specProvider, LimboLogs.Instance);
             _processor = new BlockchainProcessor(_blockTree, blockProcessor, txRecovery, stateReader, LimboLogs.Instance, BlockchainProcessor.Options.NoReceipts);

src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.Setup.cs

@@ -224,8 +224,7 @@ protected override IBlockProcessor CreateBlockProcessor()
                 State,
                 ReceiptStorage,
                 NullWitnessCollector.Instance,
-                LogManager,
-                beaconBlockRootHandler: new BeaconBlockRootHandler());
+                LogManager);
 
             return new TestBlockProcessorInterceptor(processor, _blockProcessingThrottle);
         }

src/Nethermind/Nethermind.Mev.Test/MevRpcModuleTests.TestMevRpcBlockchain.cs

@@ -207,8 +207,7 @@ protected override BlockProcessor CreateBlockProcessor()
                     State,
                     ReceiptStorage,
                     NullWitnessCollector.Instance,
-                    LogManager,
-                    beaconBlockRootHandler: new BeaconBlockRootHandler());
+                    LogManager);
 
                 _tracerFactory = new TracerFactory(
                     DbProvider,

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

@@ -300,7 +300,7 @@ private SyncTestContext CreateSyncManager(int index)
                 stateProvider,
                 receiptStorage,
                 NullWitnessCollector.Instance,
-                logManager, beaconBlockRootHandler: new BeaconBlockRootHandler());
+                logManager);
 
             RecoverSignatures step = new(ecdsa, txPool, specProvider, logManager);
             BlockchainProcessor processor = new(tree, blockProcessor, step, stateReader, logManager,
@@ -322,7 +322,7 @@ private SyncTestContext CreateSyncManager(int index)
                 devState,
                 receiptStorage,
                 NullWitnessCollector.Instance,
-                logManager, beaconBlockRootHandler: new BeaconBlockRootHandler());
+                logManager);
 
             BlockchainProcessor devChainProcessor = new(tree, devBlockProcessor, step, stateReader, logManager,
                 BlockchainProcessor.Options.NoReceipts);