Trace/db traces

.github/workflows/run-nethermind-tests-with-code-coverage.yml

@@ -160,9 +160,12 @@ jobs:
     - name: Nethermind.Sockets.Test
       run: |
         dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.Sockets.Test
+    - name: Nethermind.JsonRpc.TraceStore.Tests
+      run: |
+        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Nethermind/Nethermind.JsonRpc.TraceStore.Tests        
     - name: MathGmp.Native
       run: |
-        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Math.Gmp.Native/MathGmp.Native.UnitTests                
+        dotnet test -c Release $EXCLUDE_TEST_PROJECTS src/Math.Gmp.Native/MathGmp.Native.UnitTests              
     - name: Upload Codecov Report
       if: matrix.os == 'ubuntu-latest'
       uses: actions/upload-artifact@v2

.github/workflows/run-nethermind-tests.yml

@@ -43,6 +43,9 @@ jobs:
     - name: Nethermind.AccountAbstraction.Test
       run: |
         dotnet test -c Release src/Nethermind/Nethermind.AccountAbstraction.Test
+    - name: Nethermind.JsonRpc.TraceStore.Tests
+      run: |
+        dotnet test -c Release src/Nethermind/Nethermind.JsonRpc.TraceStore.Tests
 
   neth-tests2:
     name: Running Nethermind Tests 2

scripts/deployment/archive-packages.sh

@@ -31,11 +31,11 @@ dotnet build -c Release Nethermind.sln
 
 cd $RELEASE_DIRECTORY
 
-cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev}.dll $LIN_RELEASE/plugins
-cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev}.dll $OSX_RELEASE/plugins
-cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev}.dll $WIN_RELEASE/plugins
-cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev}.dll $LIN_ARM64_RELEASE/plugins
-cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev}.dll $OSX_ARM64_RELEASE/plugins
+cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev,JsonRpc.TraceStore}.dll $LIN_RELEASE/plugins
+cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev,JsonRpc.TraceStore}.dll $OSX_RELEASE/plugins
+cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev,JsonRpc.TraceStore}.dll $WIN_RELEASE/plugins
+cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev,JsonRpc.TraceStore}.dll $LIN_ARM64_RELEASE/plugins
+cp $RELEASE_DIRECTORY/$RELEASE_PATH/Nethermind.{Api,HealthChecks,EthStats,Merge.Plugin,Mev,JsonRpc.TraceStore}.dll $OSX_ARM64_RELEASE/plugins
 
 cd $LIN_RELEASE && zip -r $LIN-$GIT_SHORT_TAG-$GIT_HASH.zip . && cd ..
 cd $OSX_RELEASE && zip -r $OSX-$GIT_SHORT_TAG-$GIT_HASH.zip . && cd ..

src/Nethermind/Nethermind.Consensus/Processing/BlockProcessor.cs

@@ -236,10 +236,10 @@ protected virtual TxReceipt[] ProcessBlock(
             _receiptsTracer.SetOtherTracer(blockTracer);
             _receiptsTracer.StartNewBlockTrace(block);
             TxReceipt[] receipts = _blockTransactionsExecutor.ProcessTransactions(block, options, _receiptsTracer, spec);
-            _receiptsTracer.EndBlockTrace();
 
             block.Header.ReceiptsRoot = receipts.GetReceiptsRoot(spec, block.ReceiptsRoot);
             ApplyMinerRewards(block, blockTracer, spec);
+            _receiptsTracer.EndBlockTrace();
 
             _stateProvider.Commit(spec);
             _stateProvider.RecalculateStateRoot();

src/Nethermind/Nethermind.Core.Test/Collections/ArrayPoolListTests.cs

@@ -1,19 +1,19 @@
 //  Copyright (c) 2021 Demerzel Solutions Limited
 //  This file is part of the Nethermind library.
-// 
+//
 //  The Nethermind library is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU Lesser General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
-// 
+//
 //  The Nethermind library is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 //  GNU Lesser General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with the Nethermind. If not, see <http://www.gnu.org/licenses/>.
-// 
+//
 
 using System;
 using System.Linq;
@@ -35,15 +35,15 @@ public void Empty_list()
             list.Capacity.Should().Be(1024);
             list.IsReadOnly.Should().BeFalse();
         }
