Hive tests with Byzantine

1 files changed, 160 insertions, 48 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json
index 10634a2e4..c8a7c6625 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g1v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG_d0g1v1_EIP150" : {
+    "RevertSubCallStorageOOG_d0g1v1_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/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x1fe51a675a320e3b5d32d02cffe8a6dd773469f52de569ab3a3f058db3997826",
-                    "mixHash" : "0xfcd4d2a7cf0b46ade5ebb9f42efeff7b7d2a1ddf8126fb2d8d83a51779316759",
-                    "nonce" : "0x86a174e86ccffebb",
+                    "hash" : "0xc7f7a628d0b9979403e748418f3636d021f9af732d58cebcadac024657e29e7a",
+                    "mixHash" : "0xbd552f46424729156ac16fd325dd9ea8f48f2284e0879e1d9786b2a4193f6677",
+                    "nonce" : "0xc5e0347674225477",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
-                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
+                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
+                    "stateRoot" : "0xc6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0fcd4d2a7cf0b46ade5ebb9f42efeff7b7d2a1ddf8126fb2d8d83a517793167598886a174e86ccffebbf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0bd552f46424729156ac16fd325dd9ea8f48f2284e0879e1d9786b2a4193f667788c5e0347674225477f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fe51a675a320e3b5d32d02cffe8a6dd773469f52de569ab3a3f058db3997826",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc7f7a628d0b9979403e748418f3636d021f9af732d58cebcadac024657e29e7a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_EIP158" : {
+    "RevertSubCallStorageOOG_d0g1v1_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/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x389ea5faec54777b52e379c7d531d9fcaebb0733016f0d83f6a97d4cdba94289",
-                    "mixHash" : "0xd3e8c4e343cbd8abfa3051bf5171d739d2b4a2486845dd2e8d56b690bac7035d",
-                    "nonce" : "0xe5d81a70693ef203",
+                    "hash" : "0xcaf42a64c1a73f3fc9da48928c34cda902dd4563e359193bdf27ecdadcabdc17",
+                    "mixHash" : "0xd5b633763865cee8e84e8fa293550c9e62759e01db7950e010295300473c9987",
+                    "nonce" : "0x91305eb51e3ed937",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
-                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
+                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
+                    "stateRoot" : "0xc6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0d3e8c4e343cbd8abfa3051bf5171d739d2b4a2486845dd2e8d56b690bac7035d88e5d81a70693ef203f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0d5b633763865cee8e84e8fa293550c9e62759e01db7950e010295300473c99878891305eb51e3ed937f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x389ea5faec54777b52e379c7d531d9fcaebb0733016f0d83f6a97d4cdba94289",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcaf42a64c1a73f3fc9da48928c34cda902dd4563e359193bdf27ecdadcabdc17",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_Frontier" : {
+    "RevertSubCallStorageOOG_d0g1v1_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/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xe9cd20bf543185fdb5acd5f0a1dc6b80804970b49285067bdeaa16d1b3c88431",
-                    "mixHash" : "0x354d2faace8d2f2060621813968ab9f7c076f9930bc518f416f801507414a039",
-                    "nonce" : "0x673e43d8f9b2723c",
+                    "hash" : "0x79439a97ba3d39119a4ead3fde76a33b841ea230472642d0b30263cbbde60f95",
+                    "mixHash" : "0x98512150f19334b54c190decec19654c7f90f2310bb57841e6c43e72c71df879",
+                    "nonce" : "0xf4aa16131c3003ca",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0354d2faace8d2f2060621813968ab9f7c076f9930bc518f416f801507414a03988673e43d8f9b2723cf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a098512150f19334b54c190decec19654c7f90f2310bb57841e6c43e72c71df87988f4aa16131c3003caf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9cd20bf543185fdb5acd5f0a1dc6b80804970b49285067bdeaa16d1b3c88431",
-        "network" : "Frontier",
+        "lastblockhash" : "0x79439a97ba3d39119a4ead3fde76a33b841ea230472642d0b30263cbbde60f95",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_Homestead" : {
+    "RevertSubCallStorageOOG_d0g1v1_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/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x1362dd1967a8f76ff3e0bc381bcdbd7a28b646574ad9a35fd528f2055c12e195",
-                    "mixHash" : "0x6e530a0eee5e73253e5eb875e25d945043b18dae60e370b4438a300aa21aa9e6",
-                    "nonce" : "0x2080ab5c36299cdb",
+                    "hash" : "0x96304bf3f42d34728510fc2031597573b5433130526c3121d2b76f821782fce5",
+                    "mixHash" : "0x2601b79af305502ac221a4391ad584ab70ffa82b03d46372f0db3d43a6631391",
+                    "nonce" : "0xa24d97b20ff045a9",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a06e530a0eee5e73253e5eb875e25d945043b18dae60e370b4438a300aa21aa9e6882080ab5c36299cdbf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a02601b79af305502ac221a4391ad584ab70ffa82b03d46372f0db3d43a663139188a24d97b20ff045a9f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1362dd1967a8f76ff3e0bc381bcdbd7a28b646574ad9a35fd528f2055c12e195",
-        "network" : "Homestead",
+        "lastblockhash" : "0x96304bf3f42d34728510fc2031597573b5433130526c3121d2b76f821782fce5",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG_d0g1v1_Metropolis" : {
+    "RevertSubCallStorageOOG_d0g1v1_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/RevertSubCallStorageOOG_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xcd630501bd5220c71cba4b80b8b3d4c0d43ed6be2e898bf71eee64e6bfad0e34",
-                    "mixHash" : "0x814dc29dee4d1a35173b64586e5c28311bce862658ad734c2e5a457962e18bba",
-                    "nonce" : "0x6e7ef990002909b1",
+                    "hash" : "0x4461baf248047ffedbb6ac8108294c98ecf1b20fd0103f404fb3435a446f7c74",
+                    "mixHash" : "0x24aefb301501e300d53ed386000c76fdbfa7f15346f5bc6cf75655ca05372325",
+                    "nonce" : "0x9cc223f95809169a",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
-                    "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
-                    "stateRoot" : "0xc6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274",
+                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
+                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c6520d5ff3cd89d7c2dcc460b23d356cdaf3172d579f266b544232120372f274a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0814dc29dee4d1a35173b64586e5c28311bce862658ad734c2e5a457962e18bba886e7ef990002909b1f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a024aefb301501e300d53ed386000c76fdbfa7f15346f5bc6cf75655ca05372325889cc223f95809169af866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd630501bd5220c71cba4b80b8b3d4c0d43ed6be2e898bf71eee64e6bfad0e34",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4461baf248047ffedbb6ac8108294c98ecf1b20fd0103f404fb3435a446f7c74",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f6c308",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a24cf8",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600181905550600e600281905550600190505b905600a165627a7a723058202a8a75d7d795b5bcb9042fb18b283daa90b999a11ddec892f548732235342eb60029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG_d0g1v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG_d0g1v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x02c308",
+                    "hash" : "0xfe7b97c09ae9c76690186803a4556e2dd6f0f2801cb8e56c832362f9619f0088",
+                    "mixHash" : "0x887c38590798f4b21ca98c407b45b72e3364b10f137e823994c5a7d9c5181461",
+                    "nonce" : "0x1c294eaa7bb93f34",
+                    "number" : "0x01",
+                    "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+                    "receiptTrie" : "0x5cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196",
+                    "stateRoot" : "0x1ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ffcda6b66d61dbb242a4b582658c740bcc897357210c3d1928a7cc69a58b9a8a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a05cd3acb5eb76fc9b8080fb617dbfbd6dc1a760631f142f5c687fd0455559c196b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0887c38590798f4b21ca98c407b45b72e3364b10f137e823994c5a7d9c5181461881c294eaa7bb93f34f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02c308",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93fa",
+                        "s" : "0x26ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfe7b97c09ae9c76690186803a4556e2dd6f0f2801cb8e56c832362f9619f0088",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6c308",
                 "code" : "",