Update hive tests for gray glacier (#4203)

* Update hive tests for gray glacier

* Fix/merge instance (#4204)

* London instance as a placeholder for the merge

* fix access list tests

* fix access list check

* Print general tests results

* Revert "Print general tests results"

This reverts commit cf94a8b.

* Add support for post-merge tests

* small refactors

* fix some warnings to run pipeline

Co-authored-by: Tanishq Jasoria <jasoriatanishq@gmail.com>

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

@@ -45,7 +45,8 @@ public class GeneralStateTest : IEthereumTest
         public Keccak? PostReceiptsRoot { get; set; }
         public string? LoadFailure { get; set; }
         public Transaction? Transaction { get; set; }
-
+        public Keccak? CurrentRandom { get; set; }
+
         public override string ToString()
         {
             return $"{Path.GetFileName(Category)}.{Name}_{ForkName}";

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

@@ -13,5 +13,6 @@ public class GeneralStateTestEnvJson
         public UInt256 CurrentTimestamp { get; set; }
         public UInt256? CurrentBaseFee { get; set; }
         public Keccak PreviousHash { get; set; }
+        public Keccak? CurrentRandom { get; set; }
     }
 }

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

@@ -98,10 +98,12 @@ protected EthereumTestResult RunTest(GeneralStateTest test, ITxTracer txTracer)
             InitializeTestState(test, stateProvider, storageProvider, specProvider);
 
             BlockHeader header = new(test.PreviousHash, Keccak.OfAnEmptySequenceRlp, test.CurrentCoinbase,
-                test.CurrentDifficulty, test.CurrentNumber, test.CurrentGasLimit, test.CurrentTimestamp, new byte[0]);
+                test.CurrentDifficulty, test.CurrentNumber, test.CurrentGasLimit, test.CurrentTimestamp, Array.Empty<byte>());
             header.BaseFeePerGas = test.Fork.IsEip1559Enabled ? test.CurrentBaseFee ?? _defaultBaseFeeForStateTest : UInt256.Zero;
             header.StateRoot = test.PostHash;
             header.Hash = header.CalculateHash();
+            header.IsPostMerge = test.CurrentRandom is not null;
+            header.MixHash = test.CurrentRandom;
 
             Stopwatch stopwatch = Stopwatch.StartNew();
             var txValidator = new TxValidator((MainnetSpecProvider.Instance.ChainId));

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

@@ -56,6 +56,7 @@ private static IReleaseSpec ParseSpec(string network)
                 "Istanbul" => Istanbul.Instance,
                 "Berlin" => Berlin.Instance,
                 "London" => London.Instance,
+                "Merge" => London.Instance,
                 _ => throw new NotSupportedException()
             };
         }
