[WIP]Add Eip6110 implementation

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

@@ -11,7 +11,7 @@
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
-using Nethermind.Consensus.Withdrawals;
+using Nethermind.Consensus.Deposits;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Extensions;
@@ -160,6 +160,7 @@ void Process(AuRaBlockProcessor auRaBlockProcessor, int blockNumber, Hash256 sta
                 LimboLogs.Instance,
                 Substitute.For<IBlockTree>(),
                 new WithdrawalProcessor(stateProvider, LimboLogs.Instance),
+                new DepositsProcessor(LimboLogs.Instance),
                 null,
                 txFilter,
                 contractRewriter: contractRewriter);

src/Nethermind/Nethermind.AuRa.Test/Contract/AuRaContractGasLimitOverrideTests.cs

@@ -10,6 +10,7 @@
 using Nethermind.Consensus;
 using Nethermind.Consensus.AuRa;
 using Nethermind.Consensus.AuRa.Contracts;
+using Nethermind.Consensus.AuRa.Deposits;
 using Nethermind.Consensus.AuRa.Withdrawals;
 using Nethermind.Consensus.Processing;
 using Nethermind.Consensus.Rewards;
@@ -100,6 +101,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,
+                NullDepositsProcessor.Instance,
                 null,
                 null,
                 GasLimitCalculator as AuRaContractGasLimitOverride);

src/Nethermind/Nethermind.AuRa.Test/Transactions/TxCertifierFilterTests.cs

@@ -8,6 +8,7 @@
 using Nethermind.AuRa.Test.Contract;
 using Nethermind.Consensus.AuRa;
 using Nethermind.Consensus.AuRa.Contracts;
+using Nethermind.Consensus.AuRa.Deposits;
 using Nethermind.Consensus.AuRa.Transactions;
 using Nethermind.Consensus.AuRa.Withdrawals;
 using Nethermind.Consensus.Processing;
@@ -156,6 +157,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,
+                NullDepositsProcessor.Instance,
                 null
                 );
         }

src/Nethermind/Nethermind.AuRa.Test/Transactions/TxPermissionFilterTest.cs

@@ -30,6 +30,7 @@
 using Nethermind.TxPool;
 using NSubstitute;
 using NUnit.Framework;
+using Nethermind.Consensus.AuRa.Deposits;
 
 namespace Nethermind.AuRa.Test.Transactions;
 
@@ -297,6 +298,7 @@ protected override BlockProcessor CreateBlockProcessor()
                 LimboLogs.Instance,
                 BlockTree,
                 NullWithdrawalProcessor.Instance,
+                NullDepositsProcessor.Instance,
                 null,
                 PermissionBasedTxFilter);
         }

src/Nethermind/Nethermind.Consensus.AuRa/AuRaBlockProcessor.cs

@@ -10,7 +10,7 @@
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
 using Nethermind.Consensus.Validators;
-using Nethermind.Consensus.Withdrawals;
+using Nethermind.Consensus.Deposits;
 using Nethermind.Core;
 using Nethermind.Core.Specs;
 using Nethermind.Crypto;
@@ -40,6 +40,7 @@ public class AuRaBlockProcessor : BlockProcessor
             ILogManager logManager,
             IBlockTree blockTree,
             IWithdrawalProcessor withdrawalProcessor,
+            IDepositsProcessor depositsProcessor,
             IAuRaValidator? auRaValidator,
             ITxFilter? txFilter = null,
             AuRaContractGasLimitOverride? gasLimitOverride = null,
@@ -53,7 +54,8 @@ public class AuRaBlockProcessor : BlockProcessor
                 receiptStorage,
                 NullWitnessCollector.Instance,
                 logManager,
-                withdrawalProcessor)
+                withdrawalProcessor,
+                depositsProcessor)
         {
             _specProvider = specProvider;
             _blockTree = blockTree ?? throw new ArgumentNullException(nameof(blockTree));

src/Nethermind/Nethermind.Consensus.AuRa/Deposits/NullDepositsProcessor.cs

@@ -0,0 +1,17 @@
+// SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Nethermind.Consensus.Deposits;
+using Nethermind.Core;
+using Nethermind.Core.Specs;
+using System.Collections.Generic;
+
+namespace Nethermind.Consensus.AuRa.Deposits;
+
+public class NullDepositsProcessor : IDepositsProcessor
+{
+    public void ProcessDeposits(Block block, TxReceipt[] receipts, IReleaseSpec spec)
+    {
+    }
+    public static IDepositsProcessor Instance { get; } = new NullDepositsProcessor();
+}

src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs

@@ -13,6 +13,7 @@
 using Nethermind.Consensus.AuRa.Config;
 using Nethermind.Consensus.AuRa.Contracts;
 using Nethermind.Consensus.AuRa.Contracts.DataStore;
+using Nethermind.Consensus.AuRa.Deposits;
 using Nethermind.Consensus.AuRa.Rewards;
 using Nethermind.Consensus.AuRa.Services;
 using Nethermind.Consensus.AuRa.Transactions;
@@ -109,6 +110,7 @@ protected virtual AuRaBlockProcessor NewAuraBlockProcessor(ITxFilter txFilter)
             _api.LogManager,
             _api.BlockTree!,
             NullWithdrawalProcessor.Instance,
+            NullDepositsProcessor.Instance,
             CreateAuRaValidator(),
             txFilter,
             GetGasLimitCalculator(),

src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/StartBlockProducerAuRa.cs

@@ -13,6 +13,7 @@
 using Nethermind.Consensus.AuRa.Config;
 using Nethermind.Consensus.AuRa.Contracts;
 using Nethermind.Consensus.AuRa.Contracts.DataStore;
+using Nethermind.Consensus.AuRa.Deposits;
 using Nethermind.Consensus.AuRa.Transactions;
 using Nethermind.Consensus.AuRa.Validators;
 using Nethermind.Consensus.AuRa.Withdrawals;
@@ -157,6 +158,7 @@ private BlockProcessor CreateBlockProcessor(ReadOnlyTxProcessingEnv changeableTx
             _api.LogManager,
             changeableTxProcessingEnv.BlockTree,
             NullWithdrawalProcessor.Instance,
+            NullDepositsProcessor.Instance,
             _validator,
             auRaTxFilter,
             CreateGasLimitCalculator(_api) as AuRaContractGasLimitOverride,

src/Nethermind/Nethermind.Consensus.AuRa/Withdrawals/NullWithdrawalProcessor.cs

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
-using Nethermind.Consensus.Withdrawals;
+using Nethermind.Consensus.Deposits;
 using Nethermind.Core;
 using Nethermind.Core.Specs;
 

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

@@ -13,7 +13,7 @@
 using Nethermind.Consensus.Producers;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
-using Nethermind.Consensus.Withdrawals;
+using Nethermind.Consensus.Deposits;
 using Nethermind.Core.Attributes;
 using Nethermind.Db;
 using Nethermind.JsonRpc.Modules;
@@ -108,7 +108,8 @@ public Task<IBlockProducer> InitBlockProducer(IBlockProductionTrigger? blockProd
                 NullReceiptStorage.Instance,
                 NullWitnessCollector.Instance,
                 getFromApi.LogManager,
-                new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(producerEnv.StateProvider, getFromApi.LogManager)));
+                new BlockProductionWithdrawalProcessor(new WithdrawalProcessor(producerEnv.StateProvider, getFromApi.LogManager)),
+                new DepositsProcessor(getFromApi.LogManager));
 
             IBlockchainProcessor producerChainProcessor = new BlockchainProcessor(
                 readOnlyBlockTree,

src/Nethermind/Nethermind.Consensus/Deposits/DepositsProcessor.cs

@@ -0,0 +1,58 @@
+// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.IdentityModel.Tokens;
+using Nethermind.Core;
+using Nethermind.Core.Crypto;
+using Nethermind.Core.Specs;
+using Nethermind.Logging;
+using Nethermind.Serialization.Rlp;
+using Nethermind.State;
+using Nethermind.State.Proofs;
+
+namespace Nethermind.Consensus.Deposits;
+
+public class DepositsProcessor : IDepositsProcessor
+{
+    private readonly ILogger _logger;
+
+    public DepositsProcessor(ILogManager logManager)
+    {
+        ArgumentNullException.ThrowIfNull(logManager);
+
+        _logger = logManager.GetClassLogger();
+    }
+
+    public void ProcessDeposits(Block block, TxReceipt[] receipts, IReleaseSpec spec)
+    {
+        if (!spec.IsEip6110Enabled)
+            return;
+
+
+        List<Deposit> depositList = [];
+        for (int i = 0; i < block.Transactions.Length; i++)
+        {
+            foreach (var log in receipts[i].Logs)
+            {
+                if (log.LoggersAddress == spec.Eip6110ContractAddress)
+                {
+                    var depositDecoder = new DepositDecoder();
+                    Deposit? deposit = depositDecoder.Decode(new RlpStream(log.Data));
+                    depositList.Add(deposit);
+                }
+            }
+        }
+
+        CalculateDepositsRoot(block, depositList, spec);
+    }
+
+    private void CalculateDepositsRoot(Block block, IEnumerable<Deposit> deposits, IReleaseSpec spec)
+    {
+        block.Header.DepositsRoot = deposits.IsNullOrEmpty()
+            ? Keccak.EmptyTreeHash
+            : new DepositTrie(deposits.ToArray()!).RootHash;
+    }
+}

src/Nethermind/Nethermind.Consensus/Deposits/IDepositsProcessor.cs

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using Nethermind.Core;
+using Nethermind.Core.Specs;
+using Nethermind.Serialization.Rlp;
+using System.Collections.Generic;
+
+namespace Nethermind.Consensus.Deposits;
+
+public interface IDepositsProcessor
+{
+    void ProcessDeposits(Block block, TxReceipt[] receipts, IReleaseSpec spec);
+}

src/Nethermind/Nethermind.Consensus/EngineApiVersions.cs

@@ -8,4 +8,5 @@ public static class EngineApiVersions
     public const int Paris = 1;
     public const int Shanghai = 2;
     public const int Cancun = 3;
+    public const int Prague = 4;
 }

src/Nethermind/Nethermind.Consensus/Messages/BlockErrorMessages.cs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using Nethermind.Core;
+using Nethermind.Core.Crypto;
 using Nethermind.Crypto;
 
 namespace Nethermind.Consensus.Messages;
@@ -116,4 +117,7 @@ public static class BlockErrorMessages
 
     public const string NegativeGasUsed =
         "NegativeGasUsed: Cannot be negative.";
+    public static string MissingDeposits => "MissingDeposits: Deposits cannot be null in block when EIP-6110 activated.";
+    public static string DepositsNotEnabled => "DepositsNotEnabled: Deposits must be null in block when EIP-6110 not activated.";
+    public static string InvalidDepositsRoot(Hash256 expected, Hash256 actual) => $"InvalidDepositsRoot: Deposits root hash mismatch in block: expected {expected}, got {actual}";
 }

src/Nethermind/Nethermind.Consensus/Processing/BlockExtensions.cs

@@ -19,7 +19,7 @@ internal static class BlockExtensions
         public static Block CreateCopy(this Block block, BlockHeader header) =>
             block is BlockToProduce blockToProduce
                 ? new BlockToProduce(header, blockToProduce.Transactions, blockToProduce.Uncles, blockToProduce.Withdrawals)
-                : new Block(header, block.Transactions, block.Uncles, block.Withdrawals);
+                : new Block(header, block.Transactions, block.Uncles, block.Withdrawals, block.Deposits);
 
         public static IEnumerable<Transaction> GetTransactions(this Block block) =>
             block is BlockToProduce blockToProduce

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

@@ -11,7 +11,7 @@
 using Nethermind.Consensus.BeaconBlockRoot;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Validators;
-using Nethermind.Consensus.Withdrawals;
+using Nethermind.Consensus.Deposits;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
@@ -39,7 +39,7 @@ public partial class BlockProcessor : IBlockProcessor
     private readonly IBlockValidator _blockValidator;
     private readonly IRewardCalculator _rewardCalculator;
     private readonly IBlockProcessor.IBlockTransactionsExecutor _blockTransactionsExecutor;
-
+    private readonly IDepositsProcessor _depositsProcessor;
     private const int MaxUncommittedBlocks = 64;
 
     /// <summary>
@@ -58,6 +58,7 @@ public partial class BlockProcessor : IBlockProcessor
         IWitnessCollector? witnessCollector,
         ILogManager? logManager,
         IWithdrawalProcessor? withdrawalProcessor = null,
+        IDepositsProcessor? depositsProcessor = null,
         IReceiptsRootCalculator? receiptsRootCalculator = null)
     {
         _logger = logManager?.GetClassLogger() ?? throw new ArgumentNullException(nameof(logManager));
@@ -70,6 +71,7 @@ public partial class BlockProcessor : IBlockProcessor
         _rewardCalculator = rewardCalculator ?? throw new ArgumentNullException(nameof(rewardCalculator));
         _blockTransactionsExecutor = blockTransactionsExecutor ?? throw new ArgumentNullException(nameof(blockTransactionsExecutor));
         _receiptsRootCalculator = receiptsRootCalculator ?? ReceiptsRootCalculator.Instance;
+        _depositsProcessor = depositsProcessor ?? new DepositsProcessor(logManager);
         _beaconBlockRootHandler = new BeaconBlockRootHandler();
 
         ReceiptsTracer = new BlockReceiptsTracer();
@@ -248,6 +250,7 @@ private void ValidateProcessedBlock(Block suggestedBlock, ProcessingOptions opti
         block.Header.ReceiptsRoot = _receiptsRootCalculator.GetReceiptsRoot(receipts, spec, block.ReceiptsRoot);
         ApplyMinerRewards(block, blockTracer, spec);
         _withdrawalProcessor.ProcessWithdrawals(block, spec);
+        _depositsProcessor.ProcessDeposits(block, receipts, spec);
         ReceiptsTracer.EndBlockTrace();
 
         _stateProvider.Commit(spec);
@@ -299,6 +302,7 @@ private Block PrepareBlockForProcessing(Block suggestedBlock)
             ReceiptsRoot = bh.ReceiptsRoot,
             BaseFeePerGas = bh.BaseFeePerGas,
             WithdrawalsRoot = bh.WithdrawalsRoot,
+            DepositsRoot = bh.DepositsRoot,
             IsPostMerge = bh.IsPostMerge,
             ParentBeaconBlockRoot = bh.ParentBeaconBlockRoot,
         };

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

@@ -9,7 +9,7 @@
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
 using Nethermind.Consensus.Validators;
-using Nethermind.Consensus.Withdrawals;
+using Nethermind.Consensus.Deposits;
 using Nethermind.Core.Specs;
 using Nethermind.Logging;
 using Nethermind.State;

src/Nethermind/Nethermind.Consensus/Producers/BlockToProduce.cs

@@ -33,8 +33,9 @@ public new IEnumerable<Transaction> Transactions
             BlockHeader blockHeader,
             IEnumerable<Transaction> transactions,
             IEnumerable<BlockHeader> uncles,
-            IEnumerable<Withdrawal>? withdrawals = null)
-            : base(blockHeader, Array.Empty<Transaction>(), uncles, withdrawals)
+            IEnumerable<Withdrawal>? withdrawals = null,
+            IEnumerable<Deposit>? deposits = null)
+            : base(blockHeader, Array.Empty<Transaction>(), uncles, withdrawals, deposits)
         {
             Transactions = transactions;
         }