1 files changed, 207 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
index 805415f8e..44c567be3 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcallcodecall_010_SuicideMiddle_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/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xe26f795191a37b6f2fbfbea6d7f739f6edb7337fcbc42e1b40a8dedb5b41c8c6",
-                    "mixHash" : "0xdd4d138feaf240bf55dcc8b3d47005e2d267f4b54276f49fdf532a79f2012ee1",
-                    "nonce" : "0x1aabcc53e10596d9",
+                    "hash" : "0x4cbbcc1afe9cdefa3ca7ee97be0e206c9f36f193376b3199b01a014bec35b427",
+                    "mixHash" : "0xd3d61598bc74462ddc770433e6cb90b30b70580a734faea8529ddd556b19aa5f",
+                    "nonce" : "0xbdff2ffce2bb8699",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
-                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0dd4d138feaf240bf55dcc8b3d47005e2d267f4b54276f49fdf532a79f2012ee1881aabcc53e10596d9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d3d61598bc74462ddc770433e6cb90b30b70580a734faea8529ddd556b19aa5f88bdff2ffce2bb8699f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe26f795191a37b6f2fbfbea6d7f739f6edb7337fcbc42e1b40a8dedb5b41c8c6",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4cbbcc1afe9cdefa3ca7ee97be0e206c9f36f193376b3199b01a014bec35b427",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -140,10 +147,158 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcallcodecall_010_SuicideMiddle_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xcb3c1e6f5616fcd943eb3117cf592947b85fa413eaf23791c99a905f855840f1",
+                    "mixHash" : "0xf13593c25ad429ef8551205c42e2dac17c06370535bcfc6b079801ef28b787e1",
+                    "nonce" : "0x62548113dbb4803b",
+                    "number" : "0x01",
+                    "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f13593c25ad429ef8551205c42e2dac17c06370535bcfc6b079801ef28b787e18862548113dbb4803bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcb3c1e6f5616fcd943eb3117cf592947b85fa413eaf23791c99a905f855840f1",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a9c7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7635639",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_SuicideMiddle_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/stCallCodes/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -155,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x5a7e4d51f9a76ddfbeac5d6c4b5fe2b7d24f2565191321103c19680839bb6d7a",
-                    "mixHash" : "0x2ff381fe302386ca42013f28c719c2fc03537676deff999504dc7386daf942fa",
-                    "nonce" : "0x2606e77b22ebaab4",
+                    "hash" : "0x63c660789be1df81bec9c0d9ebced4eb44e6832e0eefbc90cb89401f378fd96e",
+                    "mixHash" : "0x360ba1cfa50fddd000d5728a47ca3861e309769ea507bdf9ef34c42e243bd1eb",
+                    "nonce" : "0x58354e821096e4dd",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
                     "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
@@ -166,7 +321,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a02ff381fe302386ca42013f28c719c2fc03537676deff999504dc7386daf942fa882606e77b22ebaab4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0360ba1cfa50fddd000d5728a47ca3861e309769ea507bdf9ef34c42e243bd1eb8858354e821096e4ddf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -203,8 +358,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a7e4d51f9a76ddfbeac5d6c4b5fe2b7d24f2565191321103c19680839bb6d7a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x63c660789be1df81bec9c0d9ebced4eb44e6832e0eefbc90cb89401f378fd96e",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -281,10 +436,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcallcodecall_010_SuicideMiddle_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/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -295,19 +450,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0x2bb3104438b3f084c360a0157cd888df0d2abc97ebdb249e42cb2b019b70572b",
-                    "mixHash" : "0x12f1e511e0d978c300c771188102673b2fdfe8571c3a6b8cb07e60b1bad06996",
-                    "nonce" : "0x66f9d4ed40e8ddaf",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0xdff67528fdb83d5b5f9af40d731c669e9a67cc59d5288b578990cbe4c5d5baca",
+                    "mixHash" : "0xbdd9276ee9d5ce4e08f7bc4e23b74a125559f25b170074010236688579115e80",
+                    "nonce" : "0x1ceaaf3b744a5006",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
-                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
+                    "receiptTrie" : "0x40d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51",
+                    "stateRoot" : "0x76de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a012f1e511e0d978c300c771188102673b2fdfe8571c3a6b8cb07e60b1bad069968866f9d4ed40e8ddaff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076de141d5d2cc15f768a401a730ca1be8a8bd7525acbfd156dd1f3509bad43b8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a040d9be83d2ab0f0d0dee1f51da1edc1bc49cd036cc024fa0ef77306d6ea54e51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0bdd9276ee9d5ce4e08f7bc4e23b74a125559f25b170074010236688579115e80881ceaaf3b744a5006f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -344,8 +499,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2bb3104438b3f084c360a0157cd888df0d2abc97ebdb249e42cb2b019b70572b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdff67528fdb83d5b5f9af40d731c669e9a67cc59d5288b578990cbe4c5d5baca",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -370,14 +525,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -422,10 +577,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcallcodecall_010_SuicideMiddle_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/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,9 +592,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0x09b20cccb302f45fb9403f8377643554ef1e31d25b7472d8489df09bd3a78e89",
-                    "mixHash" : "0xc0ab53333aeab9fcf1086e1f23544f3409fc59f10354529543a9d50ce700c5e9",
-                    "nonce" : "0x25797daf38250b9a",
+                    "hash" : "0xbfa9fb15e7d77e32b7188216041dbc468d61e549359a8ca56c9bc528b5fe3cf0",
+                    "mixHash" : "0x1ae047acd2ea8c9ec0e46d2fbb588641b4830401ba14b2d9022004bc3ab49780",
+                    "nonce" : "0xdfa54dab5f34a31d",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
                     "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
@@ -448,7 +603,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0c0ab53333aeab9fcf1086e1f23544f3409fc59f10354529543a9d50ce700c5e98825797daf38250b9af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a01ae047acd2ea8c9ec0e46d2fbb588641b4830401ba14b2d9022004bc3ab4978088dfa54dab5f34a31df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -485,8 +640,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09b20cccb302f45fb9403f8377643554ef1e31d25b7472d8489df09bd3a78e89",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbfa9fb15e7d77e32b7188216041dbc468d61e549359a8ca56c9bc528b5fe3cf0",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -563,10 +718,10 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcallcodecall_010_SuicideMiddle_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/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -577,19 +732,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0xc7ce3ac74d407507a64473e1d82a0ca4c7cd19d98383aded5d6812ee2cec85b7",
-                    "mixHash" : "0xd898bed68f99dc1e667491065e08ac7ab3236ac11f7b5177822c941dc7711a65",
-                    "nonce" : "0x42ca72599576aa4b",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0xb11dda70ebf5186fa89e26338fc81d28160ce8cd14787d5038dd980cd730f255",
+                    "mixHash" : "0x955225148775d91f989ca7fbac98a62cfefd0a03c8e93a5c504bd64fbeb63fc1",
+                    "nonce" : "0x3e86297abf7065b6",
                     "number" : "0x01",
                     "parentHash" : "0xabf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7f",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x39f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7d",
+                    "receiptTrie" : "0xc8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06b",
+                    "stateRoot" : "0xb31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039f82e5ac57a04a7592a6a8b747b317502c024e25f4fa1ce3d92afce40ccfb7da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0d898bed68f99dc1e667491065e08ac7ab3236ac11f7b5177822c941dc7711a658842ca72599576aa4bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0abf8930700e5a39b877c514ed87e0a020aeb31a156f472ac9705b73856837f7fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b31691965d326aa0b307410a45603ee2492f7fc2f7918c4804ba5299c6618113a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c8fcde60045e89f28153ae6d59b296c5293cb91570713171d03097732c64c06bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0955225148775d91f989ca7fbac98a62cfefd0a03c8e93a5c504bd64fbeb63fc1883e86297abf7065b6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -626,16 +781,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08e68427ae0c3f3c3a0c996bda45182e43e6ffd44b2b522f5f074c2da214644a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7ce3ac74d407507a64473e1d82a0ca4c7cd19d98383aded5d6812ee2cec85b7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb11dda70ebf5186fa89e26338fc81d28160ce8cd14787d5038dd980cd730f255",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -659,14 +807,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {