EIP-7594: PeerDAS

src/Nethermind/Directory.Packages.props

@@ -11,7 +11,7 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
     <PackageVersion Include="BouncyCastle.Cryptography" Version="2.5.0" />
-    <PackageVersion Include="Ckzg.Bindings" Version="2.0.1.1258" />
+    <PackageVersion Include="Ckzg.Bindings" Version="2.1.1.1366" />
     <PackageVersion Include="Colorful.Console" Version="1.2.15" />
     <PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
     <PackageVersion Include="ConcurrentHashSet" Version="1.3.0" />

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

@@ -16,57 +16,12 @@
 using Nethermind.Int256;
 using Nethermind.Serialization.Json;
 using Nethermind.Serialization.Rlp;
-using Nethermind.Specs.Forks;
+using Nethermind.Specs;
 
 namespace Ethereum.Test.Base
 {
     public static class JsonToEthereumTest
     {
-        public static IReleaseSpec ParseSpec(string network)
-        {
-            network = network.Replace("EIP150", "TangerineWhistle");
-            network = network.Replace("EIP158", "SpuriousDragon");
-            network = network.Replace("DAO", "Dao");
-            network = network.Replace("Merged", "Paris");
-            network = network.Replace("Merge", "Paris");
-            network = network.Replace("London+3540+3670", "Shanghai");
-            network = network.Replace("GrayGlacier+3540+3670", "Shanghai");
-            network = network.Replace("GrayGlacier+3860", "Shanghai");
-            network = network.Replace("GrayGlacier+3855", "Shanghai");
-            network = network.Replace("Merge+3540+3670", "Shanghai");
-            network = network.Replace("Shanghai+3855", "Shanghai");
-            network = network.Replace("Shanghai+3860", "Shanghai");
-            network = network.Replace("GrayGlacier+1153", "Cancun");
-            network = network.Replace("Merge+1153", "Cancun");
-            network = network.Replace("Shanghai+6780", "Cancun");
-            network = network.Replace("GrayGlacier+1153", "Cancun");
-            network = network.Replace("Merge+1153", "Cancun");
-            return network switch
-            {
-                "Frontier" => Frontier.Instance,
-                "Homestead" => Homestead.Instance,
-                "TangerineWhistle" => TangerineWhistle.Instance,
-                "SpuriousDragon" => SpuriousDragon.Instance,
-                "EIP150" => TangerineWhistle.Instance,
-                "EIP158" => SpuriousDragon.Instance,
-                "Dao" => Dao.Instance,
-                "Constantinople" => Constantinople.Instance,
-                "ConstantinopleFix" => ConstantinopleFix.Instance,
-                "Byzantium" => Byzantium.Instance,
-                "Istanbul" => Istanbul.Instance,
-                "Berlin" => Berlin.Instance,
-                "London" => London.Instance,
-                "ArrowGlacier" => ArrowGlacier.Instance,
-                "GrayGlacier" => GrayGlacier.Instance,
-                "Shanghai" => Shanghai.Instance,
-                "Cancun" => Cancun.Instance,
-                "Paris" => Paris.Instance,
-                "Prague" => Prague.Instance,
-                "Osaka" => Osaka.Instance,
-                _ => throw new NotSupportedException()
-            };
-        }
-
         private static ForkActivation TransitionForkActivation(string transitionInfo)
         {
             const string timestampPrefix = "Time";
@@ -252,7 +207,7 @@ public static IEnumerable<GeneralStateTest> Convert(string name, string category
                     test.Category = category;
 
                     test.ForkName = postStateBySpec.Key;
-                    test.Fork = ParseSpec(postStateBySpec.Key);
+                    test.Fork = SpecNameParser.Parse(postStateBySpec.Key);
                     test.PreviousHash = testJson.Env.PreviousHash;
                     test.CurrentCoinbase = testJson.Env.CurrentCoinbase;
                     test.CurrentDifficulty = testJson.Env.CurrentDifficulty;
@@ -410,11 +365,11 @@ public static IEnumerable<BlockchainTest> ConvertToBlockchainTests(string json)
                 string[] transitionInfo = testSpec.Network.Split("At");
                 string[] networks = transitionInfo[0].Split("To");
 
-                testSpec.EthereumNetwork = ParseSpec(networks[0]);
+                testSpec.EthereumNetwork = SpecNameParser.Parse(networks[0]);
                 if (transitionInfo.Length > 1)
                 {
                     testSpec.TransitionForkActivation = TransitionForkActivation(transitionInfo[1]);
-                    testSpec.EthereumNetworkAfterTransition = ParseSpec(networks[1]);
+                    testSpec.EthereumNetworkAfterTransition = SpecNameParser.Parse(networks[1]);
                 }
 
                 (string name, string category) = GetNameAndCategory(testName);

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

@@ -160,6 +160,7 @@ public static IEnumerable EnoughShardBlobTransactionsSelectedTestCases
                     tx.Type = TxType.Blob;
                     tx.BlobVersionedHashes = new byte[1][];
                     tx.MaxFeePerBlobGas = 1;
+                    tx.NetworkWrapper = new ShardBlobNetworkWrapper(new byte[1][], new byte[1][], new byte[1][], ProofVersion.V0);
                 });
                 maxTransactionsSelected.Transactions[1].BlobVersionedHashes =
                     new byte[maxTransactionsSelected.ReleaseSpec.MaxBlobCount - 1][];
@@ -178,9 +179,13 @@ public static IEnumerable EnoughShardBlobTransactionsSelectedTestCases
                 expectedSelectedTransactions[0].BlobVersionedHashes =
                     new byte[enoughTransactionsSelected.ReleaseSpec.MaxBlobCount][];
                 expectedSelectedTransactions[0].MaxFeePerBlobGas = 1;
+                expectedSelectedTransactions[0].NetworkWrapper =
+                    new ShardBlobNetworkWrapper(new byte[1][], new byte[1][], new byte[1][], ProofVersion.V0);
                 expectedSelectedTransactions[1].Type = TxType.Blob;
                 expectedSelectedTransactions[1].BlobVersionedHashes = new byte[1][];
                 expectedSelectedTransactions[1].MaxFeePerBlobGas = 1;
+                expectedSelectedTransactions[1].NetworkWrapper =
+                    new ShardBlobNetworkWrapper(new byte[1][], new byte[1][], new byte[1][], ProofVersion.V0);
                 enoughTransactionsSelected.ExpectedSelectedTransactions.AddRange(
                     expectedSelectedTransactions.Where(static (_, index) => index != 1));
                 yield return new TestCaseData(enoughTransactionsSelected).SetName(
@@ -224,9 +229,13 @@ public static IEnumerable EnoughShardBlobTransactionsSelectedTestCases
 
                 static Transaction CreateBlobTransaction(Address address, PrivateKey key, UInt256 maxFee, int blobCount)
                 {
-                    return Build.A.Transaction.WithSenderAddress(address).WithType(TxType.Blob).WithNonce(1)
-                        .WithMaxFeePerGas(maxFee).WithMaxFeePerBlobGas(1).WithGasLimit(20)
-                        .WithBlobVersionedHashes([.. Enumerable.Range(0, blobCount).Select(i => new byte[1] { 0 })])
+                    return Build.A.Transaction
+                        .WithSenderAddress(address)
+                        .WithShardBlobTxTypeAndFields(blobCount)
+                        .WithNonce(1)
+                        .WithMaxFeePerGas(maxFee)
+                        .WithMaxFeePerBlobGas(1)
+                        .WithGasLimit(20)
                         .SignedAndResolved(key).TestObject;
                 }
             }

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

@@ -1,10 +1,11 @@
-// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
+// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
+using CkzgLib;
 using FluentAssertions;
 using Nethermind.Consensus.Messages;
 using Nethermind.Consensus.Validators;
@@ -483,7 +484,7 @@ public void IsWellFormed_BlobTxHasBlobOverTheSizeLimit_ReturnFalse()
             .SignedAndResolved();
 
         Transaction tx = txBuilder.TestObject;
-        ((ShardBlobNetworkWrapper)tx.NetworkWrapper!).Blobs[0] = new byte[Ckzg.Ckzg.BytesPerBlob + 1];
+        ((ShardBlobNetworkWrapper)tx.NetworkWrapper!).Blobs[0] = new byte[Ckzg.BytesPerBlob + 1];
         TxValidator txValidator = new(TestBlockchainIds.ChainId);
 
         Assert.That(txValidator.IsWellFormed(tx, Cancun.Instance).AsBool(), Is.False);
@@ -500,7 +501,7 @@ public void IsWellFormed_BlobTxHasCommitmentOverTheSizeLimit_ReturnFalse()
             .SignedAndResolved();
 
         Transaction tx = txBuilder.TestObject;
-        ((ShardBlobNetworkWrapper)tx.NetworkWrapper!).Commitments[0] = new byte[Ckzg.Ckzg.BytesPerCommitment + 1];
+        ((ShardBlobNetworkWrapper)tx.NetworkWrapper!).Commitments[0] = new byte[Ckzg.BytesPerCommitment + 1];
         TxValidator txValidator = new(TestBlockchainIds.ChainId);
 
         Assert.That(txValidator.IsWellFormed(tx, Cancun.Instance).AsBool(), Is.False);
@@ -517,7 +518,7 @@ public void IsWellFormed_BlobTxHasProofOverTheSizeLimit_ReturnFalse()
             .SignedAndResolved();
 
         Transaction tx = txBuilder.TestObject;
-        ((ShardBlobNetworkWrapper)tx.NetworkWrapper!).Proofs[0] = new byte[Ckzg.Ckzg.BytesPerProof + 1];
+        ((ShardBlobNetworkWrapper)tx.NetworkWrapper!).Proofs[0] = new byte[Ckzg.BytesPerProof + 1];
         TxValidator txValidator = new(TestBlockchainIds.ChainId);
 
         Assert.That(txValidator.IsWellFormed(tx, Cancun.Instance).AsBool(), Is.False);

src/Nethermind/Nethermind.Blockchain/ChainHeadInfoProvider.cs

@@ -56,6 +56,8 @@ public ChainHeadInfoProvider(IChainHeadSpecProvider specProvider, IBlockTree blo
 
         public UInt256 CurrentFeePerBlobGas { get; internal set; }
 
+        public ProofVersion CurrentProofVersion { get; private set; }
+
         public bool IsSyncing
         {
             get
@@ -82,6 +84,7 @@ private void OnHeadChanged(object? sender, BlockReplacementEventArgs e)
                 BlobGasCalculator.TryCalculateFeePerBlobGas(e.Block.Header, spec.BlobBaseFeeUpdateFraction, out UInt256 currentFeePerBlobGas)
                     ? currentFeePerBlobGas
                     : UInt256.Zero;
+            CurrentProofVersion = spec.BlobProofVersion;
             HeadChanged?.Invoke(sender, e);
         }
     }

src/Nethermind/Nethermind.Consensus.AuRa/InitializationSteps/InitializeBlockchainAuRa.cs

@@ -244,7 +244,7 @@ private IComparer<Transaction> CreateTxPoolTxComparer(TxPriorityContract? txPrio
         return CreateTxPoolTxComparer();
     }
 
-    protected override TxPool.TxPool CreateTxPool(CodeInfoRepository codeInfoRepository)
+    protected override TxPool.TxPool CreateTxPool(IChainHeadInfoProvider chainHeadInfoProvider)
     {
         // This has to be different object than the _processingReadOnlyTransactionProcessorSource as this is in separate thread
         TxPriorityContract txPriorityContract = TxAuRaFilterBuilders.CreateTxPrioritySources(_api);
@@ -260,7 +260,7 @@ protected override TxPool.TxPool CreateTxPool(CodeInfoRepository codeInfoReposit
         return new TxPool.TxPool(
             _api.EthereumEcdsa!,
             _api.BlobTxStorage ?? NullBlobTxStorage.Instance,
-            new ChainHeadInfoProvider(_api.SpecProvider!, _api.BlockTree!, _api.StateReader!, codeInfoRepository),
+            chainHeadInfoProvider,
             NethermindApi.Config<ITxPoolConfig>(),
             _api.TxValidator!,
             _api.LogManager,

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

@@ -31,12 +31,13 @@ public static string InvalidTxChainId(ulong expected, ulong? actual) =>
     public const string NotAllowedBlobVersionedHashes =
         "NotAllowedBlobVersionedHashes: Cannot be set.";
 
-    public const string InvalidTransaction =
+    public const string InvalidTransactionForm =
         $"InvalidTransaction: Cannot be {nameof(ShardBlobNetworkWrapper)}.";
 
     public const string NotAllowedCreateTransaction =
         "NotAllowedCreateTransaction: To must be set.";
 
+
     public const string BlobTxMissingMaxFeePerBlobGas =
         "BlobTxMissingMaxFeePerBlobGas: Must be set.";
 
@@ -58,14 +59,19 @@ public static string BlobTxGasLimitExceeded(ulong totalDataGas, ulong maxBlobGas
     public const string InvalidBlobVersionedHashVersion =
         "InvalidBlobVersionedHashVersion: Blob version not supported.";
 
-    public static readonly string ExceededBlobSize =
-        $"ExceededBlobSize: Cannot be more than {Ckzg.Ckzg.BytesPerBlob}.";
+    public static readonly string InvalidBlobDataSize =
+        $"InvalidBlobDataSize: Blob data fields are of incorrect size.";
+
+    public const string InvalidBlobHashes =
+        "InvalidBlobProof: Hashes do not match the blobs.";
+
+    public const string InvalidBlobProofs =
+        "InvalidBlobProof: Proofs do not match the blobs.";
+
+    public const string InvalidProofVersion
+        = "InvalidTxProofVersion: Version of network wrapper is not supported.";
 
-    public static readonly string ExceededBlobCommitmentSize =
-        $"ExceededBlobCommitmentSize: Cannot be more than {Ckzg.Ckzg.BytesPerCommitment}.";
 
-    public static readonly string InvalidBlobProofSize =
-        $"InvalidBlobProofSize: Cannot be more than {Ckzg.Ckzg.BytesPerProof}.";
 
     public const string NotAllowedAuthorizationList = $"NotAllowedAuthorizationList: Only transactions with type {nameof(TxType.SetCode)} can have authorization_list.";
 
@@ -76,12 +82,6 @@ public static string BlobTxGasLimitExceeded(ulong totalDataGas, ulong maxBlobGas
     public const string InvalidBlobCommitmentHash =
         "InvalidBlobCommitmentHash: Commitment hash does not match.";
 
-    public const string InvalidBlobProof =
-        "InvalidBlobProof: Proof does not match.";
-
-    public const string InvalidBlobData
-        = "InvalidTxBlobData: Number of blobs, hashes, commitments and proofs must match.";
-
     public const string InvalidCreateTxData
         = "InvalidCreateTxData: Legacy createTx cannot create Eof code";
 

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

@@ -47,7 +47,7 @@ public TxPoolTxSource(
         public IEnumerable<Transaction> GetTransactions(BlockHeader parent, long gasLimit, PayloadAttributes? payloadAttributes = null, bool filterSource = false)
         {
             long blockNumber = parent.Number + 1;
-            IReleaseSpec spec = _specProvider.GetSpec(parent);
+            IReleaseSpec spec = payloadAttributes is not null ? _specProvider.GetSpec(new ForkActivation(parent.Number + 1, payloadAttributes.Timestamp)) : _specProvider.GetSpec(parent);
             UInt256 baseFee = BaseFeeCalculator.Calculate(parent, spec);
             IDictionary<AddressAsKey, Transaction[]> pendingTransactions = filterSource ?
                 _transactionPool.GetPendingTransactionsBySender(filterToReadyTx: true, baseFee) :
@@ -155,6 +155,13 @@ private void SelectBlobTransactions(IEnumerable<Transaction> blobTransactions, B
                     continue;
                 }
 
+                ProofVersion? proofVersion = (fullBlobTx.NetworkWrapper as ShardBlobNetworkWrapper)?.Version;
+                if (spec.BlobProofVersion != proofVersion)
+                {
+                    if (_logger.IsTrace) _logger.Trace($"Declining {blobTx.ToShortString()}, {spec.BlobProofVersion} is wanted, but tx's proof version is {proofVersion}.");
+                    continue;
+                }
+
                 if (txBlobCount == 1 && candidates is null)
                 {
                     selectedBlobTxs.Add(fullBlobTx);

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

@@ -11,7 +11,6 @@
 using Nethermind.Crypto;
 using Nethermind.Evm;
 using Nethermind.Int256;
-using System.Linq;
 
 namespace Nethermind.Consensus.Validators;
 
@@ -164,7 +163,7 @@ private NonBlobFieldsTxValidator() { }
         // Execution-payload version verification
         { MaxFeePerBlobGas: not null } => TxErrorMessages.NotAllowedMaxFeePerBlobGas,
         { BlobVersionedHashes: not null } => TxErrorMessages.NotAllowedBlobVersionedHashes,
-        { NetworkWrapper: ShardBlobNetworkWrapper } => TxErrorMessages.InvalidTransaction,
+        { NetworkWrapper: ShardBlobNetworkWrapper } => TxErrorMessages.InvalidTransactionForm,
         _ => ValidationResult.Success
     };
 }
@@ -231,45 +230,26 @@ private MempoolBlobTxValidator() { }
 
     public ValidationResult IsWellFormed(Transaction transaction, IReleaseSpec releaseSpec)
     {
-        int blobCount = transaction.BlobVersionedHashes!.Length;
-        return transaction.NetworkWrapper is not ShardBlobNetworkWrapper wrapper ? ValidationResult.Success
-            : wrapper.Blobs.Length != blobCount ? TxErrorMessages.InvalidBlobData
-            : wrapper.Commitments.Length != blobCount ? TxErrorMessages.InvalidBlobData
-            : wrapper.Proofs.Length != blobCount ? TxErrorMessages.InvalidBlobData
-            : ValidateBlobs();
+        return transaction switch
+        {
+            { NetworkWrapper: null } => ValidationResult.Success,
+            { Type: TxType.Blob, NetworkWrapper: ShardBlobNetworkWrapper wrapper } => ValidateBlobs(transaction, wrapper, releaseSpec),
+            { Type: TxType.Blob } or { NetworkWrapper: not null } => TxErrorMessages.InvalidTransactionForm,
+        };
 
-        ValidationResult ValidateBlobs()
+        static ValidationResult ValidateBlobs(Transaction transaction, ShardBlobNetworkWrapper wrapper, IReleaseSpec releaseSpec)
         {
-            for (int i = 0; i < blobCount; i++)
+            if (wrapper.Version != releaseSpec.BlobProofVersion)
             {
-                if (wrapper.Blobs[i].Length != Ckzg.Ckzg.BytesPerBlob)
-                {
-                    return TxErrorMessages.ExceededBlobSize;
-                }
-
-                if (wrapper.Commitments[i].Length != Ckzg.Ckzg.BytesPerCommitment)
-                {
-                    return TxErrorMessages.ExceededBlobCommitmentSize;
-                }
-
-                if (wrapper.Proofs[i].Length != Ckzg.Ckzg.BytesPerProof)
-                {
-                    return TxErrorMessages.InvalidBlobProofSize;
-                }
+                return TxErrorMessages.InvalidProofVersion;
             }
 
-            Span<byte> hash = stackalloc byte[32];
-            for (int i = 0; i < blobCount; i++)
-            {
-                if (!KzgPolynomialCommitments.TryComputeCommitmentHashV1(wrapper.Commitments[i].AsSpan(), hash) || !hash.SequenceEqual(transaction.BlobVersionedHashes[i]))
-                {
-                    return TxErrorMessages.InvalidBlobCommitmentHash;
-                }
-            }
+            IBlobProofsManager proofsManager = IBlobProofsManager.For(wrapper.Version);
 
-            return !KzgPolynomialCommitments.AreProofsValid(wrapper.Blobs, wrapper.Commitments, wrapper.Proofs)
-                ? TxErrorMessages.InvalidBlobProof
-                : ValidationResult.Success;
+            return !proofsManager.ValidateLengths(wrapper) ? TxErrorMessages.InvalidBlobDataSize :
+                   !proofsManager.ValidateHashes(wrapper, transaction.BlobVersionedHashes) ? TxErrorMessages.InvalidBlobHashes :
+                   !proofsManager.ValidateProofs(wrapper) ? TxErrorMessages.InvalidBlobProofs :
+                   ValidationResult.Success;
         }
     }
 }