Changes to adjust infrastructure code to latest NM master

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "src/Nethermind"]
 	path = src/Nethermind
 	url = https://github.com/NethermindEth/nethermind.git
-	branch = feature/arbitrum-setup
+	branch = master

src/Nethermind.Arbitrum.Test/Arbos/ArbosGenesisLoaderTests.cs

@@ -1,15 +1,10 @@
 using FluentAssertions;
-using Nethermind.Arbitrum.Config;
-using Nethermind.Arbitrum.Data;
-using Nethermind.Arbitrum.Genesis;
 using Nethermind.Arbitrum.Test.Infrastructure;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Test;
-using Nethermind.Logging;
-using Nethermind.Specs.ChainSpecStyle;
+using Nethermind.Evm.State;
 using Nethermind.State;
-using NUnit.Framework;
 
 namespace Nethermind.Arbitrum.Test.Arbos;
 
@@ -18,7 +13,11 @@ public class ArbosGenesisLoaderTests
     [Test]
     public void Load_FullChainSimulationAtV32_ProducesCorrectHash()
     {
-        (_, Block genesisBlock) = ArbOSInitialization.Create();
+        IWorldStateManager worldStateManager = TestWorldStateFactory.CreateForTest();
+        IWorldState worldState = worldStateManager.GlobalWorldState;
+        using var worldStateDisposer = worldState.BeginScope(IWorldState.PreGenesis);
+
+        Block genesisBlock = ArbOSInitialization.Create(worldState);
 
         genesisBlock.Hash.Should().Be(new Hash256("0xbd9f2163899efb7c39f945c9a7744b2c3ff12cfa00fe573dcb480a436c0803a8"));
     }

src/Nethermind.Arbitrum.Test/Arbos/ArbosStorageTests.BackedByBigInteger.cs

@@ -1,8 +1,10 @@
-using System.Numerics;
 using FluentAssertions;
 using Nethermind.Arbitrum.Arbos.Storage;
 using Nethermind.Arbitrum.Test.Infrastructure;
 using Nethermind.Core.Crypto;
+using Nethermind.Core.Test;
+using System.Numerics;
+using Nethermind.Evm.State;
 
 namespace Nethermind.Arbitrum.Test.Arbos;
 
@@ -25,7 +27,7 @@ public partial class ArbosStorageTests
     public void SetCheckedStorageBackedByBigInteger_Always_SetsAndGetsTheSameValue(string strValue, string expectedHash)
     {
         const ulong offset = 0ul;
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBigInteger backedStorage = new(storage, offset);
 
         BigInteger value = BigInteger.Parse(strValue);
@@ -47,7 +49,7 @@ public void SetCheckedStorageBackedByBigInteger_Always_SetsAndGetsTheSameValue(s
     public void SetCheckedStorageBackedByBigInteger_Overflow_Throws(string strValue)
     {
         const ulong offset = 0ul;
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBigInteger backedStorage = new(storage, offset);
 
         BigInteger value = strValue switch
@@ -77,7 +79,7 @@ public void SetCheckedStorageBackedByBigInteger_Overflow_Throws(string strValue)
     public void SetSaturatingStorageBackedByBigInteger_Always_SetsAndGetsTheSameValue(string strValue, string expectedHash)
     {
         const ulong offset = 0ul;
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBigInteger backedStorage = new(storage, offset);
 
         BigInteger value = BigInteger.Parse(strValue);
@@ -100,7 +102,7 @@ public void SetSaturatingStorageBackedByBigInteger_Underflow_UsesMaxUInt256Value
         BigInteger expectedValue = ArbosStorageBackedBigInteger.TwoToThe255 * -1;
 
         const ulong offset = 0ul;
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBigInteger backedStorage = new(storage, offset);
 
         BigInteger value = strValue == "min"
@@ -126,7 +128,7 @@ public void SetSaturatingStorageBackedByBigInteger_Overflow_UsesMaxUInt256MinusO
         BigInteger expectedValue = ArbosStorageBackedBigInteger.TwoToThe255MinusOne;
 
         const ulong offset = 0ul;
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBigInteger backedStorage = new(storage, offset);
 
         BigInteger value = strValue == "max"
@@ -160,7 +162,7 @@ public void SetSaturatingStorageBackedByBigInteger_Overflow_UsesMaxUInt256MinusO
     public void SetPreVersion7StorageBackedByBigInteger_Always_HandlesNegativeValuesIncorrectly(string strValue, string expectedHash)
     {
         const ulong offset = 0ul;
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBigInteger backedStorage = new(storage, offset);
 
         BigInteger value = BigInteger.Parse(strValue);
@@ -179,7 +181,7 @@ public void SetPreVersion7StorageBackedByBigInteger_Always_HandlesNegativeValues
     public void SetStorageBackedByBigInteger_Always_SetsAndGetsTheSameValue(ulong value)
     {
         const ulong offset = 0ul;
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBigInteger backedStorage = new(storage, offset);
 
         backedStorage.Set(value);

src/Nethermind.Arbitrum.Test/Arbos/ArbosStorageTests.BackedByType.cs

@@ -17,7 +17,7 @@ public partial class ArbosStorageTests
     [TestCase(ulong.MaxValue, uint.MaxValue)]
     public void GetSetStorageBackedByUInt_Always_SetsAndGetsTheSameValue(ulong offset, uint value)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedUInt backedStorage = new(storage, offset);
 
         backedStorage.Set(value);
@@ -34,7 +34,7 @@ public void GetSetStorageBackedByUInt_Always_SetsAndGetsTheSameValue(ulong offse
     [TestCase(ulong.MaxValue, ulong.MaxValue)]
     public void GetSetStorageBackedByULong_Always_SetsAndGetsTheSameValue(ulong offset, ulong value)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedULong backedStorage = new(storage, offset);
 
         backedStorage.Set(value);
@@ -46,7 +46,7 @@ public void GetSetStorageBackedByULong_Always_SetsAndGetsTheSameValue(ulong offs
     [Test]
     public void IncrementStorageBackedByULong_IncrementULongMax_Throws()
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedULong backedStorage = new(storage, 10);
 
         backedStorage.Set(ulong.MaxValue);
@@ -58,7 +58,7 @@ public void IncrementStorageBackedByULong_IncrementULongMax_Throws()
     [Test]
     public void IncrementStorageBackedByULong_Always_IncrementsCorrectly()
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedULong backedStorage = new(storage, 10);
 
         backedStorage.Get().Should().Be(0);
@@ -71,7 +71,7 @@ public void IncrementStorageBackedByULong_Always_IncrementsCorrectly()
     [Test]
     public void DecrementStorageBackedByULong_DecrementZero_Throws()
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedULong backedStorage = new(storage, 10);
 
         var underflow = () => backedStorage.Decrement();
@@ -81,7 +81,7 @@ public void DecrementStorageBackedByULong_DecrementZero_Throws()
     [Test]
     public void DecrementStorageBackedByULong_Always_DecrementsCorrectly()
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedULong backedStorage = new(storage, 10);
 
         backedStorage.Set(3);
@@ -101,7 +101,7 @@ public void DecrementStorageBackedByULong_Always_DecrementsCorrectly()
     [TestCase(ulong.MaxValue, "18446744073709551615999999999999")] // much larger than ulong.MaxValue
     public void GetSetStorageBackedByUInt256_Always_SetsAndGetsTheSameValue(ulong offset, string rawValue)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedUInt256 backedStorage = new(storage, offset);
         UInt256 value = UInt256.Parse(rawValue);
 
@@ -116,7 +116,7 @@ public void GetSetStorageBackedByUInt256_Always_SetsAndGetsTheSameValue(ulong of
     [TestCase(100ul, "0x123456ffffffffffffffffffffffffffffffffff")]
     public void GetSetStorageBackedByAddress_Always_SetsAndGetsTheSameValue(ulong offset, string rawAddress)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedAddress backedStorage = new(storage, offset);
         Address value = new(rawAddress);
 
@@ -133,7 +133,7 @@ public void GetSetStorageBackedByAddress_Always_SetsAndGetsTheSameValue(ulong of
     [TestCase(5, 200)]
     public void GetSetStorageBackedByBytes_Always_SetsAndGetsTheSameValue(byte offset, int length)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ArbosStorageBackedBytes backedStorage = new(storage.OpenSubStorage([offset]));
         byte[] value = RandomNumberGenerator.GetBytes(length);
 

src/Nethermind.Arbitrum.Test/Arbos/ArbosStorageTests.cs

@@ -4,12 +4,13 @@
 using Nethermind.Arbitrum.Arbos.Storage;
 using Nethermind.Arbitrum.Test.Infrastructure;
 using Nethermind.Arbitrum.Tracing;
+using Nethermind.Blockchain.Tracing.GethStyle;
 using Nethermind.Core;
 using Nethermind.Core.Crypto;
 using Nethermind.Core.Extensions;
 using Nethermind.Evm;
 using Nethermind.Evm.CodeAnalysis;
-using Nethermind.Evm.Tracing.GethStyle;
+using Nethermind.Evm.State;
 
 namespace Nethermind.Arbitrum.Test.Arbos;
 
@@ -27,7 +28,7 @@ public partial class ArbosStorageTests
     [TestCase(1, 255, "0xdbdac6271f6e6f0b61b2d13ce15962a39f49ff9593aa09e53e4a9ce085ccd03b")]
     public void Set_Always_MapsAddressTheSameWayAsNitro(byte byte1, byte byte2, string cellHash)
     {
-        (ArbosStorage storage, TrackingWorldState worldState) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out TrackingWorldState worldState, out ArbosStorage storage, TestAccount);
 
         storage.Set(Hash256.FromBytesWithPadding([byte1, byte2]), Hash256.Zero);
 
@@ -42,7 +43,7 @@ public void Set_Always_TrimsLeadingZeroes(byte byte1, byte byte2, byte byte3)
     {
         byte[] expectedValue = new[] { byte1, byte2, byte3 }.WithoutLeadingZeros().ToArray();
 
-        (ArbosStorage storage, TrackingWorldState worldState) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out TrackingWorldState worldState, out ArbosStorage storage, TestAccount);
 
         storage.Set(Hash256.FromBytesWithPadding([1]), new ValueHash256(Bytes32(byte1, byte2, byte3)));
 
@@ -55,7 +56,7 @@ public void Set_Always_TrimsLeadingZeroes(byte byte1, byte byte2, byte byte3)
     [TestCase(255, 255, 255)]
     public void SetGet_Always_GetReturnsWhatsSet(byte byte1, byte byte2, byte byte3)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
 
         ValueHash256 key = Hash256.FromBytesWithPadding([1]);
         ValueHash256 value = new Hash256(Bytes32(byte1, byte2, byte3));
@@ -70,7 +71,7 @@ public void SetGet_Always_GetReturnsWhatsSet(byte byte1, byte byte2, byte byte3)
     public void Get_Always_BurnsStorageReadCost()
     {
         SystemBurner systemBurner = new SystemBurner();
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount, systemBurner);
 
         storage.Get(Hash256.FromBytesWithPadding([1]));
 
@@ -81,7 +82,7 @@ public void Get_Always_BurnsStorageReadCost()
     public void GetFree_Always_BurnsNothing()
     {
         SystemBurner systemBurner = new SystemBurner();
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount, systemBurner);
 
         storage.GetFree(Hash256.FromBytesWithPadding([1]));
 
@@ -92,7 +93,7 @@ public void GetFree_Always_BurnsNothing()
     public void Set_ValueIsEmpty_BurnsStorageWriteZeroCost()
     {
         SystemBurner systemBurner = new SystemBurner();
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount, systemBurner);
 
         storage.Set(Hash256.FromBytesWithPadding([1]), Hash256.Zero);
 
@@ -103,7 +104,7 @@ public void Set_ValueIsEmpty_BurnsStorageWriteZeroCost()
     public void Set_ValueIsNonEmpty_BurnsStorageWriteCost()
     {
         SystemBurner systemBurner = new SystemBurner();
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount, systemBurner);
 
         storage.Set(Hash256.FromBytesWithPadding([1]), new ValueHash256(Bytes32(1, 2, 3)));
 
@@ -116,7 +117,7 @@ public void Set_ValueIsNonEmpty_BurnsStorageWriteCost()
     [TestCase(ulong.MaxValue)]
     public void GetSetULong_Always_SetsAndGetsProperValue(ulong value)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
 
         storage.Set(Hash256.FromBytesWithPadding([1]), value);
 
@@ -130,7 +131,7 @@ public void GetSetULong_Always_SetsAndGetsProperValue(ulong value)
     [TestCase(ulong.MaxValue)]
     public void GetSetByULong_Always_SetsAndGetsTheSameValue(ulong key)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ValueHash256 value = new ValueHash256(RandomNumberGenerator.GetBytes(Hash256.Size));
 
         storage.Set(key, value);
@@ -145,7 +146,7 @@ public void GetSetByULong_Always_SetsAndGetsTheSameValue(ulong key)
     [TestCase(ulong.MaxValue, ulong.MaxValue)]
     public void GetSetULongByULong_Always_SetsAndGetsTheSameValue(ulong key, ulong value)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
 
         storage.Set(key, value);
 
@@ -156,7 +157,7 @@ public void GetSetULongByULong_Always_SetsAndGetsTheSameValue(ulong key, ulong v
     [Test]
     public void Clear_Always_ClearsStorage()
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ValueHash256 key = Hash256.FromBytesWithPadding([1]);
 
         storage.Set(key, new ValueHash256(Bytes32(1, 2, 3)));
@@ -169,7 +170,7 @@ public void Clear_Always_ClearsStorage()
     [Test]
     public void ClearByULong_Always_ClearsStorage()
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
         ulong key = 999;
 
         storage.Set(key, new ValueHash256(Bytes32(1, 2, 3)));
@@ -185,7 +186,7 @@ public void ClearByULong_Always_ClearsStorage()
     [TestCase(100)]
     public void GetBytesLength_Always_ReturnsCorrectLength(int length)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
 
         byte[] value = RandomNumberGenerator.GetBytes(length);
 
@@ -203,7 +204,7 @@ public void GetBytesLength_Always_ReturnsCorrectLength(int length)
     [TestCase(400)]
     public void SetBytesGetBytes_Always_SetsAndGetsTheSameValue(int length)
     {
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount);
 
         byte[] value = RandomNumberGenerator.GetBytes(length);
 
@@ -217,7 +218,7 @@ public void SetBytesGetBytes_Always_SetsAndGetsTheSameValue(int length)
     [TestCase(100)]
     public void ClearBytes_Always_ClearsStorage(int length)
     {
-        (ArbosStorage storage, TrackingWorldState worldState) = TestArbosStorage.Create(TestAccount);
+        using var disposable = TestArbosStorage.Create(out TrackingWorldState worldState, out ArbosStorage storage, TestAccount);
 
         worldState.Commit(FullChainSimulationReleaseSpec.Instance);
         worldState.CommitTree(0);
@@ -241,7 +242,7 @@ public void ClearBytes_Always_ClearsStorage(int length)
     public void GetCodeHash_Always_BurnsStorageReadCostAndGetsHash()
     {
         SystemBurner systemBurner = new SystemBurner();
-        (ArbosStorage storage, TrackingWorldState worldState) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out TrackingWorldState worldState, out ArbosStorage storage, TestAccount, systemBurner);
 
         // Insert random code to ensure the code hash is set.
         byte[] code = RandomNumberGenerator.GetBytes(Hash256.Size);
@@ -263,7 +264,7 @@ public void GetCodeHash_Always_BurnsStorageReadCostAndGetsHash()
     public void CalculateHash_Always_BurnsProperCostAndReturnsHash(int bytesLength, ulong burnedCost)
     {
         SystemBurner systemBurner = new SystemBurner();
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount, systemBurner);
 
         ReadOnlySpan<byte> data = RandomNumberGenerator.GetBytes(bytesLength);
         ValueHash256 expected = Keccak.Compute(data);
@@ -285,7 +286,7 @@ public void Trace_OnlyDuringEvm_RecordStorageGet(TracingScenario scenario)
         var tracingInfo = new TracingInfo(tracer, scenario, executionEnv);
 
         SystemBurner systemBurner = new SystemBurner(tracingInfo);
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount, systemBurner);
 
         storage.Get(Hash256.FromBytesWithPadding([1]));
 
@@ -314,7 +315,7 @@ public void Trace_OnlyDuringEvm_RecordStorageSet(TracingScenario scenario)
         var tracingInfo = new TracingInfo(tracer, scenario, executionEnv);
 
         SystemBurner systemBurner = new SystemBurner(tracingInfo);
-        (ArbosStorage storage, _) = TestArbosStorage.Create(TestAccount, systemBurner);
+        using var disposable = TestArbosStorage.Create(out _, out ArbosStorage storage, TestAccount, systemBurner);
 
         storage.Set(Hash256.FromBytesWithPadding([1]), Hash256.FromBytesWithPadding([2]));