1 files changed, 187 insertions, 47 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json
index 4e838006c..6fa5c0f6f 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/TouchToEmptyAccountRevert_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TouchToEmptyAccountRevert_d0g0v0_EIP150" : {
+    "TouchToEmptyAccountRevert_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x8bfd7098877d3656c28a0c729f11a784c1905a8f55aac45653f326ae27b2168c",
-                    "mixHash" : "0xf31fd0a41a4632ec1f5641f6c717d9273001dd136698d60ba77e84657ad4d6b7",
-                    "nonce" : "0x1193a9b58290015f",
+                    "hash" : "0xd83e3a9e1e696c34d008b725bc2b628e43134f5c387dfe843114fb2fbf111f6a",
+                    "mixHash" : "0xf4bb936b6e0627a4b35a58c6f2ebbda59a3fb7f213facfb5bd00c1ca4003f461",
+                    "nonce" : "0x5cfc456c23858adc",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
-                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
-                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0xf6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0f31fd0a41a4632ec1f5641f6c717d9273001dd136698d60ba77e84657ad4d6b7881193a9b58290015ff862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416ea0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0f4bb936b6e0627a4b35a58c6f2ebbda59a3fb7f213facfb5bd00c1ca4003f461885cfc456c23858adcf862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bfd7098877d3656c28a0c729f11a784c1905a8f55aac45653f326ae27b2168c",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd83e3a9e1e696c34d008b725bc2b628e43134f5c387dfe843114fb2fbf111f6a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_EIP158" : {
+    "TouchToEmptyAccountRevert_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x120e5f2803f044d7fb628349c0e881d7c3fef966f1893de96b72aebe4ffd9589",
-                    "mixHash" : "0x5314dbcd2a888ea3ae239b27a880786f14d7b24b2465f647198ddf8325a62681",
-                    "nonce" : "0xb3148fc2ac81d6f7",
+                    "hash" : "0x8fe826ed4d2998fad85e56767460986a4a7f298a5850e387c1a75326a00c1c85",
+                    "mixHash" : "0xbaae025708094651afae4977220f92f5d01eadb0a2fce7b7c58e694a60cb4579",
+                    "nonce" : "0xdcb0059d434d8390",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
-                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
-                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
+                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
+                    "stateRoot" : "0xf6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05314dbcd2a888ea3ae239b27a880786f14d7b24b2465f647198ddf8325a6268188b3148fc2ac81d6f7f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416ea0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0baae025708094651afae4977220f92f5d01eadb0a2fce7b7c58e694a60cb457988dcb0059d434d8390f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x120e5f2803f044d7fb628349c0e881d7c3fef966f1893de96b72aebe4ffd9589",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8fe826ed4d2998fad85e56767460986a4a7f298a5850e387c1a75326a00c1c85",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_Frontier" : {
+    "TouchToEmptyAccountRevert_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0x6e4d70b07abef152584128b8790ef2389f190ea45b68a6a5e07b8310c25a527e",
-                    "mixHash" : "0x5c69eab1011ff94553e43bff7a95d0787a128edd04ec3e78d4eedcea578c29d9",
-                    "nonce" : "0x5f56da8bc4b92abb",
+                    "hash" : "0xdf421ddc7a183d8a484bd382c812243f3ae95f066ecc331d07367551d732649b",
+                    "mixHash" : "0xa00b027e66fc5e69819f9c080e9df89914d7d159ace646928599c3e8f8eee6c4",
+                    "nonce" : "0xfb9463e317433049",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
                     "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05c69eab1011ff94553e43bff7a95d0787a128edd04ec3e78d4eedcea578c29d9885f56da8bc4b92abbf862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0a00b027e66fc5e69819f9c080e9df89914d7d159ace646928599c3e8f8eee6c488fb9463e317433049f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e4d70b07abef152584128b8790ef2389f190ea45b68a6a5e07b8310c25a527e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdf421ddc7a183d8a484bd382c812243f3ae95f066ecc331d07367551d732649b",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_Homestead" : {
+    "TouchToEmptyAccountRevert_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xf2cbf6c5a0eb80f0e8d81413339adb468e8c75822290510dcef2e0ab8b9f30af",
-                    "mixHash" : "0xd47350b8f7c6376b9ec4fdba72795d07fc5b01662ba9584fe064e8ed507bd791",
-                    "nonce" : "0x972a056d1f24d33f",
+                    "hash" : "0x100e6469af4250159025825cab945dca7353d59563fafa0ad11c7644a5cca660",
+                    "mixHash" : "0x5a6640d7bcf050cdb87195291c19a58e156b1b01ae159c8cc38732187604f851",
+                    "nonce" : "0x37513d7d69379010",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
                     "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0d47350b8f7c6376b9ec4fdba72795d07fc5b01662ba9584fe064e8ed507bd79188972a056d1f24d33ff862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a05a6640d7bcf050cdb87195291c19a58e156b1b01ae159c8cc38732187604f8518837513d7d69379010f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2cbf6c5a0eb80f0e8d81413339adb468e8c75822290510dcef2e0ab8b9f30af",
-        "network" : "Homestead",
+        "lastblockhash" : "0x100e6469af4250159025825cab945dca7353d59563fafa0ad11c7644a5cca660",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "TouchToEmptyAccountRevert_d0g0v0_Metropolis" : {
+    "TouchToEmptyAccountRevert_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011170",
-                    "hash" : "0xdf2a14313205292d1b7a02cb9d326a13f334bd07d893a6c7bd483d82bd365ca5",
-                    "mixHash" : "0xa9eb384de959f4da46f2f984fe93b2d9766f816d1fcab1a1d7daa152082eb8f7",
-                    "nonce" : "0xd9561c1e6f0d4394",
+                    "hash" : "0xc62bbbe5a1858535868ca4b350935ed6610ac34c853478e59bcd2ef603b4448e",
+                    "mixHash" : "0x4684716a1e5f8457b89f3b1b4b2a0a7a7aecf3a7ccf19d5f1d56f97b2fe1c284",
+                    "nonce" : "0x186c6131170c87ba",
                     "number" : "0x01",
                     "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
-                    "receiptTrie" : "0x33206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4ba",
-                    "stateRoot" : "0xf6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416e",
+                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
+                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f6293e80736531f83021d7d88e5d206df6083c003e90b0e3e8731037ad31416ea0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a033206fdb0b04af73aed5fcc49c377894a2ad7acc74a06782884999e9c75de4bab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a0a9eb384de959f4da46f2f984fe93b2d9766f816d1fcab1a1d7daa152082eb8f788d9561c1e6f0d4394f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a04684716a1e5f8457b89f3b1b4b2a0a7a7aecf3a7ccf19d5f1d56f97b2fe1c28488186c6131170c87baf862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf2a14313205292d1b7a02cb9d326a13f334bd07d893a6c7bd483d82bd365ca5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc62bbbe5a1858535868ca4b350935ed6610ac34c853478e59bcd2ef603b4448e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51170",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3fe90",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b617530f16000556001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060006000731000000000000000000000000000000000000000617530f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TouchToEmptyAccountRevert_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/TouchToEmptyAccountRevert_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011170",
+                    "hash" : "0xa098c292e24a7d069e84cb49356b998c28f21f5157971645bad3e2bfa7360626",
+                    "mixHash" : "0x7e1cb4989bfac0530065db5f660b70d3116ad7e14a73ec81babddbaff810a653",
+                    "nonce" : "0xd0b317bdf485a407",
+                    "number" : "0x01",
+                    "parentHash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
+                    "receiptTrie" : "0x3f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56a",
+                    "stateRoot" : "0xf84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xd807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f84fb9fd05a6169e6e31f15f527fce50b1b92cb905d38b614cf99afa1c1df23ba0d807f8bb79d14c4fec93e6f45c181ea9926a3a7dacc86b275b394b36b841f867a03f8578a5df8bb8949052794afae34c2f203261cf9d8d66831c8bf1375454f56ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830111708203e880a07e1cb4989bfac0530065db5f660b70d3116ad7e14a73ec81babddbaff810a65388d0b317bdf485a407f862f86080018301117094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba02263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97ea059d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x011170",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x2263a45338e3fd8975ecb00bb2be4f23ab279a8c7565d97c2b33420b3003d97e",
+                        "s" : "0x59d5152e2d60f87cbb7a9d8c790730849553b2181514a6cd58564a29aeefad0e",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x315de2669b104120b392b9509423fdf81d5c015d4cfe702926064bb1c0092416",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbc6ae9218631af51abf428b88d44c9b4b97c81d3fea9d88203cd307f05cce58a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa098c292e24a7d069e84cb49356b998c28f21f5157971645bad3e2bfa7360626",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "",