Sync with master

Directory.Packages.props

@@ -49,7 +49,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.2" />
     <PackageVersion Include="Nethermind.Crypto.Bls" Version="1.0.5" />
     <PackageVersion Include="Nethermind.Crypto.Pairings" Version="1.1.1" />
-    <PackageVersion Include="Nethermind.Crypto.SecP256k1" Version="1.4.0" />
+    <PackageVersion Include="Nethermind.Crypto.SecP256k1" Version="1.4.1" />
     <PackageVersion Include="Nethermind.Crypto.SecP256r1" Version="1.0.0-preview.6" />
     <PackageVersion Include="Nethermind.DotNetty.Buffers" Version="1.0.1" />
     <PackageVersion Include="Nethermind.DotNetty.Handlers" Version="1.0.1" />
@@ -88,4 +88,4 @@
     <PackageVersion Include="Websocket.Client" Version="5.2.0" />
     <PackageVersion Include="ZstdSharp.Port" Version="0.8.5" />
   </ItemGroup>
-</Project>
+</Project>

scripts/build/build.sh

@@ -17,7 +17,7 @@ for rid in "linux-x64" "linux-arm64" "win-x64" "osx-x64" "osx-arm64"; do
   dotnet publish -c $build_config -r $rid -o $output_path/$rid --sc true \
     -p:BuildTimestamp=$2 \
     -p:Commit=$1 \
-    -p:DebugType=none \
+    -p:DebugType=embedded \
     -p:IncludeAllContentForSelfExtract=true \
     -p:PublishSingleFile=true
 

src/Nethermind/Chains/AuRaTest.json

@@ -40,7 +40,7 @@
     "gasLimitBoundDivisor": "0x400",
     "maximumExtraDataSize": "0x20",
     "minGasLimit": "0x1388",
-    "networkID": "0x4D00",
+    "networkID": "0x4d00",
     "eip140Transition": "0x0",
     "eip145Transition": "0x0",
     "eip150Transition": "0x0",
@@ -55,12 +55,12 @@
     "eip1052Transition": "0x0",
     "eip1283Transition": "0x0",
     "eip1283DisableTransition": "0x0",
-    "eip152Transition": "0xFFFFFFFF",
-    "eip1108Transition": "0xFFFFFFFF",
-    "eip1344Transition": "0xFFFFFFFF",
-    "eip1884Transition": "0xFFFFFFFF",
-    "eip2028Transition": "0xFFFFFFFF",
-    "eip2200Transition": "0xFFFFFFFF"
+    "eip152Transition": "0xffffffff",
+    "eip1108Transition": "0xffffffff",
+    "eip1344Transition": "0xffffffff",
+    "eip1884Transition": "0xffffffff",
+    "eip2028Transition": "0xffffffff",
+    "eip2200Transition": "0xffffffff"
   },
   "genesis": {
     "seal": {
@@ -70,7 +70,7 @@
       }
     },
     "difficulty": "0x20000",
-    "gasLimit": "0x863BE0"
+    "gasLimit": "0x863be0"
   },
   "nodes": [
     "enode://c72927e9c767b7d5786a4cc1452a98d50a1e9a42fee8b92fda7bbf752b71b168f064275cec15fb09b11fec12dba08ed25571f388835ab8ed7747422d20b56962@127.0.0.1:30303",
@@ -159,4 +159,4 @@
       "constructor": "6080604052348015600f57600080fd5b5060818061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c80637877a79714602d575b600080fd5b60336045565b60408051918252519081900360200190f35b629896809056fea265627a7a72315820caef906268140a8c2aca9cb6013ab964af8e26c3954fb6a6440ba582737a307764736f6c63430005110032"
     }
   }
-}
+}

src/Nethermind/Chains/chiado.json

@@ -83,14 +83,14 @@
     "transactionPermissionContract": "0x4000000000000000000000000000000000000001",
     "transactionPermissionContractTransition": "0x0",
     "terminalTotalDifficulty": "231707791542740786049188744689299064356246512",
-    "eip2537TransitionTimestamp": "0x67C96E4C",
-    "eip2935TransitionTimestamp": "0x67C96E4C",
-    "eip6110TransitionTimestamp": "0x67C96E4C",
-    "eip7002TransitionTimestamp": "0x67C96E4C",
-    "eip7251TransitionTimestamp": "0x67C96E4C",
-    "eip7623TransitionTimestamp": "0x67C96E4C",
-    "eip7702TransitionTimestamp": "0x67C96E4C",
-    "eip4844FeeCollectorTransitionTimestamp": "0x67C96E4C",
+    "eip2537TransitionTimestamp": "0x67c96e4c",
+    "eip2935TransitionTimestamp": "0x67c96e4c",
+    "eip6110TransitionTimestamp": "0x67c96e4c",
+    "eip7002TransitionTimestamp": "0x67c96e4c",
+    "eip7251TransitionTimestamp": "0x67c96e4c",
+    "eip7623TransitionTimestamp": "0x67c96e4c",
+    "eip7702TransitionTimestamp": "0x67c96e4c",
+    "eip4844FeeCollectorTransitionTimestamp": "0x67c96e4c",
     "depositContractAddress": "0xb97036A26259B7147018913bD58a774cf91acf25",
     "blobSchedule": [
       {

src/Nethermind/Chains/holesky.json

@@ -64,7 +64,7 @@
     "blobSchedule": [
       {
         "name": "prague",
-        "timestamp": "0x67BCEAC0",
+        "timestamp": "0x67bceac0",
         "target": 6,
         "max": 9,
         "baseFeeUpdateFraction": "0x4c6964"

src/Nethermind/Chains/sepolia.json

@@ -24,7 +24,7 @@
     "accountStartNonce": "0x0",
     "maximumExtraDataSize": "0x20",
     "minGasLimit": "0x1388",
-    "networkID": "0xAA36A7",
+    "networkId": "0xaa36a7",
     "forkBlock": "0x0",
     "maxCodeSize": "0x6000",
     "maxCodeSizeTransition": "0x0",
@@ -58,27 +58,27 @@
     "terminalTotalDifficulty": "3C6568F12E8000",
     "mergeForkIdTransition": "0x1A7ACB",
     "beaconChainGenesisTimestamp": "0x62b07d60",
-    "eip4895TransitionTimestamp": "0x63FD7D60",
-    "eip3855TransitionTimestamp": "0x63FD7D60",
-    "eip3651TransitionTimestamp": "0x63FD7D60",
-    "eip3860TransitionTimestamp": "0x63FD7D60",
-    "eip1153TransitionTimestamp": "0x65B97D60",
-    "eip4788TransitionTimestamp": "0x65B97D60",
-    "eip4844TransitionTimestamp": "0x65B97D60",
-    "eip5656TransitionTimestamp": "0x65B97D60",
-    "eip6780TransitionTimestamp": "0x65B97D60",
-    "eip2537TransitionTimestamp": "0x67C7FD60",
-    "eip2935TransitionTimestamp": "0x67C7FD60",
-    "eip6110TransitionTimestamp": "0x67C7FD60",
-    "eip7002TransitionTimestamp": "0x67C7FD60",
-    "eip7251TransitionTimestamp": "0x67C7FD60",
-    "eip7623TransitionTimestamp": "0x67C7FD60",
-    "eip7702TransitionTimestamp": "0x67C7FD60",
+    "eip4895TransitionTimestamp": "0x63fd7d60",
+    "eip3855TransitionTimestamp": "0x63fd7d60",
+    "eip3651TransitionTimestamp": "0x63fd7d60",
+    "eip3860TransitionTimestamp": "0x63fd7d60",
+    "eip1153TransitionTimestamp": "0x65b97d60",
+    "eip4788TransitionTimestamp": "0x65b97d60",
+    "eip4844TransitionTimestamp": "0x65b97d60",
+    "eip5656TransitionTimestamp": "0x65b97d60",
+    "eip6780TransitionTimestamp": "0x65b97d60",
+    "eip2537TransitionTimestamp": "0x67c7fd60",
+    "eip2935TransitionTimestamp": "0x67c7fd60",
+    "eip6110TransitionTimestamp": "0x67c7fd60",
+    "eip7002TransitionTimestamp": "0x67c7fd60",
+    "eip7251TransitionTimestamp": "0x67c7fd60",
+    "eip7623TransitionTimestamp": "0x67c7fd60",
+    "eip7702TransitionTimestamp": "0x67c7fd60",
     "depositContractAddress": "0x7f02c3e3c98b133055b8b348b2ac625669ed295d",
     "blobSchedule": [
       {
         "name": "prague",
-        "timestamp": "0x67C7FD60",
+        "timestamp": "0x67c7fd60",
         "target": 6,
         "max": 9,
         "baseFeeUpdateFraction": "0x4c6964"

src/Nethermind/Nethermind.Benchmark.Runner/Program.cs

@@ -12,6 +12,7 @@
 using System.Linq;
 using BenchmarkDotNet.Toolchains.InProcess.NoEmit;
 using BenchmarkDotNet.Columns;
+using Nethermind.Benchmarks.State;
 using Nethermind.Precompiles.Benchmark;
 
 namespace Nethermind.Benchmark.Runner

src/Nethermind/Nethermind.Benchmark/Core/RecoverSignaturesBenchmark.cs

@@ -41,7 +41,7 @@ public class RecoverSignaturesBenchmark
         public void GlobalSetup()
         {
             _ethereumEcdsa = new(_specProvider.ChainId);
-            _sut = new(_ethereumEcdsa, NullTxPool.Instance, _specProvider, NullLogManager.Instance);
+            _sut = new(_ethereumEcdsa, _specProvider, NullLogManager.Instance);
 
             var rnd = new Random();
 

src/Nethermind/Nethermind.Benchmark/Core/SpanSourceBenchmark.cs

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using BenchmarkDotNet.Attributes;
+using Nethermind.Core.Buffers;
+
+namespace Nethermind.Benchmarks.Core;
+
+[DisassemblyDiagnoser(maxDepth: 2)]
+public class SpanSourceBenchmark
+{
+    private static readonly SpanSource Array = new([1, 2, 3]);
+    private static readonly SpanSource CappedArray = new(new CappedArray<byte>([1, 2, 3]));
+
+    [Benchmark]
+    public int MemorySize_ByteArray()
+    {
+        return Array.MemorySize;
+    }
+
+    [Benchmark]
+    public int MemorySize_CappedArray()
+    {
+        return CappedArray.MemorySize;
+    }
+
+    [Benchmark]
+    public Span<byte> Span_ByteArray()
+    {
+        return Array.Span;
+    }
+
+    [Benchmark]
+    public Span<byte> Span_CappedArray()
+    {
+        return CappedArray.Span;
+    }
+}

src/Nethermind/Nethermind.Benchmark/Rlp/RlpTrieNodeEncodingBenchmark.cs

@@ -55,21 +55,21 @@ public RlpTrieNodeEncodingBenchmark()
     }
 
     [Benchmark]
-    public CappedArray<byte> Encode_Extension()
+    public SpanSource Encode_Extension()
     {
         TreePath path = default;
         return _extension.RlpEncode(_store, ref path);
     }
 
     [Benchmark]
-    public CappedArray<byte> Encode_Branch()
+    public SpanSource Encode_Branch()
     {
         TreePath path = default;
         return _branch.RlpEncode(_store, ref path);
     }
 
     [Benchmark]
-    public CappedArray<byte> Encode_Leaf()
+    public SpanSource Encode_Leaf()
     {
         TreePath path = default;
         return _leaf.RlpEncode(_store, ref path);

src/Nethermind/Nethermind.Blockchain.Test/Proofs/ReceiptTrieTests.cs

@@ -47,8 +47,9 @@ public void Can_collect_proof_with_branch()
     {
         TxReceipt receipt1 = Build.A.Receipt.WithAllFieldsFilled.TestObject;
         TxReceipt receipt2 = Build.A.Receipt.WithAllFieldsFilled.TestObject;
+        using var pool = new TrackingCappedArrayPool();
         ReceiptTrie<TxReceipt> trie = new(MainnetSpecProvider.Instance.GetSpec((ForkActivation)1),
-            [receipt1, receipt2], _decoder, true);
+            [receipt1, receipt2], _decoder, true, pool);
         byte[][] proof = trie.BuildProof(0);
         Assert.That(proof.Length, Is.EqualTo(2));
 
@@ -60,7 +61,7 @@ private void VerifyProof(byte[][] proof, Hash256 receiptRoot)
     {
         TrieNode node = new(NodeType.Unknown, proof.Last());
         node.ResolveNode(Substitute.For<ITrieNodeResolver>(), TreePath.Empty);
-        TxReceipt receipt = _decoder.Decode(node.Value.AsRlpStream());
+        TxReceipt receipt = _decoder.Decode(node.Value.ToArray().AsRlpStream());
         Assert.That(receipt.Bloom, Is.Not.Null);
 
         for (int i = proof.Length; i > 0; i--)

src/Nethermind/Nethermind.Blockchain.Test/Proofs/TxTrieTests.cs

@@ -10,6 +10,7 @@
 using Nethermind.Serialization.Rlp;
 using Nethermind.Specs.Forks;
 using Nethermind.State.Proofs;
+using Nethermind.Trie;
 using NUnit.Framework;
 
 namespace Nethermind.Blockchain.Test.Proofs;
@@ -45,7 +46,8 @@ public void Can_calculate_root()
     public void Can_collect_proof_trie_case_1()
     {
         Block block = Build.A.Block.WithTransactions(Build.A.Transaction.TestObject).TestObject;
-        TxTrie txTrie = new(block.Transactions, true);
+        using var pool = new TrackingCappedArrayPool();
+        TxTrie txTrie = new(block.Transactions, true, pool);
         byte[][] proof = txTrie.BuildProof(0);
 
         txTrie.UpdateRootHash();
@@ -56,7 +58,8 @@ public void Can_collect_proof_trie_case_1()
     public void Can_collect_proof_with_trie_case_2()
     {
         Block block = Build.A.Block.WithTransactions(Build.A.Transaction.TestObject, Build.A.Transaction.TestObject).TestObject;
-        TxTrie txTrie = new(block.Transactions, true);
+        using var pool = new TrackingCappedArrayPool();
+        TxTrie txTrie = new(block.Transactions, true, pool);
         byte[][] proof = txTrie.BuildProof(0);
         Assert.That(proof.Length, Is.EqualTo(2));
 
@@ -68,7 +71,8 @@ public void Can_collect_proof_with_trie_case_2()
     public void Can_collect_proof_with_trie_case_3_modified()
     {
         Block block = Build.A.Block.WithTransactions(Enumerable.Repeat(Build.A.Transaction.TestObject, 1000).ToArray()).TestObject;
-        TxTrie txTrie = new(block.Transactions, true);
+        using var pool = new TrackingCappedArrayPool();
+        TxTrie txTrie = new(block.Transactions, true, pool);
 
         txTrie.UpdateRootHash();
         for (int i = 0; i < 1000; i++)

src/Nethermind/Nethermind.Blockchain.Test/ReorgTests.cs

@@ -110,7 +110,6 @@ public void Setup()
             blockProcessor,
             new RecoverSignatures(
                 ecdsa,
-                txPool,
                 specProvider,
                 LimboLogs.Instance),
             stateReader,