eip158 to general state - eip special tests

10 files changed, 934 insertions, 0 deletions

diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json
new file mode 100644
index 000000000..9b7c7a57a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_OneVCallSuicideFiller.json
@@ -0,0 +1,94 @@
+{
+    "CALL_OneVCallSuicide" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"shouldnotexist" : "1"
+		    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"storage" : {
+		            "0x00" : "0x08d5b6",
+		            "0x64" : "0x085707"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Frontier", "Homestead"],
+                "result" : {
+			"c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			    "shouldnotexist" : "1"
+			},
+			"b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			    "balance" : "0x64",
+			    "nonce" : "0x00",
+			    "storage" : {
+				"0x00" : "0x08d5b6",
+				"0x64" : "0x086d23"
+			    }
+			}
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "100",
+		"nonce" : "0",
+		"code" : "{ [[0]](GAS) (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 1 0 0 0 0) [[100]] (GAS) }",
+		"storage": {
+		}
+            },
+	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"storage": {
+		}
+            }
+
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "600000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
new file mode 100644
index 000000000..05416bf2d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/CALL_ZeroVCallSuicideFiller.json
@@ -0,0 +1,94 @@
+{
+    "CALL_ZeroVCallSuicide" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"shouldnotexist" : "1"
+		    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"storage" : {
+		            "0x00" : "0x08d5b6",
+		            "0x64" : "0x087133"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Frontier", "Homestead"],
+                "result" : {
+		        "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			    "shouldnotexist" : "1"
+		        },
+                        "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x00",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x64" : "0x08874f"
+                            }
+                        }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[0]](GAS) (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+		"storage": {
+		}
+            },
+	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (SUICIDE 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b) }",
+		"storage": {
+		}
+            }
+
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "600000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
new file mode 100644
index 000000000..6180c0e1b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
@@ -0,0 +1,101 @@
+{
+    "EXP_Empty" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"comment" : "https://etherpad.net/p/EIP158",
+		        "storage" : {
+		            "0x00" : "0x08d5b6",
+		            "0x02" : "0x0873c4",
+		            "0x03" : "0x01",
+		            "0x04" : "0x07d76c",
+		            "0x06" : "0x07741c",
+		            "0x08" : "0x070f3c",
+		            "0x0a" : "0x06a73c",
+		            "0x0b" : "0x01",
+		            "0x0c" : "0x060ae4",
+		            "0x0d" : "0x01",
+		            "0x0e" : "0x056e8c",
+		            "0x0f" : "0x01",
+		            "0x64" : "0x04d234"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Frontier", "Homestead"],
+                "result" : {
+                        "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {    
+                            "storage" : {
+                                "0x00" : "0x08d5b6",
+                                "0x02" : "0x0873ec",
+                                "0x03" : "0x01",
+                                "0x04" : "0x07d794",
+                                "0x06" : "0x077584",
+                                "0x08" : "0x071324",
+                                "0x0a" : "0x06b024",
+                                "0x0b" : "0x01",
+                                "0x0c" : "0x0613cc",
+                                "0x0d" : "0x01",
+                                "0x0e" : "0x057774",
+                                "0x0f" : "0x01",
+                                "0x64" : "0x04db1c"
+                            }
+                        }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[0]](GAS) [[1]](EXP 0 12)  [[2]](GAS) [[3]](EXP 12 0) [[4]](GAS) [[5]](EXP 0 0xffffffffffffffff) [[6]](GAS) [[7]](EXP 0 0xffffffffffffffffffffffffffffffff) [[8]](GAS) [[9]](EXP 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[10]](GAS) [[11]](EXP 0xffffffffffffffff 0) [[12]](GAS) [[13]](EXP 0xffffffffffffffffffffffffffffffff 0) [[14]](GAS) [[15]](EXP 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) [[100]] (GAS) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "600000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json
new file mode 100644
index 000000000..64a89f8d7
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toEpmtyFiller.json
@@ -0,0 +1,100 @@
+{
+    "EXTCODESIZE_toEpmty" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"balance" : "0",
+			"nonce" : "0",
+			"code" : "",
+			"storage": {
+			}
+		    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"storage" : {
+		            "0x00" : "0x08d5b6",
+		            "0x64" : "0x087147"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Frontier", "Homestead"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"balance" : "0",
+			"nonce" : "0",
+			"code" : "",
+			"storage": {
+			}
+		    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"storage" : {
+                            "0x00" : "0x08d5b6",
+                            "0x64" : "0x0873ef"
+                        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[0]](GAS) [[1]] (EXTCODESIZE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[100]] (GAS) }",
+		"storage": {
+		}
+            },
+	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "",
+		"storage": {
+		}
+            }
+
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "600000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json
new file mode 100644
index 000000000..411bf912c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXTCODESIZE_toNonExistentFiller.json
@@ -0,0 +1,84 @@
+{
+    "EXTCODESIZE_toNonExistent" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"shouldnotexist" : "1"
+		    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"storage" : {
+		            "0x00" : "0x08d5b6",
+		            "0x64" : "0x087147"
+		        }
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Frontier", "Homestead"],
+                "result" : {
+		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"shouldnotexist" : "1"
+		    },
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			"storage" : {
+		            "0x00" : "0x08d5b6",
+                            "0x64" : "0x0873ef"
+		        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[0]](GAS) [[1]] (EXTCODESIZE 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b) [[100]] (GAS) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "600000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json
new file mode 100644
index 000000000..c59c30353
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert2Filler.json
@@ -0,0 +1,77 @@
+{
+    "TouchToEmptyAccountRevert2" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["ALL"],
+                "result" : {
+		    "1000000000000000000000000000000000000000" : {
+			"balance" : "",
+		        "code" : "",
+		        "nonce" : "0",
+		        "storage" : {
+		        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "1000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[0]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) [[1]](CALL 30000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
+		"storage": {
+		}
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[2]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) [[3]] 1 }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "77400"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json
new file mode 100644
index 000000000..20f990a8e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevert3Filler.json
@@ -0,0 +1,91 @@
+{
+    "TouchToEmptyAccountRevert3" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["ALL"],
+                "result" : {
+		    "1000000000000000000000000000000000000000" : {
+			"balance" : "",
+		        "code" : "",
+		        "nonce" : "0",
+		        "storage" : {
+		        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "1000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[0]](CALL 30000 0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[1]](CALL 30000 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) }",
+		"storage": {
+		}
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[2]](CALL 30000 0xe94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[3]] 1 }",
+		"storage": {
+		}
+            },
+	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+		"storage": {
+		}
+            },
+	    "e94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ (SUICIDE 0x1000000000000000000000000000000000000000) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "82400"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "ba4f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json
new file mode 100644
index 000000000..12214cb3a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/TouchToEmptyAccountRevertFiller.json
@@ -0,0 +1,77 @@
+{
+    "TouchToEmptyAccountRevert" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["ALL"],
+                "result" : {
+		    "1000000000000000000000000000000000000000" : {
+			"balance" : "",
+		        "code" : "",
+		        "nonce" : "0",
+		        "storage" : {
+		        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "1000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[0]](CALL 30000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[2]] 1 }",
+		"storage": {
+		}
+            },
+	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0",
+		"nonce" : "0",
+		"code" : "{ [[1]](CALL 30000 0x1000000000000000000000000000000000000000 0 0 0 0 0) }",
+		"storage": {
+		}
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "70000"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json b/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json
new file mode 100644
index 000000000..e7a0cd9d9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/chfastRevertDepth2Filler.json
@@ -0,0 +1,103 @@
+{
+    "chfastRevertDepth2" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["ALL"],
+                "result" : {
+		    "a000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00",
+		            "0x01" : "0x00",
+		            "0x02" : "0x00"
+		        }
+		    },
+		    "b000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00",
+		            "0x01" : "0x00"
+		        }
+		    },
+		    "c000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00"
+		        }
+		    },
+		    "d000000000000000000000000000000000000000" : {
+		        "storage" : {
+		            "0x00" : "0x00",
+		            "0x01" : "0x00",
+		            "0x02" : "0x00"
+		        }
+		    }
+                }
+            }
+        ],
+        "pre" :
+        {
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "a000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 150000 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (CALL 150000 0xd000000000000000000000000000000000000000 0 0 0 0 0)}",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "b000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0)}",
+                "nonce" : "",
+                "storage" : {
+                }
+            },
+	    "c000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) }",
+                "nonce" : "0",
+                "storage" : {
+                }
+            },
+	    "d000000000000000000000000000000000000000" : {
+                "balance" : "",
+                "code" : "{ [[0]] (ADD 1 (SLOAD 0)) [[1]] (CALL 50000 0xc000000000000000000000000000000000000000 0 0 0 0 0) [[2]] (GAS)}",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+	    "data" : "In transaction T to A, A call B call C, then A call D calls C, D fails after calling C.",
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "170685"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0x014f",
+            "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+            "to" : "a000000000000000000000000000000000000000",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json
new file mode 100644
index 000000000..a1ccce26d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/vitalikTransactionTestFiller.json
@@ -0,0 +1,113 @@
+{
+    "vitalikTransactionTest" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "45678256",
+            "currentGasLimit" : "10000000",
+            "currentNumber" : "2675000",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["EIP158"],
+                "result" : {
+		    "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": {
+		        "nonce": "0x00", 
+		        "balance": "0x00", 
+		        "storage": {}, 
+		        "code": "0x"
+		    }, 
+		    "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": {
+		        "nonce": "0x03", 
+		        "balance": "0x00", 
+		        "storage": {}, 
+		        "code": "0x"
+		    }, 
+		    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba": {
+		        "nonce": "0x00", 
+		        "balance": "0x044dec", 
+		        "storage": {}, 
+		        "code": "0x"
+		    }, 
+		    "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": {
+		        "nonce": "0x01", 
+		        "balance": "0x00", 
+		        "storage": {}, 
+		        "code": "0x6000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe"
+		    }, 
+		    "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {
+		        "nonce": "0x0150", 
+		        "balance": "0xfffffffffffffbb213", 
+		        "storage": {}, 
+		        "code": "0x"
+		    }
+                }
+            },
+	    {
+                "indexes" : {
+                    "data" : -1,
+                    "gas" : -1,
+                    "value" : -1
+                },
+                "network" : ["Frontier", "Homestead"],
+                "result" : {
+		    "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": {
+		        "nonce": "0x00", 
+		        "balance": "0x00", 
+		        "storage": {}, 
+		        "code": "0x"
+		    }, 
+		    "1bc78ae0e5ec5cb439f1d5355d6f90d38343e109": {
+		        "nonce": "0x02", 
+		        "balance": "0x00", 
+		        "storage": {}, 
+		        "code": "0x"
+		    }, 
+		    "51f9d7f98e997bdd6bebde4c2dd27be8c99303aa": {
+		        "shouldnotexist" : "1"
+		    }, 
+		    "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {
+		        "nonce": "0x0150",
+		        "storage": {}, 
+		        "code": "0x"
+		    }
+                }
+            }
+        ],
+        "pre": {
+            "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": {
+                "nonce": "0x014f", 
+                "balance": "0xffffffffffffffffff", 
+                "code": "0x", 
+                "storage": {}
+            }, 
+            "ee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4": {
+                "nonce": "0x00", 
+                "balance": "0x00", 
+                "code": "0x", 
+                "storage": {}
+            }
+        }, 
+        "transaction" : {
+            "data" : [
+                "0x6000607f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050596100718061006c59396100dd5661005f8061000e60003961006d566000603f5359610043806100135939610056566c010000000000000000000000007fee098e6c2a43d9e2c04f08f0c3a87b0ba59079d4d53532071d6cd0cb86facd5605ff6100008061003f60003961003f565b6000f35b816000f0905050fe5b6000f35b816000f0905060405260006000600060006000604051620249f0f15061000080610108600039610108565b6000f3"
+            ],
+            "gasLimit" : [
+                "0x1fffff"
+            ],
+            "gasPrice" : "1",
+            "nonce" : "0x014f",
+            "secretKey" : "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+            "to" : "",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}