Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 40 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json
index 8e45ae853..9bec09cfa 100644
--- a/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json
+++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertSubCallStorageOOG2_d0g1v1.json
@@ -2,7 +2,7 @@
     "RevertSubCallStorageOOG2_d0g1v1_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_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x379884c2ed341d49a1d4e2fa9b54691a1b335587a3d3303fb3f2fe42f0eb3002",
-                    "mixHash" : "0xbc447533be5a2b2419f4e228bb6f632f52e2821c6d98f0cd34e82079561f422a",
-                    "nonce" : "0x461a9d1761549dd0",
+                    "hash" : "0xe3e31ec162b2b8efca224d98ef17df10ae5f887e8e4e35c227d638cf969e6200",
+                    "mixHash" : "0x35e7649e6997e88f23644c716d6d58734d6391924a50bd7e1706e758cd10878f",
+                    "nonce" : "0x77dc5d24f8a44142",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
-                    "stateRoot" : "0x013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6",
+                    "stateRoot" : "0x27392a639d46b6181b48198582ee2c5dbb1b333afe17e521b4a9bd7eb43794a0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0bc447533be5a2b2419f4e228bb6f632f52e2821c6d98f0cd34e82079561f422a88461a9d1761549dd0f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa027392a639d46b6181b48198582ee2c5dbb1b333afe17e521b4a9bd7eb43794a0a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a035e7649e6997e88f23644c716d6d58734d6391924a50bd7e1706e758cd10878f8877dc5d24f8a44142f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x379884c2ed341d49a1d4e2fa9b54691a1b335587a3d3303fb3f2fe42f0eb3002",
+        "lastblockhash" : "0xe3e31ec162b2b8efca224d98ef17df10ae5f887e8e4e35c227d638cf969e6200",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c308",
+                "balance" : "0x29a2241af62ec308",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -114,7 +107,7 @@
     "RevertSubCallStorageOOG2_d0g1v1_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_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -126,18 +119,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xd28331d0198d5bb6c25d36a797ee2699ea71ac966e1feb63cf2dee9adbd19bcb",
-                    "mixHash" : "0x8fb58b31b699f75c0f0535bce3f50702d9a48c6fa45efd4e1964f7cb7a1e9c48",
-                    "nonce" : "0xde3eadc22c27ae22",
+                    "hash" : "0x9ffcd8f544828d6354e3d5b0f42ab4856c8b4cbc49d1100f825aefe997fd9995",
+                    "mixHash" : "0xfc81175bc6e8b5b9cb25c51f1f1d0a93149c5b4dcb36867c96376be3df588501",
+                    "nonce" : "0x4ab7021c0776e77f",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xa0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937",
-                    "stateRoot" : "0x013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6",
+                    "stateRoot" : "0xb115d9ef880a1825f7e1c3f4cf2d0287ee60a93d0e4d13d832ae1dd428d518e4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0013ac40abce54c3100c9f0cbe7ec70da3aaa9424172b640f70ce4e9d1498f5b6a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a08fb58b31b699f75c0f0535bce3f50702d9a48c6fa45efd4e1964f7cb7a1e9c4888de3eadc22c27ae22f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b115d9ef880a1825f7e1c3f4cf2d0287ee60a93d0e4d13d832ae1dd428d518e4a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0a0e59dd82470f49ac8e90225d6d4478de021b3e726e5bddd464b6b763766a937b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0fc81175bc6e8b5b9cb25c51f1f1d0a93149c5b4dcb36867c96376be3df588501884ab7021c0776e77ff866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -174,7 +167,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd28331d0198d5bb6c25d36a797ee2699ea71ac966e1feb63cf2dee9adbd19bcb",
+        "lastblockhash" : "0x9ffcd8f544828d6354e3d5b0f42ab4856c8b4cbc49d1100f825aefe997fd9995",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -185,7 +178,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6c308",
+                "balance" : "0x29a2241af62ec308",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -226,7 +219,7 @@
     "RevertSubCallStorageOOG2_d0g1v1_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_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -238,9 +231,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xae0c4c60695f01ed4019d70874ff92aaa93137ec27e6e97a3830d0b9f20a9ab7",
-                    "mixHash" : "0xf9d506906f08d0ee41ee877ecf6dc6953884d08fb7f7e5b550ca82ffb0ab762e",
-                    "nonce" : "0x7b7a914e1c8d494d",
+                    "hash" : "0x9ae9ccd547dad690731acac32830afb2fc4029c702e891b23875ff943d2bf4d0",
+                    "mixHash" : "0x2287fe477b51321ac62e4023b4ad2dc44dace41f246d3d5ec42a24db346a614c",
+                    "nonce" : "0x8eac91d7735cb612",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
@@ -249,7 +242,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0f9d506906f08d0ee41ee877ecf6dc6953884d08fb7f7e5b550ca82ffb0ab762e887b7a914e1c8d494df866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a02287fe477b51321ac62e4023b4ad2dc44dace41f246d3d5ec42a24db346a614c888eac91d7735cb612f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -286,7 +279,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae0c4c60695f01ed4019d70874ff92aaa93137ec27e6e97a3830d0b9f20a9ab7",
+        "lastblockhash" : "0x9ae9ccd547dad690731acac32830afb2fc4029c702e891b23875ff943d2bf4d0",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -331,7 +324,7 @@
     "RevertSubCallStorageOOG2_d0g1v1_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_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -343,9 +336,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x3359a9469f5a81ea95b300776313691bba4465fe9c3057334f35ffe6c8a2734d",
-                    "mixHash" : "0xcf39ac0d3d368bd5e44b6fba01c0c0e0187f6717041640b64b9ce44085c91eca",
-                    "nonce" : "0x06850af880ab275c",
+                    "hash" : "0xadb8eabc58b9a3782f10abf478c98e63f38ea34c983b2bfb32d16fcc1b84739c",
+                    "mixHash" : "0x5c4e0eafd4b105a69a153c0f1be50f72519a99f4ca2a88d8f226f0021d3e174c",
+                    "nonce" : "0x64f6be061564f3f9",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
@@ -354,7 +347,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0cf39ac0d3d368bd5e44b6fba01c0c0e0187f6717041640b64b9ce44085c91eca8806850af880ab275cf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a05c4e0eafd4b105a69a153c0f1be50f72519a99f4ca2a88d8f226f0021d3e174c8864f6be061564f3f9f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -391,7 +384,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3359a9469f5a81ea95b300776313691bba4465fe9c3057334f35ffe6c8a2734d",
+        "lastblockhash" : "0xadb8eabc58b9a3782f10abf478c98e63f38ea34c983b2bfb32d16fcc1b84739c",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -436,7 +429,7 @@
     "RevertSubCallStorageOOG2_d0g1v1_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_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -448,9 +441,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0x200877e7ccb8b2f68d004e02c2e8d109132a74c3bb90661a848f281bc745b3e8",
-                    "mixHash" : "0xb2a5c96ccfd1bcc344a6dd7713726133ccb49159615b219dbc1ce0fd1d728a34",
-                    "nonce" : "0x96ae09adb29fb319",
+                    "hash" : "0x20f0283d943a571f03c4d5d326d8b7a59cfb6bfed6f37c697532f5088ad97ec7",
+                    "mixHash" : "0x0f1800dfe12d6f713561fbe1707174c88fadb09817157f781d918c81c7bede7d",
+                    "nonce" : "0x75b2ff542e9d4dfd",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
@@ -459,7 +452,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0b2a5c96ccfd1bcc344a6dd7713726133ccb49159615b219dbc1ce0fd1d728a348896ae09adb29fb319f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a00f1800dfe12d6f713561fbe1707174c88fadb09817157f781d918c81c7bede7d8875b2ff542e9d4dfdf866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -496,7 +489,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x200877e7ccb8b2f68d004e02c2e8d109132a74c3bb90661a848f281bc745b3e8",
+        "lastblockhash" : "0x20f0283d943a571f03c4d5d326d8b7a59cfb6bfed6f37c697532f5088ad97ec7",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -541,7 +534,7 @@
     "RevertSubCallStorageOOG2_d0g1v1_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_d0g1v1Filler.json"
         },
         "blocks" : [
@@ -553,9 +546,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x02c308",
-                    "hash" : "0xbf1e6eb8c6af4203f13ca52f17f709445c61872ea322f9ccbcc87ccf5d7a4dd5",
-                    "mixHash" : "0xd3345d4331f01af3682bb2c011c993372350eda08a40d4315cab61041a1f5bbc",
-                    "nonce" : "0xbdd7b86b68a0d146",
+                    "hash" : "0xb19b232e8cdaf396786cbcb20a3fbcde39ffd15952c9f88a2c915ed74bd39d70",
+                    "mixHash" : "0xbb204e00773d54e91405c3c28fd36ef4ff1e6ce42796b09b754dbe8edb3d2063",
+                    "nonce" : "0x66720e44ff8b0eb9",
                     "number" : "0x01",
                     "parentHash" : "0x7c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7d",
                     "receiptTrie" : "0xceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635",
@@ -564,7 +557,7 @@
                     "transactionsTrie" : "0xb415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0d3345d4331f01af3682bb2c011c993372350eda08a40d4315cab61041a1f5bbc88bdd7b86b68a0d146f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
+                "rlp" : "0xf90264f901f8a07c700d11409534b7aca1879d490020779a5c324eb69ff33422192be6b150af7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01ec08514a54a4d9dc8ebcd5b4e2f02ad6428ecc8ad85ce49af0019f69dda1a74a0b415bd35fe0e64413510fc89329f197ae0eb68df955145ac5f97a2eb5f025b95a0ceceb7bd43cd438513e34f52cd956dfc28ba249a41f56e3c2c4b6d5e251fc635b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808302c3088203e880a0bb204e00773d54e91405c3c28fd36ef4ff1e6ce42796b09b754dbe8edb3d20638866720e44ff8b0eb9f866f86480018302c30894a0000000000000000000000000000000000000000184c04062261ca08b2261fe602738d6853da8f1121679f6dc2286bef0fc235e67c2e537142a93faa026ba115a962be542d894ee59793cc9095557f7d1b82540cccbae35074c5f5af6c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -601,7 +594,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f353193b99eb46e7a469c00fa91be2359f2eb9278c9287f1e0fdd3f4137074e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf1e6eb8c6af4203f13ca52f17f709445c61872ea322f9ccbcc87ccf5d7a4dd5",
+        "lastblockhash" : "0xb19b232e8cdaf396786cbcb20a3fbcde39ffd15952c9f88a2c915ed74bd39d70",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {