Add flat encoding and requests as a side car

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

@@ -37,7 +37,7 @@ public class GeneralStateTest : IEthereumTest
         public UInt256? ParentBlobGasUsed { get; set; }
         public UInt256? ParentExcessBlobGas { get; set; }
 
-        public Hash256? RequestsRoot { get; set; }
+        public Hash256? RequestsHash { get; set; }
 
         public override string ToString()
         {

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

@@ -109,7 +109,7 @@ protected EthereumTestResult RunTest(GeneralStateTest test, ITxTracer txTracer)
             header.ParentBeaconBlockRoot = test.CurrentBeaconRoot;
             header.ExcessBlobGas = test.CurrentExcessBlobGas ?? (test.Fork is Cancun ? 0ul : null);
             header.BlobGasUsed = BlobGasCalculator.CalculateBlobGas(test.Transaction);
-            header.RequestsRoot = test.RequestsRoot;
+            header.RequestsHash = test.RequestsHash;
 
             Stopwatch stopwatch = Stopwatch.StartNew();
             IReleaseSpec? spec = specProvider.GetSpec((ForkActivation)test.CurrentNumber);

src/Nethermind/Nethermind.Blockchain.Test/Validators/BlockValidatorTests.cs

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using Nethermind.Consensus.Validators;
-using Nethermind.Core.ConsensusRequests;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
@@ -199,51 +198,4 @@ public void ValidateSuggestedBlock_SuggestedBlockIsInvalid_CorrectErrorIsSet(Blo
 
         Assert.That(error, Does.StartWith(expectedError));
     }
-
-    [Test]
-    public void ValidateBodyAgainstHeader_BlockHasInvalidRequestRoot_ReturnsFalse()
-    {
-        Block block = Build.A.Block
-            .WithConsensusRequests(new ConsensusRequest[] {
-                Build.A.Deposit.WithIndex(0).TestObject,
-                Build.A.WithdrawalRequest.TestObject
-            })
-            .TestObject;
-        block.Header.RequestsRoot = Keccak.OfAnEmptyString;
-
-        Assert.That(
-            BlockValidator.ValidateBodyAgainstHeader(block.Header, block.Body),
-            Is.False);
-    }
-
-    [Test]
-    public void ValidateBodyRequests_BlockHasReuests_InOrder_ReturnsTrue()
-    {
-        Block block = Build.A.Block
-            .WithConsensusRequests(new ConsensusRequest[] {
-                Build.A.Deposit.WithIndex(0).TestObject,
-                Build.A.WithdrawalRequest.TestObject
-            })
-            .TestObject;
-
-        Assert.That(
-            BlockValidator.ValidateRequestsOrder(block, out string? _),
-            Is.True);
-    }
-
-    [Test]
-    public void ValidateBodyRequests_BlockHasReuests_OutOfOrder_ReturnsFalse()
-    {
-        Block block = Build.A.Block
-            .WithConsensusRequests(new ConsensusRequest[] {
-                Build.A.WithdrawalRequest.TestObject,
-                Build.A.Deposit.WithIndex(0).TestObject
-            })
-            .TestObject;
-
-        Assert.That(
-            BlockValidator.ValidateRequestsOrder(block, out string? _),
-            Is.False);
-    }
-
 }

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

@@ -8,8 +8,8 @@
 using Nethermind.Blockchain.Find;
 using Nethermind.Blockchain.Receipts;
 using Nethermind.Consensus.AuRa.Validators;
+using Nethermind.Consensus.ExecutionRequests;
 using Nethermind.Consensus.Processing;
-using Nethermind.Consensus.Requests;
 using Nethermind.Consensus.Rewards;
 using Nethermind.Consensus.Transactions;
 using Nethermind.Consensus.Validators;
@@ -53,7 +53,7 @@ public AuRaBlockProcessor(
             AuRaContractGasLimitOverride? gasLimitOverride = null,
             ContractRewriter? contractRewriter = null,
             IBlockCachePreWarmer? preWarmer = null,
-            IConsensusRequestsProcessor? consensusRequestsProcessor = null)
+            IExecutionRequestsProcessor? executionRequestsProcessor = null)
             : base(
                 specProvider,
                 blockValidator,
@@ -67,7 +67,7 @@ public AuRaBlockProcessor(
                 logManager,
                 withdrawalProcessor,
                 preWarmer: preWarmer,
-                consensusRequestsProcessor: consensusRequestsProcessor)
+                executionRequestsProcessor: executionRequestsProcessor)
         {
             _specProvider = specProvider;
             _blockTree = blockTree ?? throw new ArgumentNullException(nameof(blockTree));

src/Nethermind/Nethermind.Consensus.Clique/CliqueBlockProducer.cs

@@ -15,7 +15,6 @@
 using Nethermind.Consensus.Producers;
 using Nethermind.Consensus.Transactions;
 using Nethermind.Core;
-using Nethermind.Core.ConsensusRequests;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Crypto;
@@ -500,8 +499,7 @@ ILogManager logManager
             header,
             selectedTxs,
             Array.Empty<BlockHeader>(),
-            spec.WithdrawalsEnabled ? Enumerable.Empty<Withdrawal>() : null,
-            spec.RequestsEnabled ? Enumerable.Empty<ConsensusRequest>() : null
+            spec.WithdrawalsEnabled ? Enumerable.Empty<Withdrawal>() : null
         );
         header.TxRoot = TxTrie.CalculateRoot(block.Transactions);
         block.Header.Author = _sealer.Address;

src/Nethermind/Nethermind.Consensus.Test/ExecutionRequestProcessorTests.cs

@@ -0,0 +1,128 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Linq;
+using Nethermind.Abi;
+using Nethermind.Consensus.ExecutionRequests;
+using Nethermind.Core;
+using Nethermind.Core.ExecutionRequest;
+using Nethermind.Core.Extensions;
+using Nethermind.Core.Specs;
+using Nethermind.Core.Test.Builders;
+using Nethermind.Db;
+using Nethermind.Evm;
+using Nethermind.Evm.Tracing;
+using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Int256;
+using Nethermind.Logging;
+using Nethermind.Specs;
+using Nethermind.State;
+using Nethermind.Trie.Pruning;
+using NSubstitute;
+using NUnit.Framework;
+
+namespace Nethermind.Consensus.Test;
+
+public class ExecutionProcessorTests
+{
+    private ISpecProvider _specProvider;
+    private ITransactionProcessor _transactionProcessor;
+    private WorldState _stateProvider;
+    private static readonly UInt256 AccountBalance = 1.Ether();
+    private readonly Address DepositContractAddress = Eip6110Constants.MainnetDepositContractAddress;
+    private readonly Address eip7002Account = Eip7002Constants.WithdrawalRequestPredeployAddress;
+    private readonly Address eip7251Account = Eip7251Constants.ConsolidationRequestPredeployAddress;
+    private IReleaseSpec spec;
+    private readonly AbiSignature _depositEventABI = new("DepositEvent", AbiType.DynamicBytes, AbiType.DynamicBytes, AbiType.DynamicBytes, AbiType.DynamicBytes, AbiType.DynamicBytes);
+    private readonly AbiEncoder _abiEncoder = AbiEncoder.Instance;
+
+    ExecutionRequest[] executionDepositRequests = [TestItem.ExecutionRequestA, TestItem.ExecutionRequestB, TestItem.ExecutionRequestC];
+    ExecutionRequest[] executionWithdrawalRequests = [TestItem.ExecutionRequestD, TestItem.ExecutionRequestE, TestItem.ExecutionRequestF];
+    ExecutionRequest[] executionConsolidationRequests = [TestItem.ExecutionRequestG, TestItem.ExecutionRequestH, TestItem.ExecutionRequestI];
+
+    [SetUp]
+    public void Setup()
+    {
+
+
+        _specProvider = MainnetSpecProvider.Instance;
+        MemDb stateDb = new();
+        TrieStore trieStore = new(stateDb, LimboLogs.Instance);
+
+        _stateProvider = new WorldState(trieStore, new MemDb(), LimboLogs.Instance);
+        _stateProvider.CreateAccount(eip7002Account, AccountBalance);
+        _stateProvider.CreateAccount(eip7251Account, AccountBalance);
+        _stateProvider.Commit(_specProvider.GenesisSpec);
+        _stateProvider.CommitTree(0);
+
+        spec = Substitute.For<IReleaseSpec>();
+
+        spec.RequestsEnabled.Returns(true);
+        spec.DepositsEnabled.Returns(true);
+        spec.WithdrawalRequestsEnabled.Returns(true);
+        spec.ConsolidationRequestsEnabled.Returns(true);
+
+        spec.DepositContractAddress.Returns(DepositContractAddress);
+        spec.Eip7002ContractAddress.Returns(eip7002Account);
+        spec.Eip7251ContractAddress.Returns(eip7251Account);
+
+        _transactionProcessor = Substitute.For<ITransactionProcessor>();
+
+        _transactionProcessor.Execute(Arg.Any<Transaction>(), Arg.Any<BlockExecutionContext>(), Arg.Any<CallOutputTracer>())
+            .Returns(ci =>
+            {
+                Transaction transaction = ci.Arg<Transaction>();
+                CallOutputTracer tracer = ci.Arg<CallOutputTracer>();
+                if (transaction.To == eip7002Account)
+                {
+                    tracer.ReturnValue = executionWithdrawalRequests.FlatEncodeWithoutType();
+                }
+                else if (transaction.To == eip7251Account)
+                {
+                    tracer.ReturnValue = executionConsolidationRequests.FlatEncodeWithoutType();
+                }
+                else
+                {
+                    tracer.ReturnValue = Array.Empty<byte>();
+                }
+                return new TransactionResult();
+            });
+    }
+
+    [Test]
+    public void ShouldProcessExecutionRequests()
+    {
+        Block block = Build.A.Block.TestObject;
+        ExecutionRequestsProcessor executionRequestsProcessor = new(_transactionProcessor);
+
+        TxReceipt[] txReceipts = [
+            Build.A.Receipt.WithLogs(
+                Build.A.LogEntry.WithData(
+                    _abiEncoder.Encode(AbiEncodingStyle.None, _depositEventABI, [TestItem.PublicKeyA.Bytes.Slice(0, 48), TestItem.KeccakA.Bytes.ToArray(), BitConverter.GetBytes((ulong)1_000_000_000), TestItem.SignatureBytes, BitConverter.GetBytes((ulong)1)])
+                ).WithAddress(DepositContractAddress).TestObject,
+                Build.A.LogEntry.WithData(
+                    _abiEncoder.Encode(AbiEncodingStyle.None, _depositEventABI, [TestItem.PublicKeyB.Bytes.Slice(0, 48), TestItem.KeccakB.Bytes.ToArray(), BitConverter.GetBytes((ulong)2_000_000_000), TestItem.SignatureBytes, BitConverter.GetBytes((ulong)2)])
+                ).WithAddress(DepositContractAddress).TestObject,
+                Build.A.LogEntry.WithData(
+                    _abiEncoder.Encode(AbiEncodingStyle.None, _depositEventABI, [TestItem.PublicKeyC.Bytes.Slice(0, 48), TestItem.KeccakC.Bytes.ToArray(), BitConverter.GetBytes((ulong)3_000_000_000), TestItem.SignatureBytes, BitConverter.GetBytes((ulong)3)])
+                ).WithAddress(DepositContractAddress).TestObject
+            ).TestObject
+        ];
+
+
+        executionRequestsProcessor.ProcessExecutionRequests(block, _stateProvider, txReceipts, spec);
+
+        foreach (var (processedRequest, expectedRequest) in block.ExecutionRequests.Zip([
+            .. executionDepositRequests,
+            .. executionWithdrawalRequests,
+            .. executionConsolidationRequests
+        ]))
+        {
+            Assert.That(processedRequest.RequestType, Is.EqualTo(expectedRequest.RequestType));
+            Assert.That(processedRequest.RequestData, Is.EqualTo(expectedRequest.RequestData));
+        }
+
+        Assert.That(block.Header.RequestsHash, Is.EqualTo(block.ExecutionRequests.ToArray().CalculateHash()));
+    }
+}