Hive tests with Byzantine

1 files changed, 160 insertions, 48 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json
index a719e166e..5886e04a9 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g0v1.json
@@ -1,8 +1,8 @@
 {
-    "RevertSubCallStorageOOG2_d0g0v1_EIP150" : {
+    "RevertSubCallStorageOOG2_d0g0v1_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_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xf49a938e6b2dc329494ab3ee6a07671ff388a58723089d1ca8557de4f980517a",
-                    "mixHash" : "0xe28166b163b69bfad300f0271b02484e16a822c681a79302f91edfacdef07295",
-                    "nonce" : "0xeaa39bc239114d8e",
+                    "hash" : "0x4e43679090d11b91473b5421d752e497806a72bea068c9db361d4a58a74cf0d8",
+                    "mixHash" : "0xe83db0a798bc1297f18cf9cf339a1efd1bbdaa5301dc5ad5a262adc8f873dbc4",
+                    "nonce" : "0x1d8da41d5a95174c",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
-                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
+                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0e28166b163b69bfad300f0271b02484e16a822c681a79302f91edfacdef0729588eaa39bc239114d8ef866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0e83db0a798bc1297f18cf9cf339a1efd1bbdaa5301dc5ad5a262adc8f873dbc4881d8da41d5a95174cf866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf49a938e6b2dc329494ab3ee6a07671ff388a58723089d1ca8557de4f980517a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4e43679090d11b91473b5421d752e497806a72bea068c9db361d4a58a74cf0d8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_EIP158" : {
+    "RevertSubCallStorageOOG2_d0g0v1_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_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xfab4a326435b235640b910b29b59d1263effb85be8a0052abc94ff274177d53d",
-                    "mixHash" : "0x7db087b665b66b97ce194dac3eaafde49622273bef91c14bce16c2e5fea6b548",
-                    "nonce" : "0xec32e1a241d78986",
+                    "hash" : "0x3160ebaa638282c34417a7b94f03c1777f9b5bcc4a599cdda288ae551afd972d",
+                    "mixHash" : "0x900810292bc2aed207da3c03a187bc5269f59178016de811e317acb72eb6cd4a",
+                    "nonce" : "0x734c52f4c5f0049b",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
-                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
+                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a07db087b665b66b97ce194dac3eaafde49622273bef91c14bce16c2e5fea6b54888ec32e1a241d78986f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0900810292bc2aed207da3c03a187bc5269f59178016de811e317acb72eb6cd4a88734c52f4c5f0049bf866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfab4a326435b235640b910b29b59d1263effb85be8a0052abc94ff274177d53d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3160ebaa638282c34417a7b94f03c1777f9b5bcc4a599cdda288ae551afd972d",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_Frontier" : {
+    "RevertSubCallStorageOOG2_d0g0v1_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_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xa54d01d3b2019ddc3bea9ed4a3dbfd2108baff8319fb30941358bd8a4812c32c",
-                    "mixHash" : "0xeda7141d339f59e32c656e1e0fad7359f352210b36b07beab2521db5dda8f195",
-                    "nonce" : "0x281984d9dd058ed9",
+                    "hash" : "0xc451a7eea99ab12f32164ce10bafa0fd82d132dfe1a77a50f143a81f3ed057af",
+                    "mixHash" : "0x081c35b58d4d2ff7e5252bfbe479e5c1860fcf343b9c373eb51b1afcbecc8abb",
+                    "nonce" : "0x522f9fedf3e35c9a",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0eda7141d339f59e32c656e1e0fad7359f352210b36b07beab2521db5dda8f19588281984d9dd058ed9f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0081c35b58d4d2ff7e5252bfbe479e5c1860fcf343b9c373eb51b1afcbecc8abb88522f9fedf3e35c9af866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa54d01d3b2019ddc3bea9ed4a3dbfd2108baff8319fb30941358bd8a4812c32c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc451a7eea99ab12f32164ce10bafa0fd82d132dfe1a77a50f143a81f3ed057af",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_Homestead" : {
+    "RevertSubCallStorageOOG2_d0g0v1_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_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xe0ba61b322c8d8afb526ad0b70a86ba5f5e343a1ff1ffba7a6c862b67a89410f",
-                    "mixHash" : "0x6ae5340327eb873320dc6c9e83fbe36060a340334da7eea6d23006d7f7d5accf",
-                    "nonce" : "0x906fa6e6cc4bbb40",
+                    "hash" : "0x9fe21ae5e2adcc19e1be2711ac820382e065d131b951567fff07afa2cf598dfa",
+                    "mixHash" : "0x8cf54dd4ee71948e49b9137ed61da546a711b45832a8fac97e940fe0531a506a",
+                    "nonce" : "0xf07ed4c0136cbd73",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a06ae5340327eb873320dc6c9e83fbe36060a340334da7eea6d23006d7f7d5accf88906fa6e6cc4bbb40f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a08cf54dd4ee71948e49b9137ed61da546a711b45832a8fac97e940fe0531a506a88f07ed4c0136cbd73f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0ba61b322c8d8afb526ad0b70a86ba5f5e343a1ff1ffba7a6c862b67a89410f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9fe21ae5e2adcc19e1be2711ac820382e065d131b951567fff07afa2cf598dfa",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "RevertSubCallStorageOOG2_d0g0v1_Metropolis" : {
+    "RevertSubCallStorageOOG2_d0g0v1_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_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103c4",
-                    "hash" : "0xb1c4b5b7504c8d75bbcc625f50241e0cee90b08cc2e6cd516bc3eafe90855f5c",
-                    "mixHash" : "0xaf62252134c1541e40580ecd55120c4c8c1a7ab9b5ea711ccce3c3e8a577b83a",
-                    "nonce" : "0xdebb9065c60a59d8",
+                    "hash" : "0xd78cf4c5340ef2539df8cf3f54c277691a82bd352869fceaa7be909c7fbb6f36",
+                    "mixHash" : "0x442faf4e2fe3230b735f185e49cc86b13f6acc332898db55c616391ef9b0e3b0",
+                    "nonce" : "0x1d271c2f71d31fae",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
-                    "receiptTrie" : "0x375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2",
-                    "stateRoot" : "0xd26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46",
+                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
+                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d26b2c4cd2312d01ef6029548ed4af3a1aefd15102d400632d81d20187894f46a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0375bfbef05f31b1b79b46728e0dffaa3f8a9f57635e80dea8eeb3e5548e23ee2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0af62252134c1541e40580ecd55120c4c8c1a7ab9b5ea711ccce3c3e8a577b83a88debb9065c60a59d8f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0442faf4e2fe3230b735f185e49cc86b13f6acc332898db55c616391ef9b0e3b0881d271c2f71d31faef866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb1c4b5b7504c8d75bbcc625f50241e0cee90b08cc2e6cd516bc3eafe90855f5c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd78cf4c5340ef2539df8cf3f54c277691a82bd352869fceaa7be909c7fbb6f36",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f503c4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a40c3c",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x01",
+                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063b28175c4146046578063c0406226146052575b6000565b3460005760506076565b005b34600057605c6081565b604051808215151515815260200191505060405180910390f35b600c6000819055505b565b600060896076565b600d600081905550600e6001819055505b905600a165627a7a72305820b7c6987c21e63fed8a74d899557744a3be8d3fda191ce0f56cf261d6b860f6b40029",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RevertSubCallStorageOOG2_d0g0v1_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g0v1Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0103c4",
+                    "hash" : "0xfa8ea747379bfb2132af1cdc7f34783b3de7540f9e7b5f94438b04f81af25b61",
+                    "mixHash" : "0xbe25616d41261407fa52e50e46ee45b23091cd43a56421a50b5f0942bcd44f65",
+                    "nonce" : "0x88dbbe7a8e691d41",
+                    "number" : "0x01",
+                    "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
+                    "receiptTrie" : "0xabf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470",
+                    "stateRoot" : "0x05156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x3826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005156c27fe102e04d1ee1bc51f266b2e691629175f94efe9af50ef80aeb89288a03826507eea24b53a17aa87d6b4ff325d9b28765b4e6b86474504180a3fd2f061a0abf5d6ba2b06c89a5caf70e46758c59440360e06af7dac8c9c926cfe0d5b8470b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103c48203e880a0be25616d41261407fa52e50e46ee45b23091cd43a56421a50b5f0942bcd44f658888dbbe7a8e691d41f866f8648001830103c494a0000000000000000000000000000000000000000184c04062261ba0137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33a01d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x0103c4",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x137ee53667401cbfb8fc5d2c9bd1be3a80c878b74c06ff6700a5416b43b3ff33",
+                        "s" : "0x1d0b535b30ee294865bc8df3c289243202c3312dd03eff17bb91526db7d9a393",
+                        "to" : "0xa000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "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" : "0xfa8ea747379bfb2132af1cdc7f34783b3de7540f9e7b5f94438b04f81af25b61",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f503c4",
                 "code" : "",