Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 40 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json
index 5783ce6db..6fae72598 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG_d0g0v1.json
@@ -2,7 +2,7 @@
     "RevertSubCallStorageOOG_d0g0v1_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/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x1a29632c0ac00b22d10c60e9f33f6d139ed19c7cbbabb408eebd3e83db22cfbf",
-                    "mixHash" : "0x5f401618eeb129e0e03078dafe6c448bbb74d53c7d9baf04f1e3cf7a9c3789f7",
-                    "nonce" : "0xce07f4ad6e85645f",
+                    "hash" : "0x5c199014a92c3806940542558e73db1d90064774bb9abb1fc75346514722b3be",
+                    "mixHash" : "0xae8262a28cdfa2f0bd7ba8793d3d29dc13cee5265fd5f96b9d6c1d20e7481c58",
+                    "nonce" : "0x32cc6b20fced7c7d",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
-                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
+                    "stateRoot" : "0xa123b12bb5eb9cd0ea64ae0c46e61c7004b858567270383d48c4d4c750a8ebbf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a05f401618eeb129e0e03078dafe6c448bbb74d53c7d9baf04f1e3cf7a9c3789f788ce07f4ad6e85645ff866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a123b12bb5eb9cd0ea64ae0c46e61c7004b858567270383d48c4d4c750a8ebbfa073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0ae8262a28cdfa2f0bd7ba8793d3d29dc13cee5265fd5f96b9d6c1d20e7481c588832cc6b20fced7c7df866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a29632c0ac00b22d10c60e9f33f6d139ed19c7cbbabb408eebd3e83db22cfbf",
+        "lastblockhash" : "0x5c199014a92c3806940542558e73db1d90064774bb9abb1fc75346514722b3be",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53c68",
+                "balance" : "0x29a2241af62d3c68",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -114,7 +107,7 @@
     "RevertSubCallStorageOOG_d0g0v1_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/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -126,18 +119,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0xe8cae1d186e26d2521d5e9ba280d535de81d6181470617fdca0a91cf00abed9c",
-                    "mixHash" : "0x0cb1c47af0fe88b5829f9e2609c80721b384db50c2e435dcdf8830ffba6b819a",
-                    "nonce" : "0x7796ae2a5b5e017c",
+                    "hash" : "0x04cf6fa061deaf222400caed7a60ae8fd0c7bfdbe00356ec6bd461e76ef94b84",
+                    "mixHash" : "0x9aca05ca2a82832b06d795921465998d50ac5ac5c3935df0fd7947abf9763c88",
+                    "nonce" : "0x336180dd314adc3d",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x2281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374",
-                    "stateRoot" : "0x2b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86",
+                    "stateRoot" : "0x808178dd37dc86691df8d62344718c36e2694b6e199f0bde611251b20265c1c1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b78525222570e3aa92e149713f78d6704d0dfc8b4d08720253325825ce18c86a073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a00cb1c47af0fe88b5829f9e2609c80721b384db50c2e435dcdf8830ffba6b819a887796ae2a5b5e017cf866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0808178dd37dc86691df8d62344718c36e2694b6e199f0bde611251b20265c1c1a073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca02281238d90b06f758a6c25fcd6a34375d8606cd2891dada916c1869a7dc7d374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a09aca05ca2a82832b06d795921465998d50ac5ac5c3935df0fd7947abf9763c8888336180dd314adc3df866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -174,7 +167,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8cae1d186e26d2521d5e9ba280d535de81d6181470617fdca0a91cf00abed9c",
+        "lastblockhash" : "0x04cf6fa061deaf222400caed7a60ae8fd0c7bfdbe00356ec6bd461e76ef94b84",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -185,7 +178,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53c68",
+                "balance" : "0x29a2241af62d3c68",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -226,7 +219,7 @@
     "RevertSubCallStorageOOG_d0g0v1_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/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -238,9 +231,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x5d0df2da461763d697c394cac0f44e092fe983448017802a361db5ddcb569805",
-                    "mixHash" : "0xa1c3c5c2a09cf1607b5b2d243546029c17a23630343acd4430b3e809c0e0bc73",
-                    "nonce" : "0x28ec7d0ee15b145b",
+                    "hash" : "0xee580e9dd6418096f3f53bf972e051b1f2471cc1167149a7c433d1307db9e0a2",
+                    "mixHash" : "0x41faab5287a433e0ae8d786a7585aa272f04575aa26ae26b9992b8ec0c4a7e67",
+                    "nonce" : "0x05c69f431b380618",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -249,7 +242,7 @@
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0a1c3c5c2a09cf1607b5b2d243546029c17a23630343acd4430b3e809c0e0bc738828ec7d0ee15b145bf866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a041faab5287a433e0ae8d786a7585aa272f04575aa26ae26b9992b8ec0c4a7e678805c69f431b380618f866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -286,7 +279,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d0df2da461763d697c394cac0f44e092fe983448017802a361db5ddcb569805",
+        "lastblockhash" : "0xee580e9dd6418096f3f53bf972e051b1f2471cc1167149a7c433d1307db9e0a2",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -331,7 +324,7 @@
     "RevertSubCallStorageOOG_d0g0v1_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/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -343,9 +336,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x30dabb3e3f78734292a4fb5ff47b9eaf27805394cb9fdbbb0178f4a1ae0b0904",
-                    "mixHash" : "0xe4627abf7dd5605a5006d1132a9bb79b7003d9100fe5089a1abb4277d4af07a9",
-                    "nonce" : "0xb04ce2c100c7fb4c",
+                    "hash" : "0x6e25329f8508a572f8abfe5520cf7c877c2e730c6e0995d65d76c307e5b10ac7",
+                    "mixHash" : "0x967745fc4917309d5017f04191748758a2be442ae8555700d0a6c90b8e86a338",
+                    "nonce" : "0xc5eb3dd4a59c9b1a",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -354,7 +347,7 @@
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0e4627abf7dd5605a5006d1132a9bb79b7003d9100fe5089a1abb4277d4af07a988b04ce2c100c7fb4cf866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0967745fc4917309d5017f04191748758a2be442ae8555700d0a6c90b8e86a33888c5eb3dd4a59c9b1af866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -391,7 +384,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30dabb3e3f78734292a4fb5ff47b9eaf27805394cb9fdbbb0178f4a1ae0b0904",
+        "lastblockhash" : "0x6e25329f8508a572f8abfe5520cf7c877c2e730c6e0995d65d76c307e5b10ac7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -436,7 +429,7 @@
     "RevertSubCallStorageOOG_d0g0v1_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/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -448,9 +441,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0x9561edec0d4dee66aba3d3e76ad5c66dff6eb5ee037865403e1df1a4262e6b9f",
-                    "mixHash" : "0xfdda530d998782e9716ad3464280ec576360665533e9273d557a7a38fb991cda",
-                    "nonce" : "0xb39937d49dddd5d3",
+                    "hash" : "0xa54f2c3633e29c8911be3abbf42ff8dec168339a571470951c1afcebb685e1a0",
+                    "mixHash" : "0x2dd7f6fb6a01edb964cb59e0f3a12c084a47c16ea90bc66b9de5e996c6eae951",
+                    "nonce" : "0xd5934d2d62612ca6",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -459,7 +452,7 @@
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a0fdda530d998782e9716ad3464280ec576360665533e9273d557a7a38fb991cda88b39937d49dddd5d3f866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a02dd7f6fb6a01edb964cb59e0f3a12c084a47c16ea90bc66b9de5e996c6eae95188d5934d2d62612ca6f866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -496,7 +489,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9561edec0d4dee66aba3d3e76ad5c66dff6eb5ee037865403e1df1a4262e6b9f",
+        "lastblockhash" : "0xa54f2c3633e29c8911be3abbf42ff8dec168339a571470951c1afcebb685e1a0",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -541,7 +534,7 @@
     "RevertSubCallStorageOOG_d0g0v1_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/RevertSubCallStorageOOG_d0g0v1Filler.json"
         },
         "blocks" : [
@@ -553,9 +546,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013c68",
-                    "hash" : "0xea54593088795d2ebead17d20def2c8da80f0b1b2be3073169fec80ee43c3876",
-                    "mixHash" : "0x32656774c6c75b0aef0b6e7527a6e869961c1b3656e12692cd54fcbd2a8d6f89",
-                    "nonce" : "0x4529f026a0d333ff",
+                    "hash" : "0x4e960f061c894a35264fe15334e522db86bdab1352af10912eef39a44fcd11e2",
+                    "mixHash" : "0x8be84d1bfb4131c42b0d3cea32b08fe4910d01c6530b6f6f678a45b0e151e4c1",
+                    "nonce" : "0x0c64c3a7d9b1b216",
                     "number" : "0x01",
                     "parentHash" : "0x38eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195",
                     "receiptTrie" : "0x55247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1f",
@@ -564,7 +557,7 @@
                     "transactionsTrie" : "0x73fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a032656774c6c75b0aef0b6e7527a6e869961c1b3656e12692cd54fcbd2a8d6f89884529f026a0d333fff866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
+                "rlp" : "0xf90264f901f8a038eca8f5e513e3f1622fde552380decf77ccf1ac9607d7ff85e4b17b0931d195a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0890df59bc72ca0e5ae73c11835db96e65144a5a7d7127891cbe6249d81ada10da073fb414e519196511b85739aaa64573d3bcc13d7e9f1873eb2b482db84e4751ca055247fde6ad7eef3cb39626b54cf7f70346484f026cef5a0c395286b0e094d1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013c688203e880a08be84d1bfb4131c42b0d3cea32b08fe4910d01c6530b6f6f678a45b0e151e4c1880c64c3a7d9b1b216f866f864800183013c6894a0000000000000000000000000000000000000000184c04062261ba08a01d6ce6e532476b173cbd56cbad66cdae73c23b986d6a8c1a8180d07e24c3fa045e60960797678679e5874b38b89a5cfc788d969928eb97302ed39e62c66af18c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -601,7 +594,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d0242656b55c4eefe20d9c3ae6d445a03334d6d60338dd7c2f9514a87468e3da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea54593088795d2ebead17d20def2c8da80f0b1b2be3073169fec80ee43c3876",
+        "lastblockhash" : "0x4e960f061c894a35264fe15334e522db86bdab1352af10912eef39a44fcd11e2",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {