Fix state override accessing state

src/Nethermind/Nethermind.Consensus/Processing/OverridableTxProcessingEnv.cs

@@ -51,17 +51,12 @@ protected virtual ITransactionProcessor CreateTransactionProcessor() =>
 
     IOverridableTxProcessingScope IOverridableTxProcessorSource.Build(Hash256 stateRoot) => Build(stateRoot);
 
-    public OverridableTxProcessingScope Build(Hash256 stateRoot)
-    {
-        Hash256 originalStateRoot = StateProvider.StateRoot;
-        StateProvider.StateRoot = stateRoot;
-        return new(CodeInfoRepository, TransactionProcessor, StateProvider, originalStateRoot);
-    }
+    public OverridableTxProcessingScope Build(Hash256 stateRoot) => new(CodeInfoRepository, TransactionProcessor, StateProvider, stateRoot);
 
     IOverridableTxProcessingScope IOverridableTxProcessorSource.BuildAndOverride(BlockHeader header, Dictionary<Address, AccountOverride>? stateOverride)
     {
         OverridableTxProcessingScope scope = Build(header.StateRoot ?? throw new ArgumentException($"Block {header.Hash} state root is null", nameof(header)));
-        if (stateOverride != null)
+        if (stateOverride is not null)
         {
             scope.WorldState.ApplyStateOverrides(scope.CodeInfoRepository, stateOverride, SpecProvider.GetSpec(header), header.Number);
             header.StateRoot = scope.WorldState.StateRoot;

src/Nethermind/Nethermind.Consensus/Processing/OverridableTxProcessingScope.cs

@@ -8,22 +8,34 @@
 
 namespace Nethermind.Consensus.Processing;
 
-public class OverridableTxProcessingScope(
-    IOverridableCodeInfoRepository codeInfoRepository,
-    ITransactionProcessor transactionProcessor,
-    IOverridableWorldState worldState,
-    Hash256 originalStateRoot
-) : IOverridableTxProcessingScope
+public class OverridableTxProcessingScope : IOverridableTxProcessingScope
 {
-    public IOverridableCodeInfoRepository CodeInfoRepository => codeInfoRepository;
-    public ITransactionProcessor TransactionProcessor => transactionProcessor;
-    public IWorldState WorldState => worldState;
+    private readonly IOverridableCodeInfoRepository _codeInfoRepository;
+    private readonly ITransactionProcessor _transactionProcessor;
+    private readonly IOverridableWorldState _worldState;
 
-    public void Dispose()
+    public OverridableTxProcessingScope(IOverridableCodeInfoRepository codeInfoRepository,
+        ITransactionProcessor transactionProcessor,
+        IOverridableWorldState worldState,
+        Hash256 stateRoot)
     {
-        worldState.StateRoot = originalStateRoot;
-        worldState.Reset();
-        worldState.ResetOverrides();
-        codeInfoRepository.ResetOverrides();
+        _codeInfoRepository = codeInfoRepository;
+        _transactionProcessor = transactionProcessor;
+        _worldState = worldState;
+        Reset();
+        _worldState.StateRoot = stateRoot;
+    }
+
+    public IOverridableCodeInfoRepository CodeInfoRepository => _codeInfoRepository;
+    public ITransactionProcessor TransactionProcessor => _transactionProcessor;
+    public IWorldState WorldState => _worldState;
+
+    public void Dispose() => Reset();
+
+    private void Reset()
+    {
+        _worldState.Reset();
+        _worldState.ResetOverrides();
+        _codeInfoRepository.ResetOverrides();
     }
 }

src/Nethermind/Nethermind.Evm/StateOverridesExtensions.cs

@@ -38,11 +38,11 @@ public static void ApplyStateOverrides(
                 state.UpdateCode(overridableCodeInfoRepository, spec, accountOverride, address);
                 state.UpdateState(accountOverride, address);
             }
-        }
 
-        state.Commit(spec);
-        state.CommitTree(blockNumber);
-        state.RecalculateStateRoot();
+            state.Commit(spec);
+            state.CommitTree(blockNumber);
+            state.RecalculateStateRoot();
+        }
     }
 
     private static void UpdateState(this IWorldState stateProvider, AccountOverride accountOverride, Address address)