EIP 7742 implementation

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

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

src/Nethermind/Nethermind.Blockchain.Test/TestEip4844Config.cs

@@ -16,5 +16,5 @@ public TestEip4844Config(ulong? maxBlobGasPerBlock = null)
 
     public ulong GasPerBlob => Eip4844Constants.GasPerBlob;
 
-    public int GetMaxBlobsPerBlock() => (int)(MaxBlobGasPerBlock / GasPerBlob);
+    public ulong GetMaxBlobsPerBlock() => MaxBlobGasPerBlock / GasPerBlob;
 }

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

@@ -396,7 +396,8 @@ private Block PrepareBlockForProcessing(Block suggestedBlock)
             WithdrawalsRoot = bh.WithdrawalsRoot,
             RequestsHash = bh.RequestsHash,
             IsPostMerge = bh.IsPostMerge,
-            ParentBeaconBlockRoot = bh.ParentBeaconBlockRoot
+            ParentBeaconBlockRoot = bh.ParentBeaconBlockRoot,
+            TargetBlobCount = bh.TargetBlobCount,
         };
 
         if (!ShouldComputeStateRoot(bh))

src/Nethermind/Nethermind.Consensus/Producers/BlockProducerBase.cs

@@ -232,7 +232,8 @@ protected virtual BlockHeader PrepareBlockHeader(BlockHeader parent,
             {
                 Author = blockAuthor,
                 MixHash = payloadAttributes?.PrevRandao,
-                ParentBeaconBlockRoot = payloadAttributes?.ParentBeaconBlockRoot
+                ParentBeaconBlockRoot = payloadAttributes?.ParentBeaconBlockRoot,
+                TargetBlobCount = payloadAttributes?.TargetBlobCount,
             };
 
             UInt256 difficulty = _difficultyCalculator.Calculate(header, parent);

src/Nethermind/Nethermind.Consensus/Producers/BuildBlocksWhenRequested.cs

@@ -17,7 +17,7 @@ public class BuildBlocksWhenRequested : IManualBlockProductionTrigger
             BlockHeader? parentHeader = null,
             CancellationToken? cancellationToken = null,
             IBlockTracer? blockTracer = null,
-            PayloadAttributes payloadAttributes = null)
+            PayloadAttributes? payloadAttributes = null)
         {
             BlockProductionEventArgs args = new(parentHeader, cancellationToken, blockTracer, payloadAttributes);
             TriggerBlockProduction?.Invoke(this, args);

src/Nethermind/Nethermind.Consensus/Producers/PayloadAttributes.cs

@@ -26,6 +26,10 @@ public class PayloadAttributes
 
     public Hash256? ParentBeaconBlockRoot { get; set; }
 
+    public ulong? TargetBlobCount { get; set; }
+
+    public ulong? MaxBlobCount { get; set; }
+
     public virtual long? GetGasLimit() => null;
 
     public override string ToString() => ToString(string.Empty);
@@ -47,6 +51,16 @@ public string ToString(string indentation)
             sb.Append($", {nameof(ParentBeaconBlockRoot)} : {ParentBeaconBlockRoot}");
         }
 
+        if (TargetBlobCount is not null)
+        {
+            sb.Append($", {nameof(TargetBlobCount)} : {TargetBlobCount}");
+        }
+
+        if (MaxBlobCount is not null)
+        {
+            sb.Append($", {nameof(MaxBlobCount)} : {MaxBlobCount}");
+        }
+
         sb.Append('}');
 
         return sb.ToString();
@@ -71,7 +85,9 @@ protected virtual int ComputePayloadIdMembersSize() =>
         + Keccak.Size // prev randao
         + Address.Size // suggested fee recipient
         + (Withdrawals is null ? 0 : Keccak.Size) // withdrawals root hash
-        + (ParentBeaconBlockRoot is null ? 0 : Keccak.Size); // parent beacon block root
+        + (ParentBeaconBlockRoot is null ? 0 : Keccak.Size) // parent beacon block root
+        + (TargetBlobCount is null ? 0 : sizeof(ulong)) // target blob count
+        + (MaxBlobCount is null ? 0 : sizeof(ulong)); // max blob count
 
     protected static string ComputePayloadId(Span<byte> inputSpan)
     {
@@ -110,6 +126,18 @@ protected virtual int WritePayloadIdMembers(BlockHeader parentHeader, Span<byte>
             position += Keccak.Size;
         }
 
+        if (TargetBlobCount.HasValue)
+        {
+            BinaryPrimitives.WriteUInt64BigEndian(inputSpan.Slice(position, sizeof(ulong)), TargetBlobCount.Value);
+            position += sizeof(ulong);
+        }
+
+        if (MaxBlobCount.HasValue)
+        {
+            BinaryPrimitives.WriteUInt64BigEndian(inputSpan.Slice(position, sizeof(ulong)), MaxBlobCount.Value);
+            position += sizeof(ulong);
+        }
+
         return position;
     }
 
@@ -166,6 +194,7 @@ public static class PayloadAttributesExtensions
     public static int GetVersion(this PayloadAttributes executionPayload) =>
         executionPayload switch
         {
+            { MaxBlobCount: not null, TargetBlobCount: not null } => EngineApiVersions.Prague,
             { ParentBeaconBlockRoot: not null, Withdrawals: not null } => EngineApiVersions.Cancun,
             { Withdrawals: not null } => EngineApiVersions.Shanghai,
             _ => EngineApiVersions.Paris
@@ -174,6 +203,7 @@ public static int GetVersion(this PayloadAttributes executionPayload) =>
     public static int ExpectedPayloadAttributesVersion(this IReleaseSpec spec) =>
         spec switch
         {
+            { IsEip7742Enabled: true } => EngineApiVersions.Prague,
             { IsEip4844Enabled: true } => EngineApiVersions.Cancun,
             { WithdrawalsEnabled: true } => EngineApiVersions.Shanghai,
             _ => EngineApiVersions.Paris

src/Nethermind/Nethermind.Consensus/Producers/TxPoolTxSource.cs

@@ -62,9 +62,13 @@ public IEnumerable<Transaction> GetTransactions(BlockHeader parent, long gasLimi
 
             int checkedTransactions = 0;
             int selectedTransactions = 0;
-            using ArrayPoolList<Transaction> selectedBlobTxs = new(_eip4844Config.GetMaxBlobsPerBlock());
 
-            SelectBlobTransactions(blobTransactions, parent, spec, selectedBlobTxs);
+            using ArrayPoolList<Transaction> selectedBlobTxs = new((int)(payloadAttributes?.MaxBlobCount ?? Eip4844Constants.GetMaxBlobsPerBlock()));
+
+            if (!spec.IsEip7742Enabled || payloadAttributes?.MaxBlobCount is not null)
+            {
+                SelectBlobTransactions(blobTransactions, parent, spec, selectedBlobTxs);
+            }
 
             foreach (Transaction tx in transactions)
             {
@@ -119,7 +123,7 @@ private static IEnumerable<Transaction> PickBlobTxsBetterThanCurrentTx(ArrayPool
             }
         }
 
-        private void SelectBlobTransactions(IEnumerable<Transaction> blobTransactions, BlockHeader parent, IReleaseSpec spec, ArrayPoolList<Transaction> selectedBlobTxs)
+        private void SelectBlobTransactions(IEnumerable<Transaction> blobTransactions, BlockHeader parent, IReleaseSpec spec, ArrayPoolList<Transaction> selectedBlobTxs, PayloadAttributes? payloadAttributes = null)
         {
             int checkedBlobTransactions = 0;
             int selectedBlobTransactions = 0;
@@ -128,7 +132,10 @@ private void SelectBlobTransactions(IEnumerable<Transaction> blobTransactions, B
 
             foreach (Transaction blobTx in blobTransactions)
             {
-                if (blobGasCounter >= _eip4844Config.MaxBlobGasPerBlock)
+                UInt256 maxBlobGas = spec.IsEip7742Enabled
+                    ? payloadAttributes?.MaxBlobCount * Eip4844Constants.GasPerBlob ?? UInt256.Zero
+                    : _eip4844Config.MaxBlobGasPerBlock;
+                if (blobGasCounter >= maxBlobGas)
                 {
                     if (_logger.IsTrace) _logger.Trace($"Declining {blobTx.ToShortString()}, no more blob space. Block already have {blobGasCounter} blob gas which is max value allowed.");
                     break;
@@ -137,7 +144,9 @@ private void SelectBlobTransactions(IEnumerable<Transaction> blobTransactions, B
                 checkedBlobTransactions++;
 
                 ulong txBlobGas = (ulong)(blobTx.BlobVersionedHashes?.Length ?? 0) * _eip4844Config.GasPerBlob;
-                if (txBlobGas > _eip4844Config.MaxBlobGasPerBlock - blobGasCounter)
+
+                UInt256 blobGasLeft = maxBlobGas - blobGasCounter;
+                if (txBlobGas > blobGasLeft)
                 {
                     if (_logger.IsTrace) _logger.Trace($"Declining {blobTx.ToShortString()}, not enough blob space.");
                     continue;

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

@@ -337,7 +337,8 @@ protected virtual bool ValidateEip4844Fields(Block block, IReleaseSpec spec, out
 
         ulong blobGasUsed = BlobGasCalculator.CalculateBlobGas(blobsInBlock);
 
-        if (blobGasUsed > Eip4844Constants.MaxBlobGasPerBlock)
+        // no validation is needed when eip7742 is activated
+        if (!spec.IsEip7742Enabled && blobGasUsed > Eip4844Constants.MaxBlobGasPerBlock)
         {
             error = BlockErrorMessages.BlobGasUsedAboveBlockLimit;
             if (_logger.IsDebug) _logger.Debug($"{Invalid(block)} {error}.");

src/Nethermind/Nethermind.Consensus/Validators/TxValidator.cs

@@ -189,15 +189,19 @@ public ValidationResult IsWellFormed(Transaction transaction, IReleaseSpec relea
             { To: null } => TxErrorMessages.TxMissingTo,
             { MaxFeePerBlobGas: null } => TxErrorMessages.BlobTxMissingMaxFeePerBlobGas,
             { BlobVersionedHashes: null } => TxErrorMessages.BlobTxMissingBlobVersionedHashes,
-            _ => ValidateBlobFields(transaction)
+            _ => ValidateBlobFields(transaction, releaseSpec)
         };
 
-    private ValidationResult ValidateBlobFields(Transaction transaction)
+    private ValidationResult ValidateBlobFields(Transaction transaction, IReleaseSpec releaseSpec)
     {
         int blobCount = transaction.BlobVersionedHashes!.Length;
-        ulong totalDataGas = BlobGasCalculator.CalculateBlobGas(blobCount);
-        return totalDataGas > Eip4844Constants.MaxBlobGasPerTransaction ? TxErrorMessages.BlobTxGasLimitExceeded
-            : blobCount < Eip4844Constants.MinBlobsPerTransaction ? TxErrorMessages.BlobTxMissingBlobs
+        if (!releaseSpec.IsEip7742Enabled
+            && BlobGasCalculator.CalculateBlobGas(blobCount) > Eip4844Constants.MaxBlobGasPerTransaction)
+        {
+            return TxErrorMessages.BlobTxGasLimitExceeded;
+        }
+
+        return blobCount < Eip4844Constants.MinBlobsPerTransaction ? TxErrorMessages.BlobTxMissingBlobs
             : ValidateBlobVersionedHashes();
 
         ValidationResult ValidateBlobVersionedHashes()

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

@@ -368,6 +368,11 @@ protected virtual Block GetGenesisBlock()
             genesisBlockBuilder.WithEmptyRequestsHash();
         }
 
+        if (SpecProvider.GenesisSpec.IsEip7742Enabled)
+        {
+            genesisBlockBuilder.WithTargetBlobCount(0);
+        }
+
         genesisBlockBuilder.WithStateRoot(State.StateRoot);
         return genesisBlockBuilder.TestObject;
     }
@@ -440,7 +445,7 @@ private async Task<AcceptTxResult[]> AddBlockInternal(params Transaction[] trans
         Timestamper.Add(TimeSpan.FromSeconds(1));
         var headProcessed = new SemaphoreSlim(0);
         TxPool.TxPoolHeadChanged += (s, a) => headProcessed.Release();
-        await BlockProductionTrigger.BuildBlock().ConfigureAwait(false);
+        await BlockProductionTrigger.BuildBlock(payloadAttributes: new PayloadAttributes { TargetBlobCount = 1 }).ConfigureAwait(false);
         await headProcessed.WaitAsync().ConfigureAwait(false);
         return txResults;
     }

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

@@ -288,5 +288,11 @@ public BlockBuilder WithParentBeaconBlockRoot(Hash256? parentBeaconBlockRoot)
             TestObjectInternal.Header.ParentBeaconBlockRoot = parentBeaconBlockRoot;
             return this;
         }
+
+        public BlockBuilder WithTargetBlobCount(ulong? targetBlobCount)
+        {
+            TestObjectInternal.Header.TargetBlobCount = targetBlobCount;
+            return this;
+        }
     }
 }

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

@@ -201,4 +201,10 @@ public BlockHeaderBuilder WithRequestsHash(Hash256? requestsHash)
         TestObjectInternal.RequestsHash = requestsHash;
         return this;
     }
+
+    public BlockHeaderBuilder WithTargetBlobCount(ulong? targetBlobCount)
+    {
+        TestObjectInternal.TargetBlobCount = targetBlobCount;
+        return this;
+    }
 }

src/Nethermind/Nethermind.Core/Block.cs

@@ -120,6 +120,8 @@ public Transaction[] Transactions
     [JsonIgnore]
     public byte[][]? ExecutionRequests { get; set; }
 
+    public ulong? TargetBlobCount => Header.TargetBlobCount; // do not add setter here
+
     [JsonIgnore]
     public ArrayPoolList<AddressAsKey>? AccountChanges { get; set; }
     [JsonIgnore]

src/Nethermind/Nethermind.Core/BlockHeader.cs

@@ -83,6 +83,7 @@ public BlockHeader(
 
     public string SealEngineType { get; set; } = Core.SealEngineType.Ethash;
     public bool IsPostMerge { get; set; }
+    public ulong? TargetBlobCount { get; set; }
 
     public string ToString(string indent)
     {

src/Nethermind/Nethermind.Core/Eip4844Constants.cs

@@ -69,5 +69,5 @@ public static void OverrideIfAny(
             TargetBlobGasPerBlock = targetBlobGasPerBlock.Value;
     }
 
-    public static int GetMaxBlobsPerBlock() => (int)(MaxBlobGasPerBlock / GasPerBlob);
+    public static ulong GetMaxBlobsPerBlock() => MaxBlobGasPerBlock / GasPerBlob;
 }

src/Nethermind/Nethermind.Core/IEip4844Config.cs

@@ -10,14 +10,14 @@ public interface IEip4844Config
 {
     ulong MaxBlobGasPerBlock { get; }
     ulong GasPerBlob { get; }
-    int GetMaxBlobsPerBlock();
+    ulong GetMaxBlobsPerBlock();
 }
 
 public class ConstantEip4844Config : IEip4844Config
 {
     public ulong MaxBlobGasPerBlock => Eip4844Constants.MaxBlobGasPerBlock;
     public ulong GasPerBlob => Eip4844Constants.GasPerBlob;
-    public int GetMaxBlobsPerBlock() => Eip4844Constants.GetMaxBlobsPerBlock();
+    public ulong GetMaxBlobsPerBlock() => Eip4844Constants.GetMaxBlobsPerBlock();
 
     static ConstantEip4844Config() => Instance = new ConstantEip4844Config();
     private ConstantEip4844Config() { }

src/Nethermind/Nethermind.Core/Specs/IReleaseSpec.cs

@@ -323,6 +323,8 @@ public interface IReleaseSpec : IEip1559Spec, IReceiptSpec
         /// </summary>
         bool IsRip7212Enabled { get; }
 
+        bool IsEip7742Enabled { get; }
+
         /// OP Granite
         bool IsOpGraniteEnabled { get; }
 

src/Nethermind/Nethermind.Core/Specs/ReleaseSpecDecorator.cs

@@ -67,6 +67,7 @@ public class ReleaseSpecDecorator(IReleaseSpec spec) : IReleaseSpec
     public virtual bool IsEip4895Enabled => spec.IsEip4895Enabled;
     public virtual bool IsEip4844Enabled => spec.IsEip4844Enabled;
     public virtual bool IsEip4788Enabled => spec.IsEip4788Enabled;
+    public virtual bool IsEip7742Enabled => spec.IsEip7742Enabled;
     public virtual Address? Eip4788ContractAddress => spec.Eip4788ContractAddress;
     public bool IsEip6110Enabled => spec.IsEip6110Enabled;
     public Address DepositContractAddress => spec.DepositContractAddress;

src/Nethermind/Nethermind.Evm.Test/TransactionProcessorFeeTests.cs

@@ -108,9 +108,11 @@ public void Check_paid_fees_multiple_transactions(bool withFeeCollector)
         tracer.BurntFees.Should().Be(84000);
     }
 
-    [TestCase(false)]
-    [TestCase(true)]
-    public void Check_paid_fees_with_blob(bool withFeeCollector)
+    [TestCase(false, true)]
+    [TestCase(false, false)]
+    [TestCase(true, true)]
+    [TestCase(true, false)]
+    public void Check_paid_fees_with_blob(bool withFeeCollector, bool eip7742Enabled)
     {
         UInt256 initialBalance = 0;
         if (withFeeCollector)
@@ -121,6 +123,9 @@ public void Check_paid_fees_with_blob(bool withFeeCollector)
 
         BlockHeader header = Build.A.BlockHeader.WithExcessBlobGas(0).TestObject;
 
+        _spec.IsEip7742Enabled = eip7742Enabled;
+        if (eip7742Enabled) header.TargetBlobCount = 3;
+
         Transaction tx = Build.A.Transaction
             .SignedAndResolved(_ethereumEcdsa, TestItem.PrivateKeyA).WithType(TxType.Blob)
             .WithBlobVersionedHashes(1).WithMaxFeePerBlobGas(1).TestObject;

src/Nethermind/Nethermind.Evm.Test/VirtualMachineTestsBase.cs

@@ -335,6 +335,7 @@ protected virtual Block BuildBlock(ForkActivation activation, SenderRecipientAnd
             .WithExcessBlobGas(0)
             .WithParentBeaconBlockRoot(TestItem.KeccakG)
             .WithExcessBlobGas(excessBlobGas)
+            .WithTargetBlobCount(3)
             .TestObject;
     }
 

src/Nethermind/Nethermind.Facade/BlockchainBridge.cs

@@ -297,6 +297,7 @@ private TransactionResult CallAndRestore(
             }
             callHeader.MixHash = blockHeader.MixHash;
             callHeader.IsPostMerge = blockHeader.Difficulty == 0;
+            callHeader.TargetBlobCount = blockHeader.TargetBlobCount;
             transaction.Hash = transaction.CalculateHash();
             return scope.TransactionProcessor.CallAndRestore(transaction, new(callHeader), tracer);
         }

src/Nethermind/Nethermind.Facade/Simulate/SimulateBridgeHelper.cs

@@ -288,6 +288,7 @@ private BlockHeader GetCallHeader(BlockStateCall<TransactionWithSourceDetails> b
                 MixHash = parent.MixHash,
                 IsPostMerge = parent.Difficulty == 0,
             };
+        result.TargetBlobCount = parent.TargetBlobCount;
         result.Timestamp = parent.Timestamp + 1;
         result.BaseFeePerGas = block.BlockOverrides is { BaseFeePerGas: not null }
             ? block.BlockOverrides.BaseFeePerGas.Value