Hive tests with Byzantine

1 files changed, 162 insertions, 48 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
index 92f4b4d2d..b83109710 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG2_d0g1v0_EIP150" : {
+    "RevertSubCallStorageOOG2_d0g1v0_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/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xf6e5ddb8d944151a67390b0b3242913d6c2507961de71950d79cf9c79cf2c5bf",
-                    "mixHash" : "0xee57de7f6ba5d9340eb84ae4389d8c4252768cb3096f5f035a159404649533d2",
-                    "nonce" : "0x112de40fdb50d4b9",
+                    "hash" : "0x7698b7b719b5ad9548186432da447844fc63e1d956059e163c18965b0c41f311",
+                    "mixHash" : "0x62c93a687dc30556a606fa7df00c0deb73eaaa1aa4b02b6bea565f1c10dc89d7",
+                    "nonce" : "0x989025a716f12364",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
-                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
+                    "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
+                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0ee57de7f6ba5d9340eb84ae4389d8c4252768cb3096f5f035a159404649533d288112de40fdb50d4b9f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a062c93a687dc30556a606fa7df00c0deb73eaaa1aa4b02b6bea565f1c10dc89d788989025a716f12364f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6e5ddb8d944151a67390b0b3242913d6c2507961de71950d79cf9c79cf2c5bf",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7698b7b719b5ad9548186432da447844fc63e1d956059e163c18965b0c41f311",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
                 "code" : "",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_EIP158" : {
+    "RevertSubCallStorageOOG2_d0g1v0_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/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xb43f4e854e7ef4a3e3d9ee957f42ac2807318f0cec3cc0abbb4919ae7b82a5b3",
-                    "mixHash" : "0x0c5f3fcce481d944ee61862325a090f2c4c3377a53440d4803548f9a95d700df",
-                    "nonce" : "0xa37c7e9d6c473184",
+                    "hash" : "0x1aea095850d8d391b3c62035342572850db769e6096d2d63aa90741651f718c0",
+                    "mixHash" : "0xd8986acda5477ecd220fddf482c16aebb9979741685d9d1dc7971316fd02677f",
+                    "nonce" : "0x35701da7e341983f",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
-                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
+                    "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
+                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a00c5f3fcce481d944ee61862325a090f2c4c3377a53440d4803548f9a95d700df88a37c7e9d6c473184f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0d8986acda5477ecd220fddf482c16aebb9979741685d9d1dc7971316fd02677f8835701da7e341983ff866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb43f4e854e7ef4a3e3d9ee957f42ac2807318f0cec3cc0abbb4919ae7b82a5b3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x1aea095850d8d391b3c62035342572850db769e6096d2d63aa90741651f718c0",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
                 "code" : "",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_Frontier" : {
+    "RevertSubCallStorageOOG2_d0g1v0_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/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xe26fec98300b3f5abf9a5c3a0c97297dab06ecbbbd3051945a0245955707ad4b",
-                    "mixHash" : "0xa331654be7772e472d8d58c536169cae9ef618a868ddafa7cdd76c97f1181af2",
-                    "nonce" : "0x5fb623475c10c96b",
+                    "hash" : "0xb14578113646cb29484da50cc59db57bcc9774a7ad1dbf0c6290750bd8bcc755",
+                    "mixHash" : "0x6766ee9397e7f6c21e0ed931a9d16b363f3f7e4813962cd704d49da5e4d0b306",
+                    "nonce" : "0x8eec2fb5365500f3",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0a331654be7772e472d8d58c536169cae9ef618a868ddafa7cdd76c97f1181af2885fb623475c10c96bf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a06766ee9397e7f6c21e0ed931a9d16b363f3f7e4813962cd704d49da5e4d0b306888eec2fb5365500f3f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe26fec98300b3f5abf9a5c3a0c97297dab06ecbbbd3051945a0245955707ad4b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb14578113646cb29484da50cc59db57bcc9774a7ad1dbf0c6290750bd8bcc755",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_Homestead" : {
+    "RevertSubCallStorageOOG2_d0g1v0_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/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xed2a8d6e042cdf84a15922794f60bbb8aa28dcb10ac9b52e8460840a191ff878",
-                    "mixHash" : "0x38d4ffb74ec14e38fb669a1df59886d33578f77836efac72b1fb368a45747af5",
-                    "nonce" : "0x762fedba3375af37",
+                    "hash" : "0xefb38c018d7324e40d07667eb6812018d85d25566c66e2c12bd340608d2c162d",
+                    "mixHash" : "0xcbb6c4f70ab97f49a0322bec81e830ce67e421fb94f8b48d245248451de02765",
+                    "nonce" : "0xa2ae0ad77275bc9a",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a038d4ffb74ec14e38fb669a1df59886d33578f77836efac72b1fb368a45747af588762fedba3375af37f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0cbb6c4f70ab97f49a0322bec81e830ce67e421fb94f8b48d245248451de0276588a2ae0ad77275bc9af866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed2a8d6e042cdf84a15922794f60bbb8aa28dcb10ac9b52e8460840a191ff878",
-        "network" : "Homestead",
+        "lastblockhash" : "0xefb38c018d7324e40d07667eb6812018d85d25566c66e2c12bd340608d2c162d",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g1v0_Metropolis" : {
+    "RevertSubCallStorageOOG2_d0g1v0_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/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0x3c7d2a869feebf9685fb11b04da6c6e21ccacab6728f1a01309b12ba5f57b5d3",
-                    "mixHash" : "0x8935e5eee177203cee43ff9844767b84f1befe5cf249e07925d389261a05c8af",
-                    "nonce" : "0xca033dc3a79eaa5b",
+                    "hash" : "0x18c7c10782d296e04f9f37a2b1d3c10b5257ac0c48f7cab4682f9fb0f7ec74f4",
+                    "mixHash" : "0x3a8dba684695d691d67a6c147c9cf6db79afb833f0bcc59a71c77c0a575a9c4a",
+                    "nonce" : "0x20a407bf6ad02225",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
-                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
+                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
+                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a08935e5eee177203cee43ff9844767b84f1befe5cf249e07925d389261a05c8af88ca033dc3a79eaa5bf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a03a8dba684695d691d67a6c147c9cf6db79afb833f0bcc59a71c77c0a575a9c4a8820a407bf6ad02225f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c7d2a869feebf9685fb11b04da6c6e21ccacab6728f1a01309b12ba5f57b5d3",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x18c7c10782d296e04f9f37a2b1d3c10b5257ac0c48f7cab4682f9fb0f7ec74f4",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f503e7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0d",
+                    "0x01" : "0x0e"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40c19",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG2_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0103e7",
+                    "hash" : "0x4a8c0041b47e1b2904389436c371670fef40c9edc657d68a377d43823a6ecb11",
+                    "mixHash" : "0x0ee74528156e3c25165bf844001c20fde3aaa82b4606663c54671c065f685ffe",
+                    "nonce" : "0x7ea68562950df224",
+                    "number" : "0x01",
+                    "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+                    "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
+                    "stateRoot" : "0x4508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a00ee74528156e3c25165bf844001c20fde3aaa82b4606663c54671c065f685ffe887ea68562950df224f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234e",
+                        "s" : "0x28495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4a8c0041b47e1b2904389436c371670fef40c9edc657d68a377d43823a6ecb11",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503e7",
                 "code" : "",