fix original value retrieval

Signed-off-by: Danno Ferrin <[email protected]>
shemnon · Oct 14, 2023 · a3ba879 · a3ba879
1 parent 830ab3d
commit a3ba879
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/worldstate/JournaledAccount.java b/evm/src/main/java/org/hyperledger/besu/evm/worldstate/JournaledAccount.java
@@ -278,11 +278,10 @@ public UInt256 getStorageValue(final UInt256 key) {
 
   @Override
   public UInt256 getOriginalStorageValue(final UInt256 key) {
-    if (storageWasCleared) {
-      return getStorageValue(key);
-    } else {
-      return account.getOriginalStorageValue(key);
-    }
+    // if storage was cleared then it is because it was an empty account, hence zero storage
+    // if we have no backing account, it's a new account, hence zero storage
+    // otherwise ask outside of what we are journaling, journaled change may not be original value
+    return (storageWasCleared || account == null) ? UInt256.ZERO : account.getStorageValue(key);
   }
 
   @Override