-        
+
         [Test]
         public void Add_should_work()
         {
             ArrayPoolList<int> list = new(1024);
             list.AddRange(Enumerable.Range(0, 4));
             list.Should().BeEquivalentTo(Enumerable.Range(0, 4));
         }
-        
+
         [Test]
         public void Add_should_expand()
         {
@@ -53,7 +53,7 @@ public void Add_should_expand()
             list.Count.Should().Be(50);
             list.Capacity.Should().Be(64);
         }
-        
+
         [Test]
         public void Clear_should_clear()
         {
@@ -64,7 +64,7 @@ public void Clear_should_clear()
             list.Count.Should().Be(0);
             list.Capacity.Should().Be(64);
         }
-        
+
         [TestCase(0, ExpectedResult = true)]
         [TestCase(20, ExpectedResult = true)]
         [TestCase(100, ExpectedResult = false)]
@@ -75,7 +75,7 @@ public bool Contains_should_check_ok(int item)
             list.AddRange(Enumerable.Range(0, 50));
             return list.Contains(item);
         }
-        
+
         [TestCase(0, new[] {-1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15})]
         [TestCase(4, new[] {0, 1, 2, 3, -1, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15})]
         [TestCase(16, new[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1})]
@@ -96,7 +96,7 @@ public void Insert_should_throw(int index)
             Action action = () => list.Insert(index, -1);
             action.Should().Throw<ArgumentOutOfRangeException>();
         }
-        
+
         [TestCase(0, ExpectedResult = 0)]
         [TestCase(40, ExpectedResult = 40)]
         [TestCase(50, ExpectedResult = -1)]
@@ -107,8 +107,8 @@ public int IndexOf_should_return_index(int item)
             list.AddRange(Enumerable.Range(0, 50));
             return list.IndexOf(item);
         }
-     
-        
+
+
         [TestCase(0, true, new[] {1, 2, 3, 4, 5, 6, 7})]
         [TestCase(7, true, new[] {0, 1, 2, 3, 4, 5, 6})]
         [TestCase(8, false, new[] {0, 1, 2, 3, 4, 5, 6, 7})]
@@ -120,7 +120,7 @@ public void Remove_should_remove(int item, bool removed, int[] expected)
             list.Remove(item).Should().Be(removed);
             list.Should().BeEquivalentTo(expected);
         }
-        
+
         [TestCase(0, new[] {1, 2, 3, 4, 5, 6, 7})]
         [TestCase(7, new[] {0, 1, 2, 3, 4, 5, 6})]
         public void RemoveAt_should_remove(int item, int[] expected)
@@ -130,7 +130,7 @@ public void RemoveAt_should_remove(int item, int[] expected)
             list.RemoveAt(item);
             list.Should().BeEquivalentTo(expected);
         }
-        
+
         [TestCase(8, new[] {0, 1, 2, 3, 4, 5, 6, 7})]
         [TestCase(-1, new[] {0, 1, 2, 3, 4, 5, 6, 7})]
         public void RemoveAt_should_throw(int item, int[] expected)
@@ -140,7 +140,7 @@ public void RemoveAt_should_throw(int item, int[] expected)
             Action action = () => list.RemoveAt(item);
             action.Should().Throw<ArgumentOutOfRangeException>();
         }
-        
+
         [Test]
         public void CopyTo_should_copy()
         {
@@ -150,7 +150,7 @@ public void CopyTo_should_copy()
             list.CopyTo(array, 1);
             array.Should().BeEquivalentTo(Enumerable.Range(0, 1).Concat(Enumerable.Range(0, 50)));
         }
-        
+
         [TestCase(0, ExpectedResult = 0)]
         [TestCase(7, ExpectedResult = 7)]
         public int Get_should_return(int item)
@@ -159,7 +159,7 @@ public int Get_should_return(int item)
             list.AddRange(Enumerable.Range(0, 8));
             return list[item];
         }
-        
+
         [TestCase(8)]
         [TestCase(-1)]
         public void Get_should_throw(int item)
@@ -169,7 +169,7 @@ public void Get_should_throw(int item)
             Func<int> action = () => list[item];
             action.Should().Throw<ArgumentOutOfRangeException>();
         }
-        
+
         [TestCase(0, ExpectedResult = -1)]
         [TestCase(7, ExpectedResult = -1)]
         public int Set_should_set(int item)
@@ -179,7 +179,7 @@ public int Set_should_set(int item)
             list[item] = -1;
             return list[item];
         }
-        
+
         [TestCase(8)]
         [TestCase(-1)]
         public void Set_should_throw(int item)
@@ -189,5 +189,18 @@ public void Set_should_throw(int item)
             Action action = () => list[item] = 1;
             action.Should().Throw<ArgumentOutOfRangeException>();
         }
+
+        [TestCase(1, 16)]
+        [TestCase(14, 16)]
+        [TestCase(15, 32)]
+        [TestCase(20, 32)]
+        [TestCase(100, 128)]
+        public void AddRange_should_expand(int items, int expectedCapacity)
+        {
+            ArrayPoolList<int> list = new(16) { 0, 1 };
+            list.AddRange(Enumerable.Range(2, items));
+            list.Should().BeEquivalentTo(Enumerable.Range(0, items + 2));
+            list.Capacity.Should().Be(expectedCapacity);
+        }
     }
 }

src/Nethermind/Nethermind.Core/BlockInfo.cs

@@ -1,16 +1,16 @@
 //  Copyright (c) 2021 Demerzel Solutions Limited
 //  This file is part of the Nethermind library.
-// 
+//
 //  The Nethermind library is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU Lesser General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
-// 
+//
 //  The Nethermind library is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 //  GNU Lesser General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU Lesser General Public License
 //  along with the Nethermind. If not, see <http://www.gnu.org/licenses/>.
 
@@ -30,7 +30,7 @@ public enum BlockMetadata
         BeaconBody = 8,
         BeaconMainChain = 16
     }
-    
+
     public class BlockInfo
     {
         public BlockInfo(Keccak blockHash, in UInt256 totalDifficulty, BlockMetadata metadata = BlockMetadata.None)
@@ -39,9 +39,9 @@ public BlockInfo(Keccak blockHash, in UInt256 totalDifficulty, BlockMetadata met
             TotalDifficulty = totalDifficulty;
             Metadata = metadata;
         }
-        
+
         public UInt256 TotalDifficulty { get; set; }
-        
+
         public bool WasProcessed { get; set; }
 
         public Keccak BlockHash { get; }
@@ -61,8 +61,8 @@ public bool IsFinalized
                 }
             }
         }
-        
-        
+
+
         public bool IsBeaconHeader
         {
             get => (Metadata & BlockMetadata.BeaconHeader) != 0;
@@ -72,12 +72,12 @@ public bool IsBeaconBody
         {
             get => (Metadata & BlockMetadata.BeaconBody) != 0;
         }
-        
+
         public bool IsBeaconMainChain
         {
             get => (Metadata & BlockMetadata.BeaconMainChain) != 0;
         }
-        
+
         public bool IsBeaconInfo
         {
             get => (Metadata & (BlockMetadata.BeaconBody | BlockMetadata.BeaconHeader)) != 0;
@@ -89,5 +89,7 @@ public bool IsBeaconInfo
         /// This property is not serialized
         /// </summary>
         public long BlockNumber { get; set; }
+
+        public override string ToString() => BlockHash.ToString();
     }
 }