refactor(consensus): wire block preprocessor steps through DI (#12258)

* refactor(consensus): wire block preprocessor steps through DI

Move IBlockPreprocessorStep wiring off the mutable NethermindApi.BlockPreprocessor
composite and onto the OrderedComponents DI DSL, matching the earlier TxGossipPolicy
(#10941) and IP2PCapabilityResolver (#12093) migrations:

- Register RecoverSignatures (BlockProcessingModule), MergeProcessingRecoveryStep
  (BaseMergePluginModule, covering Merge/Optimism/Taiko/AuRaMerge) and
  AuthorRecoveryStep (CliqueModule) via AddFirst/AddLast, preserving execution order.
- Drop the imperative api.BlockPreprocessor.AddFirst/AddLast calls, the
  BlockPreprocessor property on IApiWithBlockchain/NethermindApi, and the
  IBlockPreprocessorStep bridge in NethermindRunnerModule.

Remove CompositeBlockPreprocessorStep entirely: it was a logic-free foreach adapter.
Consumers (BlockchainProcessor, BlockchainProcessorFacade, MainProcessingContext)
now inject the ordered IReadOnlyList<IBlockPreprocessorStep> directly, consistent
with how BlockchainProcessor already takes IEnumerable<IBlockTracer>.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* refactor(consensus): address review feedback on preprocessor DI

- MergePlugin: register MergeProcessingRecoveryStep via AddLast so RecoverSignatures
  stays ahead of it, restoring the exact pre-DI ordering [RecoverSignatures, Merge]
  (the previous AddFirst flipped it; harmless since the steps touch disjoint fields,
  but now behavior-identical to master).
- BlockchainProcessor: rename recoverySteps -> preprocessorSteps and the private
  RecoverData helper -> Preprocess, now that the steps are generic pre-processors.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>

Author: asdacap

src/Nethermind/Nethermind.Api/IApiWithBlockchain.cs

@@ -18,7 +18,6 @@ public interface IApiWithBlockchain : IApiWithStores
         (IApiWithStores GetFromApi, IApiWithBlockchain SetInApi) ForInit => (this, this);
         (IApiWithStores GetFromApi, IApiWithBlockchain SetInApi) ForBlockchain => (this, this);
 
-        CompositeBlockPreprocessorStep BlockPreprocessor { get; }
         IBlockProducer? BlockProducer { get; set; }
         IBlockProducerRunner BlockProducerRunner { get; set; }
 

src/Nethermind/Nethermind.Api/NethermindApi.cs

@@ -51,7 +51,6 @@ ILifetimeScope Context
         private Dependencies _dependencies = dependencies;
 
         public IBlobTxStorage BlobTxStorage => Context.Resolve<IBlobTxStorage>();
-        public CompositeBlockPreprocessorStep BlockPreprocessor { get; } = new();
         public IBlockProducer? BlockProducer { get; set; }
         public IBlockProducerRunner BlockProducerRunner { get; set; } = new NoBlockProducerRunner();
         public IBlockTree BlockTree => Context.Resolve<IBlockTree>();

src/Nethermind/Nethermind.Blockchain.Test/BlockchainProcessorTests.cs

@@ -224,7 +224,7 @@ public ProcessingTestContext(bool startProcessor)
                 .TestObject;
             _branchProcessor = new BranchProcessorMock(_logManager, _stateReader);
             _recoveryStep = new RecoveryStepMock(_logManager);
-            _processor = new BlockchainProcessor(_blockTree, _branchProcessor, _recoveryStep, _stateReader, LimboLogs.Instance, BlockchainProcessor.Options.Default, Substitute.For<IProcessingStats>());
+            _processor = new BlockchainProcessor(_blockTree, _branchProcessor, [_recoveryStep], _stateReader, LimboLogs.Instance, BlockchainProcessor.Options.Default, Substitute.For<IProcessingStats>());
             _resetEvent = new AutoResetEvent(false);
             _queueEmptyResetEvent = new AutoResetEvent(false);
 

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

@@ -117,10 +117,10 @@ public void Setup()
         _blockchainProcessor = new BlockchainProcessor(
             _blockTree,
             branchProcessor,
-            new RecoverSignatures(
+            [new RecoverSignatures(
                 ecdsa,
                 specProvider,
-                LimboLogs.Instance),
+                LimboLogs.Instance)],
             stateReader,
             LimboLogs.Instance,
             BlockchainProcessor.Options.Default,

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

@@ -77,7 +77,6 @@ public On CreateNode(PrivateKey privateKey, bool withGenesisAlreadyProcessed = f
 
                 .AddModule(new TestNethermindModule())
                 .AddModule(new CliqueModule())
-                .AddSingleton<IBlockPreprocessorStep, AuthorRecoveryStep>()
                 .AddSingleton<IBlockValidator>(Always.Valid)
                 .AddSingleton<ISpecProvider>(SepoliaSpecProvider.Instance)
                 .AddSingleton<CliqueChainSpecEngineParameters>(new CliqueChainSpecEngineParameters()

src/Nethermind/Nethermind.Consensus.Clique/CliquePlugin.cs

@@ -7,7 +7,9 @@
 using Nethermind.Api;
 using Nethermind.Api.Extensions;
 using Nethermind.Blockchain.Services;
+using Nethermind.Consensus.Processing;
 using Nethermind.Core;
+using Nethermind.Core.Container;
 using Nethermind.JsonRpc.Modules;
 using Nethermind.Specs.ChainSpecStyle;
 
@@ -23,16 +25,7 @@ public class CliquePlugin(ChainSpec chainSpec) : IConsensusPlugin
 
         public bool Enabled => chainSpec.SealEngineType == SealEngineType;
 
-        public Task Init(INethermindApi nethermindApi)
-        {
-            (IApiWithStores _, IApiWithBlockchain setInApi) = nethermindApi.ForInit;
-
-            ISnapshotManager snapshotManager = nethermindApi.Context.Resolve<ISnapshotManager>();
-
-            setInApi.BlockPreprocessor.AddLast(new AuthorRecoveryStep(snapshotManager));
-
-            return Task.CompletedTask;
-        }
+        public Task Init(INethermindApi nethermindApi) => Task.CompletedTask;
 
         public string SealEngineType => Nethermind.Core.SealEngineType.Clique;
 
@@ -59,6 +52,7 @@ protected override void Load(ContainerBuilder builder)
                 })
 
                 .AddSingleton<ISnapshotManager, SnapshotManager>()
+                .AddLast<IBlockPreprocessorStep, AuthorRecoveryStep>()
                 .AddSingleton<ISealValidator, CliqueSealValidator>()
                 .AddSingleton<ISealer, CliqueSealer>()
 

src/Nethermind/Nethermind.Consensus/Processing/BlockchainProcessor.cs

@@ -40,7 +40,7 @@ public sealed class BlockchainProcessor : IBlockchainProcessor, IBlockProcessing
     public bool IsMainProcessor { get; init; }
 
     private readonly IBranchProcessor _branchProcessor;
-    private readonly IBlockPreprocessorStep _recoveryStep;
+    private readonly IReadOnlyList<IBlockPreprocessorStep> _preprocessorSteps;
     private readonly IStateReader _stateReader;
     private readonly Options _options;
     private readonly IBlockTree _blockTree;
@@ -88,7 +88,7 @@ public sealed class BlockchainProcessor : IBlockchainProcessor, IBlockProcessing
     /// </summary>
     /// <param name="blockTree"></param>
     /// <param name="branchProcessor"></param>
-    /// <param name="recoveryStep"></param>
+    /// <param name="preprocessorSteps"></param>
     /// <param name="stateReader"></param>
     /// <param name="logManager"></param>
     /// <param name="options"></param>
@@ -97,7 +97,7 @@ public sealed class BlockchainProcessor : IBlockchainProcessor, IBlockProcessing
     public BlockchainProcessor(
         IBlockTree blockTree,
         IBranchProcessor branchProcessor,
-        IBlockPreprocessorStep recoveryStep,
+        IReadOnlyList<IBlockPreprocessorStep> preprocessorSteps,
         IStateReader stateReader,
         ILogManager logManager,
         Options options,
@@ -107,7 +107,7 @@ public BlockchainProcessor(
         _logger = logManager.GetClassLogger<BlockchainProcessor>();
         _blockTree = blockTree;
         _branchProcessor = branchProcessor;
-        _recoveryStep = recoveryStep;
+        _preprocessorSteps = preprocessorSteps;
         _stateReader = stateReader;
         _options = options;
 
@@ -117,6 +117,14 @@ public BlockchainProcessor(
         if (blockTracers is not null) _compositeBlockTracer.AddRange(blockTracers);
     }
 
+    private void Preprocess(Block block)
+    {
+        for (int i = 0; i < _preprocessorSteps.Count; i++)
+        {
+            _preprocessorSteps[i].RecoverData(block);
+        }
+    }
+
     private void OnNewProcessingStatistics(object? sender, BlockStatistics stats)
         => NewProcessingStatistics?.Invoke(sender, stats);
 
@@ -283,7 +291,7 @@ private async Task RunRecoveryLoop()
             {
                 Interlocked.Add(ref _currentRecoveryQueueSize, -blockRef.Block!.Transactions.Length);
                 if (_logger.IsTrace) _logger.Trace($"Recovering addresses for block {blockRef.BlockHash}.");
-                _recoveryStep.RecoverData(blockRef.Block);
+                Preprocess(blockRef.Block);
 
                 try
                 {
@@ -679,7 +687,7 @@ private void PrepareBlocksToProcess(Block suggestedBlock, ProcessingOptions opti
         for (int i = 0; i < blocksToProcess.Count; i++)
         {
             /* this can happen if the block was loaded as an ancestor and did not go through the recovery queue */
-            _recoveryStep.RecoverData(blocksToProcess[i]);
+            Preprocess(blocksToProcess[i]);
         }
 
         // Uncommon logging and throws

src/Nethermind/Nethermind.Consensus/Processing/CompositeBlockPreprocessorStep.cs

@@ -1,6 +1,7 @@
 // SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using System.Collections.Generic;
 using System.Threading;
 using Nethermind.Consensus.Processing;
 using Nethermind.Core;
@@ -18,12 +19,15 @@ namespace Nethermind.Consensus.Tracing;
 public sealed class BlockchainProcessorFacade(
     IBlockProcessor blockProcessor,
     ISpecProvider specProvider,
-    CompositeBlockPreprocessorStep preprocessorStep
+    IReadOnlyList<IBlockPreprocessorStep> preprocessorSteps
 )
 {
     public Block? Process(Block block, ProcessingOptions options, IBlockTracer tracer, CancellationToken token = default)
     {
-        preprocessorStep.RecoverData(block);
+        for (int i = 0; i < preprocessorSteps.Count; i++)
+        {
+            preprocessorSteps[i].RecoverData(block);
+        }
 
         IReleaseSpec spec = specProvider.GetSpec(block.Header);
 

src/Nethermind/Nethermind.Consensus/Tracing/BlockchainProcessorFacade.cs

@@ -64,7 +64,7 @@ public class TestBlockchain : IDisposable
     public IBlockProcessor BlockProcessor => _fromContainer.MainProcessingContext.BlockProcessor;
     public IBlockchainProcessor BlockchainProcessor => _fromContainer.MainProcessingContext.BlockchainProcessor;
     public IBlockProcessingQueue BlockProcessingQueue => _fromContainer.MainProcessingContext.BlockProcessingQueue;
-    public IBlockPreprocessorStep BlockPreprocessorStep => _fromContainer.BlockPreprocessorStep;
+    public IReadOnlyList<IBlockPreprocessorStep> BlockPreprocessorSteps => _fromContainer.BlockPreprocessorSteps;
 
     public IBlockTree BlockTree => _fromContainer.BlockTree;
 
@@ -132,7 +132,7 @@ public sealed class FromContainer(
         Lazy<IReceiptStorage> receiptStorage,
         Lazy<ITxPool> txPool,
         Lazy<IWorldStateManager> worldStateManager,
-        Lazy<IBlockPreprocessorStep> blockPreprocessorStep,
+        Lazy<IReadOnlyList<IBlockPreprocessorStep>> blockPreprocessorSteps,
         Lazy<IBlockTree> blockTree,
         Lazy<IBlockFinder> blockFinder,
         Lazy<ILogFinder> logFinder,
@@ -162,7 +162,7 @@ Lazy<IForkInfo> forkInfo
         public IReceiptStorage ReceiptStorage => receiptStorage.Value;
         public ITxPool TxPool => txPool.Value;
         public IWorldStateManager WorldStateManager => worldStateManager.Value;
-        public IBlockPreprocessorStep BlockPreprocessorStep => blockPreprocessorStep.Value;
+        public IReadOnlyList<IBlockPreprocessorStep> BlockPreprocessorSteps => blockPreprocessorSteps.Value;
         public IBlockTree BlockTree => blockTree.Value;
         public IBlockFinder BlockFinder => blockFinder.Value;
         public ILogFinder LogFinder => logFinder.Value;