eip 7840 implementation

src/Nethermind/Nethermind.Blockchain.Test/TransactionSelectorTests.cs

@@ -160,7 +160,7 @@ public static IEnumerable EnoughShardBlobTransactionsSelectedTestCases
                     tx.MaxFeePerBlobGas = 1;
                 });
                 maxTransactionsSelected.Transactions[1].BlobVersionedHashes =
-                    new byte[Eip4844Constants.MaxBlobGasPerTransaction / Eip4844Constants.GasPerBlob - 1][];
+                    new byte[2 - 1][];
                 maxTransactionsSelected.ExpectedSelectedTransactions.AddRange(
                     maxTransactionsSelected.Transactions.OrderBy(static t => t.Nonce).Take(2));
                 yield return new TestCaseData(maxTransactionsSelected).SetName("Enough transactions selected");
@@ -174,7 +174,7 @@ public static IEnumerable EnoughShardBlobTransactionsSelectedTestCases
                     enoughTransactionsSelected.Transactions.OrderBy(static t => t.Nonce).ToArray();
                 expectedSelectedTransactions[0].Type = TxType.Blob;
                 expectedSelectedTransactions[0].BlobVersionedHashes =
-                    new byte[Eip4844Constants.MaxBlobGasPerTransaction / Eip4844Constants.GasPerBlob][];
+                    new byte[1 / Eip4844Constants.GasPerBlob][];
                 expectedSelectedTransactions[0].MaxFeePerBlobGas = 1;
                 expectedSelectedTransactions[1].Type = TxType.Blob;
                 expectedSelectedTransactions[1].BlobVersionedHashes = new byte[1][];

src/Nethermind/Nethermind.Blockchain.Test/TxPoolSourceTests.cs

@@ -36,17 +36,15 @@ public void GetTransactions_should_respect_customizable_blob_gas_limit(int[] blo
         ITxFilterPipeline txFilterPipeline = Substitute.For<ITxFilterPipeline>();
         txFilterPipeline.Execute(Arg.Any<Transaction>(), Arg.Any<BlockHeader>()).Returns(true);
 
-        TestEip4844Config eip4844Config = new(customMaxBlobGasPerBlock);
-
-        TxPoolTxSource transactionSelector = new(txPool, specProvider, transactionComparerProvider, LimboLogs.Instance, txFilterPipeline, eip4844Config);
+        TxPoolTxSource transactionSelector = new(txPool, specProvider, transactionComparerProvider, LimboLogs.Instance, txFilterPipeline);
 
         IEnumerable<Transaction> txs = transactionSelector.GetTransactions(new BlockHeader { }, long.MaxValue);
         int blobsCount = txs.Sum(tx => tx.BlobVersionedHashes?.Length ?? 0);
 
         Assert.Multiple(() =>
         {
-            Assert.That((ulong)blobsCount * eip4844Config.GasPerBlob, Is.LessThanOrEqualTo(eip4844Config.MaxBlobGasPerBlock));
-            Assert.That(blobsCount, Is.LessThanOrEqualTo(eip4844Config.GetMaxBlobsPerBlock()));
+            Assert.That((ulong)blobsCount * Eip4844Constants.GasPerBlob, Is.LessThanOrEqualTo(1));
+            Assert.That(blobsCount, Is.LessThanOrEqualTo(1));
         });
     }
 

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

