Refill tests.

8 files changed, 436 insertions, 10 deletions

diff --git a/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount_d0g0v0.json b/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall_d0g0v0.json
index a3724fa73..bc3a4380f 100644
--- a/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall_d0g0v0.json
@@ -1,11 +1,11 @@
 {
-    "extCodeHashCreatedAndDeletedAccount_d0g0v0_Constantinople" : {
+    "extCodeHashCreatedAndDeletedAccountCall_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction",
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted via CALL in same transaction",
             "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
             "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount_d0g0v0Filler.json",
-            "sourceHash" : "ab779d6b3aebd5e4c44b35ccdf35527a9c43cf4170e7126bbc095b7b12b648ce"
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall_d0g0v0Filler.json",
+            "sourceHash" : "471231989d740e9224dc7fdcb3a416938c9c918a711ed2676dbd8b028c9fe3ff"
         },
         "blocks" : [
             {
diff --git a/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0.json
new file mode 100644
index 000000000..4c2e46ade
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0.json
@@ -0,0 +1,130 @@
+{
+    "extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in a CALL, checking results after the CALL returns",
+            "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
+            "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0Filler.json",
+            "sourceHash" : "d1238b70bcc0fda808d29174c0a4033375e8003d09e04989807f382ffcc640cb"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x026ef6",
+                    "hash" : "0xd11e5c4d705686ad51fef9381ba9b3f164b6e7727bc18bf3a97f0922886414d2",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xeb41e2857bbd6cc950b42877f5eda3e47c1a18102fd0f70300227c5c6455b647",
+                    "receiptTrie" : "0x0f0dea4e65d8eb0b24937e16086941a9c95964d03994f17610174656db323aa6",
+                    "stateRoot" : "0xed6fb0a87fc3fd10270f8e318e721ffef5bf508b0da03c00fe16704970b4462b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x9213f762caa85d49ef9d5bf425ffd1d0ba814cdfe0e12aa53740e5aee29a481f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0eb41e2857bbd6cc950b42877f5eda3e47c1a18102fd0f70300227c5c6455b647a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed6fb0a87fc3fd10270f8e318e721ffef5bf508b0da03c00fe16704970b4462ba09213f762caa85d49ef9d5bf425ffd1d0ba814cdfe0e12aa53740e5aee29a481fa00f0dea4e65d8eb0b24937e16086941a9c95964d03994f17610174656db323aa6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083026ef68203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f860800183061a8094deadbeef0000000000000000000000000000000101801ca052adf3b876b2b63352ca31ecde66783574c333c957135265eecba278b27d177ba06d3e5c5a0ea5414786ef955b4babc5db60430145f5419853dae17eca4bf34546c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52adf3b876b2b63352ca31ecde66783574c333c957135265eecba278b27d177b",
+                        "s" : "0x6d3e5c5a0ea5414786ef955b4babc5db60430145f5419853dae17eca4bf34546",
+                        "to" : "0xdeadbeef00000000000000000000000000000001",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xeb41e2857bbd6cc950b42877f5eda3e47c1a18102fd0f70300227c5c6455b647",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbd8dc6344f75c138be7fe4b632e063d07076ebe73fff7244674c85ab4749f2ff",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd8dc6344f75c138be7fe4b632e063d07076ebe73fff7244674c85ab4749f2ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd11e5c4d705686ad51fef9381ba9b3f164b6e7727bc18bf3a97f0922886414d2",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x1bc16d674eca6ef6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7619109",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6010600f80604360803960806000f56000526000513f6000556000513b6001556000600060006000600060005162010000f1506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                    "0x01" : "0x03",
+                    "0x02" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                    "0x03" : "0x03"
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640001",
+                "code" : "0x6000600060006000600073deadbeef0000000000000000000000000000000062020000f150737be7677a20a298ff0676ab31f91a0a923f8d94713f600055737be7677a20a298ff0676ab31f91a0a923f8d94713b60015500",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                    "0x01" : "0x03"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6010600f80604360803960806000f56000526000513f6000556000513b6001556000600060006000600060005162010000f1506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073deadbeef0000000000000000000000000000000062020000f150737be7677a20a298ff0676ab31f91a0a923f8d94713f600055737be7677a20a298ff0676ab31f91a0a923f8d94713b60015500",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0.json
new file mode 100644
index 000000000..79422ed12
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0.json
@@ -0,0 +1,121 @@
+{
+    "extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted via STATICCALL in same transaction",
+            "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
+            "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0Filler.json",
+            "sourceHash" : "690033a98b745beecff15f0178fd77a80816afb160e777d4d8a66262202bc81d"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x0315bd",
+                    "hash" : "0x24031820aa31f8b699792a9525a24b23c67f39d63ee00cacae23ecc38ed6542b",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0xe5f108d14422ee061b12a0e85d4971a4908e9120c6aaa2cc3e3779a22a9b9874",
+                    "receiptTrie" : "0x7a292c44eec2c6423a832eb12b19e035a550e6d65a3af6e5d9ae856126eb8b80",
+                    "stateRoot" : "0x17f5c102bfbabd26f1994d3ab1420c165ac1a0f2d919dd74c1aebcfdc6ded808",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x324788bcaeb3ef4ea52657457b25024fd8e28f4e686f0b44f9df8c55c10854a3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e5f108d14422ee061b12a0e85d4971a4908e9120c6aaa2cc3e3779a22a9b9874a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017f5c102bfbabd26f1994d3ab1420c165ac1a0f2d919dd74c1aebcfdc6ded808a0324788bcaeb3ef4ea52657457b25024fd8e28f4e686f0b44f9df8c55c10854a3a07a292c44eec2c6423a832eb12b19e035a550e6d65a3af6e5d9ae856126eb8b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830315bd8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f860800183061a8094deadbeef0000000000000000000000000000000001801ca0c202f0d1337e2d44fa1bf35877e7278363f8a0870146a587e8f75bbd10df9240a05cb792200832e3876d0213563d9dc7705e255718f25455ca28eec91736e98c55c0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc202f0d1337e2d44fa1bf35877e7278363f8a0870146a587e8f75bbd10df9240",
+                        "s" : "0x5cb792200832e3876d0213563d9dc7705e255718f25455ca28eec91736e98c55",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xe5f108d14422ee061b12a0e85d4971a4908e9120c6aaa2cc3e3779a22a9b9874",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8234a85694b8c3dc9db889cfb1a114f3cc703d0b7f11ac95e2b7317bd0098e30",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08234a85694b8c3dc9db889cfb1a114f3cc703d0b7f11ac95e2b7317bd0098e30a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x24031820aa31f8b699792a9525a24b23c67f39d63ee00cacae23ecc38ed6542b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x1bc16d674ecb15bd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x7be7677a20a298ff0676ab31f91a0a923f8d9471" : {
+                "balance" : "0x00",
+                "code" : "0x6000ff",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a760ea42",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640001",
+                "code" : "0x6010600f80604160803960806000f56000526000513f6000556000513b600155600060006000600060005162010000fa506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                    "0x01" : "0x03",
+                    "0x02" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                    "0x03" : "0x03"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6010600f80604160803960806000f56000526000513f6000556000513b600155600060006000600060005162010000fa506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json
index f0555b27a..4bde7b03b 100644
--- a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json
+++ b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall.json
@@ -1,11 +1,11 @@
 {
     "extCodeHashCreatedAndDeletedAccountCall" : {
         "_info" : {
-            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction",
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted via CALL in same transaction",
             "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
             "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
             "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCallFiller.json",
-            "sourceHash" : "645179b4be0326e99e7c2c406dc1a8504610db115f4027e4006b29b32a06aed0"
+            "sourceHash" : "929618720bfddefd40804dbb348ac7180e9fbe484a9e0fbaf7cc030f66ece6f5"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json
index b9c9aa84b..89cc5ce32 100644
--- a/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json
+++ b/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall.json
@@ -1,11 +1,11 @@
 {
     "extCodeHashCreatedAndDeletedAccountStaticCall" : {
         "_info" : {
-            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction",
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted via STATICCALL in same transaction",
             "filledwith" : "testeth 1.5.0-alpha.6-1+commit.19ad7d95.dirty",
             "lllcversion" : "Version: 0.5.0-develop.2018.9.29+commit.c4b5101b.Darwin.appleclang",
             "source" : "src/GeneralStateTestsFiller/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCallFiller.json",
-            "sourceHash" : "f110c2b9f36efac20a8e0d875c7852f54e725b1e5d87e7ce6d7b6b139514d338"
+            "sourceHash" : "98ce0086886a80b074aee025a9ce4de09887e0316d9c1335c04377e2a8194fb8"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall_d0g0v0Filler.json
index e31e3634f..91a834e57 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccount_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountCall_d0g0v0Filler.json
@@ -1,7 +1,7 @@
 {
-    "extCodeHashCreatedAndDeletedAccount_d0g0v0" : {
+    "extCodeHashCreatedAndDeletedAccountCall_d0g0v0" : {
         "_info" : {
-            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in same transaction"
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted via CALL in same transaction"
         },
         "blocks" : [
             {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0Filler.json
new file mode 100644
index 000000000..20005c2d4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0Filler.json
@@ -0,0 +1,94 @@
+{
+    "extCodeHashCreatedAndDeletedAccountRecheckInOuterCall_d0g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted in a CALL, checking results after the CALL returns"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x52adf3b876b2b63352ca31ecde66783574c333c957135265eecba278b27d177b",
+                        "s" : "0x6d3e5c5a0ea5414786ef955b4babc5db60430145f5419853dae17eca4bf34546",
+                        "to" : "0xdeadbeef00000000000000000000000000000001",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                            "0x01" : "0x03",
+                            "0x02" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                            "0x03" : "0x03"
+                        }
+                    },
+                    "0xdeadbeef00000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                            "0x01" : "0x03"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6010600f80604360803960806000f56000526000513f6000556000513b6001556000600060006000600060005162010000f1506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073deadbeef0000000000000000000000000000000062020000f150737be7677a20a298ff0676ab31f91a0a923f8d94713f600055737be7677a20a298ff0676ab31f91a0a923f8d94713b60015500",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0Filler.json
new file mode 100644
index 000000000..74eedc2f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stExtCodeHash/extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0Filler.json
@@ -0,0 +1,81 @@
+{
+    "extCodeHashCreatedAndDeletedAccountStaticCall_d0g0v0" : {
+        "_info" : {
+            "comment" : "EXTCODEHASH/EXTCODESIZE of an account created then deleted via STATICCALL in same transaction"
+        },
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0f4240",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x061a80",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc202f0d1337e2d44fa1bf35877e7278363f8a0870146a587e8f75bbd10df9240",
+                        "s" : "0x5cb792200832e3876d0213563d9dc7705e255718f25455ca28eec91736e98c55",
+                        "to" : "0xdeadbeef00000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xdeadbeef00000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                            "0x01" : "0x03",
+                            "0x02" : "0x396daaf3a7871f857cc9b5878c6bb66c394a6d109706095617db9f4e4c22edcd",
+                            "0x03" : "0x03"
+                        }
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xdeadbeef00000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6010600f80604160803960806000f56000526000513f6000556000513b600155600060006000600060005162010000fa506000513f6002556000513b60035500fe600380600c6000396000f3fe6000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file