Add new touched cleanup case

Regression test for https://github.com/ethereumjs/ethereumjs-vm/pull/335

First call marks an empty account as touched. Second call errors OOG. Transaction should still cleanup empty account.

4 files changed, 661 insertions, 0 deletions

diff --git a/BlockchainTests/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0.json
new file mode 100644
index 000000000..f8b5fd24f
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0.json
@@ -0,0 +1,389 @@
+{
+    "callToEmptyThenCallError_d0g0v0_Byzantium" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2-44+commit.bc7187ea",
+            "lllcversion" : "Version: 0.4.25-develop.2018.9.5+commit.9cb72fe6.Darwin.appleclang",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0Filler.json",
+            "sourceHash" : "28ce51593c2249ef1ece666e802c454df81b0d89e0770c3e38782707cd711229"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x57ac",
+                    "hash" : "0xb013f5ec97992306be8f1d6f5307952911c19f8d008bfdfe0a82b75114b57b3b",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1",
+                    "receiptTrie" : "0xa278772b2b1b71585cf37360497e8bea2506ee95d5176895db2bba3129ee694c",
+                    "stateRoot" : "0xac4cb6f0d738905090e13fb4e7e1eaa26458c233efb24f60fb206658eef5b17f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac4cb6f0d738905090e13fb4e7e1eaa26458c233efb24f60fb206658eef5b17fa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a278772b2b1b71585cf37360497e8bea2506ee95d5176895db2bba3129ee694cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257ac8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022c1f13bfa119eb88a97db1c184c60ac4ec31979545915a62876dbeb35a849",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022c1f13bfa119eb88a97db1c184c60ac4ec31979545915a62876dbeb35a849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb013f5ec97992306be8f1d6f5307952911c19f8d008bfdfe0a82b75114b57b3b",
+        "network" : "Byzantium",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x29a2241af62c57ac",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4b854",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "callToEmptyThenCallError_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2-44+commit.bc7187ea",
+            "lllcversion" : "Version: 0.4.25-develop.2018.9.5+commit.9cb72fe6.Darwin.appleclang",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0Filler.json",
+            "sourceHash" : "28ce51593c2249ef1ece666e802c454df81b0d89e0770c3e38782707cd711229"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x57ac",
+                    "hash" : "0x17538878b9741925513e1de590bd283bbe706deb07d88a3b4960905491133cb0",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1",
+                    "receiptTrie" : "0xa278772b2b1b71585cf37360497e8bea2506ee95d5176895db2bba3129ee694c",
+                    "stateRoot" : "0xe310a6ed13ab9e53e2f66cc4fad0fc547c54208cb58c2dee4e851c8a5a515e05",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e310a6ed13ab9e53e2f66cc4fad0fc547c54208cb58c2dee4e851c8a5a515e05a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0a278772b2b1b71585cf37360497e8bea2506ee95d5176895db2bba3129ee694cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257ac8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022c1f13bfa119eb88a97db1c184c60ac4ec31979545915a62876dbeb35a849",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022c1f13bfa119eb88a97db1c184c60ac4ec31979545915a62876dbeb35a849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x17538878b9741925513e1de590bd283bbe706deb07d88a3b4960905491133cb0",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x1bc16d674ec857ac",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4b854",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    },
+    "callToEmptyThenCallError_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2-44+commit.bc7187ea",
+            "lllcversion" : "Version: 0.4.25-develop.2018.9.5+commit.9cb72fe6.Darwin.appleclang",
+            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0Filler.json",
+            "sourceHash" : "28ce51593c2249ef1ece666e802c454df81b0d89e0770c3e38782707cd711229"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x57ac",
+                    "hash" : "0xf86e7ebcb32be15dfe70796de464dd44494d5f63b97e110601aa20b8f22e6b81",
+                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "nonce" : "0x0000000000000000",
+                    "number" : "0x01",
+                    "parentHash" : "0x865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1",
+                    "receiptTrie" : "0xe1033a14f1e7dc4ce072d14e511053cf0ecd3c8f6c5ce88a94562e51f1a90abe",
+                    "stateRoot" : "0xd33509483a0af04ef0f4d30f0a0a315170d637a89e4196e568c184ca362e95d6",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d33509483a0af04ef0f4d30f0a0a315170d637a89e4196e568c184ca362e95d6a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0e1033a14f1e7dc4ce072d14e511053cf0ecd3c8f6c5ce88a94562e51f1a90abeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808257ac8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x865ca0c6deb7c6001c16f7fa14b2a7e4ec835076b77f59bb026ab203b9cb14b1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x2022c1f13bfa119eb88a97db1c184c60ac4ec31979545915a62876dbeb35a849",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02022c1f13bfa119eb88a97db1c184c60ac4ec31979545915a62876dbeb35a849a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf86e7ebcb32be15dfe70796de464dd44494d5f63b97e110601aa20b8f22e6b81",
+        "network" : "EIP158",
+        "postState" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f457ac",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4b854",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError.json b/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError.json
new file mode 100644
index 000000000..0171b425e
--- /dev/null
+++ b/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError.json
@@ -0,0 +1,99 @@
+{
+    "callToEmptyThenCallError" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "testeth 1.5.0.dev2-44+commit.bc7187ea",
+            "lllcversion" : "Version: 0.4.25-develop.2018.9.5+commit.9cb72fe6.Darwin.appleclang",
+            "source" : "src/GeneralStateTestsFiller/stEIP158Specific/callToEmptyThenCallErrorFiller.json",
+            "sourceHash" : "35907a4324732d5076898bb2f86ea15c20cb0dc242170e862f255a5c83050004"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "0x989680",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "Byzantium" : [
+                {
+                    "hash" : "0xf341372fc018357dda85c74aaae4029b5196a4a67035584f33a05382ae9b1099",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "Constantinople" : [
+                {
+                    "hash" : "0xf341372fc018357dda85c74aaae4029b5196a4a67035584f33a05382ae9b1099",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "0xf341372fc018357dda85c74aaae4029b5196a4a67035584f33a05382ae9b1099",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                "0x"
+            ],
+            "gasLimit" : [
+                "0x0927c0"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0Filler.json
new file mode 100644
index 000000000..b512d80ac
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stEIP158Specific/callToEmptyThenCallError_d0g0v0Filler.json
@@ -0,0 +1,100 @@
+{
+    "callToEmptyThenCallError_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x989680",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "expect" : [
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                    }
+                }
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d46000f1506000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b6000f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "sealEngine" : "NoProof"
+    }
+}
\ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/callToEmptyThenCallErrorFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/callToEmptyThenCallErrorFiller.json
new file mode 100644
index 000000000..55838d464
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/callToEmptyThenCallErrorFiller.json
@@ -0,0 +1,73 @@
+{
+    "callToEmptyThenCallError" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x020000",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "1",
+            "currentTimestamp" : "1000",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : [">=EIP158"],
+                "result" : {
+                    "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4" : {
+                        "shouldnotexist" : "1"
+                    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+                "nonce" : "0",
+                "code" : "{ (CALL 0 0xee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4 0 0 0 0 0) (CALL 0 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
+                "storage": {
+                }
+            },
+            "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+                "nonce" : "0",
+                "code" : "{ (GAS) }",
+                "storage": {
+                }
+            },
+            "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": {
+                "nonce": "0",
+                "balance": "0",
+                "code": "",
+                "storage": {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "600000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}