Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 84 insertions, 91 deletions

diff --git a/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0.json
index 6c16853bc..ce010dfff 100644
--- a/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0.json
@@ -2,7 +2,7 @@
     "static_callcallcodecall_010_OOGMAfter2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01a285",
-                    "hash" : "0x6837d52b72e50ff1813dc1289bf0778ba4c1c1d3c42ace0cf3f224b68dbc0ead",
-                    "mixHash" : "0xcba997773f3ddfbeda4d0f4249d9aeda5c893deb0461623d67f05d78ac54112c",
-                    "nonce" : "0xc67d2b40388194b9",
+                    "hash" : "0x09215dd9ba4136894dc9c937bc9c80ea5f871d2d76e3ab55ec3f112bf67b69a2",
+                    "mixHash" : "0x9cd62917cdfe676ccdf3d45ad88092ef8addb084c243ff59858b42b309832c9c",
+                    "nonce" : "0x6e0b7a51cdb42373",
                     "number" : "0x01",
-                    "parentHash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+                    "parentHash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
                     "receiptTrie" : "0xbe8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8",
-                    "stateRoot" : "0x4fb5f40c11697af151e18eea95459282b2c88700115866d3aae159d62d6e50a0",
+                    "stateRoot" : "0x7bee1d078bf49d8b0d4b2f37e86dc1b14be5ed5e3be906f884e09159ad8a1728",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a01d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fb5f40c11697af151e18eea95459282b2c88700115866d3aae159d62d6e50a0a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a0cba997773f3ddfbeda4d0f4249d9aeda5c893deb0461623d67f05d78ac54112c88c67d2b40388194b9f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a01cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bee1d078bf49d8b0d4b2f37e86dc1b14be5ed5e3be906f884e09159ad8a1728a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a09cd62917cdfe676ccdf3d45ad88092ef8addb084c243ff59858b42b309832c9c886e0b7a51cdb42373f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -50,28 +50,21 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+            "hash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177",
+            "stateRoot" : "0xcfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6837d52b72e50ff1813dc1289bf0778ba4c1c1d3c42ace0cf3f224b68dbc0ead",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x09215dd9ba4136894dc9c937bc9c80ea5f871d2d76e3ab55ec3f112bf67b69a2",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060003561eaf6fa6000555a600155",
@@ -82,7 +75,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -109,7 +102,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5a285",
+                "balance" : "0x29a2241af62da285",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -133,7 +126,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -171,7 +164,7 @@
     "static_callcallcodecall_010_OOGMAfter2_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -183,18 +176,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01a285",
-                    "hash" : "0xb7268b2fad73e9603fcf00791c9347e61ae1e3af86bf4c8a68021955c29b888c",
-                    "mixHash" : "0xb99e4e3dad01a0588aaf7ab0f10144780fc017572bbb4094dba4235e749b4477",
-                    "nonce" : "0x4505127bcd0607fc",
+                    "hash" : "0xb698321a3c30ecdce6259694d08bf76262ce3417cf6dcd081fc48be19de95458",
+                    "mixHash" : "0xebf65dd7158ff4158a52e193019845d848bdc0ff4d2a42450056def80fb34461",
+                    "nonce" : "0x8e4a7884c7b7b263",
                     "number" : "0x01",
-                    "parentHash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+                    "parentHash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
                     "receiptTrie" : "0xbe8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8",
-                    "stateRoot" : "0x4fb5f40c11697af151e18eea95459282b2c88700115866d3aae159d62d6e50a0",
+                    "stateRoot" : "0x80426e929f4ea08557f2c36f709143f2121c336a7a58e568b9b02ac2857570ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a01d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fb5f40c11697af151e18eea95459282b2c88700115866d3aae159d62d6e50a0a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a0b99e4e3dad01a0588aaf7ab0f10144780fc017572bbb4094dba4235e749b4477884505127bcd0607fcf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a01cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080426e929f4ea08557f2c36f709143f2121c336a7a58e568b9b02ac2857570ada0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a0ebf65dd7158ff4158a52e193019845d848bdc0ff4d2a42450056def80fb34461888e4a7884c7b7b263f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -219,19 +212,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+            "hash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177",
+            "stateRoot" : "0xcfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7268b2fad73e9603fcf00791c9347e61ae1e3af86bf4c8a68021955c29b888c",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb698321a3c30ecdce6259694d08bf76262ce3417cf6dcd081fc48be19de95458",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -251,7 +244,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -278,7 +271,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5a285",
+                "balance" : "0x29a2241af62da285",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -302,7 +295,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -340,7 +333,7 @@
     "static_callcallcodecall_010_OOGMAfter2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,18 +345,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x6c5bef7f3df280604d617b707ac3f14a93438e86c8951d61b9cc78ead116bb25",
-                    "mixHash" : "0xd546ea0041109d12ac85ea1e5b8e83fa48299fda1f024243cd71a49ea0fdf24e",
-                    "nonce" : "0x61c9bed3a27691be",
+                    "hash" : "0xea88c840da00332251fd1cf89e89f5907455ffc2707aeda8c6da8158760f68ba",
+                    "mixHash" : "0xb24eff4e61bff64850d5c11b7e48192bd46a4753c957b352e18c497ba179c2d9",
+                    "nonce" : "0xd319fc12252d59eb",
                     "number" : "0x01",
-                    "parentHash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
-                    "receiptTrie" : "0x5457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340",
-                    "stateRoot" : "0x6431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229",
+                    "parentHash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
+                    "receiptTrie" : "0x2a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434",
+                    "stateRoot" : "0x6090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a01d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a05457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0d546ea0041109d12ac85ea1e5b8e83fa48299fda1f024243cd71a49ea0fdf24e8861c9bed3a27691bef882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a01cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a02a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0b24eff4e61bff64850d5c11b7e48192bd46a4753c957b352e18c497ba179c2d988d319fc12252d59ebf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -388,19 +381,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+            "hash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177",
+            "stateRoot" : "0xcfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c5bef7f3df280604d617b707ac3f14a93438e86c8951d61b9cc78ead116bb25",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xea88c840da00332251fd1cf89e89f5907455ffc2707aeda8c6da8158760f68ba",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -412,7 +405,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -463,7 +456,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -501,7 +494,7 @@
     "static_callcallcodecall_010_OOGMAfter2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -513,18 +506,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xa78df0f27e1a00d686c6fde2f6d070bcd36dab47ac18f3d194a831ebf9bddb63",
-                    "mixHash" : "0x2eb1f56deff24cec268d28131d751666c1ac0f1e6bfec986f56bec3496576a96",
-                    "nonce" : "0x7ee9a23dd4c0c1e6",
+                    "hash" : "0xe495a5385ee8b43a951a727836bbbeafde427e4e2ba9fdbdd61c2e1e03a1faee",
+                    "mixHash" : "0xb4e8dcc2cf183aeb5d8cbaf14400e6686f0babf92f3595d24bb59ddbee90ecfc",
+                    "nonce" : "0xe307afb9ddc80d64",
                     "number" : "0x01",
-                    "parentHash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
-                    "receiptTrie" : "0x5457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340",
-                    "stateRoot" : "0x6431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229",
+                    "parentHash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
+                    "receiptTrie" : "0x2a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434",
+                    "stateRoot" : "0x6090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a01d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a05457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a02eb1f56deff24cec268d28131d751666c1ac0f1e6bfec986f56bec3496576a96887ee9a23dd4c0c1e6f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a01cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a02a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0b4e8dcc2cf183aeb5d8cbaf14400e6686f0babf92f3595d24bb59ddbee90ecfc88e307afb9ddc80d64f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -549,19 +542,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+            "hash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177",
+            "stateRoot" : "0xcfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa78df0f27e1a00d686c6fde2f6d070bcd36dab47ac18f3d194a831ebf9bddb63",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xe495a5385ee8b43a951a727836bbbeafde427e4e2ba9fdbdd61c2e1e03a1faee",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,7 +566,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -624,7 +617,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -662,7 +655,7 @@
     "static_callcallcodecall_010_OOGMAfter2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -674,18 +667,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xf6c9aa46b11274b6ab30b5a27e0da1b6094dd595c6def3a04ff02a6f9254e4ba",
-                    "mixHash" : "0x64ae8608a753be2ad87c6dd47734ad50af5d75192cd94a2fc19643caf02dd6aa",
-                    "nonce" : "0xf2f6ffdf4af87af3",
+                    "hash" : "0x2b43456972ce69de9c844d0821e12f94f4ead7288ec784ebd3ea6a81ca0b3f83",
+                    "mixHash" : "0xa2e7f921aab85a7c5ff2357c3de6cef4273ee0c6d125eaf42422dab7e9878ca2",
+                    "nonce" : "0x5246ff060e067692",
                     "number" : "0x01",
-                    "parentHash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
-                    "receiptTrie" : "0x5457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340",
-                    "stateRoot" : "0x6431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229",
+                    "parentHash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
+                    "receiptTrie" : "0x2a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434",
+                    "stateRoot" : "0x6090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a01d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a05457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a064ae8608a753be2ad87c6dd47734ad50af5d75192cd94a2fc19643caf02dd6aa88f2f6ffdf4af87af3f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a01cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a02a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0a2e7f921aab85a7c5ff2357c3de6cef4273ee0c6d125eaf42422dab7e9878ca2885246ff060e067692f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -710,19 +703,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+            "hash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177",
+            "stateRoot" : "0xcfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf6c9aa46b11274b6ab30b5a27e0da1b6094dd595c6def3a04ff02a6f9254e4ba",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2b43456972ce69de9c844d0821e12f94f4ead7288ec784ebd3ea6a81ca0b3f83",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -734,7 +727,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -785,7 +778,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -823,7 +816,7 @@
     "static_callcallcodecall_010_OOGMAfter2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_callcallcodecall_010_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -835,18 +828,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xf086c08e60ec787a0cce0879c69df8bdc91767eec7c28585ce8f250426244bc5",
-                    "mixHash" : "0xbe66536521c129e0a98430e44d28bcbb05536e1134b5aa1da95d9644428beec6",
-                    "nonce" : "0xe9c6201104f94322",
+                    "hash" : "0x47bbc4e23c8a99f3f30c7343daf35743ee2cc87273bcf871aae6fd7ee2d718df",
+                    "mixHash" : "0x519e258a6731f202b32a5199ed17f234e97050f770bb928a8c6cf86e5ba5ed35",
+                    "nonce" : "0xa581b6b0f3235749",
                     "number" : "0x01",
-                    "parentHash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
-                    "receiptTrie" : "0x5457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340",
-                    "stateRoot" : "0x6431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229",
+                    "parentHash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
+                    "receiptTrie" : "0x2a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434",
+                    "stateRoot" : "0x6090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a01d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06431ade191a48056ed4b4f627b6165e7572f2ccaa4ebfdc423455903ba9e7229a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a05457c7354c5b1582b5c04c5e6d104b7a8329826e0ca4020cec75e0fa8c05f340b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0be66536521c129e0a98430e44d28bcbb05536e1134b5aa1da95d9644428beec688e9c6201104f94322f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a01cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06090cdf10e9c2eb7d414891ee0836e22da50b4db949f5b0c7fbdbbf5b4773ef9a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a02a4282101b0217c2e971ab50894a37f14dfd81eea63859e0920a2307c720e434b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0519e258a6731f202b32a5199ed17f234e97050f770bb928a8c6cf86e5ba5ed3588a581b6b0f3235749f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -871,19 +864,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0x1d22797c1a15a4bc5a6006a2003de341225e9a8ff9bfa575290004bef429e390",
+            "hash" : "0x1cc5762bdbdb06ec0516ccfd7a2333a163756e74edd301fc493c3ba8384fdc20",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177",
+            "stateRoot" : "0xcfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb3466f496e34ebd351d0b170628475ca10563be95e8ec32128ded7acd0c6177a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf086c08e60ec787a0cce0879c69df8bdc91767eec7c28585ce8f250426244bc5",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cfeb7f54601c3526a3200475a7de7dfa8a4b19abd4306d0711562f78d4bc7e95a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x47bbc4e23c8a99f3f30c7343daf35743ee2cc87273bcf871aae6fd7ee2d718df",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -895,7 +888,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -946,7 +939,7 @@
             },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }