StorageValue

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

@@ -362,24 +362,24 @@ private List<string> RunAssertions(BlockchainTest test, Block headBlock, IWorldS
             differencesBefore = differences.Count;
 
             KeyValuePair<UInt256, byte[]>[] clearedStorages = new KeyValuePair<UInt256, byte[]>[0];
-            if (test.Pre.ContainsKey(acountAddress))
+            if (test.Pre.TryGetValue(acountAddress, out var v))
             {
-                clearedStorages = test.Pre[acountAddress].Storage.Where(s => !accountState.Storage.ContainsKey(s.Key)).ToArray();
+                clearedStorages = v.Storage.Where(s => !accountState.Storage.ContainsKey(s.Key)).ToArray();
             }
 
             foreach (KeyValuePair<UInt256, byte[]> clearedStorage in clearedStorages)
             {
-                ReadOnlySpan<byte> value = !stateProvider.AccountExists(acountAddress) ? Bytes.Empty : stateProvider.Get(new StorageCell(acountAddress, clearedStorage.Key));
-                if (!value.IsZero())
+                StorageValue value = !stateProvider.AccountExists(acountAddress) ? StorageValue.Zero : stateProvider.Get(new StorageCell(acountAddress, clearedStorage.Key));
+                if (!value.IsZero)
                 {
                     differences.Add($"{acountAddress} storage[{clearedStorage.Key}] exp: 0x00, actual: {value.ToHexString(true)}");
                 }
             }
 
             foreach (KeyValuePair<UInt256, byte[]> storageItem in accountState.Storage)
             {
-                ReadOnlySpan<byte> value = !stateProvider.AccountExists(acountAddress) ? Bytes.Empty : stateProvider.Get(new StorageCell(acountAddress, storageItem.Key));
-                if (!Bytes.AreEqual(storageItem.Value, value))
+                StorageValue value = !stateProvider.AccountExists(acountAddress) ? StorageValue.Zero : stateProvider.Get(new StorageCell(acountAddress, storageItem.Key));
+                if (!new StorageValue(storageItem.Value).Equals(value))
                 {
                     differences.Add($"{acountAddress} storage[{storageItem.Key}] exp: {storageItem.Value.ToHexString(true)}, actual: {value.ToHexString(true)}");
                 }

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

@@ -12,6 +12,7 @@
 using System.Linq;
 using BenchmarkDotNet.Toolchains.InProcess.NoEmit;
 using BenchmarkDotNet.Columns;
+using Nethermind.Evm.Benchmark;
 using Nethermind.Precompiles.Benchmark;
 
 namespace Nethermind.Benchmark.Runner
@@ -48,35 +49,36 @@ public static class Program
     {
         public static void Main(string[] args)
         {
-            List<Assembly> additionalJobAssemblies = [
-                typeof(JsonRpc.Benchmark.EthModuleBenchmarks).Assembly,
-                typeof(Benchmarks.Core.Keccak256Benchmarks).Assembly,
-                typeof(Evm.Benchmark.EvmStackBenchmarks).Assembly,
-                typeof(Network.Benchmarks.DiscoveryBenchmarks).Assembly,
-            ];
-
-            List<Assembly> simpleJobAssemblies = [
-                // typeof(EthereumTests.Benchmark.EthereumTests).Assembly,
-            ];
-
-            if (Debugger.IsAttached)
-            {
-                BenchmarkSwitcher.FromAssemblies(additionalJobAssemblies.Union(simpleJobAssemblies).ToArray()).RunAll(new DebugInProcessConfig());
-            }
-            else
-            {
-                foreach (Assembly assembly in additionalJobAssemblies)
-                {
-                    BenchmarkRunner.Run(assembly, new DashboardConfig(Job.MediumRun.WithRuntime(CoreRuntime.Core90)), args);
-                }
-
-                foreach (Assembly assembly in simpleJobAssemblies)
-                {
-                    BenchmarkRunner.Run(assembly, new DashboardConfig(), args);
-                }
-
-                BenchmarkRunner.Run(typeof(KeccakBenchmark).Assembly, new PrecompileBenchmarkConfig(), args);
-            }
+            BenchmarkRunner.Run(typeof(StorageValueBenchmarks));
+            // List<Assembly> additionalJobAssemblies = [
+            //     typeof(JsonRpc.Benchmark.EthModuleBenchmarks).Assembly,
+            //     typeof(Benchmarks.Core.Keccak256Benchmarks).Assembly,
+            //     typeof(Evm.Benchmark.EvmStackBenchmarks).Assembly,
+            //     typeof(Network.Benchmarks.DiscoveryBenchmarks).Assembly,
+            // ];
+            //
+            // List<Assembly> simpleJobAssemblies = [
+            //     // typeof(EthereumTests.Benchmark.EthereumTests).Assembly,
+            // ];
+            //
+            // if (Debugger.IsAttached)
+            // {
+            //     BenchmarkSwitcher.FromAssemblies(additionalJobAssemblies.Union(simpleJobAssemblies).ToArray()).RunAll(new DebugInProcessConfig());
+            // }
+            // else
+            // {
+            //     foreach (Assembly assembly in additionalJobAssemblies)
+            //     {
+            //         BenchmarkRunner.Run(assembly, new DashboardConfig(Job.MediumRun.WithRuntime(CoreRuntime.Core90)), args);
+            //     }
+            //
+            //     foreach (Assembly assembly in simpleJobAssemblies)
+            //     {
+            //         BenchmarkRunner.Run(assembly, new DashboardConfig(), args);
+            //     }
+            //
+            //     BenchmarkRunner.Run(typeof(KeccakBenchmark).Assembly, new PrecompileBenchmarkConfig(), args);
+            // }
         }
     }
 }

src/Nethermind/Nethermind.Blockchain/Blocks/BlockhashStore.cs

@@ -17,8 +17,6 @@ namespace Nethermind.Blockchain.Blocks;
 public class BlockhashStore(ISpecProvider specProvider, IWorldState worldState)
     : IBlockhashStore
 {
-    private static readonly byte[] EmptyBytes = [0];
-
     public void ApplyBlockhashStateChanges(BlockHeader blockHeader)
     {
         IReleaseSpec spec = specProvider.GetSpec(blockHeader);
@@ -30,7 +28,7 @@ public void ApplyBlockhashStateChanges(BlockHeader blockHeader)
         Hash256 parentBlockHash = blockHeader.ParentHash;
         var parentBlockIndex = new UInt256((ulong)((blockHeader.Number - 1) % Eip2935Constants.RingBufferSize));
         StorageCell blockHashStoreCell = new(eip2935Account, parentBlockIndex);
-        worldState.Set(blockHashStoreCell, parentBlockHash!.Bytes.WithoutLeadingZeros().ToArray());
+        worldState.Set(blockHashStoreCell, new StorageValue(parentBlockHash!.Bytes));
     }
 
     public Hash256? GetBlockHashFromState(BlockHeader currentHeader, long requiredBlockNumber)
@@ -44,7 +42,7 @@ public void ApplyBlockhashStateChanges(BlockHeader blockHeader)
         var blockIndex = new UInt256((ulong)(requiredBlockNumber % Eip2935Constants.RingBufferSize));
         Address? eip2935Account = spec.Eip2935ContractAddress ?? Eip2935Constants.BlockHashHistoryAddress;
         StorageCell blockHashStoreCell = new(eip2935Account, blockIndex);
-        ReadOnlySpan<byte> data = worldState.Get(blockHashStoreCell);
-        return data.SequenceEqual(EmptyBytes) ? null : Hash256.FromBytesWithPadding(data);
+        ref readonly StorageValue data = ref worldState.Get(blockHashStoreCell);
+        return data.IsZero ? null : Hash256.FromBytesWithPadding(data.Bytes);
     }
 }

src/Nethermind/Nethermind.Blockchain/GenesisLoader.cs

@@ -66,7 +66,7 @@ private void Preallocate(Block genesis)
                     foreach (KeyValuePair<UInt256, byte[]> storage in allocation.Storage)
                     {
                         _stateProvider.Set(new StorageCell(address, storage.Key),
-                            storage.Value.WithoutLeadingZeros().ToArray());
+                            new StorageValue(storage.Value));
                     }
                 }
 

src/Nethermind/Nethermind.Core.Test/Blockchain/TestBlockchain.cs

@@ -197,7 +197,7 @@ protected virtual async Task<TestBlockchain> Build(Action<ContainerBuilder>? con
         byte[] code = Bytes.FromHexString("0xabcd");
         state.InsertCode(TestItem.AddressA, code, SpecProvider.GenesisSpec);
 
-        state.Set(new StorageCell(TestItem.AddressA, UInt256.One), Bytes.FromHexString("0xabcdef"));
+        state.Set(new StorageCell(TestItem.AddressA, UInt256.One), new StorageValue(Bytes.FromHexString("0xabcdef")));
 
         state.Commit(SpecProvider.GenesisSpec);
         state.CommitTree(0);

src/Nethermind/Nethermind.Evm.Benchmark/StorageValueBenchmarks.cs

@@ -0,0 +1,40 @@
+// SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System;
+using BenchmarkDotNet.Attributes;
+using Nethermind.State;
+
+namespace Nethermind.Evm.Benchmark;
+
+public class StorageValueBenchmarks
+{
+    [Benchmark(OperationsPerInvoke = 8)]
+    [Arguments(0)]
+    [Arguments(1)]
+    [Arguments(8)]
+    [Arguments(9)]
+    [Arguments(17)]
+    [Arguments(18)]
+    [Arguments(23)]
+    [Arguments(24)]
+    [Arguments(31)]
+    public int LeadingZeros(int nonZero)
+    {
+        Span<byte> span = stackalloc byte[32];
+        span[nonZero] = 1;
+
+        var v = new StorageValue(span);
+
+        return
+            v.BytesWithNoLeadingZeroes.Length +
+            v.BytesWithNoLeadingZeroes.Length +
+            v.BytesWithNoLeadingZeroes.Length +
+            v.BytesWithNoLeadingZeroes.Length +
+
+            v.BytesWithNoLeadingZeroes.Length +
+            v.BytesWithNoLeadingZeroes.Length +
+            v.BytesWithNoLeadingZeroes.Length +
+            v.BytesWithNoLeadingZeroes.Length;
+    }
+}

src/Nethermind/Nethermind.Evm.Test/Eip1014Tests.cs

@@ -105,7 +105,7 @@ public void Test_out_of_gas_existing_account_with_storage()
             Address expectedAddress = ContractAddress.From(TestItem.AddressC, salt.PadLeft(32).AsSpan(), initCode.AsSpan());
 
             TestState.CreateAccount(expectedAddress, 1.Ether());
-            TestState.Set(new StorageCell(expectedAddress, 1), new byte[] { 1, 2, 3, 4, 5 });
+            TestState.Set(new StorageCell(expectedAddress, 1), new StorageValue([1, 2, 3, 4, 5]));
             TestState.Commit(Spec);
             TestState.CommitTree(0);
 

src/Nethermind/Nethermind.Evm.Test/TransactionProcessorEip7702Tests.cs

@@ -73,7 +73,7 @@ public void Execute_TxHasAuthorizationWithCodeThatSavesCallerAddress_ExpectedAdd
 
         _transactionProcessor.Execute(tx, new BlockExecutionContext(block.Header, _specProvider.GetSpec(block.Header)), NullTxTracer.Instance);
 
-        ReadOnlySpan<byte> cell = _stateProvider.Get(new StorageCell(signer.Address, 0));
+        StorageValue cell = _stateProvider.Get(new StorageCell(signer.Address, 0));
 
         Assert.That(new Address(cell.ToArray()), Is.EqualTo(sender.Address));
     }
