Merge pull request #500 from mattdean-digicatapult/add-new-touched-cleanup-case

Add new touched cleanup case

2 files changed, 173 insertions, 0 deletions

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"
+            ]
+        }
+    }
+}