@@ -103,11 +104,7 @@ public static Block Convert(PostStateJson postStateJson, TestBlockJson testBlock
         public static Transaction Convert(PostStateJson postStateJson, TransactionJson transactionJson)
         {
             Transaction transaction = new();
-            if (transaction.AccessList != null)
-                transaction.Type = TxType.AccessList;
-            if (transactionJson.MaxFeePerGas != null)
-                transaction.Type = TxType.EIP1559;
-
+
             transaction.Value = transactionJson.Value[postStateJson.Indexes.Value];
             transaction.GasLimit = transactionJson.GasLimit[postStateJson.Indexes.Gas];
             transaction.GasPrice = transactionJson.GasPrice ?? transactionJson.MaxPriorityFeePerGas ?? 0;
@@ -124,6 +121,14 @@ public static Transaction Convert(PostStateJson postStateJson, TransactionJson t
                 ? transactionJson.AccessLists[postStateJson.Indexes.Data]
                 : transactionJson.AccessList, builder);
             transaction.AccessList = builder.ToAccessList();
+
+            if (transaction.AccessList.Data.Count != 0)
+                transaction.Type = TxType.AccessList;
+            else
+                transaction.AccessList = null;
+
+            if (transactionJson.MaxFeePerGas != null)
+                transaction.Type = TxType.EIP1559;
 
             return transaction;
         }
@@ -201,14 +206,11 @@ public static IEnumerable<GeneralStateTest> Convert(string name, GeneralStateTes
                     test.CurrentNumber = testJson.Env.CurrentNumber;
                     test.CurrentTimestamp = testJson.Env.CurrentTimestamp;
                     test.CurrentBaseFee = testJson.Env.CurrentBaseFee;
+                    test.CurrentRandom = testJson.Env.CurrentRandom;
                     test.PostReceiptsRoot = stateJson.Logs;
                     test.PostHash = stateJson.Hash;
                     test.Pre = testJson.Pre.ToDictionary(p => new Address(p.Key), p => Convert(p.Value));
                     test.Transaction = Convert(stateJson, testJson.Transaction);
-                    if (!test.Fork.UseTxAccessLists)
-                    {
-                        test.Transaction.AccessList = null;
-                    }
 
                     blockchainTests.Add(test);
                     ++iterationNumber;
@@ -250,7 +252,7 @@ public static BlockchainTest Convert(string name, BlockchainTestJson testJson)
             return test;
         }
 
-        private static EthereumJsonSerializer _serializer = new();
+        private static readonly EthereumJsonSerializer _serializer = new();
 
         public static IEnumerable<GeneralStateTest> Convert(string json)
         {

src/Nethermind/Ethereum.Transition.Test/MetaTests.cs

@@ -33,6 +33,7 @@ public void All_categories_are_tested()
         {
             string[] directories = Directory.GetDirectories(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Tests"))
                 .Select(Path.GetFileName)
+                .Except(new[] { "bcArrowGlacierToMerge" }) // this one is missing
                 .ToArray();
             Type[] types = GetType().Assembly.GetTypes();
             List<string> missingCategories = new List<string>();

src/Nethermind/Nethermind.Core/BlockHeader.cs

@@ -137,7 +137,7 @@ public enum Format
         public BlockHeader Clone()
         {
             BlockHeader header = (BlockHeader)MemberwiseClone();
-            header.Bloom = Bloom.Clone();
+            header.Bloom = Bloom?.Clone() ?? new Bloom();
             return header;
         }
     }

src/Nethermind/Nethermind.Core/Timers/TimerWrapper.cs

@@ -66,7 +66,7 @@ public void Dispose()
             _timer.Dispose();
         }
 
-        private void OnElapsed(object sender, ElapsedEventArgs e)
+        private void OnElapsed(object? sender, ElapsedEventArgs e)
         {
             Elapsed?.Invoke(sender, e);
         }

src/Nethermind/Nethermind.Network.Dns/EnrLeaf.cs

@@ -23,7 +23,7 @@ namespace Nethermind.Network.Dns;
 /// </summary>
 public class EnrLeaf : EnrTreeNode
 {
-    public string NodeRecord { get; set; }
+    public string NodeRecord { get; set; } = string.Empty;
 
     public override string ToString()
     {

src/Nethermind/Nethermind.Network.Dns/EnrLinkedTree.cs

@@ -23,7 +23,7 @@ namespace Nethermind.Network.Dns;
 /// </summary>
 public class EnrLinkedTree : EnrTreeNode
 {
-    public string Link { get; set; }
+    public string Link { get; set; } = string.Empty;
 
     public override string ToString()
     {

src/Nethermind/Nethermind.Network.Dns/EnrTreeBranch.cs

@@ -24,7 +24,7 @@ namespace Nethermind.Network.Dns;
 /// </summary>
 public class EnrTreeBranch : EnrTreeNode
 {
-    public string[] Hashes { get; set; }
+    public string[] Hashes { get; set; } = Array.Empty<string>();
 
     public override string ToString()
     {

src/Nethermind/Nethermind.Network.Dns/EnrTreeRoot.cs

@@ -26,12 +26,12 @@ public class EnrTreeRoot : EnrTreeNode
     /// <summary>
     /// the root hashes of subtrees containing nodes and links subtrees
     /// </summary>
-    public string EnrRoot { get; set; }
+    public string EnrRoot { get; set; } = string.Empty;
 
     /// <summary>
     /// the root hashes of subtrees containing nodes and links subtrees
     /// </summary>
-    public string LinkRoot { get; set; }
+    public string LinkRoot { get; set; } = string.Empty;
 
     /// <summary>
     /// Updated each time the tree gets updated.
@@ -41,7 +41,7 @@ public class EnrTreeRoot : EnrTreeNode
     /// <summary>
     /// Signature but need to learn where to take the public key from
     /// </summary>
-    public string Signature { get; set; }
+    public string Signature { get; set; } = string.Empty;
 
     public override string ToString()
     {

src/Nethermind/Nethermind.State.Test.Runner/StateTestRunner.cs

@@ -35,11 +35,11 @@ public enum WhenTrace
 
     public class StateTestsRunner : GeneralStateTestBase, IStateTestRunner
     {
-        private ITestSourceLoader _testsSource;
+        private readonly ITestSourceLoader _testsSource;
         private readonly WhenTrace _whenTrace;
         private readonly bool _traceMemory;
         private readonly bool _traceStack;
-        private IJsonSerializer _serializer = new EthereumJsonSerializer();
+        private static readonly IJsonSerializer _serializer = new EthereumJsonSerializer();
 
         public StateTestsRunner(ITestSourceLoader testsSource, WhenTrace whenTrace, bool traceMemory, bool traceStack)
         {

src/Nethermind/Nethermind.State/IStateProvider.cs

@@ -27,7 +27,7 @@ public interface IStateProvider : IReadOnlyStateProvider, IJournal<int>
     {
         void RecalculateStateRoot();
 
-        Keccak StateRoot { get; set; }
+        new Keccak StateRoot { get; set; }
 
         void DeleteAccount(Address address);