eip 7840 implementation

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

@@ -52,6 +52,15 @@ protected EthereumTestResult RunTest(GeneralStateTest test)
             return RunTest(test, NullTxTracer.Instance);
         }
 
+        private static ISpecProvider CreateSpecProvider(ISpecProvider specProvider)
+        {
+            return new OverridableSpecProvider(specProvider, static s => new OverridableReleaseSpec(s)
+            {
+                MaxBlobCount = 6,
+                TargetBlobCount = 3,
+            });
+        }
+
         protected EthereumTestResult RunTest(GeneralStateTest test, ITxTracer txTracer)
         {
             TestContext.Out.Write($"Running {test.Name} at {DateTime.UtcNow:HH:mm:ss.ffffff}");
@@ -60,14 +69,9 @@ protected EthereumTestResult RunTest(GeneralStateTest test, ITxTracer txTracer)
             IDb stateDb = new MemDb();
             IDb codeDb = new MemDb();
 
-            ISpecProvider specProvider = new CustomSpecProvider(
+            ISpecProvider specProvider = CreateSpecProvider(new CustomSpecProvider(
                 ((ForkActivation)0, Frontier.Instance), // TODO: this thing took a lot of time to find after it was removed!, genesis block is always initialized with Frontier
-                ((ForkActivation)1, test.Fork));
-
-            if (specProvider.GenesisSpec != Frontier.Instance)
-            {
-                Assert.Fail("Expected genesis spec to be Frontier for blockchain tests");
-            }
+                ((ForkActivation)1, test.Fork)));
 
             TrieStore trieStore = new(stateDb, _logManager);
             WorldState stateProvider = new(trieStore, codeDb, _logManager);

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

@@ -24,6 +24,7 @@
 using NUnit.Framework;
 using Nethermind.Config;
 using Nethermind.Core.Crypto;
+using Nethermind.Specs.Test;
 
 namespace Nethermind.Blockchain.Test
 {
@@ -160,7 +161,7 @@ public static IEnumerable EnoughShardBlobTransactionsSelectedTestCases
                     tx.MaxFeePerBlobGas = 1;
                 });
                 maxTransactionsSelected.Transactions[1].BlobVersionedHashes =
-                    new byte[Eip4844Constants.MaxBlobGasPerTransaction / Eip4844Constants.GasPerBlob - 1][];
+                    new byte[5][];
                 maxTransactionsSelected.ExpectedSelectedTransactions.AddRange(
                     maxTransactionsSelected.Transactions.OrderBy(static t => t.Nonce).Take(2));
                 yield return new TestCaseData(maxTransactionsSelected).SetName("Enough transactions selected");
@@ -174,7 +175,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[6][];
                 expectedSelectedTransactions[0].MaxFeePerBlobGas = 1;
                 expectedSelectedTransactions[1].Type = TxType.Blob;
                 expectedSelectedTransactions[1].BlobVersionedHashes = new byte[1][];
@@ -221,7 +222,11 @@ void SetAccountStates(IEnumerable<Address> missingAddresses)
             IBlockTree blockTree = Substitute.For<IBlockTree>();
             Block block = Build.A.Block.WithNumber(0).TestObject;
             blockTree.Head.Returns(block);
-            IReleaseSpec spec = testCase.ReleaseSpec;
+            IReleaseSpec spec = new OverridableReleaseSpec(testCase.ReleaseSpec)
+            {
+                MaxBlobCount = 6,
+                TargetBlobCount = 3,
+            };
             specProvider.GetSpec(Arg.Any<ForkActivation>()).Returns(spec);
             TransactionComparerProvider transactionComparerProvider =
                 new(specProvider, blockTree);

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/BlockValidatorTests.cs

@@ -181,7 +181,7 @@ private static IEnumerable<TestCaseData> BadSuggestedBlocks()
             .Signed()
             .TestObject)
         .TestObject,
