diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java
index 98b24f51cc..1552c69df0 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/BlockTracer.java
@@ -15,6 +15,8 @@
 package org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor;
 
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.processor.BlockReplay.TransactionAction;
+import org.hyperledger.besu.ethereum.core.AbstractWorldUpdater;
+import org.hyperledger.besu.ethereum.core.AbstractWorldUpdater.StackedUpdater;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.Hash;
 import org.hyperledger.besu.ethereum.core.WorldUpdater;
@@ -51,6 +53,8 @@ public class BlockTracer {
       // if we have no prior updater, it must be the first TX, so use the block's initial state
       if (chainedUpdater == null) {
         chainedUpdater = mutableWorldState.updater();
+      } else if (chainedUpdater instanceof AbstractWorldUpdater.StackedUpdater) {
+        ((StackedUpdater) chainedUpdater).markTransactionBoundary();
       }
       // create an updater for just this tx
       chainedUpdater = chainedUpdater.updater();
diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java
index 0eedf2706a..29736ec71d 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/tracing/diff/StateDiffGenerator.java
@@ -63,9 +63,11 @@ public class StateDiffGenerator {
           updatedAccount.getUpdatedStorage().entrySet()) {
         final UInt256 originalValue = rootAccount.getStorageValue(entry.getKey());
         final UInt256 newValue = entry.getValue();
-        storageDiff.put(
-            entry.getKey().toHexString(),
-            new DiffNode(originalValue.toHexString(), newValue.toHexString()));
+        if (!originalValue.equals(newValue)) {
+          storageDiff.put(
+              entry.getKey().toHexString(),
+              new DiffNode(originalValue.toHexString(), newValue.toHexString()));
+        }
       }
 
       // populate the diff object
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json
index c22512520a..3b5b81f403 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/blocks.json
@@ -48,6 +48,14 @@
           "gasPrice": "0xEF",
           "to": "0x0010000000000000000000000000000000000000",
           "data": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004"
+        },
+        {
+          "comment": "Set contract storage (key,value)'s: (1,3),(1,0)",
+          "secretKey": "0xc87509a1c067bbde78beb793e6fa76530b6382a4c0241e5e4a9ec0a0f44dc0d3",
+          "gasLimit": "0xFFFFF2",
+          "gasPrice": "0xEF",
+          "to": "0x0010000000000000000000000000000000000000",
+          "data": "0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"
         }
       ]
     },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json
index d80b0b5207..8ca785f9d0 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/chain-data/genesis.json
@@ -9,6 +9,7 @@
     "byzantiumBlock": 0,
     "constantinopleBlock": 0,
     "constantinopleFixBlock": 0,
+    "istanbulBlock": 0,
     "ethash": {
       "fixeddifficulty": 15
     },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x3.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x3.json
index ad0cbbd084..9acfe5511d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x3.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x3.json
@@ -22,7 +22,7 @@
             "balance": {
               "*": {
                 "from": "0x3782dace9ddc9578",
-                "to": "0x3782dace9ea423b8"
+                "to": "0x3782dace9ea1ac9c"
               }
             },
             "code": "=",
@@ -33,7 +33,7 @@
             "balance": {
               "*": {
                 "from": "0xeffffffffffffffffb36a87",
-                "to": "0xefffffffffffffffeebdc47"
+                "to": "0xefffffffffffffffeee5363"
               }
             },
             "code": "=",
@@ -62,7 +62,7 @@
           {
             "action": {
               "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
-              "gas": "0xff2d6a",
+              "gas": "0xff300e",
               "init": "0x6004600c60003960046000f3600035ff",
               "value": "0x0"
             },
@@ -88,7 +88,7 @@
                   "0x4"
                 ],
                 "store": null,
-                "used": 16723303
+                "used": 16723979
               },
               "pc": 0,
               "sub": null
@@ -101,7 +101,7 @@
                   "0xc"
                 ],
                 "store": null,
-                "used": 16723300
+                "used": 16723976
               },
               "pc": 2,
               "sub": null
@@ -114,7 +114,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16723297
+                "used": 16723973
               },
               "pc": 4,
               "sub": null
@@ -128,7 +128,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16723288
+                "used": 16723964
               },
               "pc": 6,
               "sub": null
@@ -141,7 +141,7 @@
                   "0x4"
                 ],
                 "store": null,
-                "used": 16723285
+                "used": 16723961
               },
               "pc": 7,
               "sub": null
@@ -154,7 +154,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16723282
+                "used": 16723958
               },
               "pc": 9,
               "sub": null
@@ -165,7 +165,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16723282
+                "used": 16723958
               },
               "pc": 11,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x4.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x4.json
index 53f738acda..9b1706866b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x4.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x4.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x53444835ed6c23b8",
-                "to": "0x53444835ee4d7c58"
+                "from": "0x53444835ed69ac9c",
+                "to": "0x53444835ee4a430c"
               }
             },
             "code": "=",
@@ -52,7 +52,7 @@
             "balance": {
               "*": {
                 "from": "0xfffffffffffffffffffffffffffffffffffffffff",
-                "to": "0xfffffffffffffffffffffffffffffffffff1ea75f"
+                "to": "0xfffffffffffffffffffffffffffffffffff1f698f"
               }
             },
             "code": "=",
@@ -70,7 +70,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffaaea",
+              "gas": "0xffabba",
               "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
               "to": "0x0010000000000000000000000000000000000000",
               "value": "0x0"
@@ -96,7 +96,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755431
+                "used": 16755639
               },
               "pc": 0,
               "sub": null
@@ -109,7 +109,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755428
+                "used": 16755636
               },
               "pc": 2,
               "sub": null
@@ -122,7 +122,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755425
+                "used": 16755633
               },
               "pc": 3,
               "sub": null
@@ -135,7 +135,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755422
+                "used": 16755630
               },
               "pc": 5,
               "sub": null
@@ -149,7 +149,7 @@
                   "key": "0x1",
                   "val": "0x1"
                 },
-                "used": 16735422
+                "used": 16735630
               },
               "pc": 6,
               "sub": null
@@ -162,7 +162,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16735419
+                "used": 16735627
               },
               "pc": 7,
               "sub": null
@@ -175,7 +175,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16735416
+                "used": 16735624
               },
               "pc": 9,
               "sub": null
@@ -188,7 +188,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16735413
+                "used": 16735621
               },
               "pc": 10,
               "sub": null
@@ -201,7 +201,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16735410
+                "used": 16735618
               },
               "pc": 12,
               "sub": null
@@ -215,7 +215,7 @@
                   "key": "0x2",
                   "val": "0x2"
                 },
-                "used": 16715410
+                "used": 16715618
               },
               "pc": 13,
               "sub": null
@@ -229,8 +229,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x53444835ee4d7c58",
-                "to": "0x53444835eec16d28"
+                "from": "0x53444835ee4a430c",
+                "to": "0x53444835eebd71ac"
               }
             },
             "code": "=",
@@ -259,8 +259,8 @@
           "0x627306090abab3a6e1400e9345bc60c78a8bef57": {
             "balance": {
               "*": {
-                "from": "0xefffffffffffffffeebdc47",
-                "to": "0xefffffffffffffffe77eb77"
+                "from": "0xefffffffffffffffeee5363",
+                "to": "0xefffffffffffffffe7b24c3"
               }
             },
             "code": "=",
@@ -278,7 +278,7 @@
             "action": {
               "callType": "call",
               "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
-              "gas": "0xffaaea",
+              "gas": "0xffabba",
               "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
               "to": "0x0010000000000000000000000000000000000000",
               "value": "0x0"
@@ -304,7 +304,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755431
+                "used": 16755639
               },
               "pc": 0,
               "sub": null
@@ -317,7 +317,7 @@
                   "0x3"
                 ],
                 "store": null,
-                "used": 16755428
+                "used": 16755636
               },
               "pc": 2,
               "sub": null
@@ -330,7 +330,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755425
+                "used": 16755633
               },
               "pc": 3,
               "sub": null
@@ -343,7 +343,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755422
+                "used": 16755630
               },
               "pc": 5,
               "sub": null
@@ -357,7 +357,7 @@
                   "key": "0x1",
                   "val": "0x3"
                 },
-                "used": 16750422
+                "used": 16750630
               },
               "pc": 6,
               "sub": null
@@ -370,7 +370,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16750419
+                "used": 16750627
               },
               "pc": 7,
               "sub": null
@@ -383,7 +383,7 @@
                   "0x4"
                 ],
                 "store": null,
-                "used": 16750416
+                "used": 16750624
               },
               "pc": 9,
               "sub": null
@@ -396,7 +396,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16750413
+                "used": 16750621
               },
               "pc": 10,
               "sub": null
@@ -409,7 +409,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16750410
+                "used": 16750618
               },
               "pc": 12,
               "sub": null
@@ -423,7 +423,209 @@
                   "key": "0x2",
                   "val": "0x4"
                 },
-                "used": 16745410
+                "used": 16745618
+              },
+              "pc": 13,
+              "sub": null
+            }
+          ]
+        }
+      },
+      {
+        "output": "0x",
+        "stateDiff": {
+          "0x0000000000000000000000000000000000000000": {
+            "balance": {
+              "*": {
+                "from": "0x53444835eebd71ac",
+                "to": "0x53444835eeef5ad6"
+              }
+            },
+            "code": "=",
+            "nonce": "=",
+            "storage": {}
+          },
+          "0x0010000000000000000000000000000000000000": {
+            "balance": "=",
+            "code": "=",
+            "nonce": "=",
+            "storage": {
+              "0x0000000000000000000000000000000000000000000000000000000000000001": {
+                "*": {
+                  "from": "0x0000000000000000000000000000000000000000000000000000000000000003",
+                  "to": "0x0000000000000000000000000000000000000000000000000000000000000000"
+                }
+              }
+            }
+          },
+          "0x627306090abab3a6e1400e9345bc60c78a8bef57": {
+            "balance": {
+              "*": {
+                "from": "0xefffffffffffffffe7b24c3",
+                "to": "0xefffffffffffffffe493b99"
+              }
+            },
+            "code": "=",
+            "nonce": {
+              "*": {
+                "from": "0x3",
+                "to": "0x4"
+              }
+            },
+            "storage": {}
+          }
+        },
+        "trace": [
+          {
+            "action": {
+              "callType": "call",
+              "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+              "gas": "0xffabc6",
+              "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "to": "0x0010000000000000000000000000000000000000",
+              "value": "0x0"
+            },
+            "result": {
+              "gasUsed": "0x16c0",
+              "output": "0x"
+            },
+            "subtraces": 0,
+            "traceAddress": [],
+            "type": "call"
+          }
+        ],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "vmTrace": {
+          "code": "0x6020356000355560603560403555",
+          "ops": [
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x20"
+                ],
+                "store": null,
+                "used": 16755651
+              },
+              "pc": 0,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x3"
+                ],
+                "store": null,
+                "used": 16755648
+              },
+              "pc": 2,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x0"
+                ],
+                "store": null,
+                "used": 16755645
+              },
+              "pc": 3,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x1"
+                ],
+                "store": null,
+                "used": 16755642
+              },
+              "pc": 5,
+              "sub": null
+            },
+            {
+              "cost": 800,
+              "ex": {
+                "mem": null,
+                "push": [],
+                "store": {
+                  "key": "0x1",
+                  "val": "0x3"
+                },
+                "used": 16754842
+              },
+              "pc": 6,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x60"
+                ],
+                "store": null,
+                "used": 16754839
+              },
+              "pc": 7,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x0"
+                ],
+                "store": null,
+                "used": 16754836
+              },
+              "pc": 9,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x40"
+                ],
+                "store": null,
+                "used": 16754833
+              },
+              "pc": 10,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x1"
+                ],
+                "store": null,
+                "used": 16754830
+              },
+              "pc": 12,
+              "sub": null
+            },
+            {
+              "cost": 5000,
+              "ex": {
+                "mem": null,
+                "push": [],
+                "store": {
+                  "key": "0x1",
+                  "val": "0x0"
+                },
+                "used": 16749830
               },
               "pc": 13,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x5.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x5.json
index 91122716b2..a7d4a8baa0 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x5.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x5.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x6f05b59d3d896d28",
-                "to": "0x6f05b59d3dc329d0"
+                "from": "0x6f05b59d3db75ad6",
+                "to": "0x6f05b59d3de93e66"
               }
             },
             "code": "=",
@@ -34,12 +34,6 @@
             "code": "=",
             "nonce": "=",
             "storage": {
-              "0x0000000000000000000000000000000000000000000000000000000000000001": {
-                "*": {
-                  "from": "0x0000000000000000000000000000000000000000000000000000000000000003",
-                  "to": "0x0000000000000000000000000000000000000000000000000000000000000000"
-                }
-              },
               "0x0000000000000000000000000000000000000000000000000000000000000002": {
                 "*": {
                   "from": "0x0000000000000000000000000000000000000000000000000000000000000004",
@@ -51,8 +45,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffffff1ea75f",
-                "to": "0xffffffffffffffffffffffffffffffffffee4eab7"
+                "from": "0xfffffffffffffffffffffffffffffffffff1f698f",
+                "to": "0xffffffffffffffffffffffffffffffffffeed85ff"
               }
             },
             "code": "=",
@@ -70,13 +64,13 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffab6a",
+              "gas": "0xffabd2",
               "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
               "to": "0x0010000000000000000000000000000000000000",
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x2728",
+              "gasUsed": "0x16c0",
               "output": "0x"
             },
             "subtraces": 0,
@@ -96,7 +90,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755559
+                "used": 16755663
               },
               "pc": 0,
               "sub": null
@@ -109,7 +103,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755556
+                "used": 16755660
               },
               "pc": 2,
               "sub": null
@@ -122,7 +116,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755553
+                "used": 16755657
               },
               "pc": 3,
               "sub": null
@@ -135,13 +129,13 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755550
+                "used": 16755654
               },
               "pc": 5,
               "sub": null
             },
             {
-              "cost": 5000,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [],
@@ -149,7 +143,7 @@
                   "key": "0x1",
                   "val": "0x0"
                 },
-                "used": 16750550
+                "used": 16754854
               },
               "pc": 6,
               "sub": null
@@ -162,7 +156,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16750547
+                "used": 16754851
               },
               "pc": 7,
               "sub": null
@@ -175,7 +169,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16750544
+                "used": 16754848
               },
               "pc": 9,
               "sub": null
@@ -188,7 +182,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16750541
+                "used": 16754845
               },
               "pc": 10,
               "sub": null
@@ -201,7 +195,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16750538
+                "used": 16754842
               },
               "pc": 12,
               "sub": null
@@ -215,7 +209,7 @@
                   "key": "0x2",
                   "val": "0x0"
                 },
-                "used": 16745538
+                "used": 16749842
               },
               "pc": 13,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x6.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x6.json
index a49fb33d4f..def6d1925a 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x6.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x6.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x8ac723048c8b29d0",
-                "to": "0x8ac723048cee68a2"
+                "from": "0x8ac723048cb13e66",
+                "to": "0x8ac723048d141c20"
               }
             },
             "code": "=",
@@ -56,8 +56,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffee4eab7",
-                "to": "0xffffffffffffffffffffffffffffffffffe81abe5"
+                "from": "0xffffffffffffffffffffffffffffffffffeed85ff",
+                "to": "0xffffffffffffffffffffffffffffffffffe8aa845"
               }
             },
             "code": "=",
@@ -75,7 +75,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffad1a",
+              "gas": "0xffad82",
               "input": "0x0000000000000000000000000000000000000999",
               "to": "0x0020000000000000000000000000000000000000",
               "value": "0x0"
@@ -114,7 +114,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755991
+                "used": 16756095
               },
               "pc": 0,
               "sub": null
@@ -127,7 +127,7 @@
                   "0x999000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755988
+                "used": 16756092
               },
               "pc": 2,
               "sub": null
@@ -138,7 +138,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16725988
+                "used": 16726092
               },
               "pc": 3,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x7.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x7.json
index df86c3bdf7..d861ce1179 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x7.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x7.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xa688906bdbb668a2",
-                "to": "0xa688906bdc04064f"
+                "from": "0xa688906bdbdc1c20",
+                "to": "0xa688906bdc2958b5"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffe81abe5",
-                "to": "0xffffffffffffffffffffffffffffffffffe340e38"
+                "from": "0xffffffffffffffffffffffffffffffffffe8aa845",
+                "to": "0xffffffffffffffffffffffffffffffffffe3d6bb0"
               }
             },
             "code": "=",
@@ -51,7 +51,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffacea",
+              "gas": "0xffad52",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
@@ -77,7 +77,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755943
+                "used": 16756047
               },
               "pc": 0,
               "sub": null
@@ -90,7 +90,7 @@
                   "0xf000000000000000000000000000000000000000000000000000000000000001"
                 ],
                 "store": null,
-                "used": 16755940
+                "used": 16756044
               },
               "pc": 2,
               "sub": null
@@ -103,7 +103,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755937
+                "used": 16756041
               },
               "pc": 3,
               "sub": null
@@ -116,7 +116,7 @@
                   "0xf000000000000000000000000000000000000000000000000000000000000002"
                 ],
                 "store": null,
-                "used": 16755934
+                "used": 16756038
               },
               "pc": 5,
               "sub": null
@@ -129,7 +129,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755931
+                "used": 16756035
               },
               "pc": 6,
               "sub": null
@@ -143,7 +143,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755925
+                "used": 16756029
               },
               "pc": 8,
               "sub": null
@@ -156,7 +156,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755922
+                "used": 16756026
               },
               "pc": 9,
               "sub": null
@@ -169,7 +169,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755919
+                "used": 16756023
               },
               "pc": 11,
               "sub": null
@@ -180,7 +180,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16755919
+                "used": 16756023
               },
               "pc": 13,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x8.json
index 02c31327a6..7df9435f2b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x8.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xc249fdd32acc064f",
-                "to": "0xc249fdd32b1d145d"
+                "from": "0xc249fdd32af158b5",
+                "to": "0xc249fdd32b41d51f"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffe340e38",
-                "to": "0xffffffffffffffffffffffffffffffffffde3002a"
+                "from": "0xffffffffffffffffffffffffffffffffffe3d6bb0",
+                "to": "0xffffffffffffffffffffffffffffffffffdecef46"
               }
             },
             "code": "=",
@@ -51,7 +51,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffac2a",
+              "gas": "0xffacc6",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -68,7 +68,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xfbaa9c",
+              "gas": "0xfbab36",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
@@ -96,7 +96,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755751
+                "used": 16755907
               },
               "pc": 0,
               "sub": null
@@ -109,7 +109,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755748
+                "used": 16755904
               },
               "pc": 2,
               "sub": null
@@ -122,7 +122,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755745
+                "used": 16755901
               },
               "pc": 4,
               "sub": null
@@ -135,7 +135,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16755743
+                "used": 16755899
               },
               "pc": 6,
               "sub": null
@@ -148,7 +148,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755740
+                "used": 16755896
               },
               "pc": 7,
               "sub": null
@@ -162,7 +162,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755737
+                "used": 16755893
               },
               "pc": 8,
               "sub": null
@@ -175,7 +175,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755734
+                "used": 16755890
               },
               "pc": 9,
               "sub": null
@@ -188,7 +188,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755731
+                "used": 16755887
               },
               "pc": 11,
               "sub": null
@@ -202,7 +202,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755722
+                "used": 16755878
               },
               "pc": 13,
               "sub": null
@@ -215,7 +215,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755719
+                "used": 16755875
               },
               "pc": 14,
               "sub": null
@@ -228,7 +228,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755717
+                "used": 16755873
               },
               "pc": 16,
               "sub": null
@@ -241,7 +241,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755714
+                "used": 16755870
               },
               "pc": 17,
               "sub": null
@@ -254,7 +254,7 @@
                   "0x30000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755711
+                "used": 16755867
               },
               "pc": 19,
               "sub": null
@@ -264,16 +264,16 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffabfd"
+                  "0xffac99"
                 ],
                 "store": null,
-                "used": 16755709
+                "used": 16755865
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493912,
+              "cost": 16494066,
               "ex": {
                 "mem": {
                   "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -283,7 +283,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16754982
+                "used": 16755138
               },
               "pc": 21,
               "sub": {
@@ -297,7 +297,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493209
+                      "used": 16493363
                     },
                     "pc": 0,
                     "sub": null
@@ -310,7 +310,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000001"
                       ],
                       "store": null,
-                      "used": 16493206
+                      "used": 16493360
                     },
                     "pc": 2,
                     "sub": null
@@ -323,7 +323,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493203
+                      "used": 16493357
                     },
                     "pc": 3,
                     "sub": null
@@ -336,7 +336,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000002"
                       ],
                       "store": null,
-                      "used": 16493200
+                      "used": 16493354
                     },
                     "pc": 5,
                     "sub": null
@@ -349,7 +349,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493197
+                      "used": 16493351
                     },
                     "pc": 6,
                     "sub": null
@@ -363,7 +363,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16493191
+                      "used": 16493345
                     },
                     "pc": 8,
                     "sub": null
@@ -376,7 +376,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16493188
+                      "used": 16493342
                     },
                     "pc": 9,
                     "sub": null
@@ -389,7 +389,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 11,
                     "sub": null
@@ -400,7 +400,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 13,
                     "sub": null
@@ -416,7 +416,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16754979
+                "used": 16755135
               },
               "pc": 22,
               "sub": null
@@ -429,7 +429,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 24,
               "sub": null
@@ -440,7 +440,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x9.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x9.json
index 838f19f222..c6f426a894 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x9.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0x9.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xde0b6b3a79e5145d",
-                "to": "0xde0b6b3a7a3d13fb"
+                "from": "0xde0b6b3a7a09d51f",
+                "to": "0xde0b6b3a7a60e201"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffde3002a",
-                "to": "0xffffffffffffffffffffffffffffffffffd8b008c"
+                "from": "0xffffffffffffffffffffffffffffffffffdecef46",
+                "to": "0xffffffffffffffffffffffffffffffffffd95e264"
               }
             },
             "code": "=",
@@ -51,7 +51,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffaaaa",
+              "gas": "0xffabae",
               "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -68,7 +68,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xfba917",
+              "gas": "0xfbaa17",
               "input": "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -87,7 +87,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xf7b790",
+              "gas": "0xf7b88c",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -107,7 +107,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xf3d5d5",
+              "gas": "0xf3d6cd",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
@@ -137,7 +137,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755367
+                "used": 16755627
               },
               "pc": 0,
               "sub": null
@@ -150,7 +150,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755364
+                "used": 16755624
               },
               "pc": 2,
               "sub": null
@@ -163,7 +163,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755361
+                "used": 16755621
               },
               "pc": 4,
               "sub": null
@@ -176,7 +176,7 @@
                   "0x80"
                 ],
                 "store": null,
-                "used": 16755359
+                "used": 16755619
               },
               "pc": 6,
               "sub": null
@@ -189,7 +189,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16755356
+                "used": 16755616
               },
               "pc": 7,
               "sub": null
@@ -203,7 +203,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16755353
+                "used": 16755613
               },
               "pc": 8,
               "sub": null
@@ -216,7 +216,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755350
+                "used": 16755610
               },
               "pc": 9,
               "sub": null
@@ -229,7 +229,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755347
+                "used": 16755607
               },
               "pc": 11,
               "sub": null
@@ -243,7 +243,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755326
+                "used": 16755586
               },
               "pc": 13,
               "sub": null
@@ -256,7 +256,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755323
+                "used": 16755583
               },
               "pc": 14,
               "sub": null
@@ -269,7 +269,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755321
+                "used": 16755581
               },
               "pc": 16,
               "sub": null
@@ -282,7 +282,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755318
+                "used": 16755578
               },
               "pc": 17,
               "sub": null
@@ -295,7 +295,7 @@
                   "0x40000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755315
+                "used": 16755575
               },
               "pc": 19,
               "sub": null
@@ -305,16 +305,16 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffaa71"
+                  "0xffab75"
                 ],
                 "store": null,
-                "used": 16755313
+                "used": 16755573
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493523,
+              "cost": 16493779,
               "ex": {
                 "mem": {
                   "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -324,7 +324,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16753078
+                "used": 16753338
               },
               "pc": 21,
               "sub": {
@@ -338,7 +338,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16492820
+                      "used": 16493076
                     },
                     "pc": 0,
                     "sub": null
@@ -351,7 +351,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492817
+                      "used": 16493073
                     },
                     "pc": 2,
                     "sub": null
@@ -364,7 +364,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16492814
+                      "used": 16493070
                     },
                     "pc": 4,
                     "sub": null
@@ -377,7 +377,7 @@
                         "0x60"
                       ],
                       "store": null,
-                      "used": 16492812
+                      "used": 16493068
                     },
                     "pc": 6,
                     "sub": null
@@ -390,7 +390,7 @@
                         "0x40"
                       ],
                       "store": null,
-                      "used": 16492809
+                      "used": 16493065
                     },
                     "pc": 7,
                     "sub": null
@@ -404,7 +404,7 @@
                         "0x40"
                       ],
                       "store": null,
-                      "used": 16492806
+                      "used": 16493062
                     },
                     "pc": 8,
                     "sub": null
@@ -417,7 +417,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16492803
+                      "used": 16493059
                     },
                     "pc": 9,
                     "sub": null
@@ -430,7 +430,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492800
+                      "used": 16493056
                     },
                     "pc": 11,
                     "sub": null
@@ -444,7 +444,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16492785
+                      "used": 16493041
                     },
                     "pc": 13,
                     "sub": null
@@ -457,7 +457,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492782
+                      "used": 16493038
                     },
                     "pc": 14,
                     "sub": null
@@ -470,7 +470,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492780
+                      "used": 16493036
                     },
                     "pc": 16,
                     "sub": null
@@ -483,7 +483,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492777
+                      "used": 16493033
                     },
                     "pc": 17,
                     "sub": null
@@ -496,7 +496,7 @@
                         "0x40000000000000000000000000000000000000"
                       ],
                       "store": null,
-                      "used": 16492774
+                      "used": 16493030
                     },
                     "pc": 19,
                     "sub": null
@@ -506,16 +506,16 @@
                     "ex": {
                       "mem": null,
                       "push": [
-                        "0xfba8e4"
+                        "0xfba9e4"
                       ],
                       "store": null,
-                      "used": 16492772
+                      "used": 16493028
                     },
                     "pc": 20,
                     "sub": null
                   },
                   {
-                    "cost": 16235084,
+                    "cost": 16235336,
                     "ex": {
                       "mem": {
                         "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -525,7 +525,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16491294
+                      "used": 16491550
                     },
                     "pc": 21,
                     "sub": {
@@ -539,7 +539,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234381
+                            "used": 16234633
                           },
                           "pc": 0,
                           "sub": null
@@ -552,7 +552,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234378
+                            "used": 16234630
                           },
                           "pc": 2,
                           "sub": null
@@ -565,7 +565,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234375
+                            "used": 16234627
                           },
                           "pc": 4,
                           "sub": null
@@ -578,7 +578,7 @@
                               "0x40"
                             ],
                             "store": null,
-                            "used": 16234373
+                            "used": 16234625
                           },
                           "pc": 6,
                           "sub": null
@@ -591,7 +591,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234370
+                            "used": 16234622
                           },
                           "pc": 7,
                           "sub": null
@@ -605,7 +605,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234367
+                            "used": 16234619
                           },
                           "pc": 8,
                           "sub": null
@@ -618,7 +618,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234364
+                            "used": 16234616
                           },
                           "pc": 9,
                           "sub": null
@@ -631,7 +631,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234361
+                            "used": 16234613
                           },
                           "pc": 11,
                           "sub": null
@@ -645,7 +645,7 @@
                             },
                             "push": [],
                             "store": null,
-                            "used": 16234352
+                            "used": 16234604
                           },
                           "pc": 13,
                           "sub": null
@@ -658,7 +658,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234349
+                            "used": 16234601
                           },
                           "pc": 14,
                           "sub": null
@@ -671,7 +671,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234347
+                            "used": 16234599
                           },
                           "pc": 16,
                           "sub": null
@@ -684,7 +684,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234344
+                            "used": 16234596
                           },
                           "pc": 17,
                           "sub": null
@@ -697,7 +697,7 @@
                               "0x30000000000000000000000000000000000000"
                             ],
                             "store": null,
-                            "used": 16234341
+                            "used": 16234593
                           },
                           "pc": 19,
                           "sub": null
@@ -707,16 +707,16 @@
                           "ex": {
                             "mem": null,
                             "push": [
-                              "0xf7b763"
+                              "0xf7b85f"
                             ],
                             "store": null,
-                            "used": 16234339
+                            "used": 16234591
                           },
                           "pc": 20,
                           "sub": null
                         },
                         {
-                          "cost": 15980689,
+                          "cost": 15980937,
                           "ex": {
                             "mem": {
                               "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -726,7 +726,7 @@
                               "0x1"
                             ],
                             "store": null,
-                            "used": 16233612
+                            "used": 16233864
                           },
                           "pc": 21,
                           "sub": {
@@ -740,7 +740,7 @@
                                     "0x0"
                                   ],
                                   "store": null,
-                                  "used": 15979986
+                                  "used": 15980234
                                 },
                                 "pc": 0,
                                 "sub": null
@@ -753,7 +753,7 @@
                                     "0xf000000000000000000000000000000000000000000000000000000000000001"
                                   ],
                                   "store": null,
-                                  "used": 15979983
+                                  "used": 15980231
                                 },
                                 "pc": 2,
                                 "sub": null
@@ -766,7 +766,7 @@
                                     "0x1"
                                   ],
                                   "store": null,
-                                  "used": 15979980
+                                  "used": 15980228
                                 },
                                 "pc": 3,
                                 "sub": null
@@ -779,7 +779,7 @@
                                     "0xf000000000000000000000000000000000000000000000000000000000000002"
                                   ],
                                   "store": null,
-                                  "used": 15979977
+                                  "used": 15980225
                                 },
                                 "pc": 5,
                                 "sub": null
@@ -792,7 +792,7 @@
                                     "0x0"
                                   ],
                                   "store": null,
-                                  "used": 15979974
+                                  "used": 15980222
                                 },
                                 "pc": 6,
                                 "sub": null
@@ -806,7 +806,7 @@
                                   },
                                   "push": [],
                                   "store": null,
-                                  "used": 15979968
+                                  "used": 15980216
                                 },
                                 "pc": 8,
                                 "sub": null
@@ -819,7 +819,7 @@
                                     "0x20"
                                   ],
                                   "store": null,
-                                  "used": 15979965
+                                  "used": 15980213
                                 },
                                 "pc": 9,
                                 "sub": null
@@ -832,7 +832,7 @@
                                     "0x0"
                                   ],
                                   "store": null,
-                                  "used": 15979962
+                                  "used": 15980210
                                 },
                                 "pc": 11,
                                 "sub": null
@@ -843,7 +843,7 @@
                                   "mem": null,
                                   "push": [],
                                   "store": null,
-                                  "used": 15979962
+                                  "used": 15980210
                                 },
                                 "pc": 13,
                                 "sub": null
@@ -859,7 +859,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16233609
+                            "used": 16233861
                           },
                           "pc": 22,
                           "sub": null
@@ -872,7 +872,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16233606
+                            "used": 16233858
                           },
                           "pc": 24,
                           "sub": null
@@ -883,7 +883,7 @@
                             "mem": null,
                             "push": [],
                             "store": null,
-                            "used": 16233606
+                            "used": 16233858
                           },
                           "pc": 26,
                           "sub": null
@@ -899,7 +899,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16491291
+                      "used": 16491547
                     },
                     "pc": 22,
                     "sub": null
@@ -912,7 +912,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16491288
+                      "used": 16491544
                     },
                     "pc": 24,
                     "sub": null
@@ -923,7 +923,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16491288
+                      "used": 16491544
                     },
                     "pc": 26,
                     "sub": null
@@ -939,7 +939,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16753075
+                "used": 16753335
               },
               "pc": 22,
               "sub": null
@@ -952,7 +952,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16753072
+                "used": 16753332
               },
               "pc": 24,
               "sub": null
@@ -963,7 +963,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16753072
+                "used": 16753332
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xA.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xA.json
index 2afcaec2a2..86ae74cd66 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xA.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xA.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xf9ccd8a1c90513fb",
-                "to": "0xf9ccd8a1c9562209"
+                "from": "0xf9ccd8a1c928e201",
+                "to": "0xf9ccd8a1c9795e6b"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffd8b008c",
-                "to": "0xffffffffffffffffffffffffffffffffffd39f27e"
+                "from": "0xffffffffffffffffffffffffffffffffffd95e264",
+                "to": "0xffffffffffffffffffffffffffffffffffd4565fa"
               }
             },
             "code": "=",
@@ -51,7 +51,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffac2a",
+              "gas": "0xffacc6",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0050000000000000000000000000000000000000",
               "value": "0x0"
@@ -68,7 +68,7 @@
             "action": {
               "callType": "callcode",
               "from": "0x0050000000000000000000000000000000000000",
-              "gas": "0xfbaa9c",
+              "gas": "0xfbab36",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
@@ -96,7 +96,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755751
+                "used": 16755907
               },
               "pc": 0,
               "sub": null
@@ -109,7 +109,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755748
+                "used": 16755904
               },
               "pc": 2,
               "sub": null
@@ -122,7 +122,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755745
+                "used": 16755901
               },
               "pc": 4,
               "sub": null
@@ -135,7 +135,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16755743
+                "used": 16755899
               },
               "pc": 6,
               "sub": null
@@ -148,7 +148,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755740
+                "used": 16755896
               },
               "pc": 7,
               "sub": null
@@ -162,7 +162,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755737
+                "used": 16755893
               },
               "pc": 8,
               "sub": null
@@ -175,7 +175,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755734
+                "used": 16755890
               },
               "pc": 9,
               "sub": null
@@ -188,7 +188,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755731
+                "used": 16755887
               },
               "pc": 11,
               "sub": null
@@ -202,7 +202,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755722
+                "used": 16755878
               },
               "pc": 13,
               "sub": null
@@ -215,7 +215,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755719
+                "used": 16755875
               },
               "pc": 14,
               "sub": null
@@ -228,7 +228,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755717
+                "used": 16755873
               },
               "pc": 16,
               "sub": null
@@ -241,7 +241,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755714
+                "used": 16755870
               },
               "pc": 17,
               "sub": null
@@ -254,7 +254,7 @@
                   "0x30000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755711
+                "used": 16755867
               },
               "pc": 19,
               "sub": null
@@ -264,16 +264,16 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffabfd"
+                  "0xffac99"
                 ],
                 "store": null,
-                "used": 16755709
+                "used": 16755865
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493912,
+              "cost": 16494066,
               "ex": {
                 "mem": {
                   "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -283,7 +283,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16754982
+                "used": 16755138
               },
               "pc": 21,
               "sub": {
@@ -297,7 +297,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493209
+                      "used": 16493363
                     },
                     "pc": 0,
                     "sub": null
@@ -310,7 +310,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000001"
                       ],
                       "store": null,
-                      "used": 16493206
+                      "used": 16493360
                     },
                     "pc": 2,
                     "sub": null
@@ -323,7 +323,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493203
+                      "used": 16493357
                     },
                     "pc": 3,
                     "sub": null
@@ -336,7 +336,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000002"
                       ],
                       "store": null,
-                      "used": 16493200
+                      "used": 16493354
                     },
                     "pc": 5,
                     "sub": null
@@ -349,7 +349,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493197
+                      "used": 16493351
                     },
                     "pc": 6,
                     "sub": null
@@ -363,7 +363,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16493191
+                      "used": 16493345
                     },
                     "pc": 8,
                     "sub": null
@@ -376,7 +376,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16493188
+                      "used": 16493342
                     },
                     "pc": 9,
                     "sub": null
@@ -389,7 +389,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 11,
                     "sub": null
@@ -400,7 +400,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 13,
                     "sub": null
@@ -416,7 +416,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16754979
+                "used": 16755135
               },
               "pc": 22,
               "sub": null
@@ -429,7 +429,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 24,
               "sub": null
@@ -440,7 +440,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xB.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xB.json
index b26ec56c72..b29e7b46b9 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xB.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xB.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x1158e4609181e2209",
-                "to": "0x1158e4609186f3017"
+                "from": "0x1158e460918415e6b",
+                "to": "0x1158e46091891dad5"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffd39f27e",
-                "to": "0xffffffffffffffffffffffffffffffffffce8e470"
+                "from": "0xffffffffffffffffffffffffffffffffffd4565fa",
+                "to": "0xffffffffffffffffffffffffffffffffffcf4e990"
               }
             },
             "code": "=",
@@ -51,7 +51,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffac2a",
+              "gas": "0xffacc6",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0060000000000000000000000000000000000000",
               "value": "0x0"
@@ -68,7 +68,7 @@
             "action": {
               "callType": "delegatecall",
               "from": "0x0060000000000000000000000000000000000000",
-              "gas": "0xfbaa9c",
+              "gas": "0xfbab36",
               "input": "0x",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
@@ -96,7 +96,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755751
+                "used": 16755907
               },
               "pc": 0,
               "sub": null
@@ -109,7 +109,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755748
+                "used": 16755904
               },
               "pc": 2,
               "sub": null
@@ -122,7 +122,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755745
+                "used": 16755901
               },
               "pc": 4,
               "sub": null
@@ -135,7 +135,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16755743
+                "used": 16755899
               },
               "pc": 6,
               "sub": null
@@ -148,7 +148,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755740
+                "used": 16755896
               },
               "pc": 7,
               "sub": null
@@ -162,7 +162,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755737
+                "used": 16755893
               },
               "pc": 8,
               "sub": null
@@ -175,7 +175,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755734
+                "used": 16755890
               },
               "pc": 9,
               "sub": null
@@ -188,7 +188,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755731
+                "used": 16755887
               },
               "pc": 11,
               "sub": null
@@ -202,7 +202,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755722
+                "used": 16755878
               },
               "pc": 13,
               "sub": null
@@ -215,7 +215,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755719
+                "used": 16755875
               },
               "pc": 14,
               "sub": null
@@ -228,7 +228,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755717
+                "used": 16755873
               },
               "pc": 16,
               "sub": null
@@ -241,7 +241,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755714
+                "used": 16755870
               },
               "pc": 17,
               "sub": null
@@ -254,7 +254,7 @@
                   "0x30000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755711
+                "used": 16755867
               },
               "pc": 19,
               "sub": null
@@ -264,23 +264,23 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffabfd"
+                  "0xffac99"
                 ],
                 "store": null,
-                "used": 16755709
+                "used": 16755865
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493912,
+              "cost": 16494066,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x1"
                 ],
                 "store": null,
-                "used": 16754982
+                "used": 16755138
               },
               "pc": 21,
               "sub": {
@@ -294,7 +294,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493209
+                      "used": 16493363
                     },
                     "pc": 0,
                     "sub": null
@@ -307,7 +307,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493206
+                      "used": 16493360
                     },
                     "pc": 2,
                     "sub": null
@@ -320,7 +320,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493203
+                      "used": 16493357
                     },
                     "pc": 3,
                     "sub": null
@@ -333,7 +333,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493200
+                      "used": 16493354
                     },
                     "pc": 5,
                     "sub": null
@@ -346,7 +346,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493197
+                      "used": 16493351
                     },
                     "pc": 6,
                     "sub": null
@@ -360,7 +360,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16493191
+                      "used": 16493345
                     },
                     "pc": 8,
                     "sub": null
@@ -373,7 +373,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16493188
+                      "used": 16493342
                     },
                     "pc": 9,
                     "sub": null
@@ -386,7 +386,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 11,
                     "sub": null
@@ -397,7 +397,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 13,
                     "sub": null
@@ -413,7 +413,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16754979
+                "used": 16755135
               },
               "pc": 22,
               "sub": null
@@ -426,7 +426,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 24,
               "sub": null
@@ -437,7 +437,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xC.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xC.json
index 32f7e284e3..6b3631a799 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xC.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xC.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x1314fb37067373017",
-                "to": "0x1314fb3706783e191"
+                "from": "0x1314fb3706759dad5",
+                "to": "0x1314fb37067a68c4f"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffce8e470",
-                "to": "0xffffffffffffffffffffffffffffffffffc9c32f6"
+                "from": "0xffffffffffffffffffffffffffffffffffcf4e990",
+                "to": "0xffffffffffffffffffffffffffffffffffca83816"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xD.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xD.json
index 2d7fed9292..282e1627ba 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xD.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xD.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x14d1120d7b64be191",
-                "to": "0x14d1120d8a54bd47f"
+                "from": "0x14d1120d7b66e8c4f",
+                "to": "0x14d1120d8a56e7f3d"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffc9c32f6",
-                "to": "0xfffffffffffffffffffffffffffffffff0d9c4008"
+                "from": "0xffffffffffffffffffffffffffffffffffca83816",
+                "to": "0xfffffffffffffffffffffffffffffffff0da84528"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xE.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xE.json
index 0eea3f0733..c426eae37a 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xE.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xE.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x168d28e3ff413d47f",
-                "to": "0x168d28e3ff4aa3091"
+                "from": "0x168d28e3ff4367f3d",
+                "to": "0x168d28e3ff4cf0b77"
               }
             },
             "code": "=",
@@ -45,8 +45,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0d9c4008",
-                "to": "0xfffffffffffffffffffffffffffffffff0d05e3f6"
+                "from": "0xfffffffffffffffffffffffffffffffff0da84528",
+                "to": "0xfffffffffffffffffffffffffffffffff0d0fb8ee"
               }
             },
             "code": "=",
@@ -70,7 +70,7 @@
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x4f06",
+              "gasUsed": "0x515e",
               "output": "0x01"
             },
             "subtraces": 0,
@@ -96,14 +96,14 @@
               "sub": null
             },
             {
-              "cost": 200,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755999
+                "used": 16755399
               },
               "pc": 2,
               "sub": null
@@ -116,7 +116,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755996
+                "used": 16755396
               },
               "pc": 3,
               "sub": null
@@ -129,7 +129,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755993
+                "used": 16755393
               },
               "pc": 5,
               "sub": null
@@ -143,7 +143,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755990
+                "used": 16755390
               },
               "pc": 6,
               "sub": null
@@ -156,7 +156,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755987
+                "used": 16755387
               },
               "pc": 7,
               "sub": null
@@ -170,7 +170,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755981
+                "used": 16755381
               },
               "pc": 9,
               "sub": null
@@ -183,7 +183,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755978
+                "used": 16755378
               },
               "pc": 10,
               "sub": null
@@ -197,7 +197,7 @@
                   "key": "0x0",
                   "val": "0x1"
                 },
-                "used": 16735978
+                "used": 16735378
               },
               "pc": 12,
               "sub": null
@@ -210,7 +210,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16735975
+                "used": 16735375
               },
               "pc": 13,
               "sub": null
@@ -223,7 +223,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16735972
+                "used": 16735372
               },
               "pc": 15,
               "sub": null
@@ -234,7 +234,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16735972
+                "used": 16735372
               },
               "pc": 17,
               "sub": null
@@ -248,8 +248,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x168d28e3ff4aa3091",
-                "to": "0x168d28e3ff509d8bb"
+                "from": "0x168d28e3ff4cf0b77",
+                "to": "0x168d28e3ff530e3c9"
               }
             },
             "code": "=",
@@ -272,8 +272,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0d05e3f6",
-                "to": "0xfffffffffffffffffffffffffffffffff0ca63bcc"
+                "from": "0xfffffffffffffffffffffffffffffffff0d0fb8ee",
+                "to": "0xfffffffffffffffffffffffffffffffff0cade09c"
               }
             },
             "code": "=",
@@ -297,7 +297,7 @@
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x146e",
+              "gasUsed": "0x16c6",
               "output": "0x02"
             },
             "subtraces": 0,
@@ -323,14 +323,14 @@
               "sub": null
             },
             {
-              "cost": 200,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755999
+                "used": 16755399
               },
               "pc": 2,
               "sub": null
@@ -343,7 +343,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755996
+                "used": 16755396
               },
               "pc": 3,
               "sub": null
@@ -356,7 +356,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16755993
+                "used": 16755393
               },
               "pc": 5,
               "sub": null
@@ -370,7 +370,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16755990
+                "used": 16755390
               },
               "pc": 6,
               "sub": null
@@ -383,7 +383,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755987
+                "used": 16755387
               },
               "pc": 7,
               "sub": null
@@ -397,7 +397,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755981
+                "used": 16755381
               },
               "pc": 9,
               "sub": null
@@ -410,7 +410,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755978
+                "used": 16755378
               },
               "pc": 10,
               "sub": null
@@ -424,7 +424,7 @@
                   "key": "0x0",
                   "val": "0x2"
                 },
-                "used": 16750978
+                "used": 16750378
               },
               "pc": 12,
               "sub": null
@@ -437,7 +437,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16750975
+                "used": 16750375
               },
               "pc": 13,
               "sub": null
@@ -450,7 +450,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 15,
               "sub": null
@@ -461,7 +461,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 17,
               "sub": null
@@ -475,8 +475,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x168d28e3ff509d8bb",
-                "to": "0x168d28e3ff56980e5"
+                "from": "0x168d28e3ff530e3c9",
+                "to": "0x168d28e3ff592bc1b"
               }
             },
             "code": "=",
@@ -499,8 +499,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0ca63bcc",
-                "to": "0xfffffffffffffffffffffffffffffffff0c4693a2"
+                "from": "0xfffffffffffffffffffffffffffffffff0cade09c",
+                "to": "0xfffffffffffffffffffffffffffffffff0c4c084a"
               }
             },
             "code": "=",
@@ -524,7 +524,7 @@
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x146e",
+              "gasUsed": "0x16c6",
               "output": "0x03"
             },
             "subtraces": 0,
@@ -550,14 +550,14 @@
               "sub": null
             },
             {
-              "cost": 200,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x2"
                 ],
                 "store": null,
-                "used": 16755999
+                "used": 16755399
               },
               "pc": 2,
               "sub": null
@@ -570,7 +570,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755996
+                "used": 16755396
               },
               "pc": 3,
               "sub": null
@@ -583,7 +583,7 @@
                   "0x3"
                 ],
                 "store": null,
-                "used": 16755993
+                "used": 16755393
               },
               "pc": 5,
               "sub": null
@@ -597,7 +597,7 @@
                   "0x3"
                 ],
                 "store": null,
-                "used": 16755990
+                "used": 16755390
               },
               "pc": 6,
               "sub": null
@@ -610,7 +610,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755987
+                "used": 16755387
               },
               "pc": 7,
               "sub": null
@@ -624,7 +624,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755981
+                "used": 16755381
               },
               "pc": 9,
               "sub": null
@@ -637,7 +637,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755978
+                "used": 16755378
               },
               "pc": 10,
               "sub": null
@@ -651,7 +651,7 @@
                   "key": "0x0",
                   "val": "0x3"
                 },
-                "used": 16750978
+                "used": 16750378
               },
               "pc": 12,
               "sub": null
@@ -664,7 +664,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16750975
+                "used": 16750375
               },
               "pc": 13,
               "sub": null
@@ -677,7 +677,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 15,
               "sub": null
@@ -688,7 +688,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 17,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xF.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xF.json
index 85d3273c47..b84c7871ae 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xF.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/all/trace_replayBlockTransactions_all_0xF.json
@@ -21,8 +21,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x18493fba7443180e5",
-                "to": "0x18493fba74480eda2"
+                "from": "0x18493fba7445abc1b",
+                "to": "0x18493fba744aa28d8"
               }
             },
             "code": "=",
@@ -32,8 +32,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0c4693a2",
-                "to": "0xfffffffffffffffffffffffffffffffff0bf726e5"
+                "from": "0xfffffffffffffffffffffffffffffffff0c4c084a",
+                "to": "0xfffffffffffffffffffffffffffffffff0bfc9b8d"
               }
             },
             "code": "=",
@@ -168,8 +168,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x18493fba74480eda2",
-                "to": "0x18493fba744d1bb45"
+                "from": "0x18493fba744aa28d8",
+                "to": "0x18493fba744faf67b"
               }
             },
             "code": "=",
@@ -179,8 +179,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0bf726e5",
-                "to": "0xfffffffffffffffffffffffffffffffff0ba65942"
+                "from": "0xfffffffffffffffffffffffffffffffff0bfc9b8d",
+                "to": "0xfffffffffffffffffffffffffffffffff0babcdea"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x3.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x3.json
index 5c57ee6fcb..1964ba9820 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x3.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x3.json
@@ -20,7 +20,7 @@
           {
             "action": {
               "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
-              "gas": "0xff2d6a",
+              "gas": "0xff300e",
               "init": "0x6004600c60003960046000f3600035ff",
               "value": "0x0"
             },
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x4.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x4.json
index 459a3afc2c..ab702c84a8 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x4.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x4.json
@@ -21,7 +21,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffaaea",
+              "gas": "0xffabba",
               "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002",
               "to": "0x0010000000000000000000000000000000000000",
               "value": "0x0"
@@ -46,7 +46,7 @@
             "action": {
               "callType": "call",
               "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
-              "gas": "0xffaaea",
+              "gas": "0xffabba",
               "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004",
               "to": "0x0010000000000000000000000000000000000000",
               "value": "0x0"
@@ -62,6 +62,31 @@
         ],
         "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
         "vmTrace": null
+      },
+      {
+        "output": "0x",
+        "stateDiff": null,
+        "trace": [
+          {
+            "action": {
+              "callType": "call",
+              "from": "0x627306090abab3a6e1400e9345bc60c78a8bef57",
+              "gas": "0xffabc6",
+              "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000",
+              "to": "0x0010000000000000000000000000000000000000",
+              "value": "0x0"
+            },
+            "result": {
+              "gasUsed": "0x16c0",
+              "output": "0x"
+            },
+            "subtraces": 0,
+            "traceAddress": [],
+            "type": "call"
+          }
+        ],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "vmTrace": null
       }
     ],
     "id": 415
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x5.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x5.json
index 89967f6f4b..2bb3e5f803 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x5.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x5.json
@@ -21,13 +21,13 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffab6a",
+              "gas": "0xffabd2",
               "input": "0x0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000",
               "to": "0x0010000000000000000000000000000000000000",
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x2728",
+              "gasUsed": "0x16c0",
               "output": "0x"
             },
             "subtraces": 0,
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x6.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x6.json
index 487b455ad1..c48ded5bb9 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x6.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x6.json
@@ -21,7 +21,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffad1a",
+              "gas": "0xffad82",
               "input": "0x0000000000000000000000000000000000000999",
               "to": "0x0020000000000000000000000000000000000000",
               "value": "0x0"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x7.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x7.json
index e62f98fd22..f34fcd589d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x7.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x7.json
@@ -21,7 +21,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffacea",
+              "gas": "0xffad52",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x8.json
index 9d78cf2fd3..e617403cd2 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x8.json
@@ -21,7 +21,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffac2a",
+              "gas": "0xffacc6",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -38,7 +38,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xfbaa9c",
+              "gas": "0xfbab36",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x9.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x9.json
index 36aadcfdcb..0116db9b9d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x9.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0x9.json
@@ -21,7 +21,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffaaaa",
+              "gas": "0xffabae",
               "input": "0x000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -38,7 +38,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xfba917",
+              "gas": "0xfbaa17",
               "input": "0x00000000000000000000000000400000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -57,7 +57,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xf7b790",
+              "gas": "0xf7b88c",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0040000000000000000000000000000000000000",
               "value": "0x0"
@@ -77,7 +77,7 @@
             "action": {
               "callType": "call",
               "from": "0x0040000000000000000000000000000000000000",
-              "gas": "0xf3d5d5",
+              "gas": "0xf3d6cd",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xA.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xA.json
index d99697e8b3..58ad754736 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xA.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xA.json
@@ -21,7 +21,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffac2a",
+              "gas": "0xffacc6",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0050000000000000000000000000000000000000",
               "value": "0x0"
@@ -38,7 +38,7 @@
             "action": {
               "callType": "callcode",
               "from": "0x0050000000000000000000000000000000000000",
-              "gas": "0xfbaa9c",
+              "gas": "0xfbab36",
               "input": "0xf000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xB.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xB.json
index 5856a2f7c6..2d2fa4ba21 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xB.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xB.json
@@ -21,7 +21,7 @@
             "action": {
               "callType": "call",
               "from": "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73",
-              "gas": "0xffac2a",
+              "gas": "0xffacc6",
               "input": "0x0000000000000000000000000030000000000000000000000000000000000000f000000000000000000000000000000000000000000000000000000000000001",
               "to": "0x0060000000000000000000000000000000000000",
               "value": "0x0"
@@ -38,7 +38,7 @@
             "action": {
               "callType": "delegatecall",
               "from": "0x0060000000000000000000000000000000000000",
-              "gas": "0xfbaa9c",
+              "gas": "0xfbab36",
               "input": "0x",
               "to": "0x0030000000000000000000000000000000000000",
               "value": "0x0"
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xE.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xE.json
index db551585e5..96792e0dbd 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xE.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/flat/trace_replayBlockTransactions_traceOnly_0xE.json
@@ -27,7 +27,7 @@
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x4f06",
+              "gasUsed": "0x515e",
               "output": "0x01"
             },
             "subtraces": 0,
@@ -52,7 +52,7 @@
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x146e",
+              "gasUsed": "0x16c6",
               "output": "0x02"
             },
             "subtraces": 0,
@@ -77,7 +77,7 @@
               "value": "0x0"
             },
             "result": {
-              "gasUsed": "0x146e",
+              "gasUsed": "0x16c6",
               "output": "0x03"
             },
             "subtraces": 0,
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x3.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x3.json
index 20e23969ec..05a149d9f3 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x3.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x3.json
@@ -20,7 +20,7 @@
             "balance": {
               "*": {
                 "from": "0x3782dace9ddc9578",
-                "to": "0x3782dace9ea423b8"
+                "to": "0x3782dace9ea1ac9c"
               }
             },
             "code": "=",
@@ -31,7 +31,7 @@
             "balance": {
               "*": {
                 "from": "0xeffffffffffffffffb36a87",
-                "to": "0xefffffffffffffffeebdc47"
+                "to": "0xefffffffffffffffeee5363"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x4.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x4.json
index 77e12bfde6..631d2fe879 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x4.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x4.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x53444835ed6c23b8",
-                "to": "0x53444835ee4d7c58"
+                "from": "0x53444835ed69ac9c",
+                "to": "0x53444835ee4a430c"
               }
             },
             "code": "=",
@@ -50,7 +50,7 @@
             "balance": {
               "*": {
                 "from": "0xfffffffffffffffffffffffffffffffffffffffff",
-                "to": "0xfffffffffffffffffffffffffffffffffff1ea75f"
+                "to": "0xfffffffffffffffffffffffffffffffffff1f698f"
               }
             },
             "code": "=",
@@ -73,8 +73,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x53444835ee4d7c58",
-                "to": "0x53444835eec16d28"
+                "from": "0x53444835ee4a430c",
+                "to": "0x53444835eebd71ac"
               }
             },
             "code": "=",
@@ -103,8 +103,8 @@
           "0x627306090abab3a6e1400e9345bc60c78a8bef57": {
             "balance": {
               "*": {
-                "from": "0xefffffffffffffffeebdc47",
-                "to": "0xefffffffffffffffe77eb77"
+                "from": "0xefffffffffffffffeee5363",
+                "to": "0xefffffffffffffffe7b24c3"
               }
             },
             "code": "=",
@@ -120,6 +120,54 @@
         "trace": [],
         "transactionHash": "0xf882ec206292910527fd7095e59a1ca027b873296f1eba3886aa1addc4ff0ab9",
         "vmTrace": null
+      },
+      {
+        "output": "0x",
+        "stateDiff": {
+          "0x0000000000000000000000000000000000000000": {
+            "balance": {
+              "*": {
+                "from": "0x53444835eebd71ac",
+                "to": "0x53444835eeef5ad6"
+              }
+            },
+            "code": "=",
+            "nonce": "=",
+            "storage": {}
+          },
+          "0x0010000000000000000000000000000000000000": {
+            "balance": "=",
+            "code": "=",
+            "nonce": "=",
+            "storage": {
+              "0x0000000000000000000000000000000000000000000000000000000000000001": {
+                "*": {
+                  "from": "0x0000000000000000000000000000000000000000000000000000000000000003",
+                  "to": "0x0000000000000000000000000000000000000000000000000000000000000000"
+                }
+              }
+            }
+          },
+          "0x627306090abab3a6e1400e9345bc60c78a8bef57": {
+            "balance": {
+              "*": {
+                "from": "0xefffffffffffffffe7b24c3",
+                "to": "0xefffffffffffffffe493b99"
+              }
+            },
+            "code": "=",
+            "nonce": {
+              "*": {
+                "from": "0x3",
+                "to": "0x4"
+              }
+            },
+            "storage": {}
+          }
+        },
+        "trace": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "vmTrace": null
       }
     ],
     "id": 415
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x5.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x5.json
index 31cc9ceda7..550978f5e9 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x5.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x5.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x6f05b59d3d896d28",
-                "to": "0x6f05b59d3dc329d0"
+                "from": "0x6f05b59d3db75ad6",
+                "to": "0x6f05b59d3de93e66"
               }
             },
             "code": "=",
@@ -32,12 +32,6 @@
             "code": "=",
             "nonce": "=",
             "storage": {
-              "0x0000000000000000000000000000000000000000000000000000000000000001": {
-                "*": {
-                  "from": "0x0000000000000000000000000000000000000000000000000000000000000003",
-                  "to": "0x0000000000000000000000000000000000000000000000000000000000000000"
-                }
-              },
               "0x0000000000000000000000000000000000000000000000000000000000000002": {
                 "*": {
                   "from": "0x0000000000000000000000000000000000000000000000000000000000000004",
@@ -49,8 +43,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffffff1ea75f",
-                "to": "0xffffffffffffffffffffffffffffffffffee4eab7"
+                "from": "0xfffffffffffffffffffffffffffffffffff1f698f",
+                "to": "0xffffffffffffffffffffffffffffffffffeed85ff"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x6.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x6.json
index 40944f6baf..6daf2d3c77 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x6.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x6.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x8ac723048c8b29d0",
-                "to": "0x8ac723048cee68a2"
+                "from": "0x8ac723048cb13e66",
+                "to": "0x8ac723048d141c20"
               }
             },
             "code": "=",
@@ -54,8 +54,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffee4eab7",
-                "to": "0xffffffffffffffffffffffffffffffffffe81abe5"
+                "from": "0xffffffffffffffffffffffffffffffffffeed85ff",
+                "to": "0xffffffffffffffffffffffffffffffffffe8aa845"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x7.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x7.json
index 188ea40cbe..2621db37a1 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x7.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x7.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xa688906bdbb668a2",
-                "to": "0xa688906bdc04064f"
+                "from": "0xa688906bdbdc1c20",
+                "to": "0xa688906bdc2958b5"
               }
             },
             "code": "=",
@@ -30,8 +30,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffe81abe5",
-                "to": "0xffffffffffffffffffffffffffffffffffe340e38"
+                "from": "0xffffffffffffffffffffffffffffffffffe8aa845",
+                "to": "0xffffffffffffffffffffffffffffffffffe3d6bb0"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x8.json
index d663073a89..67addfbb08 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x8.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xc249fdd32acc064f",
-                "to": "0xc249fdd32b1d145d"
+                "from": "0xc249fdd32af158b5",
+                "to": "0xc249fdd32b41d51f"
               }
             },
             "code": "=",
@@ -30,8 +30,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffe340e38",
-                "to": "0xffffffffffffffffffffffffffffffffffde3002a"
+                "from": "0xffffffffffffffffffffffffffffffffffe3d6bb0",
+                "to": "0xffffffffffffffffffffffffffffffffffdecef46"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x9.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x9.json
index 9dc18a2f78..f1b0fc0109 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x9.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0x9.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xde0b6b3a79e5145d",
-                "to": "0xde0b6b3a7a3d13fb"
+                "from": "0xde0b6b3a7a09d51f",
+                "to": "0xde0b6b3a7a60e201"
               }
             },
             "code": "=",
@@ -30,8 +30,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffde3002a",
-                "to": "0xffffffffffffffffffffffffffffffffffd8b008c"
+                "from": "0xffffffffffffffffffffffffffffffffffdecef46",
+                "to": "0xffffffffffffffffffffffffffffffffffd95e264"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xA.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xA.json
index f0164218c0..aab8b42fa2 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xA.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xA.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0xf9ccd8a1c90513fb",
-                "to": "0xf9ccd8a1c9562209"
+                "from": "0xf9ccd8a1c928e201",
+                "to": "0xf9ccd8a1c9795e6b"
               }
             },
             "code": "=",
@@ -30,8 +30,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffd8b008c",
-                "to": "0xffffffffffffffffffffffffffffffffffd39f27e"
+                "from": "0xffffffffffffffffffffffffffffffffffd95e264",
+                "to": "0xffffffffffffffffffffffffffffffffffd4565fa"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xB.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xB.json
index a991fc5503..58a2f8724b 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xB.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xB.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x1158e4609181e2209",
-                "to": "0x1158e4609186f3017"
+                "from": "0x1158e460918415e6b",
+                "to": "0x1158e46091891dad5"
               }
             },
             "code": "=",
@@ -30,8 +30,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffd39f27e",
-                "to": "0xffffffffffffffffffffffffffffffffffce8e470"
+                "from": "0xffffffffffffffffffffffffffffffffffd4565fa",
+                "to": "0xffffffffffffffffffffffffffffffffffcf4e990"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xC.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xC.json
index 506a03b955..cd39358dde 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xC.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xC.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x1314fb37067373017",
-                "to": "0x1314fb3706783e191"
+                "from": "0x1314fb3706759dad5",
+                "to": "0x1314fb37067a68c4f"
               }
             },
             "code": "=",
@@ -30,8 +30,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffce8e470",
-                "to": "0xffffffffffffffffffffffffffffffffffc9c32f6"
+                "from": "0xffffffffffffffffffffffffffffffffffcf4e990",
+                "to": "0xffffffffffffffffffffffffffffffffffca83816"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xD.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xD.json
index fcf3515f40..b12755265e 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xD.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xD.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x14d1120d7b64be191",
-                "to": "0x14d1120d8a54bd47f"
+                "from": "0x14d1120d7b66e8c4f",
+                "to": "0x14d1120d8a56e7f3d"
               }
             },
             "code": "=",
