1 files changed, 171 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json
index 4289f541c..ed03fa9a9 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "createInitFailBadJumpDestination_d0g0v0_EIP150" : {
+    "createInitFailBadJumpDestination_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05de2429",
-                    "hash" : "0x74436141300afbfbfaed3c820e9105c694c6508e23e2f590a2fdcf6e80a47769",
-                    "mixHash" : "0x32c1fb335f97bfa2f1d938427c326ca9d3e5776bda19ccfcc2a734a766f61be3",
-                    "nonce" : "0xa7d6f3c2eca0d9c6",
+                    "hash" : "0xd265a71e98408f4d454dd49003cd714674441a9995f2235df6bc490ff85a07c6",
+                    "mixHash" : "0x8d79937baccc4ffca31ee449fd5f9c48f95d1cdd891da7e484da314782c6d146",
+                    "nonce" : "0xa5b5fc1748e72a28",
                     "number" : "0x01",
                     "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
-                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
+                    "receiptTrie" : "0x4abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0",
+                    "stateRoot" : "0xa3730a1caf84fb8c81f0d04c5d6623059d0c0975e3a80cf88cacf4ebbeb93458",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a032c1fb335f97bfa2f1d938427c326ca9d3e5776bda19ccfcc2a734a766f61be388a7d6f3c2eca0d9c6f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3730a1caf84fb8c81f0d04c5d6623059d0c0975e3a80cf88cacf4ebbeb93458a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a08d79937baccc4ffca31ee449fd5f9c48f95d1cdd891da7e484da314782c6d14688a5b5fc1748e72a28f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,8 +62,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74436141300afbfbfaed3c820e9105c694c6508e23e2f590a2fdcf6e80a47769",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd265a71e98408f4d454dd49003cd714674441a9995f2235df6bc490ff85a07c6",
+        "network" : "Byzantium",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -72,6 +72,13 @@
                 "storage" : {
                 }
             },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x456391824ad22429",
                 "code" : "",
@@ -104,10 +111,122 @@
             }
         }
     },
-    "createInitFailBadJumpDestination_d0g0v0_EIP158" : {
+    "createInitFailBadJumpDestination_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x05de2429",
+                    "hash" : "0x65cb1dacf0a5cfd1e3551189d052284c03fb3dfb38949a3e738d07b5fe371914",
+                    "mixHash" : "0xb0b911ef53c926a90677b3440bdf1575aed5ef29fd7d256e0444c16559eb2d33",
+                    "nonce" : "0x2feaee6e3da72793",
+                    "number" : "0x01",
+                    "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
+                    "receiptTrie" : "0x4abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0",
+                    "stateRoot" : "0xa3730a1caf84fb8c81f0d04c5d6623059d0c0975e3a80cf88cacf4ebbeb93458",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3730a1caf84fb8c81f0d04c5d6623059d0c0975e3a80cf88cacf4ebbeb93458a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a0b0b911ef53c926a90677b3440bdf1575aed5ef29fd7d256e0444c16559eb2d33882feaee6e3da72793f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x88544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56b",
+                        "s" : "0x7fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xafd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x65cb1dacf0a5cfd1e3551189d052284c03fb3dfb38949a3e738d07b5fe371914",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x0000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x456391824ad22429",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a1845537",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6056600053600160006001f0ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "createInitFailBadJumpDestination_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05de2429",
-                    "hash" : "0xb7f7fd9f5ae88d83110231f0282119cdd8d69ab028c878ea9502b35b24746699",
-                    "mixHash" : "0x3b0aabb1f578574f274f3cde1a8b68f4d094102b531caeb4b62e2d7cb5f2b9f6",
-                    "nonce" : "0xe7843b88c669198f",
+                    "hash" : "0x8a1d4440a8283bb3b8b10be9505f00343d771f7585bf62e9925128b219cbe4c6",
+                    "mixHash" : "0x8fee1c7358ff55ee707d8943bb99b931bd39e3c6294c497cddf497f42382ea3e",
+                    "nonce" : "0x4bc6992cad8b6aef",
                     "number" : "0x01",
                     "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
                     "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
@@ -130,7 +249,7 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a03b0aabb1f578574f274f3cde1a8b68f4d094102b531caeb4b62e2d7cb5f2b9f688e7843b88c669198ff866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a08fee1c7358ff55ee707d8943bb99b931bd39e3c6294c497cddf497f42382ea3e884bc6992cad8b6aeff866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7f7fd9f5ae88d83110231f0282119cdd8d69ab028c878ea9502b35b24746699",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8a1d4440a8283bb3b8b10be9505f00343d771f7585bf62e9925128b219cbe4c6",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -209,10 +328,10 @@
             }
         }
     },
-    "createInitFailBadJumpDestination_d0g0v0_Frontier" : {
+    "createInitFailBadJumpDestination_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05f58340",
-                    "hash" : "0x782d6b13a78b9ac46a79da3b82d0d1d1ebd628e757c150a2cc934a441e80882a",
-                    "mixHash" : "0x972618bb40a6e7b34d860ef85bcbf595e18827f080f59f340d24ec869bb7f906",
-                    "nonce" : "0xb82b123c041c6c3a",
+                    "gasUsed" : "0x05de2429",
+                    "hash" : "0xec88201c22da8986463be9497fe3e95a6701299a1a5433d1b7ef9120e4c9c62f",
+                    "mixHash" : "0x3107ba6add9277f9d85b315a04842f4e74227dfd5c11a7c1d3002de736a936be",
+                    "nonce" : "0x8cbe2b3cfd521d41",
                     "number" : "0x01",
                     "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-                    "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
-                    "stateRoot" : "0xf8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7d",
+                    "receiptTrie" : "0x492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03",
+                    "stateRoot" : "0xbf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a0972618bb40a6e7b34d860ef85bcbf595e18827f080f59f340d24ec869bb7f90688b82b123c041c6c3af866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf5e9b6997b323ff0a2cecda3ddb667c966fccbd5e75d0c2c5a81af7df1e6400a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0492104097be561ae597c4bfec7059fddccf05363171ee3fca75bf372cb1adf03b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a03107ba6add9277f9d85b315a04842f4e74227dfd5c11a7c1d3002de736a936be888cbe2b3cfd521d41f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x782d6b13a78b9ac46a79da3b82d0d1d1ebd628e757c150a2cc934a441e80882a",
-        "network" : "Frontier",
+        "lastblockhash" : "0xec88201c22da8986463be9497fe3e95a6701299a1a5433d1b7ef9120e4c9c62f",
+        "network" : "EIP158",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -283,14 +402,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae98340",
+                "balance" : "0x456391824ad22429",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a16cf620",
+                "balance" : "0x0de0b6b3a1845537",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -314,10 +433,10 @@
             }
         }
     },
-    "createInitFailBadJumpDestination_d0g0v0_Homestead" : {
+    "createInitFailBadJumpDestination_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +448,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x05f58340",
-                    "hash" : "0x4ad8ee94af95a19624505efaba830cf1c393e360d84cc39fcf21c001a6cbc518",
-                    "mixHash" : "0x2576f3a315a12519624f40f91363b88815de62a6244e5f6b8d3222db52e96640",
-                    "nonce" : "0x4b2b10402c2f3909",
+                    "hash" : "0x95396dedce9f745ae5bb81a962d986b102ce5b138e971b2200a82cab3348184f",
+                    "mixHash" : "0x43c31c8f1802d88a99b5b9eeee04827ed8940ef5b5eb503806bdb15766375880",
+                    "nonce" : "0xd8a9008c88f7f3ae",
                     "number" : "0x01",
                     "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
                     "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
@@ -340,7 +459,7 @@
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a02576f3a315a12519624f40f91363b88815de62a6244e5f6b8d3222db52e96640884b2b10402c2f3909f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a043c31c8f1802d88a99b5b9eeee04827ed8940ef5b5eb503806bdb1576637588088d8a9008c88f7f3aef866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +496,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ad8ee94af95a19624505efaba830cf1c393e360d84cc39fcf21c001a6cbc518",
-        "network" : "Homestead",
+        "lastblockhash" : "0x95396dedce9f745ae5bb81a962d986b102ce5b138e971b2200a82cab3348184f",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -419,10 +538,10 @@
             }
         }
     },
-    "createInitFailBadJumpDestination_d0g0v0_Metropolis" : {
+    "createInitFailBadJumpDestination_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/createInitFailBadJumpDestination_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +552,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x05de2429",
-                    "hash" : "0x8bcf3e3d70fbaa10faab217a43cd88aa4a9dd65e31e0224a6e003bbb17c2622f",
-                    "mixHash" : "0x5171026cc5b5eeebad5efc91485695fc7c7fba96a3262c38152202f2f6658728",
-                    "nonce" : "0x1db0688353a48e18",
+                    "gasUsed" : "0x05f58340",
+                    "hash" : "0x6c085c6ef64072e9a4d171bfbf9dd51de62c5d836d398508248f75ef77fcfa39",
+                    "mixHash" : "0x0447ee83e81161f8df22e83daf65a19bd2e1744bbed9f91ebd61d3123cc3684a",
+                    "nonce" : "0x1574c16c8a836bfe",
                     "number" : "0x01",
                     "parentHash" : "0xa8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297",
-                    "receiptTrie" : "0x4abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0",
-                    "stateRoot" : "0xa3730a1caf84fb8c81f0d04c5d6623059d0c0975e3a80cf88cacf4ebbeb93458",
+                    "receiptTrie" : "0x297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033a",
+                    "stateRoot" : "0xf8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x75e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3730a1caf84fb8c81f0d04c5d6623059d0c0975e3a80cf88cacf4ebbeb93458a075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba04abc455ea42b05ee31f1ac1b48a2be9059b37a20378ac71515b5c3b33be685d0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405de24298203e880a05171026cc5b5eeebad5efc91485695fc7c7fba96a3262c38152202f2f6658728881db0688353a48e18f866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
+                "rlp" : "0xf90266f901faa0a8979b84082aa5c6543ceab709ac7adc25a8396bc0b7b1ebd38f070640eb3297a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ab0473a58752f3916b4bda129c722c25ba74e5bed67805d622c55fbdbc6d7da075e61774a2ff58cbe32653420256c7f44bc715715a423b0b746d5c622979af6ba0297434bb102fde84e1334f2767855669b51b075f8aad50f0fec7ed27a9c2033ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008405f583408203e880a00447ee83e81161f8df22e83daf65a19bd2e1744bbed9f91ebd61d3123cc3684a881574c16c8a836bfef866f86480018405f5e10094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba088544c93a564b4c28d2ffac2074a0c55fdd4658fe0d215596ed2e32e3ef7f56ba07fb4075d54190f825d7c47bb820284757b34fd6293904a93cddb1d3aa961ac28c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,8 +601,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afd429b43dc5d7e4866eb102c1f29f8b47f7325eb9f176270ef3b1b6c983e947a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8bcf3e3d70fbaa10faab217a43cd88aa4a9dd65e31e0224a6e003bbb17c2622f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6c085c6ef64072e9a4d171bfbf9dd51de62c5d836d398508248f75ef77fcfa39",
+        "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -492,22 +611,15 @@
                 "storage" : {
                 }
             },
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ad22429",
+                "balance" : "0x456391824ae98340",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a1845537",
+                "balance" : "0x0de0b6b3a16cf620",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {