Warm up empty trees for accesslists (#7111)

NethermindEth · May 30, 2024 · f1ff7a7 · f1ff7a7
1 parent e3b68b1
commit f1ff7a7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/Nethermind/Nethermind.State/PersistentStorageProvider.cs b/src/Nethermind/Nethermind.State/PersistentStorageProvider.cs
@@ -344,9 +344,16 @@ private StorageTree GetOrCreateStorage(Address address)
             return value;
         }
 
-        public void WarmUp(in StorageCell storageCell)
+        public void WarmUp(in StorageCell storageCell, bool isEmpty)
         {
-            LoadFromTree(in storageCell);
+            if (isEmpty)
+            {
+                _preBlockCache[storageCell] = Array.Empty<byte>();
+            }
+            else
+            {
+                LoadFromTree(in storageCell);
+            }
         }
 
         private ReadOnlySpan<byte> LoadFromTree(in StorageCell storageCell)

diff --git a/src/Nethermind/Nethermind.State/StateProvider.cs b/src/Nethermind/Nethermind.State/StateProvider.cs
@@ -654,9 +654,9 @@ public StateProvider(IScopedTrieStore? trieStore,
             };
         }
 
-        public void WarmUp(Address address)
+        public bool WarmUp(Address address)
         {
-            GetState(address);
+            return GetState(address) is not null;
         }
 
         private Account? GetState(Address address)

diff --git a/src/Nethermind/Nethermind.State/WorldState.cs b/src/Nethermind/Nethermind.State/WorldState.cs
@@ -116,10 +116,10 @@ public void WarmUp(AccessList? accessList)
             {
                 foreach ((Address address, AccessList.StorageKeysEnumerable storages) in accessList)
                 {
-                    _stateProvider.WarmUp(address);
+                    bool exists = _stateProvider.WarmUp(address);
                     foreach (UInt256 storage in storages)
                     {
-                        _persistentStorageProvider.WarmUp(new StorageCell(address, storage));
+                        _persistentStorageProvider.WarmUp(new StorageCell(address, storage), isEmpty: !exists);
                     }
                 }
             }