@@ -30,8 +30,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xffffffffffffffffffffffffffffffffffc9c32f6",
-                "to": "0xfffffffffffffffffffffffffffffffff0d9c4008"
+                "from": "0xffffffffffffffffffffffffffffffffffca83816",
+                "to": "0xfffffffffffffffffffffffffffffffff0da84528"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xE.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xE.json
index bd606d03fa..8e4d803f21 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xE.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/statediff/trace_replayBlockTransactions_diffOnly_0xE.json
@@ -19,8 +19,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x168d28e3ff413d47f",
-                "to": "0x168d28e3ff4aa3091"
+                "from": "0x168d28e3ff4367f3d",
+                "to": "0x168d28e3ff4cf0b77"
               }
             },
             "code": "=",
@@ -43,8 +43,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0d9c4008",
-                "to": "0xfffffffffffffffffffffffffffffffff0d05e3f6"
+                "from": "0xfffffffffffffffffffffffffffffffff0da84528",
+                "to": "0xfffffffffffffffffffffffffffffffff0d0fb8ee"
               }
             },
             "code": "=",
@@ -67,8 +67,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x168d28e3ff4aa3091",
-                "to": "0x168d28e3ff509d8bb"
+                "from": "0x168d28e3ff4cf0b77",
+                "to": "0x168d28e3ff530e3c9"
               }
             },
             "code": "=",
@@ -91,8 +91,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0d05e3f6",
-                "to": "0xfffffffffffffffffffffffffffffffff0ca63bcc"
+                "from": "0xfffffffffffffffffffffffffffffffff0d0fb8ee",
+                "to": "0xfffffffffffffffffffffffffffffffff0cade09c"
               }
             },
             "code": "=",
@@ -115,8 +115,8 @@
           "0x0000000000000000000000000000000000000000": {
             "balance": {
               "*": {
-                "from": "0x168d28e3ff509d8bb",
-                "to": "0x168d28e3ff56980e5"
+                "from": "0x168d28e3ff530e3c9",
+                "to": "0x168d28e3ff592bc1b"
               }
             },
             "code": "=",
@@ -139,8 +139,8 @@
           "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73": {
             "balance": {
               "*": {
-                "from": "0xfffffffffffffffffffffffffffffffff0ca63bcc",
-                "to": "0xfffffffffffffffffffffffffffffffff0c4693a2"
+                "from": "0xfffffffffffffffffffffffffffffffff0cade09c",
+                "to": "0xfffffffffffffffffffffffffffffffff0c4c084a"
               }
             },
             "code": "=",
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x3.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x3.json
index 96cb3b8d6e..f242c9e88d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x3.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x3.json
@@ -29,7 +29,7 @@
                   "0x4"
                 ],
                 "store": null,
-                "used": 16723303
+                "used": 16723979
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0xc"
                 ],
                 "store": null,
-                "used": 16723300
+                "used": 16723976
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16723297
+                "used": 16723973
               },
               "pc": 4,
               "sub": null
@@ -69,7 +69,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16723288
+                "used": 16723964
               },
               "pc": 6,
               "sub": null
@@ -82,7 +82,7 @@
                   "0x4"
                 ],
                 "store": null,
-                "used": 16723285
+                "used": 16723961
               },
               "pc": 7,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16723282
+                "used": 16723958
               },
               "pc": 9,
               "sub": null
@@ -106,7 +106,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16723282
+                "used": 16723958
               },
               "pc": 11,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x4.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x4.json
index a833a7d92c..38cc829bd0 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x4.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x4.json
@@ -29,7 +29,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755431
+                "used": 16755639
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755428
+                "used": 16755636
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755425
+                "used": 16755633
               },
               "pc": 3,
               "sub": null
@@ -68,7 +68,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755422
+                "used": 16755630
               },
               "pc": 5,
               "sub": null
@@ -82,7 +82,7 @@
                   "key": "0x1",
                   "val": "0x1"
                 },
-                "used": 16735422
+                "used": 16735630
               },
               "pc": 6,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16735419
+                "used": 16735627
               },
               "pc": 7,
               "sub": null
@@ -108,7 +108,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16735416
+                "used": 16735624
               },
               "pc": 9,
               "sub": null
@@ -121,7 +121,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16735413
+                "used": 16735621
               },
               "pc": 10,
               "sub": null
@@ -134,7 +134,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16735410
+                "used": 16735618
               },
               "pc": 12,
               "sub": null
@@ -148,7 +148,7 @@
                   "key": "0x2",
                   "val": "0x2"
                 },
-                "used": 16715410
+                "used": 16715618
               },
               "pc": 13,
               "sub": null
@@ -172,7 +172,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755431
+                "used": 16755639
               },
               "pc": 0,
               "sub": null
@@ -185,7 +185,7 @@
                   "0x3"
                 ],
                 "store": null,
-                "used": 16755428
+                "used": 16755636
               },
               "pc": 2,
               "sub": null
@@ -198,7 +198,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755425
+                "used": 16755633
               },
               "pc": 3,
               "sub": null
@@ -211,7 +211,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755422
+                "used": 16755630
               },
               "pc": 5,
               "sub": null
@@ -225,7 +225,7 @@
                   "key": "0x1",
                   "val": "0x3"
                 },
-                "used": 16750422
+                "used": 16750630
               },
               "pc": 6,
               "sub": null
@@ -238,7 +238,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16750419
+                "used": 16750627
               },
               "pc": 7,
               "sub": null
@@ -251,7 +251,7 @@
                   "0x4"
                 ],
                 "store": null,
-                "used": 16750416
+                "used": 16750624
               },
               "pc": 9,
               "sub": null
@@ -264,7 +264,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16750413
+                "used": 16750621
               },
               "pc": 10,
               "sub": null
@@ -277,7 +277,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16750410
+                "used": 16750618
               },
               "pc": 12,
               "sub": null
@@ -291,7 +291,150 @@
                   "key": "0x2",
                   "val": "0x4"
                 },
-                "used": 16745410
+                "used": 16745618
+              },
+              "pc": 13,
+              "sub": null
+            }
+          ]
+        }
+      },
+      {
+        "output": "0x",
+        "stateDiff": null,
+        "trace": [],
+        "transactionHash": "0x7ca6bf869e8882216f7443accb8d642df41af5bfa3a0e63bf03be2cfe629a030",
+        "vmTrace": {
+          "code": "0x6020356000355560603560403555",
+          "ops": [
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x20"
+                ],
+                "store": null,
+                "used": 16755651
+              },
+              "pc": 0,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x3"
+                ],
+                "store": null,
+                "used": 16755648
+              },
+              "pc": 2,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x0"
+                ],
+                "store": null,
+                "used": 16755645
+              },
+              "pc": 3,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x1"
+                ],
+                "store": null,
+                "used": 16755642
+              },
+              "pc": 5,
+              "sub": null
+            },
+            {
+              "cost": 800,
+              "ex": {
+                "mem": null,
+                "push": [],
+                "store": {
+                  "key": "0x1",
+                  "val": "0x3"
+                },
+                "used": 16754842
+              },
+              "pc": 6,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x60"
+                ],
+                "store": null,
+                "used": 16754839
+              },
+              "pc": 7,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x0"
+                ],
+                "store": null,
+                "used": 16754836
+              },
+              "pc": 9,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x40"
+                ],
+                "store": null,
+                "used": 16754833
+              },
+              "pc": 10,
+              "sub": null
+            },
+            {
+              "cost": 3,
+              "ex": {
+                "mem": null,
+                "push": [
+                  "0x1"
+                ],
+                "store": null,
+                "used": 16754830
+              },
+              "pc": 12,
+              "sub": null
+            },
+            {
+              "cost": 5000,
+              "ex": {
+                "mem": null,
+                "push": [],
+                "store": {
+                  "key": "0x1",
+                  "val": "0x0"
+                },
+                "used": 16749830
               },
               "pc": 13,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x5.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x5.json
index cbae18dac1..2d5817ee61 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x5.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x5.json
@@ -29,7 +29,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755559
+                "used": 16755663
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755556
+                "used": 16755660
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755553
+                "used": 16755657
               },
               "pc": 3,
               "sub": null
@@ -68,13 +68,13 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755550
+                "used": 16755654
               },
               "pc": 5,
               "sub": null
             },
             {
-              "cost": 5000,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [],
@@ -82,7 +82,7 @@
                   "key": "0x1",
                   "val": "0x0"
                 },
-                "used": 16750550
+                "used": 16754854
               },
               "pc": 6,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16750547
+                "used": 16754851
               },
               "pc": 7,
               "sub": null
@@ -108,7 +108,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16750544
+                "used": 16754848
               },
               "pc": 9,
               "sub": null
@@ -121,7 +121,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16750541
+                "used": 16754845
               },
               "pc": 10,
               "sub": null
@@ -134,7 +134,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16750538
+                "used": 16754842
               },
               "pc": 12,
               "sub": null
@@ -148,7 +148,7 @@
                   "key": "0x2",
                   "val": "0x0"
                 },
-                "used": 16745538
+                "used": 16749842
               },
               "pc": 13,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x6.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x6.json
index db43a0055a..ef8d937981 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x6.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x6.json
@@ -29,7 +29,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755991
+                "used": 16756095
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0x999000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755988
+                "used": 16756092
               },
               "pc": 2,
               "sub": null
@@ -53,7 +53,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16725988
+                "used": 16726092
               },
               "pc": 3,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x7.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x7.json
index d31f6d5d00..2cbbae868c 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x7.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x7.json
@@ -29,7 +29,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755943
+                "used": 16756047
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0xf000000000000000000000000000000000000000000000000000000000000001"
                 ],
                 "store": null,
-                "used": 16755940
+                "used": 16756044
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755937
+                "used": 16756041
               },
               "pc": 3,
               "sub": null
@@ -68,7 +68,7 @@
                   "0xf000000000000000000000000000000000000000000000000000000000000002"
                 ],
                 "store": null,
-                "used": 16755934
+                "used": 16756038
               },
               "pc": 5,
               "sub": null
@@ -81,7 +81,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755931
+                "used": 16756035
               },
               "pc": 6,
               "sub": null
@@ -95,7 +95,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755925
+                "used": 16756029
               },
               "pc": 8,
               "sub": null
@@ -108,7 +108,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755922
+                "used": 16756026
               },
               "pc": 9,
               "sub": null
@@ -121,7 +121,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755919
+                "used": 16756023
               },
               "pc": 11,
               "sub": null
@@ -132,7 +132,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16755919
+                "used": 16756023
               },
               "pc": 13,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x8.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x8.json
index a955ff476f..3ea2c68f33 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x8.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x8.json
@@ -29,7 +29,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755751
+                "used": 16755907
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755748
+                "used": 16755904
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755745
+                "used": 16755901
               },
               "pc": 4,
               "sub": null
@@ -68,7 +68,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16755743
+                "used": 16755899
               },
               "pc": 6,
               "sub": null
@@ -81,7 +81,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755740
+                "used": 16755896
               },
               "pc": 7,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755737
+                "used": 16755893
               },
               "pc": 8,
               "sub": null
@@ -108,7 +108,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755734
+                "used": 16755890
               },
               "pc": 9,
               "sub": null
@@ -121,7 +121,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755731
+                "used": 16755887
               },
               "pc": 11,
               "sub": null
@@ -135,7 +135,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755722
+                "used": 16755878
               },
               "pc": 13,
               "sub": null
@@ -148,7 +148,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755719
+                "used": 16755875
               },
               "pc": 14,
               "sub": null
@@ -161,7 +161,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755717
+                "used": 16755873
               },
               "pc": 16,
               "sub": null
@@ -174,7 +174,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755714
+                "used": 16755870
               },
               "pc": 17,
               "sub": null
@@ -187,7 +187,7 @@
                   "0x30000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755711
+                "used": 16755867
               },
               "pc": 19,
               "sub": null
@@ -197,16 +197,16 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffabfd"
+                  "0xffac99"
                 ],
                 "store": null,
-                "used": 16755709
+                "used": 16755865
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493912,
+              "cost": 16494066,
               "ex": {
                 "mem": {
                   "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -216,7 +216,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16754982
+                "used": 16755138
               },
               "pc": 21,
               "sub": {
@@ -230,7 +230,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493209
+                      "used": 16493363
                     },
                     "pc": 0,
                     "sub": null
@@ -243,7 +243,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000001"
                       ],
                       "store": null,
-                      "used": 16493206
+                      "used": 16493360
                     },
                     "pc": 2,
                     "sub": null
@@ -256,7 +256,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493203
+                      "used": 16493357
                     },
                     "pc": 3,
                     "sub": null
@@ -269,7 +269,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000002"
                       ],
                       "store": null,
-                      "used": 16493200
+                      "used": 16493354
                     },
                     "pc": 5,
                     "sub": null
@@ -282,7 +282,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493197
+                      "used": 16493351
                     },
                     "pc": 6,
                     "sub": null
@@ -296,7 +296,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16493191
+                      "used": 16493345
                     },
                     "pc": 8,
                     "sub": null
@@ -309,7 +309,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16493188
+                      "used": 16493342
                     },
                     "pc": 9,
                     "sub": null
@@ -322,7 +322,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 11,
                     "sub": null
@@ -333,7 +333,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 13,
                     "sub": null
@@ -349,7 +349,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16754979
+                "used": 16755135
               },
               "pc": 22,
               "sub": null
@@ -362,7 +362,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 24,
               "sub": null
@@ -373,7 +373,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x9.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x9.json
index 25559a1ce4..f1f7610951 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x9.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0x9.json
@@ -29,7 +29,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755367
+                "used": 16755627
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755364
+                "used": 16755624
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755361
+                "used": 16755621
               },
               "pc": 4,
               "sub": null
@@ -68,7 +68,7 @@
                   "0x80"
                 ],
                 "store": null,
-                "used": 16755359
+                "used": 16755619
               },
               "pc": 6,
               "sub": null
@@ -81,7 +81,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16755356
+                "used": 16755616
               },
               "pc": 7,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x60"
                 ],
                 "store": null,
-                "used": 16755353
+                "used": 16755613
               },
               "pc": 8,
               "sub": null
@@ -108,7 +108,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755350
+                "used": 16755610
               },
               "pc": 9,
               "sub": null
@@ -121,7 +121,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755347
+                "used": 16755607
               },
               "pc": 11,
               "sub": null
@@ -135,7 +135,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755326
+                "used": 16755586
               },
               "pc": 13,
               "sub": null
@@ -148,7 +148,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755323
+                "used": 16755583
               },
               "pc": 14,
               "sub": null
@@ -161,7 +161,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755321
+                "used": 16755581
               },
               "pc": 16,
               "sub": null
@@ -174,7 +174,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755318
+                "used": 16755578
               },
               "pc": 17,
               "sub": null
@@ -187,7 +187,7 @@
                   "0x40000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755315
+                "used": 16755575
               },
               "pc": 19,
               "sub": null
@@ -197,16 +197,16 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffaa71"
+                  "0xffab75"
                 ],
                 "store": null,
-                "used": 16755313
+                "used": 16755573
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493523,
+              "cost": 16493779,
               "ex": {
                 "mem": {
                   "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -216,7 +216,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16753078
+                "used": 16753338
               },
               "pc": 21,
               "sub": {
@@ -230,7 +230,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16492820
+                      "used": 16493076
                     },
                     "pc": 0,
                     "sub": null
@@ -243,7 +243,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492817
+                      "used": 16493073
                     },
                     "pc": 2,
                     "sub": null
@@ -256,7 +256,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16492814
+                      "used": 16493070
                     },
                     "pc": 4,
                     "sub": null
@@ -269,7 +269,7 @@
                         "0x60"
                       ],
                       "store": null,
-                      "used": 16492812
+                      "used": 16493068
                     },
                     "pc": 6,
                     "sub": null
@@ -282,7 +282,7 @@
                         "0x40"
                       ],
                       "store": null,
-                      "used": 16492809
+                      "used": 16493065
                     },
                     "pc": 7,
                     "sub": null
@@ -296,7 +296,7 @@
                         "0x40"
                       ],
                       "store": null,
-                      "used": 16492806
+                      "used": 16493062
                     },
                     "pc": 8,
                     "sub": null
@@ -309,7 +309,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16492803
+                      "used": 16493059
                     },
                     "pc": 9,
                     "sub": null
@@ -322,7 +322,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492800
+                      "used": 16493056
                     },
                     "pc": 11,
                     "sub": null
@@ -336,7 +336,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16492785
+                      "used": 16493041
                     },
                     "pc": 13,
                     "sub": null
@@ -349,7 +349,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492782
+                      "used": 16493038
                     },
                     "pc": 14,
                     "sub": null
@@ -362,7 +362,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492780
+                      "used": 16493036
                     },
                     "pc": 16,
                     "sub": null
@@ -375,7 +375,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16492777
+                      "used": 16493033
                     },
                     "pc": 17,
                     "sub": null
@@ -388,7 +388,7 @@
                         "0x40000000000000000000000000000000000000"
                       ],
                       "store": null,
-                      "used": 16492774
+                      "used": 16493030
                     },
                     "pc": 19,
                     "sub": null
@@ -398,16 +398,16 @@
                     "ex": {
                       "mem": null,
                       "push": [
-                        "0xfba8e4"
+                        "0xfba9e4"
                       ],
                       "store": null,
-                      "used": 16492772
+                      "used": 16493028
                     },
                     "pc": 20,
                     "sub": null
                   },
                   {
-                    "cost": 16235084,
+                    "cost": 16235336,
                     "ex": {
                       "mem": {
                         "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -417,7 +417,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16491294
+                      "used": 16491550
                     },
                     "pc": 21,
                     "sub": {
@@ -431,7 +431,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234381
+                            "used": 16234633
                           },
                           "pc": 0,
                           "sub": null
@@ -444,7 +444,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234378
+                            "used": 16234630
                           },
                           "pc": 2,
                           "sub": null
@@ -457,7 +457,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234375
+                            "used": 16234627
                           },
                           "pc": 4,
                           "sub": null
@@ -470,7 +470,7 @@
                               "0x40"
                             ],
                             "store": null,
-                            "used": 16234373
+                            "used": 16234625
                           },
                           "pc": 6,
                           "sub": null
@@ -483,7 +483,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234370
+                            "used": 16234622
                           },
                           "pc": 7,
                           "sub": null
@@ -497,7 +497,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234367
+                            "used": 16234619
                           },
                           "pc": 8,
                           "sub": null
@@ -510,7 +510,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16234364
+                            "used": 16234616
                           },
                           "pc": 9,
                           "sub": null
@@ -523,7 +523,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234361
+                            "used": 16234613
                           },
                           "pc": 11,
                           "sub": null
@@ -537,7 +537,7 @@
                             },
                             "push": [],
                             "store": null,
-                            "used": 16234352
+                            "used": 16234604
                           },
                           "pc": 13,
                           "sub": null
@@ -550,7 +550,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234349
+                            "used": 16234601
                           },
                           "pc": 14,
                           "sub": null
@@ -563,7 +563,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234347
+                            "used": 16234599
                           },
                           "pc": 16,
                           "sub": null
@@ -576,7 +576,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16234344
+                            "used": 16234596
                           },
                           "pc": 17,
                           "sub": null
@@ -589,7 +589,7 @@
                               "0x30000000000000000000000000000000000000"
                             ],
                             "store": null,
-                            "used": 16234341
+                            "used": 16234593
                           },
                           "pc": 19,
                           "sub": null
@@ -599,16 +599,16 @@
                           "ex": {
                             "mem": null,
                             "push": [
-                              "0xf7b763"
+                              "0xf7b85f"
                             ],
                             "store": null,
-                            "used": 16234339
+                            "used": 16234591
                           },
                           "pc": 20,
                           "sub": null
                         },
                         {
-                          "cost": 15980689,
+                          "cost": 15980937,
                           "ex": {
                             "mem": {
                               "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -618,7 +618,7 @@
                               "0x1"
                             ],
                             "store": null,
-                            "used": 16233612
+                            "used": 16233864
                           },
                           "pc": 21,
                           "sub": {
@@ -632,7 +632,7 @@
                                     "0x0"
                                   ],
                                   "store": null,
-                                  "used": 15979986
+                                  "used": 15980234
                                 },
                                 "pc": 0,
                                 "sub": null
@@ -645,7 +645,7 @@
                                     "0xf000000000000000000000000000000000000000000000000000000000000001"
                                   ],
                                   "store": null,
-                                  "used": 15979983
+                                  "used": 15980231
                                 },
                                 "pc": 2,
                                 "sub": null
@@ -658,7 +658,7 @@
                                     "0x1"
                                   ],
                                   "store": null,
-                                  "used": 15979980
+                                  "used": 15980228
                                 },
                                 "pc": 3,
                                 "sub": null
@@ -671,7 +671,7 @@
                                     "0xf000000000000000000000000000000000000000000000000000000000000002"
                                   ],
                                   "store": null,
-                                  "used": 15979977
+                                  "used": 15980225
                                 },
                                 "pc": 5,
                                 "sub": null
@@ -684,7 +684,7 @@
                                     "0x0"
                                   ],
                                   "store": null,
-                                  "used": 15979974
+                                  "used": 15980222
                                 },
                                 "pc": 6,
                                 "sub": null
@@ -698,7 +698,7 @@
                                   },
                                   "push": [],
                                   "store": null,
-                                  "used": 15979968
+                                  "used": 15980216
                                 },
                                 "pc": 8,
                                 "sub": null
@@ -711,7 +711,7 @@
                                     "0x20"
                                   ],
                                   "store": null,
-                                  "used": 15979965
+                                  "used": 15980213
                                 },
                                 "pc": 9,
                                 "sub": null
@@ -724,7 +724,7 @@
                                     "0x0"
                                   ],
                                   "store": null,
-                                  "used": 15979962
+                                  "used": 15980210
                                 },
                                 "pc": 11,
                                 "sub": null
@@ -735,7 +735,7 @@
                                   "mem": null,
                                   "push": [],
                                   "store": null,
-                                  "used": 15979962
+                                  "used": 15980210
                                 },
                                 "pc": 13,
                                 "sub": null
@@ -751,7 +751,7 @@
                               "0x20"
                             ],
                             "store": null,
-                            "used": 16233609
+                            "used": 16233861
                           },
                           "pc": 22,
                           "sub": null
@@ -764,7 +764,7 @@
                               "0x0"
                             ],
                             "store": null,
-                            "used": 16233606
+                            "used": 16233858
                           },
                           "pc": 24,
                           "sub": null
@@ -775,7 +775,7 @@
                             "mem": null,
                             "push": [],
                             "store": null,
-                            "used": 16233606
+                            "used": 16233858
                           },
                           "pc": 26,
                           "sub": null
@@ -791,7 +791,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16491291
+                      "used": 16491547
                     },
                     "pc": 22,
                     "sub": null
@@ -804,7 +804,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16491288
+                      "used": 16491544
                     },
                     "pc": 24,
                     "sub": null
@@ -815,7 +815,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16491288
+                      "used": 16491544
                     },
                     "pc": 26,
                     "sub": null
@@ -831,7 +831,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16753075
+                "used": 16753335
               },
               "pc": 22,
               "sub": null
@@ -844,7 +844,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16753072
+                "used": 16753332
               },
               "pc": 24,
               "sub": null
@@ -855,7 +855,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16753072
+                "used": 16753332
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xA.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xA.json
index 2acf8343d8..e70729b03a 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xA.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xA.json
@@ -29,7 +29,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755751
+                "used": 16755907
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755748
+                "used": 16755904
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755745
+                "used": 16755901
               },
               "pc": 4,
               "sub": null
@@ -68,7 +68,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16755743
+                "used": 16755899
               },
               "pc": 6,
               "sub": null
@@ -81,7 +81,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755740
+                "used": 16755896
               },
               "pc": 7,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755737
+                "used": 16755893
               },
               "pc": 8,
               "sub": null
@@ -108,7 +108,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755734
+                "used": 16755890
               },
               "pc": 9,
               "sub": null
@@ -121,7 +121,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755731
+                "used": 16755887
               },
               "pc": 11,
               "sub": null
@@ -135,7 +135,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755722
+                "used": 16755878
               },
               "pc": 13,
               "sub": null
@@ -148,7 +148,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755719
+                "used": 16755875
               },
               "pc": 14,
               "sub": null
@@ -161,7 +161,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755717
+                "used": 16755873
               },
               "pc": 16,
               "sub": null
@@ -174,7 +174,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755714
+                "used": 16755870
               },
               "pc": 17,
               "sub": null
@@ -187,7 +187,7 @@
                   "0x30000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755711
+                "used": 16755867
               },
               "pc": 19,
               "sub": null
@@ -197,16 +197,16 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffabfd"
+                  "0xffac99"
                 ],
                 "store": null,