-        new CustomSpecProvider(((ForkActivation)0, Cancun.Instance)),
+        new CustomSpecProvider(((ForkActivation)0, new OverridableReleaseSpec(Cancun.Instance) { MaxBlobCount = 6, TargetBlobCount = 3 })),
         "InsufficientMaxFeePerBlobGas");
     }
 

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

@@ -19,13 +19,23 @@
 using Nethermind.Serialization.Rlp;
 using Nethermind.Specs;
 using Nethermind.Specs.Forks;
+using Nethermind.Specs.Test;
 using NSubstitute;
 using NUnit.Framework;
 
 namespace Nethermind.Blockchain.Test.Validators;
 
 public class TxValidatorTests
 {
+    private const int MaxBlobCount = 6;
+    private const int TargetBlobCount = 3;
+
+    private IReleaseSpec CancunSpec = new OverridableReleaseSpec(Cancun.Instance)
+    {
+        MaxBlobCount = MaxBlobCount,
+        TargetBlobCount = TargetBlobCount,
+    };
+
     [SetUp]
     public void Setup()
     {
@@ -345,8 +355,8 @@ public void ShardBlobTransactions_should_have_destination_set()
             .WithChainId(TestBlockchainIds.ChainId)
             .SignedAndResolved().TestObject;
 
-        Assert.That(txValidator.IsWellFormed(txWithoutTo, Cancun.Instance).AsBool(), Is.False);
-        Assert.That(txValidator.IsWellFormed(txWithTo, Cancun.Instance).AsBool());
+        Assert.That(txValidator.IsWellFormed(txWithoutTo, CancunSpec).AsBool(), Is.False);
+        Assert.That(txValidator.IsWellFormed(txWithTo, CancunSpec).AsBool());
     }
 
     [MaxTime(Timeout.MaxTestTime)]
@@ -367,7 +377,8 @@ public bool MaxFeePerBlobGas_should_be_set_for_blob_tx_only(TxType txType, bool
         Transaction tx = txBuilder.TestObject;
 
         TxValidator txValidator = new(TestBlockchainIds.ChainId);
-        return txValidator.IsWellFormed(tx, Cancun.Instance);
+
+        return txValidator.IsWellFormed(tx, CancunSpec);
     }
 
     [TestCaseSource(nameof(BlobVersionedHashInvalidTestCases))]
@@ -384,14 +395,14 @@ public bool BlobVersionedHash_should_be_correct(byte[] hash)
             .SignedAndResolved().TestObject;
 
         TxValidator txValidator = new(TestBlockchainIds.ChainId);
-        return txValidator.IsWellFormed(tx, Cancun.Instance);
+        return txValidator.IsWellFormed(tx, CancunSpec);
     }
 
     [TestCaseSource(nameof(ShardBlobTxIncorrectTransactions))]
     public bool ShardBlobTransaction_fields_should_be_verified(Transaction tx)
     {
         TxValidator txValidator = new(TestBlockchainIds.ChainId);
-        return txValidator.IsWellFormed(tx, Cancun.Instance);
+        return txValidator.IsWellFormed(tx, CancunSpec);
     }
 
     [Test]
@@ -619,7 +630,12 @@ public void IsWellFormed_NonSetCodeTxHasAuthorizationList_ReturnsFalse(TxType ty
         Transaction tx = txBuilder.TestObject;
         TxValidator txValidator = new(TestBlockchainIds.ChainId);
 
-        Assert.That(txValidator.IsWellFormed(tx, Prague.Instance).Error, Is.EqualTo(TxErrorMessages.NotAllowedAuthorizationList));
+        var spec = new OverridableReleaseSpec(Prague.Instance)
+        {
+            MaxBlobCount = 6,
+            TargetBlobCount = 3,
+        };
+        Assert.That(txValidator.IsWellFormed(tx, spec).Error, Is.EqualTo(TxErrorMessages.NotAllowedAuthorizationList));
     }
 
     private static byte[] MakeArray(int count, params byte[] elements) =>
@@ -725,19 +741,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)