@@ -154,7 +154,7 @@ public void Execute_SenderAndSignerIsTheSameOrNotWithCodeThatSavesCallerAddress_
 
         _transactionProcessor.Execute(tx, new BlockExecutionContext(block.Header, _specProvider.GetSpec(block.Header)), NullTxTracer.Instance);
 
-        ReadOnlySpan<byte> cellValue = _stateProvider.Get(new StorageCell(signer.Address, 0));
+        StorageValue cellValue = _stateProvider.Get(new StorageCell(signer.Address, 0));
 
         Assert.That(cellValue.ToArray(), Is.EqualTo(sender.Address.Bytes));
     }
@@ -636,7 +636,7 @@ public void Execute_CodeSavesEXTCODEHASHWhenAccountIsDelegatedOrNot_SavesExpecte
             .WithGasLimit(10000000).TestObject;
         _ = _transactionProcessor.Execute(tx, new BlockExecutionContext(block.Header, _specProvider.GetSpec(block.Header)), NullTxTracer.Instance);
 
-        ReadOnlySpan<byte> actual = _stateProvider.Get(new StorageCell(codeSource, 0));
+        StorageValue actual = _stateProvider.Get(new StorageCell(codeSource, 0));
         Assert.That(actual.ToArray(), Is.EquivalentTo(expected));
     }
     public static IEnumerable<object[]> AccountAccessGasCases()

src/Nethermind/Nethermind.Evm.Test/VirtualMachineTestsBase.cs

@@ -345,17 +345,17 @@ protected void AssertGas(TestAllTracerWithOutput receipt, long gas)
 
     protected void AssertStorage(UInt256 address, Address value)
     {
-        Assert.That(TestState.Get(new StorageCell(Recipient, address)).PadLeft(32), Is.EqualTo(value.Bytes.PadLeft(32)), "storage");
+        Assert.That(TestState.Get(new StorageCell(Recipient, address)).Bytes.ToArray(), Is.EqualTo(value.Bytes.PadLeft(32)), "storage");
     }
 
     protected void AssertStorage(UInt256 address, Hash256 value)
     {
-        Assert.That(TestState.Get(new StorageCell(Recipient, address)).PadLeft(32), Is.EqualTo(value.BytesToArray()), "storage");
+        Assert.That(TestState.Get(new StorageCell(Recipient, address)).Bytes.ToArray(), Is.EqualTo(value.BytesToArray()), "storage");
     }
 
     protected void AssertStorage(UInt256 address, ReadOnlySpan<byte> value)
     {
-        Assert.That(TestState.Get(new StorageCell(Recipient, address)).PadLeft(32), Is.EqualTo(new ZeroPaddedSpan(value, 32 - value.Length, PadDirection.Left).ToArray()), "storage");
+        Assert.That(TestState.Get(new StorageCell(Recipient, address)).Bytes.ToArray(), Is.EqualTo(new ZeroPaddedSpan(value, 32 - value.Length, PadDirection.Left).ToArray()), "storage");
     }
 
     protected void AssertStorage(UInt256 address, BigInteger expectedValue)

src/Nethermind/Nethermind.Evm.Test/VmCodeDepositTests.cs

@@ -56,11 +56,11 @@ public void Regression_mainnet_6108276()
                 .Done;
 
             TestAllTracerWithOutput receipt = Execute(code);
-            byte[] result = TestState.Get(storageCell).ToArray();
+            byte[] result = TestState.Get(storageCell).BytesWithNoLeadingZeroes.ToArray();
             Assert.That(result, Is.EqualTo(new byte[] { 0 }), "storage reverted");
             Assert.That(receipt.GasSpent, Is.EqualTo(98777), "no refund");
 
-            byte[] returnData = TestState.Get(new StorageCell(TestItem.AddressC, 0)).ToArray();
+            byte[] returnData = TestState.Get(new StorageCell(TestItem.AddressC, 0)).BytesWithNoLeadingZeroes.ToArray();
             Assert.That(returnData, Is.EqualTo(new byte[1]), "address returned");
         }
 
@@ -96,11 +96,11 @@ public void Regression_mainnet_226522()
                 .Done;
 
             TestAllTracerWithOutput receipt = Execute(code);
-            byte[] result = TestState.Get(storageCell).ToArray();
+            byte[] result = TestState.Get(storageCell).BytesWithNoLeadingZeroes.ToArray();
             Assert.That(result, Is.EqualTo(new byte[] { 0 }), "storage reverted");
             Assert.That(receipt.GasSpent, Is.EqualTo(83199), "with refund");
 
-            byte[] returnData = TestState.Get(new StorageCell(TestItem.AddressC, 0)).ToArray();
+            byte[] returnData = TestState.Get(new StorageCell(TestItem.AddressC, 0)).BytesWithNoLeadingZeroes.ToArray();
             Assert.That(returnData, Is.EqualTo(deployed.Bytes), "address returned");
         }
     }

src/Nethermind/Nethermind.Evm/EvmStack.cs

@@ -13,6 +13,7 @@
 using System.Diagnostics;
 using System.Runtime.Intrinsics.X86;
 using Nethermind.Core.Extensions;
+using Nethermind.State;
 
 namespace Nethermind.Evm;
 
@@ -51,6 +52,18 @@ public ref byte PushBytesRef()
         return ref Unsafe.Add(ref MemoryMarshal.GetReference(_bytes), head * WordSize);
     }
 
+    /// <summary>
+    /// An optimized version of the push, accepting directly <see cref="StorageValue"/>
+    /// and using it's size alignment with the stack.
+    /// </summary>
+    public void PushBytes(in StorageValue value)
+    {
+        if (typeof(TTracing) == typeof(IsTracing)) _tracer.ReportStackPush(value.BytesWithNoLeadingZeroes);
+
+        ref byte bytes = ref PushBytesRef();
+        Unsafe.As<byte, Word>(ref bytes) = value.UnsafeRef;
+    }
+
     public void PushBytes(scoped ReadOnlySpan<byte> value)
     {
         if (typeof(TTracing) == typeof(IsTracing)) _tracer.ReportStackPush(value);

src/Nethermind/Nethermind.Evm/StateOverridesExtensions.cs

@@ -52,7 +52,7 @@ void ApplyState(Dictionary<UInt256, Hash256> diff)
         {
             foreach ((UInt256 index, Hash256 value) in diff)
             {
-                stateProvider.Set(new StorageCell(address, index), value.Bytes.WithoutLeadingZeros().ToArray());
+                stateProvider.Set(new StorageCell(address, index), new StorageValue(value.Bytes));
             }
         }
 

src/Nethermind/Nethermind.Evm/Tracing/GethStyle/Custom/JavaScript/Db.cs

@@ -25,7 +25,9 @@ public ITypedArray<byte> getState(object address, object hash)
     {
         using var handle = ArrayPoolDisposableReturn.Rent(32, out byte[] array);
 
-        ReadOnlySpan<byte> bytes = WorldState.Get(new StorageCell(address.ToAddress(), hash.GetHash()));
+        StorageValue v = WorldState.Get(new StorageCell(address.ToAddress(), hash.GetHash()));
+        var bytes = v.BytesWithNoLeadingZeroes;
+
         if (bytes.Length < array.Length)
         {
             Array.Clear(array);

src/Nethermind/Nethermind.Evm/Tracing/GethStyle/Custom/Native/Prestate/NativePrestateTracer.cs

@@ -214,7 +214,7 @@ private void LookupStorage(Address addr, UInt256 index)
 
         if (!account.Storage.ContainsKey(index))
         {
-            UInt256 storage = new(_worldState!.Get(new StorageCell(addr, index)), true);
+            UInt256 storage = new(_worldState!.Get(new StorageCell(addr, index)).BytesWithNoLeadingZeroes, true);
             account.Storage.Add(index, storage);
         }
     }
@@ -259,7 +259,7 @@ private void ProcessDiffState()
                     if (prestateStorage.IsZero)
                         prestateAccount.Storage.Remove(index);
 
-                    UInt256 poststateStorage = new(_worldState!.Get(new StorageCell(addr, index)), true);
+                    UInt256 poststateStorage = new(_worldState!.Get(new StorageCell(addr, index)).BytesWithNoLeadingZeroes, true);
                     if (!prestateStorage.Equals(poststateStorage))
                     {
                         modified = true;