@@ -17,6 +17,9 @@ namespace Nethermind.Blockchain.Test.Validators;
 
 public class ShardBlobBlockValidatorTests
 {
+    private const int MaxBlobCount = 6;
+    private const int TargetBlobCount = 3;
+
     [TestCaseSource(nameof(BlobGasFieldsPerForkTestCases))]
     public static bool Blob_gas_fields_should_be_set(IReleaseSpec spec, ulong? blobGasUsed, ulong? excessBlobGas)
     {
@@ -35,7 +38,10 @@ public static bool Blob_gas_fields_should_be_set(IReleaseSpec spec, ulong? blobG
     [TestCaseSource(nameof(BlobsPerBlockCountTestCases))]
     public bool Blobs_per_block_count_is_valid(ulong blobGasUsed)
     {
-        ISpecProvider specProvider = new CustomSpecProvider(((ForkActivation)0, Cancun.Instance));
+        ISpecProvider specProvider = new OverridableSpecProvider(
+            new CustomSpecProvider(((ForkActivation)0, Cancun.Instance)),
+            r => new OverridableReleaseSpec(r) { MaxBlobCount = MaxBlobCount, TargetBlobCount = TargetBlobCount });
+
         BlockValidator blockValidator = new(Always.Valid, Always.Valid, Always.Valid, specProvider, TestLogManager.Instance);
         return blockValidator.ValidateSuggestedBlock(
             Build.A.Block
@@ -55,11 +61,11 @@ private static IEnumerable<TestCaseData> BlobsPerBlockCountTestCases()
     {
         yield return new TestCaseData(0UL) { ExpectedResult = true };
 
-        yield return new TestCaseData(Eip4844Constants.MaxBlobGasPerBlock - Eip4844Constants.GasPerBlob) { ExpectedResult = true };
+        yield return new TestCaseData((MaxBlobCount - 1) * Eip4844Constants.GasPerBlob) { ExpectedResult = true };
 
-        yield return new TestCaseData(Eip4844Constants.MaxBlobGasPerBlock) { ExpectedResult = true };
+        yield return new TestCaseData(MaxBlobCount * Eip4844Constants.GasPerBlob) { ExpectedResult = true };
 
-        yield return new TestCaseData(Eip4844Constants.MaxBlobGasPerBlock + Eip4844Constants.GasPerBlob) { ExpectedResult = false };
+        yield return new TestCaseData((MaxBlobCount + 1) * Eip4844Constants.GasPerBlob) { ExpectedResult = false };
     }
 
     private static IEnumerable<TestCaseData> BlobGasFieldsPerForkTestCases()

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

@@ -26,6 +26,9 @@ namespace Nethermind.Blockchain.Test.Validators;
 
 public class TxValidatorTests
 {
+    private const int MaxBlobCount = 6;
+    private const int TargetBlobCount = 3;
+
     [SetUp]
     public void Setup()
     {
@@ -725,19 +728,19 @@ static TransactionBuilder<Transaction> MakeTestObject(int blobCount = 1) => Buil
                 TestName = "More than minimum BlobVersionedHashes",
                 ExpectedResult = true
             };
-            yield return new TestCaseData(MakeTestObject((int)(Eip4844Constants.MaxBlobGasPerBlock / Eip4844Constants.GasPerBlob - 1))
+            yield return new TestCaseData(MakeTestObject(MaxBlobCount - 1)
                 .SignedAndResolved().TestObject)
             {
                 TestName = "Less than maximum BlobVersionedHashes",
                 ExpectedResult = true
             };
-            yield return new TestCaseData(MakeTestObject((int)(Eip4844Constants.MaxBlobGasPerBlock / Eip4844Constants.GasPerBlob))
+            yield return new TestCaseData(MakeTestObject(MaxBlobCount)
                 .SignedAndResolved().TestObject)
             {
                 TestName = "Maximum BlobVersionedHashes",
                 ExpectedResult = true
             };
-            yield return new TestCaseData(MakeTestObject((int)(Eip4844Constants.MaxBlobGasPerBlock / Eip4844Constants.GasPerBlob + 1))
+            yield return new TestCaseData(MakeTestObject(MaxBlobCount + 1)
                 .SignedAndResolved().TestObject)
             {
                 TestName = "Too many BlobVersionedHashes",

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

@@ -96,7 +96,7 @@ public static string InvalidTxInBlock(int i) =>
 
     //Block's blob gas used in header is above the limit.
     public static readonly string BlobGasUsedAboveBlockLimit =
-        $"BlockBlobGasExceeded: A block cannot have more than {Eip4844Constants.MaxBlobGasPerBlock} blob gas.";
+        "BlockBlobGasExceeded: A block cannot have more than {0} blob gas.";
 
     //Block's excess blob gas in header is incorrect.
     public const string IncorrectExcessBlobGas =

src/Nethermind/Nethermind.Consensus/Messages/TxErrorMessages.cs

@@ -44,7 +44,7 @@ public static string InvalidTxChainId(ulong expected, ulong? actual) =>
         "blob transaction missing blob hashes";
 
     public static readonly string BlobTxGasLimitExceeded =
-        $"BlobTxGasLimitExceeded: Transaction exceeded {Eip4844Constants.MaxBlobGasPerTransaction}.";
+        "BlobTxGasLimitExceeded: Transaction exceeded {0}.";
 
     public const string BlobTxMissingBlobs =
         "BlobTxMissingBlobs: Blob transaction must have blobs.";

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

@@ -28,22 +28,19 @@ public class TxPoolTxSource : ITxSource
         private readonly ITxFilterPipeline _txFilterPipeline;
         private readonly ISpecProvider _specProvider;
         protected readonly ILogger _logger;
-        private readonly IEip4844Config _eip4844Config;
 
         public TxPoolTxSource(
             ITxPool? transactionPool,
             ISpecProvider? specProvider,
             ITransactionComparerProvider? transactionComparerProvider,
             ILogManager? logManager,
-            ITxFilterPipeline? txFilterPipeline,
-            IEip4844Config? eip4844ConstantsProvider = null)
+            ITxFilterPipeline? txFilterPipeline)
         {
             _transactionPool = transactionPool ?? throw new ArgumentNullException(nameof(transactionPool));
             _transactionComparerProvider = transactionComparerProvider ?? throw new ArgumentNullException(nameof(transactionComparerProvider));
             _txFilterPipeline = txFilterPipeline ?? throw new ArgumentNullException(nameof(txFilterPipeline));
             _specProvider = specProvider ?? throw new ArgumentNullException(nameof(specProvider));
             _logger = logManager?.GetClassLogger<TxPoolTxSource>() ?? throw new ArgumentNullException(nameof(logManager));
-            _eip4844Config = eip4844ConstantsProvider ?? ConstantEip4844Config.Instance;
         }
 
         public IEnumerable<Transaction> GetTransactions(BlockHeader parent, long gasLimit, PayloadAttributes? payloadAttributes = null)
@@ -62,7 +59,7 @@ public IEnumerable<Transaction> GetTransactions(BlockHeader parent, long gasLimi
 
             int checkedTransactions = 0;
             int selectedTransactions = 0;
-            using ArrayPoolList<Transaction> selectedBlobTxs = new(_eip4844Config.GetMaxBlobsPerBlock());
+            using ArrayPoolList<Transaction> selectedBlobTxs = new((int)(spec.MaxBlobCount * Eip4844Constants.GasPerBlob));
 
             SelectBlobTransactions(blobTransactions, parent, spec, selectedBlobTxs);
 
@@ -126,18 +123,19 @@ private void SelectBlobTransactions(IEnumerable<Transaction> blobTransactions, B
             UInt256 blobGasCounter = 0;
             UInt256 feePerBlobGas = UInt256.Zero;
 
+            var maxBlobGasPerBlock = spec.MaxBlobCount * Eip4844Constants.GasPerBlob;
             foreach (Transaction blobTx in blobTransactions)
             {
-                if (blobGasCounter >= _eip4844Config.MaxBlobGasPerBlock)
+                if (blobGasCounter >= maxBlobGasPerBlock)
                 {
                     if (_logger.IsTrace) _logger.Trace($"Declining {blobTx.ToShortString()}, no more blob space. Block already have {blobGasCounter} blob gas which is max value allowed.");
                     break;
                 }
 
                 checkedBlobTransactions++;
 
-                ulong txBlobGas = (ulong)(blobTx.BlobVersionedHashes?.Length ?? 0) * _eip4844Config.GasPerBlob;
-                if (txBlobGas > _eip4844Config.MaxBlobGasPerBlock - blobGasCounter)
+                ulong txBlobGas = (ulong)(blobTx.BlobVersionedHashes?.Length ?? 0) * Eip4844Constants.GasPerBlob;
+                if (txBlobGas > maxBlobGasPerBlock - blobGasCounter)
                 {
                     if (_logger.IsTrace) _logger.Trace($"Declining {blobTx.ToShortString()}, not enough blob space.");
                     continue;

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

@@ -337,9 +337,9 @@ protected virtual bool ValidateEip4844Fields(Block block, IReleaseSpec spec, out
 
         ulong blobGasUsed = BlobGasCalculator.CalculateBlobGas(blobsInBlock);
 
-        if (blobGasUsed > Eip4844Constants.MaxBlobGasPerBlock)
+        if (blobGasUsed > spec.MaxBlobCount * Eip4844Constants.GasPerBlob)
         {
-            error = BlockErrorMessages.BlobGasUsedAboveBlockLimit;
+            error = string.Format(BlockErrorMessages.BlobGasUsedAboveBlockLimit, spec.MaxBlobCount * Eip4844Constants.GasPerBlob);
             if (_logger.IsDebug) _logger.Debug($"{Invalid(block)} {error}.");
             return false;
         }

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

@@ -192,14 +192,15 @@ 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 spec)
     {
         int blobCount = transaction.BlobVersionedHashes!.Length;
         ulong totalDataGas = BlobGasCalculator.CalculateBlobGas(blobCount);
-        return totalDataGas > Eip4844Constants.MaxBlobGasPerTransaction ? TxErrorMessages.BlobTxGasLimitExceeded
+        var maxBlobGasPerBlock = spec.MaxBlobCount * Eip4844Constants.GasPerBlob;
+        return totalDataGas > maxBlobGasPerBlock ? string.Format(TxErrorMessages.BlobTxGasLimitExceeded, maxBlobGasPerBlock)
             : blobCount < Eip4844Constants.MinBlobsPerTransaction ? TxErrorMessages.BlobTxMissingBlobs
             : ValidateBlobVersionedHashes();
 

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

@@ -253,7 +253,12 @@ private static ISpecProvider CreateSpecProvider(ISpecProvider specProvider)
     {
         return specProvider is TestSpecProvider { AllowTestChainOverride: false }
             ? specProvider
-            : new OverridableSpecProvider(specProvider, static s => new OverridableReleaseSpec(s) { IsEip3607Enabled = false });
+            : new OverridableSpecProvider(specProvider, static s => new OverridableReleaseSpec(s)
+            {
+                IsEip3607Enabled = false,
+                MaxBlobCount = 6,
+                TargetBlobCount = 3,
+            });
     }
 
     private void BlockAddedToMain(object? sender, BlockEventArgs e)

src/Nethermind/Nethermind.Core/Eip4844Constants.cs

@@ -18,24 +18,6 @@ public class Eip4844Constants
     /// <remarks>Defaults to 131072.</remarks>
     public const ulong GasPerBlob = 131072;
 
-    /// <summary>
-    /// Gets the <c>MAX_BLOB_GAS_PER_BLOCK</c> parameter.
-    /// </summary>
-    /// <remarks>Defaults to 786432.</remarks>
-    public static ulong MaxBlobGasPerBlock { get; private set; } = 786432;
-
-    /// <summary>
-    /// Gets the <c>MAX_BLOB_GAS_PER_BLOCK</c> parameter.
-    /// </summary>
-    /// <remarks>The same as <see cref="MaxBlobGasPerBlock"/>.</remarks>
-    public static ulong MaxBlobGasPerTransaction => MaxBlobGasPerBlock;
-
-    /// <summary>
-    /// Gets the <c>TARGET_BLOB_GAS_PER_BLOCK</c> parameter.
-    /// </summary>
-    /// <remarks>Defaults to 393216.</remarks>
-    public static ulong TargetBlobGasPerBlock { get; private set; } = MaxBlobGasPerBlock / 2;
-
     /// <summary>
     /// Gets the <c>BLOB_GASPRICE_UPDATE_FRACTION</c> parameter.
     /// </summary>
@@ -59,15 +41,7 @@ public static void OverrideIfAny(
         if (blobGasPriceUpdateFraction.HasValue)
             BlobGasPriceUpdateFraction = blobGasPriceUpdateFraction.Value;
 
-        if (maxBlobGasPerBlock.HasValue)
-            MaxBlobGasPerBlock = maxBlobGasPerBlock.Value;
-
         if (minBlobGasPrice.HasValue)
             MinBlobGasPrice = minBlobGasPrice.Value;
-
-        if (targetBlobGasPerBlock.HasValue)
-            TargetBlobGasPerBlock = targetBlobGasPerBlock.Value;
     }
-
-    public static int GetMaxBlobsPerBlock() => (int)(MaxBlobGasPerBlock / GasPerBlob);
 }

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

@@ -343,6 +343,12 @@ public interface IReleaseSpec : IEip1559Spec, IReceiptSpec
         /// <remarks>Backward compatibility for early Kovan blocks.</remarks>
         bool ValidateChainId => true;
 
+        /// <summary>
+        /// EIP-7780: Add blob schedule to EL config files
+        /// </summary>
+        public ulong TargetBlobCount { get; set; }
+        public ulong MaxBlobCount { get; set; }
+
         public ulong WithdrawalTimestamp { get; }
 
         public ulong Eip4844TransitionTimestamp { get; }

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

@@ -67,6 +67,8 @@ 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 ulong TargetBlobCount { get; set; }
+    public ulong MaxBlobCount { get; set; }
     public virtual Address? Eip4788ContractAddress => spec.Eip4788ContractAddress;
     public bool IsEip6110Enabled => spec.IsEip6110Enabled;
     public Address DepositContractAddress => spec.DepositContractAddress;