-                "used": 16755709
+                "used": 16755865
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493912,
+              "cost": 16494066,
               "ex": {
                 "mem": {
                   "data": "0xf000000000000000000000000000000000000000000000000000000000000002",
@@ -216,7 +216,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16754982
+                "used": 16755138
               },
               "pc": 21,
               "sub": {
@@ -230,7 +230,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493209
+                      "used": 16493363
                     },
                     "pc": 0,
                     "sub": null
@@ -243,7 +243,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000001"
                       ],
                       "store": null,
-                      "used": 16493206
+                      "used": 16493360
                     },
                     "pc": 2,
                     "sub": null
@@ -256,7 +256,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493203
+                      "used": 16493357
                     },
                     "pc": 3,
                     "sub": null
@@ -269,7 +269,7 @@
                         "0xf000000000000000000000000000000000000000000000000000000000000002"
                       ],
                       "store": null,
-                      "used": 16493200
+                      "used": 16493354
                     },
                     "pc": 5,
                     "sub": null
@@ -282,7 +282,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493197
+                      "used": 16493351
                     },
                     "pc": 6,
                     "sub": null
@@ -296,7 +296,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16493191
+                      "used": 16493345
                     },
                     "pc": 8,
                     "sub": null
@@ -309,7 +309,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16493188
+                      "used": 16493342
                     },
                     "pc": 9,
                     "sub": null
@@ -322,7 +322,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 11,
                     "sub": null
@@ -333,7 +333,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 13,
                     "sub": null
@@ -349,7 +349,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16754979
+                "used": 16755135
               },
               "pc": 22,
               "sub": null
@@ -362,7 +362,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 24,
               "sub": null
@@ -373,7 +373,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xB.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xB.json
index 242d789479..d3858d5a9d 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xB.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xB.json
@@ -29,7 +29,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755751
+                "used": 16755907
               },
               "pc": 0,
               "sub": null
@@ -42,7 +42,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755748
+                "used": 16755904
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755745
+                "used": 16755901
               },
               "pc": 4,
               "sub": null
@@ -68,7 +68,7 @@
                   "0x40"
                 ],
                 "store": null,
-                "used": 16755743
+                "used": 16755899
               },
               "pc": 6,
               "sub": null
@@ -81,7 +81,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755740
+                "used": 16755896
               },
               "pc": 7,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755737
+                "used": 16755893
               },
               "pc": 8,
               "sub": null
@@ -108,7 +108,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16755734
+                "used": 16755890
               },
               "pc": 9,
               "sub": null
@@ -121,7 +121,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755731
+                "used": 16755887
               },
               "pc": 11,
               "sub": null
@@ -135,7 +135,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755722
+                "used": 16755878
               },
               "pc": 13,
               "sub": null
@@ -148,7 +148,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755719
+                "used": 16755875
               },
               "pc": 14,
               "sub": null
@@ -161,7 +161,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755717
+                "used": 16755873
               },
               "pc": 16,
               "sub": null
@@ -174,7 +174,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755714
+                "used": 16755870
               },
               "pc": 17,
               "sub": null
@@ -187,7 +187,7 @@
                   "0x30000000000000000000000000000000000000"
                 ],
                 "store": null,
-                "used": 16755711
+                "used": 16755867
               },
               "pc": 19,
               "sub": null
@@ -197,23 +197,23 @@
               "ex": {
                 "mem": null,
                 "push": [
-                  "0xffabfd"
+                  "0xffac99"
                 ],
                 "store": null,
-                "used": 16755709
+                "used": 16755865
               },
               "pc": 20,
               "sub": null
             },
             {
-              "cost": 16493912,
+              "cost": 16494066,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x1"
                 ],
                 "store": null,
-                "used": 16754982
+                "used": 16755138
               },
               "pc": 21,
               "sub": {
@@ -227,7 +227,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493209
+                      "used": 16493363
                     },
                     "pc": 0,
                     "sub": null
@@ -240,7 +240,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493206
+                      "used": 16493360
                     },
                     "pc": 2,
                     "sub": null
@@ -253,7 +253,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493203
+                      "used": 16493357
                     },
                     "pc": 3,
                     "sub": null
@@ -266,7 +266,7 @@
                         "0x1"
                       ],
                       "store": null,
-                      "used": 16493200
+                      "used": 16493354
                     },
                     "pc": 5,
                     "sub": null
@@ -279,7 +279,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493197
+                      "used": 16493351
                     },
                     "pc": 6,
                     "sub": null
@@ -293,7 +293,7 @@
                       },
                       "push": [],
                       "store": null,
-                      "used": 16493191
+                      "used": 16493345
                     },
                     "pc": 8,
                     "sub": null
@@ -306,7 +306,7 @@
                         "0x20"
                       ],
                       "store": null,
-                      "used": 16493188
+                      "used": 16493342
                     },
                     "pc": 9,
                     "sub": null
@@ -319,7 +319,7 @@
                         "0x0"
                       ],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 11,
                     "sub": null
@@ -330,7 +330,7 @@
                       "mem": null,
                       "push": [],
                       "store": null,
-                      "used": 16493185
+                      "used": 16493339
                     },
                     "pc": 13,
                     "sub": null
@@ -346,7 +346,7 @@
                   "0x20"
                 ],
                 "store": null,
-                "used": 16754979
+                "used": 16755135
               },
               "pc": 22,
               "sub": null
@@ -359,7 +359,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 24,
               "sub": null
@@ -370,7 +370,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16754976
+                "used": 16755132
               },
               "pc": 26,
               "sub": null
diff --git a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xE.json b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xE.json
index e5162693e8..76276ef971 100644
--- a/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xE.json
+++ b/ethereum/api/src/test/resources/org/hyperledger/besu/ethereum/api/jsonrpc/trace/specs/vm-trace/trace_replayBlockTransactions_0xE.json
@@ -35,14 +35,14 @@
               "sub": null
             },
             {
-              "cost": 200,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755999
+                "used": 16755399
               },
               "pc": 2,
               "sub": null
@@ -55,7 +55,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755996
+                "used": 16755396
               },
               "pc": 3,
               "sub": null
@@ -68,7 +68,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755993
+                "used": 16755393
               },
               "pc": 5,
               "sub": null
@@ -82,7 +82,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755990
+                "used": 16755390
               },
               "pc": 6,
               "sub": null
@@ -95,7 +95,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755987
+                "used": 16755387
               },
               "pc": 7,
               "sub": null
@@ -109,7 +109,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755981
+                "used": 16755381
               },
               "pc": 9,
               "sub": null
@@ -122,7 +122,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755978
+                "used": 16755378
               },
               "pc": 10,
               "sub": null
@@ -136,7 +136,7 @@
                   "key": "0x0",
                   "val": "0x1"
                 },
-                "used": 16735978
+                "used": 16735378
               },
               "pc": 12,
               "sub": null
@@ -149,7 +149,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16735975
+                "used": 16735375
               },
               "pc": 13,
               "sub": null
@@ -162,7 +162,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16735972
+                "used": 16735372
               },
               "pc": 15,
               "sub": null
@@ -173,7 +173,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16735972
+                "used": 16735372
               },
               "pc": 17,
               "sub": null
@@ -203,14 +203,14 @@
               "sub": null
             },
             {
-              "cost": 200,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755999
+                "used": 16755399
               },
               "pc": 2,
               "sub": null
@@ -223,7 +223,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755996
+                "used": 16755396
               },
               "pc": 3,
               "sub": null
@@ -236,7 +236,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16755993
+                "used": 16755393
               },
               "pc": 5,
               "sub": null
@@ -250,7 +250,7 @@
                   "0x2"
                 ],
                 "store": null,
-                "used": 16755990
+                "used": 16755390
               },
               "pc": 6,
               "sub": null
@@ -263,7 +263,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755987
+                "used": 16755387
               },
               "pc": 7,
               "sub": null
@@ -277,7 +277,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755981
+                "used": 16755381
               },
               "pc": 9,
               "sub": null
@@ -290,7 +290,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755978
+                "used": 16755378
               },
               "pc": 10,
               "sub": null
@@ -304,7 +304,7 @@
                   "key": "0x0",
                   "val": "0x2"
                 },
-                "used": 16750978
+                "used": 16750378
               },
               "pc": 12,
               "sub": null
@@ -317,7 +317,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16750975
+                "used": 16750375
               },
               "pc": 13,
               "sub": null
@@ -330,7 +330,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 15,
               "sub": null
@@ -341,7 +341,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 17,
               "sub": null
@@ -371,14 +371,14 @@
               "sub": null
             },
             {
-              "cost": 200,
+              "cost": 800,
               "ex": {
                 "mem": null,
                 "push": [
                   "0x2"
                 ],
                 "store": null,
-                "used": 16755999
+                "used": 16755399
               },
               "pc": 2,
               "sub": null
@@ -391,7 +391,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16755996
+                "used": 16755396
               },
               "pc": 3,
               "sub": null
@@ -404,7 +404,7 @@
                   "0x3"
                 ],
                 "store": null,
-                "used": 16755993
+                "used": 16755393
               },
               "pc": 5,
               "sub": null
@@ -418,7 +418,7 @@
                   "0x3"
                 ],
                 "store": null,
-                "used": 16755990
+                "used": 16755390
               },
               "pc": 6,
               "sub": null
@@ -431,7 +431,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755987
+                "used": 16755387
               },
               "pc": 7,
               "sub": null
@@ -445,7 +445,7 @@
                 },
                 "push": [],
                 "store": null,
-                "used": 16755981
+                "used": 16755381
               },
               "pc": 9,
               "sub": null
@@ -458,7 +458,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16755978
+                "used": 16755378
               },
               "pc": 10,
               "sub": null
@@ -472,7 +472,7 @@
                   "key": "0x0",
                   "val": "0x3"
                 },
-                "used": 16750978
+                "used": 16750378
               },
               "pc": 12,
               "sub": null
@@ -485,7 +485,7 @@
                   "0x1"
                 ],
                 "store": null,
-                "used": 16750975
+                "used": 16750375
               },
               "pc": 13,
               "sub": null
@@ -498,7 +498,7 @@
                   "0x0"
                 ],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 15,
               "sub": null
@@ -509,7 +509,7 @@
                 "mem": null,
                 "push": [],
                 "store": null,
-                "used": 16750972
+                "used": 16750372
               },
               "pc": 17,
               "sub": null
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java
index 4cd14f261c..e4dca96166 100644
--- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java
+++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/AbstractWorldUpdater.java
@@ -185,6 +185,7 @@ public abstract class AbstractWorldUpdater<W extends WorldView, A extends Accoun
     // deletion.
     private final SortedMap<UInt256, UInt256> updatedStorage;
     private boolean storageWasCleared = false;
+    private boolean transactionBoundary = false;
 
     UpdateTrackingAccount(final Address address) {
       checkNotNull(address);
@@ -314,6 +315,10 @@ public abstract class AbstractWorldUpdater<W extends WorldView, A extends Accoun
       return version;
     }
 
+    void markTransactionBoundary() {
+      this.transactionBoundary = true;
+    }
+
     @Override
     public UInt256 getStorageValue(final UInt256 key) {
       final UInt256 value = updatedStorage.get(key);
@@ -331,9 +336,13 @@ public abstract class AbstractWorldUpdater<W extends WorldView, A extends Accoun
 
     @Override
     public UInt256 getOriginalStorageValue(final UInt256 key) {
-      return storageWasCleared || account == null
-          ? UInt256.ZERO
-          : account.getOriginalStorageValue(key);
+      if (transactionBoundary) {
+        return getStorageValue(key);
+      } else if (storageWasCleared || account == null) {
+        return UInt256.ZERO;
+      } else {
+        return account.getOriginalStorageValue(key);
+      }
     }
 
     @Override
@@ -383,7 +392,7 @@ public abstract class AbstractWorldUpdater<W extends WorldView, A extends Accoun
     }
   }
 
-  static class StackedUpdater<W extends WorldView, A extends Account>
+  public static class StackedUpdater<W extends WorldView, A extends Account>
       extends AbstractWorldUpdater<AbstractWorldUpdater<W, A>, UpdateTrackingAccount<A>> {
 
     StackedUpdater(final AbstractWorldUpdater<W, A> world) {
@@ -460,5 +469,9 @@ public abstract class AbstractWorldUpdater<W extends WorldView, A extends Accoun
         update.getUpdatedStorage().forEach(existing::setStorageValue);
       }
     }
+
+    public void markTransactionBoundary() {
+      updatedAccounts().forEach(UpdateTrackingAccount::markTransactionBoundary);
+    }
   }
 }