Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 40 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
index b83109710..1ef5845bd 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v0.json
@@ -2,7 +2,7 @@
     "RevertSubCallStorageOOG2_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0x7698b7b719b5ad9548186432da447844fc63e1d956059e163c18965b0c41f311",
-                    "mixHash" : "0x62c93a687dc30556a606fa7df00c0deb73eaaa1aa4b02b6bea565f1c10dc89d7",
-                    "nonce" : "0x989025a716f12364",
+                    "hash" : "0x28302cbddaa8fd108ca948639367eb6e89161dbe38302fac49fbe7b8f41d51c2",
+                    "mixHash" : "0x28d535988b9c0ce5b8f16bb05b5eb2a380998ddc43ac0b86cecbed58036ad1a2",
+                    "nonce" : "0x63beecc3fce78cc4",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
-                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
+                    "stateRoot" : "0xdd154bb1cacdba6a1097dcd2e41227ffd8e3a6f190ac34c830b845e479cd70fb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a062c93a687dc30556a606fa7df00c0deb73eaaa1aa4b02b6bea565f1c10dc89d788989025a716f12364f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd154bb1cacdba6a1097dcd2e41227ffd8e3a6f190ac34c830b845e479cd70fba00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a028d535988b9c0ce5b8f16bb05b5eb2a380998ddc43ac0b86cecbed58036ad1a28863beecc3fce78cc4f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7698b7b719b5ad9548186432da447844fc63e1d956059e163c18965b0c41f311",
+        "lastblockhash" : "0x28302cbddaa8fd108ca948639367eb6e89161dbe38302fac49fbe7b8f41d51c2",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f503e7",
+                "balance" : "0x29a2241af62d03e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -116,7 +109,7 @@
     "RevertSubCallStorageOOG2_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +121,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0x1aea095850d8d391b3c62035342572850db769e6096d2d63aa90741651f718c0",
-                    "mixHash" : "0xd8986acda5477ecd220fddf482c16aebb9979741685d9d1dc7971316fd02677f",
-                    "nonce" : "0x35701da7e341983f",
+                    "hash" : "0xb6b36e9828f99a3760cef681173c1613789272c7de7116bc78b5c7715de9795d",
+                    "mixHash" : "0xfeaf89a9494659315289d5bb4d3c35fb1b8aa6c8dc7c47e74f573a1e09f2dc41",
+                    "nonce" : "0x73166f999ff67eec",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0x3c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2",
-                    "stateRoot" : "0x4f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712ce",
+                    "stateRoot" : "0xef3467957995cf6e3b26e14da9abc381fdca0fee3c8292b2f4b61d17643dc82f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f3ae4f3d4c1808036b10dcba28672426909a4b7aeac09ab2bd6b7a4e54712cea00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0d8986acda5477ecd220fddf482c16aebb9979741685d9d1dc7971316fd02677f8835701da7e341983ff866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3467957995cf6e3b26e14da9abc381fdca0fee3c8292b2f4b61d17643dc82fa00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a03c515ae6b34b22b263091c6243671a687efd39fdac0444e0a97ecf557d93a4c2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0feaf89a9494659315289d5bb4d3c35fb1b8aa6c8dc7c47e74f573a1e09f2dc418873166f999ff67eecf866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -176,7 +169,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1aea095850d8d391b3c62035342572850db769e6096d2d63aa90741651f718c0",
+        "lastblockhash" : "0xb6b36e9828f99a3760cef681173c1613789272c7de7116bc78b5c7715de9795d",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -187,7 +180,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f503e7",
+                "balance" : "0x29a2241af62d03e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -230,7 +223,7 @@
     "RevertSubCallStorageOOG2_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +235,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xb14578113646cb29484da50cc59db57bcc9774a7ad1dbf0c6290750bd8bcc755",
-                    "mixHash" : "0x6766ee9397e7f6c21e0ed931a9d16b363f3f7e4813962cd704d49da5e4d0b306",
-                    "nonce" : "0x8eec2fb5365500f3",
+                    "hash" : "0x33e661785dd7ebf403b33d915b66c74e7d8af0efe9cf7112d4e4a1c452d194d3",
+                    "mixHash" : "0x9a06330d71d0c3bd62eed3fd058808be2e84ab6c4643de62235b47528dbc3358",
+                    "nonce" : "0x44cedda506c8efd3",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -253,7 +246,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a06766ee9397e7f6c21e0ed931a9d16b363f3f7e4813962cd704d49da5e4d0b306888eec2fb5365500f3f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a09a06330d71d0c3bd62eed3fd058808be2e84ab6c4643de62235b47528dbc33588844cedda506c8efd3f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -290,7 +283,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb14578113646cb29484da50cc59db57bcc9774a7ad1dbf0c6290750bd8bcc755",
+        "lastblockhash" : "0x33e661785dd7ebf403b33d915b66c74e7d8af0efe9cf7112d4e4a1c452d194d3",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -337,7 +330,7 @@
     "RevertSubCallStorageOOG2_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +342,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0xefb38c018d7324e40d07667eb6812018d85d25566c66e2c12bd340608d2c162d",
-                    "mixHash" : "0xcbb6c4f70ab97f49a0322bec81e830ce67e421fb94f8b48d245248451de02765",
-                    "nonce" : "0xa2ae0ad77275bc9a",
+                    "hash" : "0x15b18afb5f56fd2a8e74596de9b5b41e9973fe00ee9007ad11273022e879d831",
+                    "mixHash" : "0xd41e59701e7fc4b5b402c7c4dc12eb6f8fc817728df3c62589b76ee3a2d20460",
+                    "nonce" : "0x65a2ac81b89370d3",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -360,7 +353,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0cbb6c4f70ab97f49a0322bec81e830ce67e421fb94f8b48d245248451de0276588a2ae0ad77275bc9af866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0d41e59701e7fc4b5b402c7c4dc12eb6f8fc817728df3c62589b76ee3a2d204608865a2ac81b89370d3f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -397,7 +390,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefb38c018d7324e40d07667eb6812018d85d25566c66e2c12bd340608d2c162d",
+        "lastblockhash" : "0x15b18afb5f56fd2a8e74596de9b5b41e9973fe00ee9007ad11273022e879d831",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -444,7 +437,7 @@
     "RevertSubCallStorageOOG2_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -456,9 +449,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0x18c7c10782d296e04f9f37a2b1d3c10b5257ac0c48f7cab4682f9fb0f7ec74f4",
-                    "mixHash" : "0x3a8dba684695d691d67a6c147c9cf6db79afb833f0bcc59a71c77c0a575a9c4a",
-                    "nonce" : "0x20a407bf6ad02225",
+                    "hash" : "0x8ee06fd2e11e22177447fe538129099eef8ec3aba38ccb53fec5050c7bc14eec",
+                    "mixHash" : "0x3d61d383006720b5941d26c958aa48ac6621a359c1c5a603b0d18dcefdab97a0",
+                    "nonce" : "0x35afbac9fb448742",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -467,7 +460,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a03a8dba684695d691d67a6c147c9cf6db79afb833f0bcc59a71c77c0a575a9c4a8820a407bf6ad02225f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a03d61d383006720b5941d26c958aa48ac6621a359c1c5a603b0d18dcefdab97a08835afbac9fb448742f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -504,7 +497,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18c7c10782d296e04f9f37a2b1d3c10b5257ac0c48f7cab4682f9fb0f7ec74f4",
+        "lastblockhash" : "0x8ee06fd2e11e22177447fe538129099eef8ec3aba38ccb53fec5050c7bc14eec",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -551,7 +544,7 @@
     "RevertSubCallStorageOOG2_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRevertTest/RevertSubCallStorageOOG2_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -563,9 +556,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0103e7",
-                    "hash" : "0x4a8c0041b47e1b2904389436c371670fef40c9edc657d68a377d43823a6ecb11",
-                    "mixHash" : "0x0ee74528156e3c25165bf844001c20fde3aaa82b4606663c54671c065f685ffe",
-                    "nonce" : "0x7ea68562950df224",
+                    "hash" : "0xf6483939e9cd1534764cada41a0142edd345f7fcb1279234d5ce0dc2a9a4e811",
+                    "mixHash" : "0xfeb4ad3a8b391370bc5bde41f931231ee144d0b42b7db8e395950c85e8160905",
+                    "nonce" : "0x25d89a1190cdfff2",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xaa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79",
@@ -574,7 +567,7 @@
                     "transactionsTrie" : "0x0e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a00ee74528156e3c25165bf844001c20fde3aaa82b4606663c54671c065f685ffe887ea68562950df224f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04508b70bbaba393ad6cedbdaf53ad1aa1a08e6e2b3e3eca634b60dd04bedcd46a00e843d65a79d5f13ce7c67b843be5a4e8a03883cf42f2abd2372dcae3de14fb0a0aa42bf7d78ec3d2f71a72110f5c8a792379a267ccb60476281584eedb4ac9d79b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830103e78203e880a0feb4ad3a8b391370bc5bde41f931231ee144d0b42b7db8e395950c85e81609058825d89a1190cdfff2f866f86480018302c30894a0000000000000000000000000000000000000008084c04062261ca08595945bb16d0e01e1d5d30cfa713240182150a8cfc4416cc3b633f1d569234ea028495891b66c06d49526f89d17edbd691b064fe4e397e55933ace1d67ae78618c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -611,7 +604,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a8c0041b47e1b2904389436c371670fef40c9edc657d68a377d43823a6ecb11",
+        "lastblockhash" : "0xf6483939e9cd1534764cada41a0142edd345f7fcb1279234d5ce0dc2a9a4e811",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {