diff --git a/integration/mainnet/trace_replayTransaction/test_36.json b/integration/mainnet/trace_replayTransaction/test_36.json
new file mode 100644
index 00000000..5b894578
--- /dev/null
+++ b/integration/mainnet/trace_replayTransaction/test_36.json
@@ -0,0 +1,273 @@
+[
+  {
+    "request": {
+      "id": 1,
+      "jsonrpc": "2.0",
+      "method": "trace_replayTransaction",
+      "params": [
+        "0xbb4b3fc2b746877dce70862850602f1d19bd890ab4db47e6b7ee1da1fe578a0d",
+        [
+          "stateDiff"
+        ]
+      ]
+    },
+    "response": {
+      "id": 1,
+      "jsonrpc": "2.0",
+  "result": {
+    "output": "0x",
+    "stateDiff": {
+      "0x0f4dbc08b8917c4d683cb55511936989dee1f736": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0xb39e9ba92c3c47c76d4f70e3bc9c3270ab78d2592718d377c8f5433a34d3470a": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000178b369361df900a9e509258",
+              "to": "0x00000000000000000000000000000000000000000000000161df900a9e509258"
+            }
+          },
+          "0xf1afbc179eac1a1bd17ea3c23b31a41e8043f1cf2bf800abc06bf9d2d95d0243": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000001dac614b3f169141e41ef7080",
+              "to": "0x0000000000000000000000000000000000000001f2514b45f169141e41ef7080"
+            }
+          }
+        }
+      },
+      "0x1956b77def3a8c551660e3881379bddff37c4a8b": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x0f61f7fd9a799effa8148b757c81bee847b29ccbc31f0b5c062cb19d3ba34262": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000002fa32e679c7f7e53",
+              "to": "0x0000000000000000000000000000000000000000000000002f8462fda67f7e53"
+            }
+          },
+          "0x577b913a3c8810dd10161c9ae11e2ee31042564c62114c83b0bc5d3a3e71b362": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000000000000002000000",
+              "to": "0x000000000000000000000000000000000000000000000000001ecb69f8000000"
+            }
+          }
+        }
+      },
+      "0x2077d81d0c5258230d5a195233941547cb5f0989": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x000000000000000000000000000000000000000000000000000000000000000e": {
+            "*": {
+              "from": "0x00000000000000000000000000000000000000000000000000000000000018d5",
+              "to": "0x00000000000000000000000000000000000000000000000000000000000018d6"
+            }
+          },
+          "0x06583869f3a48154de99a25efeae318eb27188c2ca181a6a3e6196a4fd2ed062": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000007995287397bd6b1e",
+              "to": "0x0000000000000000000000000000000000000000000000007801660397bd6b1e"
+            }
+          },
+          "0x577b913a3c8810dd10161c9ae11e2ee31042564c62114c83b0bc5d3a3e71b362": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000000d7307852e671567",
+              "to": "0x0000000000000000000000000000000000000000000000000f06c9f52e671567"
+            }
+          }
+        }
+      },
+      "0x4fc47579ecf6aa76677ee142b6b75faf9eeafba8": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000008": {
+            "*": {
+              "from": "0x665ba27300000000000001a6833d6bf397e8000000002c4cdd3bcc51121f8a7e",
+              "to": "0x665ba27f00000000000001e51bb76bf397e80000000026995439cc51121f8a7e"
+            }
+          },
+          "0x0000000000000000000000000000000000000000000000000000000000000009": {
+            "*": {
+              "from": "0x000000000000000002073a18cf9416acf521417fe123b855d8eb6fee51009b80",
+              "to": "0x000000000000000002073a18cf9416acf52141805396da09cd681e1d227d28f8"
+            }
+          },
+          "0x000000000000000000000000000000000000000000000000000000000000000a": {
+            "*": {
+              "from": "0x000000000000000000000000206347f898e0858557dbe58d23fed22db44ba5cc",
+              "to": "0x0000000000000000000000002063493ab1e5cf94ee633cc26d82f9f2b6dc0a60"
+            }
+          }
+        }
+      },
+      "0x5eaa69b29f99c84fe5de8200340b4e9b4ab38eac": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0xb39e9ba92c3c47c76d4f70e3bc9c3270ab78d2592718d377c8f5433a34d3470a": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000000001050000000000",
+              "to": "0x0000000000000000000000000000000000000000000005b38903050000000000"
+            }
+          },
+          "0xde3f0931440ad27ba33fd0d566a7e6ea99253decd320a2eb16b0d21e2d5654ab": {
+            "*": {
+              "from": "0x000000000000000000000000000000000000000000002c4cdd3bcc51121f8a7e",
+              "to": "0x0000000000000000000000000000000000000000000026995439cc51121f8a7e"
+            }
+          }
+        }
+      },
+      "0x6b75d8af000000e20b7a7ddf000ba900b4009a80": {
+        "balance": {
+          "*": {
+            "from": "0x134c48fc6bdc2",
+            "to": "0x134c4ce5f37c2"
+          }
+        },
+        "code": "=",
+        "nonce": "=",
+        "storage": {}
+      },
+      "0xae2fc483527b8ef99eb5d9b44875f005ba1fae13": {
+        "balance": {
+          "*": {
+            "from": "0x6c943a4849a50e671",
+            "to": "0x6c93e034702304af5"
+          }
+        },
+        "code": "=",
+        "nonce": {
+          "*": {
+            "from": "0x2a109e",
+            "to": "0x2a109f"
+          }
+        },
+        "storage": {}
+      },
+      "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x12231cd4c753cb5530a43a74c45106c24765e6f81dc8927d4f4be7e53315d5a8": {
+            "*": {
+              "from": "0x00000000000000000000000000000000000000000000002a6b9b1f83a3574c9a",
+              "to": "0x00000000000000000000000000000000000000000000002a60a0f13da2574c9a"
+            }
+          },
+          "0x17a4e6416fac9c9bf26d005d08e2b2ee25f982bd10d5b44147b7b75ba3d228fe": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000042dc612d9945e1d52",
+              "to": "0x0000000000000000000000000000000000000000000000043be02b05945e1d52"
+            }
+          },
+          "0x8ea767adbab85a66d92de57018f6d566653a3a636ce23bc54d43a6ef0b8c2c6d": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000004f33f7d009aaaace",
+              "to": "0x0000000000000000000000000000000000000000000000004b78bc8309aaaace"
+            }
+          },
+          "0xc425db3ba2e2e740df0bd5e70863e1467175168a1db003c150d7c3bc5a4f2746": {
+            "*": {
+              "from": "0x00000000000000000000000000000000000000000000000001a6833d6bf397e8",
+              "to": "0x00000000000000000000000000000000000000000000000001e51bb76bf397e8"
+            }
+          },
+          "0xe7267db6a8492dc35643f86d4a1e6d8a1bf1b91b0815f7eaf2bc675f60d17653": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000008ea50799e62ad730",
+              "to": "0x0000000000000000000000000000000000000000000000008f01c086e72ad730"
+            }
+          }
+        }
+      },
+      "0xe3cc21af229934034b320502fa55cfa1ab7b1493": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000008": {
+            "*": {
+              "from": "0x665ba2730000000000042dc612d9945e1d520000000000007995287397bd6b1e",
+              "to": "0x665ba27f0000000000043be02b05945e1d520000000000007801660397bd6b1e"
+            }
+          },
+          "0x0000000000000000000000000000000000000000000000000000000000000009": {
+            "*": {
+              "from": "0x00000000000000000000000000000004e674ed4d8e406882fbe6377084df8c24",
+              "to": "0x00000000000000000000000000000004e6de8305bec1af347440ea9a9c41f4a8"
+            }
+          },
+          "0x000000000000000000000000000000000000000000000000000000000000000a": {
+            "*": {
+              "from": "0x000000000000000000000000000000007612196a9b141ff098da829ce7c8f870",
+              "to": "0x000000000000000000000000000000007613768eb55eb893f8142b747fae0a08"
+            }
+          }
+        }
+      },
+      "0xf1dfcb999eeecbfca7123d13a73f54285f43db96": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000008": {
+            "*": {
+              "from": "0x665ba24f0000000000008ea50799e62ad7300000000000002fa32e679c7f7e53",
+              "to": "0x665ba27f0000000000008f01c086e72ad7300000000000002f8462fda67f7e53"
+            }
+          },
+          "0x0000000000000000000000000000000000000000000000000000000000000009": {
+            "*": {
+              "from": "0x00000000000000000000000000000000061036828dd70ce8e171160c20f5a488",
+              "to": "0x00000000000000000000000000000000069ff17971ff8700e8bcef62f86571e8"
+            }
+          },
+          "0x000000000000000000000000000000000000000000000000000000000000000a": {
+            "*": {
+              "from": "0x0000000000000000000000000000000002bfba72316479bfc0e9713353ee9824",
+              "to": "0x0000000000000000000000000000000002cfc2218e556726f6ae54b242cd9934"
+            }
+          }
+        }
+      },
+      "0xfd433bb7e98de56bb4422acd3eb6f174bac52fc9": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000008": {
+            "*": {
+              "from": "0x665ba2730000000000004f33f7d009aaaace0001dac614b3f169141e41ef7080",
+              "to": "0x665ba27f0000000000004b78bc8309aaaace0001f2514b45f169141e41ef7080"
+            }
+          },
+          "0x0000000000000000000000000000000000000000000000000000000000000009": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000049f93ed77b6935c877cb0e0",
+              "to": "0x000000000000000000000000000000000000000004a194681cae812cc129da88"
+            }
+          },
+          "0x000000000000000000000000000000000000000000000000000000000000000a": {
+            "*": {
+              "from": "0x00000000000000000000000544ca0a48fd6464de2ba72b2eeef49b24ff86e350",
+              "to": "0x0000000000000000000000054511f90deb278fec6f56d00169913bf2025edd78"
+            }
+          }
+        }
+      }
+    },
+    "trace": [],
+    "transactionHash": "0xbb4b3fc2b746877dce70862850602f1d19bd890ab4db47e6b7ee1da1fe578a0d",
+    "vmTrace": null
+  }
+  }
+}
+]
diff --git a/integration/mainnet/trace_replayTransaction/test_37.json b/integration/mainnet/trace_replayTransaction/test_37.json
new file mode 100644
index 00000000..9be3d53f
--- /dev/null
+++ b/integration/mainnet/trace_replayTransaction/test_37.json
@@ -0,0 +1,110 @@
+[
+  {
+    "request": {
+      "id": 1,
+      "jsonrpc": "2.0",
+      "method": "trace_replayTransaction",
+      "params": [
+        "0x541a536cd7ce7e9990876b7a49041f21590cd92251e699d9d924c0abbb2e98ba",
+        [
+          "stateDiff"
+        ]
+      ]
+    },
+    "response": {
+      "id": 1,
+      "jsonrpc": "2.0",
+  "result": {
+    "output": "0x",
+    "stateDiff": {
+      "0x4fc47579ecf6aa76677ee142b6b75faf9eeafba8": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000008": {
+            "*": {
+              "from": "0x665ba27f00000000000001e51bb76bf397e80000000026995439cc51121f8a7e",
+              "to": "0x665ba27f000000000000022c299c4b7597e80000000021ae36bae0f5da7d6de6"
+            }
+          }
+        }
+      },
+      "0x5eaa69b29f99c84fe5de8200340b4e9b4ab38eac": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x443d72c18f173e95e8fd5d5f55e68b01b20445348043961dfcc5504f9d095e31": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000153cef36f71c34195822c",
+              "to": "0x0000000000000000000000000000000000000000000158b6eb18ed2baf7a6a37"
+            }
+          },
+          "0xde3f0931440ad27ba33fd0d566a7e6ea99253decd320a2eb16b0d21e2d5654ab": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000026995439cc51121f8a7e",
+              "to": "0x0000000000000000000000000000000000000000000021ae36bae0f5da7d6de6"
+            }
+          },
+          "0xfe8856aa7c08b1199b17906727770d2021e30c908926ab90b6397701b9ddde02": {
+            "*": {
+              "from": "0x00000000000000000000000000000000000000000000001ef39208211b60c754",
+              "to": "0x00000000000000000000000000000000000000000000002219677813e51dfbe1"
+            }
+          }
+        }
+      },
+      "0x95222290dd7278aa3ddd389cc1e1d165cc4bafe5": {
+        "balance": {
+          "*": {
+            "from": "0x103353e6c8d0872d1",
+            "to": "0x103353e8bc2948b91"
+          }
+        },
+        "code": "=",
+        "nonce": "=",
+        "storage": {}
+      },
+      "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": {
+        "balance": {
+          "*": {
+            "from": "0x26d38654a89ea6e8e1577",
+            "to": "0x26d38659197cf4e101577"
+          }
+        },
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0xc425db3ba2e2e740df0bd5e70863e1467175168a1db003c150d7c3bc5a4f2746": {
+            "*": {
+              "from": "0x00000000000000000000000000000000000000000000000001e51bb76bf397e8",
+              "to": "0x000000000000000000000000000000000000000000000000022c299c4b7597e8"
+            }
+          }
+        }
+      },
+      "0xea3ea09394f5e925ae7592dff1d675558d0831fd": {
+        "balance": {
+          "*": {
+            "from": "0xf9fddcdbfc41e1",
+            "to": "0xb0835d1eafc931"
+          }
+        },
+        "code": "=",
+        "nonce": {
+          "*": {
+            "from": "0x7c",
+            "to": "0x7d"
+          }
+        },
+        "storage": {}
+      }
+    },
+    "trace": [],
+    "transactionHash": "0x541a536cd7ce7e9990876b7a49041f21590cd92251e699d9d924c0abbb2e98ba",
+    "vmTrace": null
+  }
+  }
+}
+]
diff --git a/integration/mainnet/trace_replayTransaction/test_38.json b/integration/mainnet/trace_replayTransaction/test_38.json
new file mode 100644
index 00000000..567188bb
--- /dev/null
+++ b/integration/mainnet/trace_replayTransaction/test_38.json
@@ -0,0 +1,110 @@
+[
+  {
+    "request": {
+      "id": 1,
+      "jsonrpc": "2.0",
+      "method": "trace_replayTransaction",
+      "params": [
+        "0x273962e00767d8989b4def781a4f89d0eb44f8d3a9bb95582aa4c51275571fbe",
+        [
+          "stateDiff"
+        ]
+      ]
+    },
+    "response": {
+      "id": 1,
+      "jsonrpc": "2.0",
+  "result": {
+    "output": "0x000000000000000000000000000000000000000000000000008af7b71a08448c",
+    "stateDiff": {
+      "0x0f4dbc08b8917c4d683cb55511936989dee1f736": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x077c8ee7b5e4fe2ffe2c9c8a2a5815107a3af7c48fc16d04ad02503fd9d5b3ab": {
+            "*": {
+              "from": "0x000000000000000000000000000000000000000003a1c80aa4cad53b867b8170",
+              "to": "0x0000000000000000000000000000000000000000000000000000000000000001"
+            }
+          },
+          "0x2b92a8817974be9ca4c428eecc7a5142fac8b633752fbedc20365449fffbbf43": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "to": "0x00000000000000000000000000000000000000000002ca1276c431479a426b23"
+            }
+          },
+          "0xf1afbc179eac1a1bd17ea3c23b31a41e8043f1cf2bf800abc06bf9d2d95d0243": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000001f2514b45f169141e41ef7080",
+              "to": "0x0000000000000000000000000000000000000001f5f0493e1f6fb8122e2886cc"
+            }
+          }
+        }
+      },
+      "0x7c925c1286654d3b720a1293d8d0821d12ebe335": {
+        "balance": {
+          "*": {
+            "from": "0x19092f3d1ba72f",
+            "to": "0x9f281e5621acc4"
+          }
+        },
+        "code": "=",
+        "nonce": {
+          "*": {
+            "from": "0xba",
+            "to": "0xbb"
+          }
+        },
+        "storage": {}
+      },
+      "0x95222290dd7278aa3ddd389cc1e1d165cc4bafe5": {
+        "balance": {
+          "*": {
+            "from": "0x103353e8bc2948b91",
+            "to": "0x10336e06eebdebfcc"
+          }
+        },
+        "code": "=",
+        "nonce": "=",
+        "storage": {}
+      },
+      "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": {
+        "balance": {
+          "*": {
+            "from": "0x26d38659197cf4e101577",
+            "to": "0x26d386506a0183407d0eb"
+          }
+        },
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x8ea767adbab85a66d92de57018f6d566653a3a636ce23bc54d43a6ef0b8c2c6d": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000004b78bc8309aaaace",
+              "to": "0x0000000000000000000000000000000000000000000000004aedc4cbefa26642"
+            }
+          }
+        }
+      },
+      "0xfd433bb7e98de56bb4422acd3eb6f174bac52fc9": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x0000000000000000000000000000000000000000000000000000000000000008": {
+            "*": {
+              "from": "0x665ba27f0000000000004b78bc8309aaaace0001f2514b45f169141e41ef7080",
+              "to": "0x665ba27f0000000000004aedc4cbefa266420001f5f0493e1f6fb8122e2886cc"
+            }
+          }
+        }
+      }
+    },
+    "trace": [],
+    "transactionHash": "0x273962e00767d8989b4def781a4f89d0eb44f8d3a9bb95582aa4c51275571fbe",
+    "vmTrace": null
+  }
+  }
+}
+]
diff --git a/integration/mainnet/trace_replayTransaction/test_39.json b/integration/mainnet/trace_replayTransaction/test_39.json
new file mode 100644
index 00000000..2143919e
--- /dev/null
+++ b/integration/mainnet/trace_replayTransaction/test_39.json
@@ -0,0 +1,73 @@
+[
+  {
+    "request": {
+      "id": 1,
+      "jsonrpc": "2.0",
+      "method": "trace_replayTransaction",
+      "params": [
+        "0xff178f8e9eede32ca37214446c889abc64c943a087bc630dfb88ad2695e262a8",
+        [
+          "stateDiff"
+        ]
+      ]
+    },
+    "response": {
+      "id": 1,
+      "jsonrpc": "2.0",
+  "result": {
+    "output": "0x0000000000000000000000000000000000000000000000000000000000000001",
+    "stateDiff": {
+      "0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0": {
+        "balance": "=",
+        "code": "=",
+        "nonce": "=",
+        "storage": {
+          "0x59d2b8842110e5d9e5a3c11b7ca2cffa43b22e96cca2a87097d9c6e3e6c2dba0": {
+            "*": {
+              "from": "0x00000000000000000000000000000000000000000000c09174a4fac0aaa8e7d8",
+              "to": "0x00000000000000000000000000000000000000000000c08167ae4e551e0223d8"
+            }
+          },
+          "0x827a69ad1ef234cfb5be4505d78f13c268e12ae164068ba780d9bd0c938717c4": {
+            "*": {
+              "from": "0x0000000000000000000000000000000000000000000000000000000000000000",
+              "to": "0x0000000000000000000000000000000000000000000000100cf6ac6b8ca6c400"
+            }
+          }
+        }
+      },
+      "0x95222290dd7278aa3ddd389cc1e1d165cc4bafe5": {
+        "balance": {
+          "*": {
+            "from": "0x10377ecf2ee08faa5",
+            "to": "0x103784f39ad87eaa5"
+          }
+        },
+        "code": "=",
+        "nonce": "=",
+        "storage": {}
+      },
+      "0x95b564f3b3bae3f206aa418667ba000afafacc8a": {
+        "balance": {
+          "*": {
+            "from": "0x2102e3e7a0df3a78",
+            "to": "0x21018f090af2d988"
+          }
+        },
+        "code": "=",
+        "nonce": {
+          "*": {
+            "from": "0x7e3a6",
+            "to": "0x7e3a7"
+          }
+        },
+        "storage": {}
+      }
+    },
+    "trace": [],
+    "transactionHash": "0xff178f8e9eede32ca37214446c889abc64c943a087bc630dfb88ad2695e262a8",
+    "vmTrace": null
+  }
+  }
+}
+]
diff --git a/integration/mainnet/trace_replayTransaction/test_40.json b/integration/mainnet/trace_replayTransaction/test_40.json
new file mode 100644
index 00000000..132cbcb8
--- /dev/null
+++ b/integration/mainnet/trace_replayTransaction/test_40.json
@@ -0,0 +1,54 @@
+[
+  {
+    "request": {
+      "id": 1,
+      "jsonrpc": "2.0",
+      "method": "trace_replayTransaction",
+      "params": [
+        "0xb79b64182236284ad6753e1b5f506e7e6989912c25887575f82d64f23f6bf267",
+        [
+          "stateDiff"
+        ]
+      ]
+    },
+    "response": {
+      "id": 1,
+      "jsonrpc": "2.0",
+  "result": {
+    "output": "0x",
+    "stateDiff": {
+      "0x4befa2aa9c305238aa3e0b5d17eb20c045269e9d": {
+        "balance": {
+          "*": {
+            "from": "0x13f623fc5ff04b9bf",
+            "to": "0x13fb4b755e7e3e6f6"
+          }
+        },
+        "code": "=",
+        "nonce": "=",
+        "storage": {}
+      },
+      "0x95222290dd7278aa3ddd389cc1e1d165cc4bafe5": {
+        "balance": {
+          "*": {
+            "from": "0x10387b4a5e777acbb",
+            "to": "0x10334be40c5e237b8"
+          }
+        },
+        "code": "=",
+        "nonce": {
+          "*": {
+            "from": "0xfba1e",
+            "to": "0xfba1f"
+          }
+        },
+        "storage": {}
+      }
+    },
+    "trace": [],
+    "transactionHash": "0xb79b64182236284ad6753e1b5f506e7e6989912c25887575f82d64f23f6bf267",
+    "vmTrace": null
+  }
+  }
+}
+]