More fixes

Author: flcl42

src/Nethermind/Nethermind.Merge.Plugin.Test/EngineModuleTests.V5.cs

@@ -59,7 +59,7 @@ public async Task GetBlobsV2_should_throw_if_more_than_128_requested_blobs([Valu
         else
         {
             result.Result.Should().Be(Result.Success);
-            result.Data.Should().BeEquivalentTo(ArraySegment<BlobAndProofV2>.Empty);
+            result.Data.Should().BeNull();
         }
     }
 
@@ -118,7 +118,7 @@ public async Task GetBlobsV2_should_return_empty_array_when_blobs_not_found([Val
         ResultWrapper<IEnumerable<BlobAndProofV2>?> result = await rpcModule.engine_getBlobsV2(blobTx.BlobVersionedHashes!);
 
         result.Result.Should().Be(Result.Success);
-        result.Data.Should().BeEquivalentTo(ArraySegment<BlobAndProofV2>.Empty);
+        result.Data.Should().BeNull();
     }
 
     [Test]
@@ -151,7 +151,7 @@ public async Task GetBlobsV2_should_return_empty_array_when_only_some_blobs_foun
         if (multiplier > 1)
         {
             result.Result.Should().Be(Result.Success);
-            result.Data.Should().BeEquivalentTo(ArraySegment<BlobAndProofV2>.Empty);
+            result.Data.Should().BeNull();
         }
         else
         {

src/Nethermind/Nethermind.Merge.Plugin/Data/GetPayloadV3Result.cs

@@ -15,7 +15,7 @@ public class GetPayloadV3Result<TVersionedExecutionPayload>(Block block, UInt256
 
     public override bool ValidateFork(ISpecProvider specProvider)
     {
-        IReleaseSpec spec = specProvider.GetSpec(new ForkActivation(ExecutionPayload.BlockNumber, ExecutionPayload.Timestamp));
+        IReleaseSpec spec = specProvider.GetSpec(ExecutionPayload.BlockNumber, ExecutionPayload.Timestamp);
         return spec.IsEip4844Enabled && !spec.IsEip7623Enabled;
     }
 

src/Nethermind/Nethermind.Merge.Plugin/Data/GetPayloadV5Result.cs

@@ -13,5 +13,6 @@ public class GetPayloadV5Result(Block block, UInt256 blockFees, BlobsBundleV2 bl
 
     public override string ToString() =>
         $"{{ExecutionPayload: {ExecutionPayload}, Fees: {BlockValue}, BlobsBundle blobs count: {BlobsBundle.Blobs.Length}, ShouldOverrideBuilder {ShouldOverrideBuilder}, ExecutionRequests count : {ExecutionRequests?.Length}}}";
-    public override bool ValidateFork(ISpecProvider specProvider) => specProvider.GetSpec(new ForkActivation(ExecutionPayload.BlockNumber, ExecutionPayload.Timestamp)).IsEip7594Enabled;
+
+    public override bool ValidateFork(ISpecProvider specProvider) => specProvider.GetSpec(ExecutionPayload.BlockNumber, ExecutionPayload.Timestamp).IsEip7594Enabled;
 }

src/Nethermind/Nethermind.Merge.Plugin/Handlers/GetBlobsHandler.cs

@@ -31,7 +31,7 @@ public class GetBlobsHandler(ITxPool txPool) : IAsyncHandler<byte[][], IEnumerab
 
         foreach (byte[] requestedBlobVersionedHash in request)
         {
-            if (txPool.TryGetBlobAndProof(requestedBlobVersionedHash, out byte[]? blob, out byte[]? proof))
+            if (txPool.TryGetBlobAndProofV0(requestedBlobVersionedHash, out byte[]? blob, out byte[]? proof))
             {
                 Metrics.NumberOfSentBlobs++;
                 yield return new BlobAndProofV1(blob, proof);

src/Nethermind/Nethermind.TxPool.Test/TxPoolTests.Blobs.cs

@@ -819,7 +819,7 @@ public void should_handle_indexing_blobs_when_adding_txs_in_parallel([Values(tru
 
                     for (int j = 0; j < 100; j++)
                     {
-                        blobPool.TryGetBlobAndProof(expectedBlobVersionedHash.ToBytes(), out _, out _, ProofVersion.V0, TxPool.SelectProofV0).Should().BeTrue();
+                        blobPool.TryGetBlobAndProofV0(expectedBlobVersionedHash.ToBytes(), out _, out _).Should().BeTrue();
                     }
 
                     // removing 50% of txs

src/Nethermind/Nethermind.TxPool/Collections/BlobTxDistinctSortedPool.cs

@@ -1,7 +1,10 @@
 // SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using CkzgLib;
+using DotNetty.Common.Utilities;
 using Nethermind.Core;
+using Nethermind.Core.Collections;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Extensions;
 using Nethermind.Core.Threading;
@@ -24,7 +27,17 @@ public class BlobTxDistinctSortedPool(int capacity, IComparer<Transaction> compa
     protected override IComparer<Transaction> GetReplacementComparer(IComparer<Transaction> comparer)
         => comparer.GetBlobReplacementComparer();
 
-    public bool TryGetBlobAndProof<TProof>(
+    public bool TryGetBlobAndProofV0(
+       byte[] requestedBlobVersionedHash,
+       [NotNullWhen(true)] out byte[]? blob,
+       [NotNullWhen(true)] out byte[]? proof) => TryGetBlobAndProof(requestedBlobVersionedHash, out blob, out proof, ProofVersion.V0, (proofs, index) => proofs[index]);
+
+    public bool TryGetBlobAndProofV1(
+       byte[] requestedBlobVersionedHash,
+       [NotNullWhen(true)] out byte[]? blob,
+       [NotNullWhen(true)] out byte[][]? proof) => TryGetBlobAndProof<byte[][]>(requestedBlobVersionedHash, out blob, out proof, ProofVersion.V1, (proofs, index) => [.. proofs.Slice(Ckzg.CellsPerExtBlob * index, Ckzg.CellsPerExtBlob)]);
+
+    private bool TryGetBlobAndProof<TProof>(
         byte[] requestedBlobVersionedHash,
         [NotNullWhen(true)] out byte[]? blob,
         [NotNullWhen(true)] out TProof? proof,

src/Nethermind/Nethermind.TxPool/ITxPool.cs

@@ -45,7 +45,7 @@ public interface ITxPool
         bool IsKnown(Hash256 hash);
         bool TryGetPendingTransaction(Hash256 hash, [NotNullWhen(true)] out Transaction? transaction);
         bool TryGetPendingBlobTransaction(Hash256 hash, [NotNullWhen(true)] out Transaction? blobTransaction);
-        bool TryGetBlobAndProof(byte[] blobVersionedHash,
+        bool TryGetBlobAndProofV0(byte[] blobVersionedHash,
             [NotNullWhen(true)] out byte[]? blob,
             [NotNullWhen(true)] out byte[]? proof);
         bool TryGetBlobAndProofV1(byte[] blobVersionedHash,

src/Nethermind/Nethermind.TxPool/NullTxPool.cs

@@ -63,7 +63,7 @@ public bool TryGetPendingBlobTransaction(Hash256 hash, [NotNullWhen(true)] out T
             return false;
         }
 
-        public bool TryGetBlobAndProof(byte[] blobVersionedHash,
+        public bool TryGetBlobAndProofV0(byte[] blobVersionedHash,
             [NotNullWhen(true)] out byte[]? blob,
             [NotNullWhen(true)] out byte[]? proof)
         {

src/Nethermind/Nethermind.TxPool/TxPool.cs

@@ -203,19 +203,16 @@ public Transaction[] GetPendingTransactionsBySender(Address address) =>
         public int GetPendingBlobTransactionsCount() => _blobTransactions.Count;
 
 
-        internal static byte[] SelectProofV0(byte[][] proofs, int index) => proofs[index];
 
-        public bool TryGetBlobAndProof(byte[] blobVersionedHash,
+        public bool TryGetBlobAndProofV0(byte[] blobVersionedHash,
             [NotNullWhen(true)] out byte[]? blob,
             [NotNullWhen(true)] out byte[]? proof)
-            => _blobTransactions.TryGetBlobAndProof(blobVersionedHash, out blob, out proof, ProofVersion.V0, SelectProofV0);
-
-        internal static byte[][] SelectProofV1(byte[][] proofs, int index) => [.. proofs.Slice(Ckzg.CellsPerExtBlob * index, Ckzg.CellsPerExtBlob)];
+            => _blobTransactions.TryGetBlobAndProofV0(blobVersionedHash, out blob, out proof);
 
         public bool TryGetBlobAndProofV1(byte[] blobVersionedHash,
             [NotNullWhen(true)] out byte[]? blob,
             [NotNullWhen(true)] out byte[][]? cellProofs)
-            => _blobTransactions.TryGetBlobAndProof(blobVersionedHash, out blob, out cellProofs, ProofVersion.V1, SelectProofV1);
+            => _blobTransactions.TryGetBlobAndProofV1(blobVersionedHash, out blob, out cellProofs);
 
         public int GetBlobCounts(byte[][] blobVersionedHashes)
             => _blobTransactions.GetBlobCounts(blobVersionedHashes);