1 files changed, 201 insertions, 47 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json
index 55a02a6fa..6197ee794 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertDepth2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertDepth2_d0g0v0_EIP150" : {
+    "RevertDepth2_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/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x46d5385b4d51242da488ad04cb80f1e39973377b0015783eea341cc49c07fbbd",
-                    "mixHash" : "0xe74a7f8d1177a28fe06ac9c687efa5e727b30901dac56ed0b208e3533c50c5b2",
-                    "nonce" : "0x944ea51ce89cf73d",
+                    "hash" : "0x616e6ca645cb9a54806c05ef5b9f7afb07cc7278fdde6e8595c2331ed773ac8a",
+                    "mixHash" : "0x198ea582d00b4b3180ebf828cae29477f6ac3096bd9a93bb26d9758bf91f0008",
+                    "nonce" : "0xde125fc44fea3ab7",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
-                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
-                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
+                    "receiptTrie" : "0x3c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995",
+                    "stateRoot" : "0x79afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0e74a7f8d1177a28fe06ac9c687efa5e727b30901dac56ed0b208e3533c50c5b288944ea51ce89cf73df862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738ba0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa03c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0198ea582d00b4b3180ebf828cae29477f6ac3096bd9a93bb26d9758bf91f000888de125fc44fea3ab7f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46d5385b4d51242da488ad04cb80f1e39973377b0015783eea341cc49c07fbbd",
-        "network" : "EIP150",
+        "lastblockhash" : "0x616e6ca645cb9a54806c05ef5b9f7afb07cc7278fdde6e8595c2331ed773ac8a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
                 "code" : "",
@@ -146,10 +153,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_EIP158" : {
+    "RevertDepth2_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/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -161,18 +168,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0xe0e24ec21b314e60f22f7df42798e7ceded5d5ac926706eeed17ce92cf0fc513",
-                    "mixHash" : "0x8e22af5118bbef9b67174c8644922f7e80c67f39e4b945ec32651f3a856bae98",
-                    "nonce" : "0x544e23ede1a0adbf",
+                    "hash" : "0xaefe4b2f6eb0e6aa0d67fcd5dbb85e9d3836c29789e66a56d1ae9a4a804ed94d",
+                    "mixHash" : "0x1dc211ce59af3b5398cb6103980dd4056b36d337579b56f22564cdcd1d22aea3",
+                    "nonce" : "0x9033e857623b5284",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
-                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
-                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
+                    "receiptTrie" : "0x3c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995",
+                    "stateRoot" : "0x79afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a08e22af5118bbef9b67174c8644922f7e80c67f39e4b945ec32651f3a856bae9888544e23ede1a0adbff862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738ba0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa03c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a01dc211ce59af3b5398cb6103980dd4056b36d337579b56f22564cdcd1d22aea3889033e857623b5284f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -209,9 +216,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0e24ec21b314e60f22f7df42798e7ceded5d5ac926706eeed17ce92cf0fc513",
-        "network" : "EIP158",
+        "lastblockhash" : "0xaefe4b2f6eb0e6aa0d67fcd5dbb85e9d3836c29789e66a56d1ae9a4a804ed94d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
                 "code" : "",
@@ -293,10 +307,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_Frontier" : {
+    "RevertDepth2_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/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -308,9 +322,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x0acd165bbc88b06db52fda4e74af4d81a6d21951c0684255c4f222bca9389f88",
-                    "mixHash" : "0x248eca4eb7aabd3edf5429871c7463d0d6d30d402465b45b70aeee8277bf64b1",
-                    "nonce" : "0xdb183e8c0cd7e7b9",
+                    "hash" : "0xeed0c7fe43fccf3a6f730ed05fb504356088dea58557ee9df3e666942b5c6145",
+                    "mixHash" : "0x9d3d066791b68266b13d55c4b6e05b6627038e1c6cfd3bd9a79d4440f7fa7b19",
+                    "nonce" : "0x91c87682725c1e30",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
                     "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
@@ -319,7 +333,7 @@
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0248eca4eb7aabd3edf5429871c7463d0d6d30d402465b45b70aeee8277bf64b188db183e8c0cd7e7b9f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a09d3d066791b68266b13d55c4b6e05b6627038e1c6cfd3bd9a79d4440f7fa7b198891c87682725c1e30f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -356,8 +370,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0acd165bbc88b06db52fda4e74af4d81a6d21951c0684255c4f222bca9389f88",
-        "network" : "Frontier",
+        "lastblockhash" : "0xeed0c7fe43fccf3a6f730ed05fb504356088dea58557ee9df3e666942b5c6145",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
@@ -440,10 +454,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_Homestead" : {
+    "RevertDepth2_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/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -455,9 +469,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x7aadbf4abbac5e282e22e0aa69fed8a6cde2acd1775cd6830874809d4fb07ac3",
-                    "mixHash" : "0x1cda078fcda658ea631ea062975f4b273cb00c6466cfbdb11eb1f5aa7e3f2f24",
-                    "nonce" : "0xc3b159b3a65becbe",
+                    "hash" : "0x51011145cbaa734ff98f0cd9339b51e2534acf6c08941fca96a2312ac211a2ff",
+                    "mixHash" : "0xcc44ed071954a833b11006cf7e6c7adede569b55f644416b463d1af7f0bf1896",
+                    "nonce" : "0x610cb0023517e2da",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
                     "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
@@ -466,7 +480,7 @@
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a01cda078fcda658ea631ea062975f4b273cb00c6466cfbdb11eb1f5aa7e3f2f2488c3b159b3a65becbef862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a0cc44ed071954a833b11006cf7e6c7adede569b55f644416b463d1af7f0bf189688610cb0023517e2daf862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -503,8 +517,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7aadbf4abbac5e282e22e0aa69fed8a6cde2acd1775cd6830874809d4fb07ac3",
-        "network" : "Homestead",
+        "lastblockhash" : "0x51011145cbaa734ff98f0cd9339b51e2534acf6c08941fca96a2312ac211a2ff",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
@@ -587,10 +601,10 @@
             }
         }
     },
-    "RevertDepth2_d0g0v0_Metropolis" : {
+    "RevertDepth2_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/RevertDepth2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -602,18 +616,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029abd",
-                    "hash" : "0x09440d5a3e0c3cb7e0206672123d142ac4a34b0f2190df6490c8b006f82d28b0",
-                    "mixHash" : "0x0ed559c6dd18df5ae2966150bd01767772f6655e57b64d80289bc2f7c490e4eb",
-                    "nonce" : "0xaff79542f1de77f7",
+                    "hash" : "0x1b4718d9d16f2d78e6acfa6dbc1d40840dbd99b6283cdb79b10cbbb86a620dad",
+                    "mixHash" : "0x9085597df893e40ecd14f3164cc7cefccf087b4b01da80823952ebb9c3d632f1",
+                    "nonce" : "0x0984ef0e2fe415cb",
                     "number" : "0x01",
                     "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
-                    "receiptTrie" : "0x3c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995",
-                    "stateRoot" : "0x79afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738b",
+                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
+                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079afee77818842c3174e947006388f373f48787f5b5c05a72d78d994808a738ba0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa03c6f093a7893cba8ad3260a6fc4bd0354037088208bb0a8e241f113127384995b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a00ed559c6dd18df5ae2966150bd01767772f6655e57b64d80289bc2f7c490e4eb88aff79542f1de77f7f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a09085597df893e40ecd14f3164cc7cefccf087b4b01da80823952ebb9c3d632f1880984ef0e2fe415cbf862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -650,16 +664,156 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09440d5a3e0c3cb7e0206672123d142ac4a34b0f2190df6490c8b006f82d28b0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x1b4718d9d16f2d78e6acfa6dbc1d40840dbd99b6283cdb79b10cbbb86a620dad",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f69abd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a27543",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073b000000000000000000000000000000000000000620249f0f16001556000600060006000600073d000000000000000000000000000000000000000620249f0f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000546001016000556000600060006000600073c00000000000000000000000000000000000000061c350f16001555a600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertDepth2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertDepth2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x029abd",
+                    "hash" : "0xaa4b330daa89547a92ab01016ded4a59b215c7767b7f37904b404e8d5bc00267",
+                    "mixHash" : "0x4bc6952cbd3e664da5ebd623ffd8dd38bebab1acfa6d2a9146d915bb5ec11bb3",
+                    "nonce" : "0x98a37b437fd1e196",
+                    "number" : "0x01",
+                    "parentHash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
+                    "receiptTrie" : "0x68b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602e",
+                    "stateRoot" : "0xa73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xf3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a73e03ccd49969c7132d7a0d8a80fdcf8735f38f4778d63afcd98e137126919fa0f3f2ae0bd4ab03c7876d0a77879b6dd49fa680ab6709e75f55279c8006c6b08aa068b9531ece03a4147c30a13c7e1878906770f1298b2813630d33dde93000602eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029abd8203e880a04bc6952cbd3e664da5ebd623ffd8dd38bebab1acfa6d2a9146d915bb5ec11bb38898a37b437fd1e196f862f860800183029abd94a00000000000000000000000000000000000000080801ba03937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66ea055fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029abd",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3937bea6a1633387223215ebe1f86e63a7b4b2b1f3e7b1ad88343465eb03a66e",
+                        "s" : "0x55fe9b0de469d8575c2b9fc9c2e71d395a9bab580f17f00f657d1a696e3f5345",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe781e8f9404d76a80fe4f3e434bee0d45c0afa15f2494fdc8c588682b61fc9f7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2b10c889bc42e1e714a22bad4b9e5bf92723f8c420b8aa9937b0e612c0c6b5fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xaa4b330daa89547a92ab01016ded4a59b215c7767b7f37904b404e8d5bc00267",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69abd",
                 "code" : "",