1 files changed, 84 insertions, 91 deletions
diff --git a/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2_d0g0v0.json
index 4a6b0d651..656ba0a5d 100644
--- a/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stStaticCall/static_callcallcodecallcode_011_OOGMAfter2_d0g0v0.json
@@ -2,7 +2,7 @@
     "static_callcallcodecallcode_011_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_callcallcodecallcode_011_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01a285",
-                    "hash" : "0x1eb2514a94c8e89f6ba608227b1ae59c876f8c5d6e70e9b75d9721818dab1554",
-                    "mixHash" : "0x5b3e92121c26ef19998cdb24c5030512428c028a06c030fec714a405d0a1f4aa",
-                    "nonce" : "0x1d76eb6672a61445",
+                    "hash" : "0x20ef6716c08410ac5389464fcd9a51b6dc6d1ef02b54279efb587dfde4fbbb9c",
+                    "mixHash" : "0xfd765257233bbba9097329f0240b421b69064c8b8212a35be133db1fbda5eefa",
+                    "nonce" : "0xa5d98035e7a5184a",
                     "number" : "0x01",
-                    "parentHash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+                    "parentHash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
                     "receiptTrie" : "0xbe8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8",
-                    "stateRoot" : "0x74a0f5540cac8ef714d0c940f182ba6430003518d6f161932869970a62e2f115",
+                    "stateRoot" : "0x306b16c8160025ec81ca32d2cd293c66745136545e58fae4c6cecda9bfce731f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a0c9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074a0f5540cac8ef714d0c940f182ba6430003518d6f161932869970a62e2f115a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a05b3e92121c26ef19998cdb24c5030512428c028a06c030fec714a405d0a1f4aa881d76eb6672a61445f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a00e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306b16c8160025ec81ca32d2cd293c66745136545e58fae4c6cecda9bfce731fa0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a0fd765257233bbba9097329f0240b421b69064c8b8212a35be133db1fbda5eefa88a5d98035e7a5184af882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -50,28 +50,21 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+            "hash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7e",
+            "stateRoot" : "0xa6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12d",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1eb2514a94c8e89f6ba608227b1ae59c876f8c5d6e70e9b75d9721818dab1554",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x20ef6716c08410ac5389464fcd9a51b6dc6d1ef02b54279efb587dfde4fbbb9c",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600060003561eaf6fa6000555a600155",
@@ -103,13 +96,13 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5a285",
+                "balance" : "0x29a2241af62da285",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -154,7 +147,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -171,7 +164,7 @@
     "static_callcallcodecallcode_011_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_callcallcodecallcode_011_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -183,18 +176,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01a285",
-                    "hash" : "0x268ddce84cdc58a63e3586a44f6faa7a54ee844efbd265203e829d702a9df01c",
-                    "mixHash" : "0x9d35a545bf9326b12ed0d53cb6fb5def154180dbcb5606c0097901df69a96433",
-                    "nonce" : "0x160a374cd0a3b734",
+                    "hash" : "0x6317baf7dbeda7541aba98c202f674e9b20aedff2956ccfb8c868b73dd98a1a7",
+                    "mixHash" : "0x68ebf0e604d63d299430205707f015c07dc481a1fff0c26308cfb1f51f693c3b",
+                    "nonce" : "0x26e56e83d34aa044",
                     "number" : "0x01",
-                    "parentHash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+                    "parentHash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
                     "receiptTrie" : "0xbe8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8",
-                    "stateRoot" : "0x74a0f5540cac8ef714d0c940f182ba6430003518d6f161932869970a62e2f115",
+                    "stateRoot" : "0xd89fc1ec257d563d9da8b57d72d85e8eec87d14446dd3e627ef7d95ba4fbaad6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a0c9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074a0f5540cac8ef714d0c940f182ba6430003518d6f161932869970a62e2f115a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a09d35a545bf9326b12ed0d53cb6fb5def154180dbcb5606c0097901df69a9643388160a374cd0a3b734f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a00e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d89fc1ec257d563d9da8b57d72d85e8eec87d14446dd3e627ef7d95ba4fbaad6a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a0be8c8e907a7517844c0e177879d9db314bd3cd30f8b1cc8668fbe953c92cd2a8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301a2858203e880a068ebf0e604d63d299430205707f015c07dc481a1fff0c26308cfb1f51f693c3b8826e56e83d34aa044f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -219,19 +212,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+            "hash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7e",
+            "stateRoot" : "0xa6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12d",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x268ddce84cdc58a63e3586a44f6faa7a54ee844efbd265203e829d702a9df01c",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6317baf7dbeda7541aba98c202f674e9b20aedff2956ccfb8c868b73dd98a1a7",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -272,13 +265,13 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5a285",
+                "balance" : "0x29a2241af62da285",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -323,7 +316,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -340,7 +333,7 @@
     "static_callcallcodecallcode_011_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_callcallcodecallcode_011_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,18 +345,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x21616eb9c751a83ce75e2c04d4505c29504ba2f6ede7628362fe485a000579cb",
-                    "mixHash" : "0x918552b60fab82c596198200ef7258470ab95f53e576a374552b3519c02e8484",
-                    "nonce" : "0x885b66c820d3b949",
+                    "hash" : "0x78081f6718246a7cfe6603b1fc7374af546f99a793ad026a505af0a618f97769",
+                    "mixHash" : "0xfe1828b049e5d51b011ab97c8a44acae6c7855ae40d9c79387293d42df14c174",
+                    "nonce" : "0xd723fabe95a7d875",
                     "number" : "0x01",
-                    "parentHash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
-                    "receiptTrie" : "0x6bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33f",
-                    "stateRoot" : "0x74d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923",
+                    "parentHash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
+                    "receiptTrie" : "0x4e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246",
+                    "stateRoot" : "0x88aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a0c9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a06bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0918552b60fab82c596198200ef7258470ab95f53e576a374552b3519c02e848488885b66c820d3b949f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a00e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a04e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0fe1828b049e5d51b011ab97c8a44acae6c7855ae40d9c79387293d42df14c17488d723fabe95a7d875f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -388,19 +381,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+            "hash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7e",
+            "stateRoot" : "0xa6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12d",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21616eb9c751a83ce75e2c04d4505c29504ba2f6ede7628362fe485a000579cb",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x78081f6718246a7cfe6603b1fc7374af546f99a793ad026a505af0a618f97769",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -433,7 +426,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -484,7 +477,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -501,7 +494,7 @@
     "static_callcallcodecallcode_011_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_callcallcodecallcode_011_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -513,18 +506,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x015c211d6d7e816d63e0d74d995d6b9d27c3502cdd7aa7676f9599d3f26be85b",
-                    "mixHash" : "0x87c3e4fff3a420bfe174709eeb9f4aff1ec175aaca5dc3773f22ed91a4681cbc",
-                    "nonce" : "0xcaec3ae8a20d258d",
+                    "hash" : "0x775ae4947e24d42a5a827fae6c4e081bc199d4bea9ada8740f813b988effb3b1",
+                    "mixHash" : "0x06a9c8aacc8cf46f92cb681064d4fbdfb353884c2b2597d93d1333f7f742bb60",
+                    "nonce" : "0x98756e0534bb26e6",
                     "number" : "0x01",
-                    "parentHash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
-                    "receiptTrie" : "0x6bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33f",
-                    "stateRoot" : "0x74d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923",
+                    "parentHash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
+                    "receiptTrie" : "0x4e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246",
+                    "stateRoot" : "0x88aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a0c9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a06bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a087c3e4fff3a420bfe174709eeb9f4aff1ec175aaca5dc3773f22ed91a4681cbc88caec3ae8a20d258df882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a00e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a04e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a006a9c8aacc8cf46f92cb681064d4fbdfb353884c2b2597d93d1333f7f742bb608898756e0534bb26e6f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -549,19 +542,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+            "hash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7e",
+            "stateRoot" : "0xa6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12d",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x015c211d6d7e816d63e0d74d995d6b9d27c3502cdd7aa7676f9599d3f26be85b",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x775ae4947e24d42a5a827fae6c4e081bc199d4bea9ada8740f813b988effb3b1",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -594,7 +587,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -645,7 +638,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -662,7 +655,7 @@
     "static_callcallcodecallcode_011_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_callcallcodecallcode_011_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -674,18 +667,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xbc5b3e784c050fb3efa5d5b1fd8ec9f08b84dc29557ea6a0a23163ce17833ca9",
-                    "mixHash" : "0x7d983d280c4185b58ba964c6056b48d48d82e6bbb3677d4af2589a0daa91aafe",
-                    "nonce" : "0xd641c147cf3c271b",
+                    "hash" : "0x2939083fa5d18697c06a3f7c10b00d617780a4b7035ae8f39b9c82affacdebd3",
+                    "mixHash" : "0x63a6039c0f99c30c1ebd5f8bfff6c5e750485ca69e2d11debad3dd6727a115b2",
+                    "nonce" : "0x319827292747b3b1",
                     "number" : "0x01",
-                    "parentHash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
-                    "receiptTrie" : "0x6bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33f",
-                    "stateRoot" : "0x74d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923",
+                    "parentHash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
+                    "receiptTrie" : "0x4e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246",
+                    "stateRoot" : "0x88aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a0c9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a06bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a07d983d280c4185b58ba964c6056b48d48d82e6bbb3677d4af2589a0daa91aafe88d641c147cf3c271bf882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a00e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a04e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a063a6039c0f99c30c1ebd5f8bfff6c5e750485ca69e2d11debad3dd6727a115b288319827292747b3b1f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -710,19 +703,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+            "hash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7e",
+            "stateRoot" : "0xa6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12d",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc5b3e784c050fb3efa5d5b1fd8ec9f08b84dc29557ea6a0a23163ce17833ca9",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2939083fa5d18697c06a3f7c10b00d617780a4b7035ae8f39b9c82affacdebd3",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -755,7 +748,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -806,7 +799,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -823,7 +816,7 @@
     "static_callcallcodecallcode_011_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_callcallcodecallcode_011_OOGMAfter2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -835,18 +828,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xf0f7456f479786f144e52ececf500422927c78b3e6125c73256d6a4d10861b83",
-                    "mixHash" : "0xc9f951eae18702417705b1afedcfade0e5d00b694fbf02fd05b32dd0954db184",
-                    "nonce" : "0x2bb785a96fb3d67f",
+                    "hash" : "0xa364dc7cf9b8b7835a6f53cf414fb31ca9a197d6f52e1a78235b76fbe600ad0c",
+                    "mixHash" : "0x1aa9a2fe03c8f5a75c80ed64d79a7393824d2dab9cf679cc0ab5d8c7c3e8fb7e",
+                    "nonce" : "0x1af67127536385d2",
                     "number" : "0x01",
-                    "parentHash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
-                    "receiptTrie" : "0x6bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33f",
-                    "stateRoot" : "0x74d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923",
+                    "parentHash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
+                    "receiptTrie" : "0x4e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246",
+                    "stateRoot" : "0x88aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f9a0c9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074d371457532d06f742322aab61f25c8a32272efd15759a521e4ac7c73d31923a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a06bd7d1a043bf0dfb59db36f87094780339b50cef37ad0dd9ad3916863203c33fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0c9f951eae18702417705b1afedcfade0e5d00b694fbf02fd05b32dd0954db184882bb785a96fb3d67ff882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
+                "rlp" : "0xf90281f901f9a00e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088aa1be8a5f142f9b58ebf1d01b56ef0bc4bf1a06d372a1740d8e9d8ed2a3e54a0c2bc41fc05a98854c4ef785ff341e07b36d9dd13a7280274ee2d4acf16b02ce9a04e096f0fa5d1445de6133ca14aa43677a86de30dd581767b80f488480fa12246b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a01aa9a2fe03c8f5a75c80ed64d79a7393824d2dab9cf679cc0ab5d8c7c3e8fb7e881af67127536385d2f882f880800183029fe094100000000000000000000000000000000000000080a000000000000000000000000010000000000000000000000000000000000000011ca0dae126c13c8d94a1c6be6a83cb1672d055e857790b14aec39060e3ce89e727b7a01889342374eb9585afa159c34b682da6442f053b773c256f542f11731f6a91d0c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000001000000000000000000000000000000000000001",
@@ -871,19 +864,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "0xc9e2587018ca584d379582ce7406d90d90bc8810113ee94c7c6b99420b3bf99d",
+            "hash" : "0x0e759e98d26d88f23bda47a7fc3495c706861eae3a2647be3a6b6a1a6d105acf",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7e",
+            "stateRoot" : "0xa6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12d",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949b879237d854c823a0b9f9efa6f0451780eda7eda32366d859f47538e28b7ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0f7456f479786f144e52ececf500422927c78b3e6125c73256d6a4d10861b83",
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b1e323b1dc627d9040c3bec049e3b7d798d6ba9e7ff3f67bb136fce931b12da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa364dc7cf9b8b7835a6f53cf414fb31ca9a197d6f52e1a78235b76fbe600ad0c",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -916,7 +909,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -967,7 +960,7 @@
             },
             "0x2000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c3506080511015603c576001608051016080526024565b",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2505b61c350608051101560405760013b506001608051016080526024565b",
                 "nonce" : "0x00",
                 "storage" : {
                 }