EIP-7251: Add EL triggered consolidations

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

@@ -495,7 +495,7 @@ ILogManager logManager
             selectedTxs,
             Array.Empty<BlockHeader>(),
             spec.WithdrawalsEnabled ? Enumerable.Empty<Withdrawal>() : null,
-            spec.ConsensusRequestsEnabled ? Enumerable.Empty<ConsensusRequest>() : null
+            spec.RequestsEnabled ? Enumerable.Empty<ConsensusRequest>() : null
         );
         header.TxRoot = TxTrie.CalculateRoot(block.Transactions);
         block.Header.Author = _sealer.Address;

src/Nethermind/Nethermind.Consensus/Requests/ConsensusRequestsProcessor.cs

@@ -9,26 +9,28 @@
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Specs;
 using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Serialization.Rlp;
 using Nethermind.State;
 using Nethermind.State.Proofs;
 
 namespace Nethermind.Consensus.Requests;
 
 public class ConsensusRequestsProcessor(ITransactionProcessor transactionProcessor) : IConsensusRequestsProcessor
 {
+    private readonly ConsolidationRequestsProcessor _consolidationRequestsProcessor = new(transactionProcessor);
     private readonly WithdrawalRequestsProcessor _withdrawalRequestsProcessor = new(transactionProcessor);
     private readonly IDepositsProcessor _depositsProcessor = new DepositsProcessor();
 
     public void ProcessRequests(IReleaseSpec spec, IWorldState state, Block block, TxReceipt[] receipts)
     {
-        if (!spec.DepositsEnabled && !spec.WithdrawalRequestsEnabled)
+        if (!spec.RequestsEnabled)
             return;
 
         using ArrayPoolList<ConsensusRequest> requestsList = new(receipts.Length * 2);
 
-        // Process deposits
         requestsList.AddRange(_depositsProcessor.ProcessDeposits(block, receipts, spec));
         requestsList.AddRange(_withdrawalRequestsProcessor.ReadWithdrawalRequests(spec, state, block));
+        requestsList.AddRange(_consolidationRequestsProcessor.ReadConsolidationRequests(spec, state, block));
 
         ConsensusRequest[] requests = requestsList.ToArray();
         Hash256 root = new RequestsTrie(requests).RootHash;

src/Nethermind/Nethermind.Consensus/Requests/ConsolidationRequestProcessor.cs

@@ -0,0 +1,66 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Nethermind.Core;
+using Nethermind.Core.ConsensusRequests;
+using Nethermind.Core.Crypto;
+using Nethermind.Core.Extensions;
+using Nethermind.Core.Specs;
+using Nethermind.Crypto;
+using Nethermind.Evm;
+using Nethermind.Evm.Tracing;
+using Nethermind.Evm.TransactionProcessing;
+using Nethermind.Int256;
+using Nethermind.State;
+
+namespace Nethermind.Consensus.Requests;
+
+// https://eips.ethereum.org/EIPS/eip-7251#block-processing
+public class ConsolidationRequestsProcessor(ITransactionProcessor transactionProcessor)
+{
+    private const long GasLimit = 30_000_000L;
+
+    public IEnumerable<ConsolidationRequest> ReadConsolidationRequests(IReleaseSpec spec, IWorldState state, Block block)
+    {
+        if (!spec.ConsolidationRequestsEnabled)
+            yield break;
+
+        Address eip7251Account = spec.Eip7251ContractAddress;
+        if (!state.AccountExists(eip7251Account)) // not needed anymore?
+            yield break;
+
+        CallOutputTracer tracer = new();
+
+        Transaction? transaction = new()
+        {
+            Value = UInt256.Zero,
+            Data = Array.Empty<byte>(),
+            To = spec.Eip7251ContractAddress,
+            SenderAddress = Address.SystemUser,
+            GasLimit = GasLimit,
+            GasPrice = UInt256.Zero,
+        };
+        transaction.Hash = transaction.CalculateHash();
+
+        transactionProcessor.Execute(transaction, new BlockExecutionContext(block.Header), tracer);
+        var result = tracer.ReturnValue;
+        if (result == null || result.Length == 0)
+            yield break;
+
+        int sizeOfClass = 20 + 48 + 48;
+        int count = result.Length / sizeOfClass;
+        for (int i = 0; i < count; ++i)
+        {
+            ConsolidationRequest request = new();
+            Span<byte> span = new Span<byte>(result, i * sizeOfClass, sizeOfClass);
+            request.SourceAddress = new Address(span.Slice(0, 20).ToArray());
+            request.SourcePubkey = span.Slice(20, 48).ToArray();
+            request.TargetPubkey = span.Slice(68, 48).ToArray();
+
+            yield return request;
+        }
+    }
+}

src/Nethermind/Nethermind.Consensus/Requests/WithdrawalRequestsProcessor.cs

@@ -17,13 +17,13 @@
 namespace Nethermind.Consensus.Requests;
 
 // https://eips.ethereum.org/EIPS/eip-7002#block-processing
-public class WithdrawalRequestsProcessor(ITransactionProcessor transactionProcessor) : IWithdrawalRequestsProcessor
+public class WithdrawalRequestsProcessor(ITransactionProcessor transactionProcessor)
 {
     private const long GasLimit = 30_000_000L;
 
     public IEnumerable<WithdrawalRequest> ReadWithdrawalRequests(IReleaseSpec spec, IWorldState state, Block block)
     {
-        if (!spec.IsEip7002Enabled)
+        if (!spec.WithdrawalRequestsEnabled)
             yield break;
 
         Address eip7002Account = spec.Eip7002ContractAddress;

src/Nethermind/Nethermind.Consensus/Validators/BlockValidator.cs

@@ -295,7 +295,7 @@ public bool ValidateRequests(Block block, out string? error) =>
 
     public bool ValidateRequests(Block block, IReleaseSpec spec, out string? error)
     {
-        if (spec.ConsensusRequestsEnabled && block.Requests is null)
+        if (spec.RequestsEnabled && block.Requests is null)
         {
             error = BlockErrorMessages.MissingRequests;
 
@@ -304,7 +304,7 @@ public bool ValidateRequests(Block block, IReleaseSpec spec, out string? error)
             return false;
         }
 
-        if (!spec.ConsensusRequestsEnabled && block.Requests is not null)
+        if (!spec.RequestsEnabled && block.Requests is not null)
         {
             error = BlockErrorMessages.RequestsNotEnabled;
 

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

@@ -362,7 +362,7 @@ protected virtual Block GetGenesisBlock()
             genesisBlockBuilder.WithParentBeaconBlockRoot(Keccak.Zero);
         }
 
-        if (SpecProvider.GenesisSpec.IsEip6110Enabled || SpecProvider.GenesisSpec.IsEip7002Enabled)
+        if (SpecProvider.GenesisSpec.RequestsEnabled)
         {
             genesisBlockBuilder.WithConsensusRequests(0);
         }

src/Nethermind/Nethermind.Core.Test/Builders/ConsolidationRequestBuilder.cs

@@ -0,0 +1,32 @@
+// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+namespace Nethermind.Core.Test.Builders;
+using Nethermind.Core.ConsensusRequests;
+
+public class ConsolidationRequestBuilder : BuilderBase<ConsolidationRequest>
+{
+    public ConsolidationRequestBuilder() => TestObject = new();
+
+    public ConsolidationRequestBuilder WithSourceAddress(Address sourceAddress)
+    {
+        TestObject.SourceAddress = sourceAddress;
+
+        return this;
+    }
+
+    public ConsolidationRequestBuilder WithSourcePubkey(byte[] SourcePubkey)
+    {
+        TestObject.SourcePubkey = SourcePubkey;
+
+        return this;
+    }
+
+    public ConsolidationRequestBuilder WithTargetPubkey(byte[] TargetPubkey)
+    {
+        TestObject.TargetPubkey = TargetPubkey;
+
+        return this;
+    }
+
+}

src/Nethermind/Nethermind.Core.Test/Builders/TestItem.cs

@@ -115,6 +115,13 @@ public static Hash256 KeccakFromNumber(int i)
         public static WithdrawalRequest WithdrawalRequestE = new() { SourceAddress = AddressE, ValidatorPubkey = PublicKeyE.Bytes };
         public static WithdrawalRequest WithdrawalRequestF = new() { SourceAddress = AddressF, ValidatorPubkey = PublicKeyF.Bytes };
 
+        public static ConsolidationRequest ConsolidationRequestA = new() { SourceAddress = AddressA, SourcePubkey = PublicKeyA.Bytes, TargetPubkey = PublicKeyB.Bytes };
+        public static ConsolidationRequest ConsolidationRequestB = new() { SourceAddress = AddressB, SourcePubkey = PublicKeyB.Bytes, TargetPubkey = PublicKeyC.Bytes };
+        public static ConsolidationRequest ConsolidationRequestC = new() { SourceAddress = AddressC, SourcePubkey = PublicKeyC.Bytes, TargetPubkey = PublicKeyD.Bytes };
+        public static ConsolidationRequest ConsolidationRequestD = new() { SourceAddress = AddressD, SourcePubkey = PublicKeyD.Bytes, TargetPubkey = PublicKeyE.Bytes };
+        public static ConsolidationRequest ConsolidationRequestE = new() { SourceAddress = AddressE, SourcePubkey = PublicKeyE.Bytes, TargetPubkey = PublicKeyF.Bytes };
+        public static ConsolidationRequest ConsolidationRequestF = new() { SourceAddress = AddressF, SourcePubkey = PublicKeyF.Bytes, TargetPubkey = PublicKeyA.Bytes };
+
         public static IPEndPoint IPEndPointA = IPEndPoint.Parse("10.0.0.1");
         public static IPEndPoint IPEndPointB = IPEndPoint.Parse("10.0.0.2");
         public static IPEndPoint IPEndPointC = IPEndPoint.Parse("10.0.0.3");

src/Nethermind/Nethermind.Core.Test/Encoding/ConsensusRequestDecoderTests.cs

@@ -50,6 +50,26 @@ public void Roundtrip_withdrawalRequest()
         decoded.Should().BeEquivalentTo(withdrawalRequest);
     }
 
+    [Test]
+    public void Roundtrip_consolidationRequest()
+    {
+        byte[] SourcePubkey = new byte[48];
+        SourcePubkey[11] = 11;
+        byte[] TargetPubkey = new byte[48];
+        TargetPubkey[22] = 22;
+        ConsensusRequest consolidationRequest = new ConsolidationRequest()
+        {
+            SourceAddress = TestItem.AddressA,
+            SourcePubkey = SourcePubkey,
+            TargetPubkey = TargetPubkey
+        };
+
+        byte[] rlp = Rlp.Encode(consolidationRequest).Bytes;
+        ConsensusRequest decoded = Rlp.Decode<ConsensusRequest>(rlp);
+
+        decoded.Should().BeEquivalentTo(consolidationRequest);
+    }
+
     [Test]
     public void Should_decode_deposit_with_ValueDecoderContext()
     {
@@ -93,7 +113,27 @@ public void Should_decode_withdrawalRequest_with_ValueDecoderContext()
     }
 
     [Test]
-    public void Should_encode_deposit_same_for_Rlp_Encode_and_DepositDecoder_Encode()
+    public void Should_decode_consolidationRequest_with_ValueDecoderContext()
+    {
+        ConsensusRequest consolidationRequest = new ConsolidationRequest()
+        {
+            SourceAddress = TestItem.AddressA,
+            SourcePubkey = KeccakTests.KeccakOfAnEmptyString.ToBytes(),
+            TargetPubkey = KeccakTests.KeccakOfAnEmptyString.ToBytes()
+        };
+        RlpStream stream = new(1024);
+        ConsensusRequestDecoder codec = new();
+
+        codec.Encode(stream, consolidationRequest);
+
+        Rlp.ValueDecoderContext decoderContext = new(stream.Data.AsSpan());
+        ConsolidationRequest? decoded = (ConsolidationRequest?)codec.Decode(ref decoderContext);
+
+        decoded.Should().BeEquivalentTo(consolidationRequest);
+    }
+
+    [Test]
+    public void Should_encode_deposit_same_for_Rlp_Encode_and_ConsensusRequestDecoder_Encode()
     {
         ConsensusRequest deposit = new Deposit()
         {
@@ -110,7 +150,7 @@ public void Should_encode_deposit_same_for_Rlp_Encode_and_DepositDecoder_Encode(
     }
 
     [Test]
-    public void Should_encode_withdrawalRequest_same_for_Rlp_Encode_and_DepositDecoder_Encode()
+    public void Should_encode_withdrawalRequest_same_for_Rlp_Encode_and_ConsensusRequestDecoder_Encode()
     {
         ConsensusRequest withdrawalRequest = new WithdrawalRequest()
         {
@@ -124,6 +164,21 @@ public void Should_encode_withdrawalRequest_same_for_Rlp_Encode_and_DepositDecod
         rlp1.Should().BeEquivalentTo(rlp2);
     }
 
+    [Test]
+    public void Should_encode_consolidationRequest_same_for_Rlp_Encode_and_ConsensusRequestDecoder_Encode()
+    {
+        ConsensusRequest consolidationRequest = new ConsolidationRequest()
+        {
+            SourceAddress = TestItem.AddressA,
+            SourcePubkey = KeccakTests.KeccakOfAnEmptyString.ToBytes(),
+            TargetPubkey = KeccakTests.KeccakOfAnEmptyString.ToBytes()
+        };
+        byte[] rlp1 = new ConsensusRequestDecoder().Encode(consolidationRequest).Bytes;
+        byte[] rlp2 = Rlp.Encode(consolidationRequest).Bytes;
+
+        rlp1.Should().BeEquivalentTo(rlp2);
+    }
+
     [Test]
     public void Should_encode_ConsensusRequests_Array()
     {
@@ -142,6 +197,12 @@ public void Should_encode_ConsensusRequests_Array()
                 SourceAddress = TestItem.AddressA,
                 ValidatorPubkey = KeccakTests.KeccakOfAnEmptyString.ToBytes(),
                 Amount = int.MaxValue
+            },
+            new ConsolidationRequest()
+            {
+                SourceAddress = TestItem.AddressA,
+                SourcePubkey = KeccakTests.KeccakOfAnEmptyString.ToBytes(),
+                TargetPubkey = KeccakTests.KeccakOfAnEmptyString.ToBytes()
             }
         };