Staging branch for devnet 4

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

@@ -2,15 +2,16 @@
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using Nethermind.Core;
+using Nethermind.Int256;
 
 namespace Ethereum.Test.Base;
 public class AuthorizationListJson
 {
-    public ulong ChainId { get; set; }
+    public UInt256 ChainId { get; set; }
     public Address Address { get; set; }
-    public ulong Nonce { get; set; }
+    public UInt256 Nonce { get; set; }
     public ulong V { get; set; }
-    public byte[] R { get; set; }
-    public byte[] S { get; set; }
+    public string R { get; set; }
+    public string S { get; set; }
     public Address Signer { get; set; }
 }

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/Ethereum.Test.Base/JsonToEthereumTest.cs

@@ -162,13 +162,51 @@ public static Transaction Convert(PostStateJson postStateJson, TransactionJson t
             {
                 transaction.AuthorizationList =
                     transactionJson.AuthorizationList
-                    .Select(i => new AuthorizationTuple(
-                        i.ChainId,
-                        i.Address,
-                        i.Nonce,
-                        i.V,
-                        i.R,
-                        i.S)).ToArray();
+                    .Select(i =>
+                    {
+                        if (i.ChainId > ulong.MaxValue)
+                        {
+                            i.ChainId = 0;
+                            transaction.SenderAddress = Address.Zero;
+                        }
+                        if (i.Nonce > ulong.MaxValue)
+                        {
+                            i.Nonce = 0;
+                            transaction.SenderAddress = Address.Zero;
+                        }
+                        UInt256 s = UInt256.Zero;
+                        if (i.S.Length > 66)
+                        {
+                            i.S = "0x0";
+                            transaction.SenderAddress = Address.Zero;
+                        }
+                        else
+                        {
+                            s = UInt256.Parse(i.S);
+                        }
+                        UInt256 r = UInt256.Zero;
+                        if (i.R.Length > 66)
+                        {
+                            i.R = "0x0";
+                            transaction.SenderAddress = Address.Zero;
+                        }
+                        else
+                        {
+                            r = UInt256.Parse(i.R);
+                        }
+                        if (i.V > byte.MaxValue)
+                        {
+                            i.V = 0;
+                            transaction.SenderAddress = Address.Zero;
+                        }
+                        return new AuthorizationTuple(
+                            i.ChainId.u0,
+                            i.Address,
+                            i.Nonce.u0,
+                            (byte)i.V,
+                            r,
+                            s);
+                    }).ToArray();
                 if (transaction.AuthorizationList.Any())
                 {
                     transaction.Type = TxType.SetCode;

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;
@@ -196,54 +195,6 @@ public void ValidateSuggestedBlock_SuggestedBlockIsInvalid_CorrectErrorIsSet(Blo
 
         sut.ValidateSuggestedBlock(
             suggestedBlock, out error);
-
         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.Blockchain.Test/Validators/TxValidatorTests.cs

@@ -528,7 +528,7 @@ public void IsWellFormed_CreateTxInSetCode_ReturnsFalse()
     {
         TransactionBuilder<Transaction> txBuilder = Build.A.Transaction
             .WithType(TxType.SetCode)
-            .WithAuthorizationCode(new AuthorizationTuple(0, TestItem.AddressA, 0, 0, [], []))
+            .WithAuthorizationCode(new AuthorizationTuple(0, TestItem.AddressA, 0, 0, 0, 0))
             .WithMaxFeePerGas(100000)
             .WithGasLimit(1000000)
             .WithChainId(TestBlockchainIds.ChainId)
@@ -552,7 +552,7 @@ public void IsWellFormed_AuthorizationListTxInPragueSpec_ReturnsTrue()
         TransactionBuilder<Transaction> txBuilder = Build.A.Transaction
             .WithType(TxType.SetCode)
             .WithTo(TestItem.AddressA)
-            .WithAuthorizationCode(new AuthorizationTuple(0, TestItem.AddressA, 0, 0, [], []))
+            .WithAuthorizationCode(new AuthorizationTuple(0, TestItem.AddressA, 0, 0, 0, 0))
             .WithMaxFeePerGas(100000)
             .WithGasLimit(1000000)
             .WithChainId(TestBlockchainIds.ChainId)
@@ -599,30 +599,6 @@ public void IsWellFormed_NullAuthorizationList_ReturnsFalse()
         Assert.That(txValidator.IsWellFormed(tx, Prague.Instance).AsBool, Is.False);
     }
 
-    private static object[] BadSignatures =
-    {
-        new object[] { 1ul, (UInt256)1, Secp256K1Curve.HalfNPlusOne, false},
-        new object[] { 1ul, UInt256.Zero, Secp256K1Curve.HalfN, true },
-        new object[] { 0ul, UInt256.Zero, UInt256.Zero, true },
-    };
-    [TestCaseSource(nameof(BadSignatures))]
-    public void IsWellFormed_AuthorizationTupleHasBadSignature_ReturnsFalse(ulong yParity, UInt256 r, UInt256 s, bool expected)
-    {
-        TransactionBuilder<Transaction> txBuilder = Build.A.Transaction
-            .WithType(TxType.SetCode)
-            .WithTo(TestItem.AddressA)
-            .WithAuthorizationCode(new AuthorizationTuple(0, Address.Zero, 0, new Signature(r, s, yParity + Signature.VOffset)))
-            .WithMaxFeePerGas(100000)
-            .WithGasLimit(1000000)
-            .WithChainId(TestBlockchainIds.ChainId)
-            .SignedAndResolved();
-
-        Transaction tx = txBuilder.TestObject;
-        TxValidator txValidator = new(TestBlockchainIds.ChainId);
-
-        Assert.That(txValidator.IsWellFormed(tx, Prague.Instance).AsBool, Is.EqualTo(expected));
-    }
-
     private static IEnumerable<TxType> NonSetCodeTypes() =>
         Enum.GetValues<TxType>().Where(t => t != TxType.SetCode && t != TxType.DepositTx);
 

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;
@@ -51,7 +51,7 @@ public AuRaBlockProcessor(
             AuRaContractGasLimitOverride? gasLimitOverride = null,
             ContractRewriter? contractRewriter = null,
             IBlockCachePreWarmer? preWarmer = null,
-            IConsensusRequestsProcessor? consensusRequestsProcessor = null)
+            IExecutionRequestsProcessor? executionRequestsProcessor = null)
             : base(
                 specProvider,
                 blockValidator,
@@ -65,7 +65,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;