1 files changed, 192 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
index 51e863ed7..845abb33b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodecallcode_11_SuicideEnd_d0g0v0_EIP150" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x07465001497f4cfb8a1703bbf83afd0293c83842d1b1c2d7ca861c07141d20e4",
-                    "mixHash" : "0x122ac8bb4d5186723ae4e19f8b83a7123d99ad74d1bbc330f68cf8833da12038",
-                    "nonce" : "0x85c7d328a10375ab",
+                    "hash" : "0x56b53f79d33c6ff101ba4ba2432b3791943c015cb78975fd81111b35088a7fa7",
+                    "mixHash" : "0xb31f0bc7b21bc514e0113c2bcb0d0036e668d4408b6f160e9e0608185da176ef",
+                    "nonce" : "0x361cec61debdf08b",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
-                    "stateRoot" : "0x545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x3f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0122ac8bb4d5186723ae4e19f8b83a7123d99ad74d1bbc330f68cf8833da120388885c7d328a10375abf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0b31f0bc7b21bc514e0113c2bcb0d0036e668d4408b6f160e9e0608185da176ef88361cec61debdf08bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07465001497f4cfb8a1703bbf83afd0293c83842d1b1c2d7ca861c07141d20e4",
-        "network" : "EIP150",
+        "lastblockhash" : "0x56b53f79d33c6ff101ba4ba2432b3791943c015cb78975fd81111b35088a7fa7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
@@ -125,10 +132,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_EIP158" : {
+    "callcodecallcode_11_SuicideEnd_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -140,9 +147,142 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x343e723007b5fdc0174ffcaf65941ecc9985c1400edbaa3544188c81019e6933",
-                    "mixHash" : "0xfa307f9d157bb051547b0b1a24251f83192788ca209e6c57dc675895cfb9e165",
-                    "nonce" : "0xadc9bed94ef7d796",
+                    "hash" : "0x70aea183c596eb5ad9e503018574cb6d07cdb125d8a8b1ba2a11475b2e98b2d8",
+                    "mixHash" : "0x62c25837ea3950dc21e8f0ce4e763b146bff9ede88f4ad157910015e9e27f566",
+                    "nonce" : "0xa0d322e7a2655a5a",
+                    "number" : "0x01",
+                    "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0x3f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58e",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a062c25837ea3950dc21e8f0ce4e763b146bff9ede88f4ad157910015e9e27f56688a0d322e7a2655a5af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x2dc6c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
+                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x70aea183c596eb5ad9e503018574cb6d07cdb125d8a8b1ba2a11475b2e98b2d8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f7ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630813",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcode_11_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0xf097ecfae6ea0c92708a2991e942aed6a31362cd7d57958b3a6bb193e5e4eac8",
+                    "mixHash" : "0xcf2884323a7bddb11091bfe611d29170563eefa2e68c9fce756f9bc65021a44a",
+                    "nonce" : "0xcbc67b08d2be8a8d",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
                     "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
@@ -151,7 +291,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0fa307f9d157bb051547b0b1a24251f83192788ca209e6c57dc675895cfb9e16588adc9bed94ef7d796f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0cf2884323a7bddb11091bfe611d29170563eefa2e68c9fce756f9bc65021a44a88cbc67b08d2be8a8df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -188,8 +328,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x343e723007b5fdc0174ffcaf65941ecc9985c1400edbaa3544188c81019e6933",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf097ecfae6ea0c92708a2991e942aed6a31362cd7d57958b3a6bb193e5e4eac8",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -251,10 +391,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_Frontier" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -265,19 +405,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3d",
-                    "hash" : "0xfe5ca741b3c77c732a17d19e10c281067549a119b43c37a41e3eebb60f637d33",
-                    "mixHash" : "0x7e0bf498238044a6754c1f012ae7ed9362ca83122741aa66002fedf421d2d5c7",
-                    "nonce" : "0x1faab22254d56bba",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0xcbe0a003b639bd19a6370e81eaac0604ce3b96198773f88870cd816272475294",
+                    "mixHash" : "0x81ce6140fd491dcfdfb7d7ff1dd2c3c253b77750f383b486b3fd8039a247a1b6",
+                    "nonce" : "0xf17c965e9017fa65",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
-                    "stateRoot" : "0x981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
+                    "receiptTrie" : "0x74a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3",
+                    "stateRoot" : "0x545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a07e0bf498238044a6754c1f012ae7ed9362ca83122741aa66002fedf421d2d5c7881faab22254d56bbaf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0545f2d8370a08d0da9fc243f586b9dc36c117ef3ebcdf8498d4f7605a1857335a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a074a9448afea2f6e65ef076ff0de25c7b6fb2e9cf4e4e5f193de8310b969771b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a081ce6140fd491dcfdfb7d7ff1dd2c3c253b77750f383b486b3fd8039a247a1b688f17c965e9017fa65f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -314,8 +454,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe5ca741b3c77c732a17d19e10c281067549a119b43c37a41e3eebb60f637d33",
-        "network" : "Frontier",
+        "lastblockhash" : "0xcbe0a003b639bd19a6370e81eaac0604ce3b96198773f88870cd816272475294",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -332,14 +472,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3d",
+                "balance" : "0x4563918244f4f7ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c3",
+                "balance" : "0x0de0b6b3a7630813",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -377,10 +517,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_Homestead" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -392,9 +532,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0x2f6ea8046b0b6c05c73d72c27de730a76dbf77259a14ceddbd5637fc74de8b47",
-                    "mixHash" : "0xf2ffa974b8fced7831865c0a7369048d11ac704c3021b491ca84faad9ad9ac5f",
-                    "nonce" : "0xabaf4a88833df356",
+                    "hash" : "0x44e3f5e271cf6d21d0ab5f666e29d34472ddadc8e1a61a022fab12991983a8c1",
+                    "mixHash" : "0x5befca160dca67b8a2cef008cc9b31a5bf64f0bbd15108de42b457e3a9a35447",
+                    "nonce" : "0x9f3dbf868cc04890",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
                     "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
@@ -403,7 +543,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0f2ffa974b8fced7831865c0a7369048d11ac704c3021b491ca84faad9ad9ac5f88abaf4a88833df356f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a05befca160dca67b8a2cef008cc9b31a5bf64f0bbd15108de42b457e3a9a35447889f3dbf868cc04890f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -440,8 +580,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f6ea8046b0b6c05c73d72c27de730a76dbf77259a14ceddbd5637fc74de8b47",
-        "network" : "Homestead",
+        "lastblockhash" : "0x44e3f5e271cf6d21d0ab5f666e29d34472ddadc8e1a61a022fab12991983a8c1",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
@@ -503,10 +643,10 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcodecallcode_11_SuicideEnd_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/stCallCodes/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -517,19 +657,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ed",
-                    "hash" : "0x65a7aa3dc70b6e36969c7742aa41512337d85a30d6d042027501a48dbee5ec7f",
-                    "mixHash" : "0xca39c81432a4e75c2d2476b9e14f81c0753864da6635ca0560faceecd6287855",
-                    "nonce" : "0x487d9dcae454e258",
+                    "gasUsed" : "0xdf3d",
+                    "hash" : "0xe1181c664a90f932e7b5b296cd9d1a62daf7925662b210ca6fba0160734e7451",
+                    "mixHash" : "0x0e2d3e71aeb207ec3fae3e4e200424940fe6720d9184dd87f50114e2d6f518e5",
+                    "nonce" : "0x6047df41555d34a9",
                     "number" : "0x01",
                     "parentHash" : "0xcfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809d",
-                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
-                    "stateRoot" : "0x3f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58e",
+                    "receiptTrie" : "0x35d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42e",
+                    "stateRoot" : "0x981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f096f3a3247d94d7d880db367dfdb0b055c9820124ade8ee541cd8a9cc6b58ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0ca39c81432a4e75c2d2476b9e14f81c0753864da6635ca0560faceecd628785588487d9dcae454e258f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0cfeed18745c0682c2d4a21218ee6bffe631c02567e482a152215baabb078809da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0981824275acb3ac521a02ab95cc038c16544646f29d53aec4f855f684e5b2946a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a035d781e6425f2c3fb4cf8e138908037e6bb4299206bfb086f877cd871706e42eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a00e2d3e71aeb207ec3fae3e4e200424940fe6720d9184dd87f50114e2d6f518e5886047df41555d34a9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -566,16 +706,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0599232a1d8354ba5a12a621ec701578b82f06cf4d64ff6cb48a1477aaadf6615a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65a7aa3dc70b6e36969c7742aa41512337d85a30d6d042027501a48dbee5ec7f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe1181c664a90f932e7b5b296cd9d1a62daf7925662b210ca6fba0160734e7451",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x02540be400",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
@@ -591,14 +724,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ed",
+                "balance" : "0x4563918244f4df3d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630813",
+                "balance" : "0x0de0b6b3a76320c3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {