1 files changed, 208 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
index 1f72401a1..58028d18c 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcallcall_000_SuicideMiddle_d0g0v0_EIP150" : {
+    "callcallcall_000_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/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0x4b549d21b4d37fe023a6e14b2cc4939d4dbd11a01679fbf27fdd3b079f54782e",
-                    "mixHash" : "0x397f8396499b6a569d221518a866c2b6e8768b46bace290953e018d91d05df8c",
-                    "nonce" : "0x6ce4ed4ae38336b5",
+                    "hash" : "0x49e005df9efc65e54970095d6fc7cbd9edc7d6c356c24054b5d3f05036af71ae",
+                    "mixHash" : "0x3db29a3d6763973d84a3302db8e0b6e68710faafa59f7f4097ca1d01e43e082a",
+                    "nonce" : "0xeddc9b4c0d4c540f",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
-                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0397f8396499b6a569d221518a866c2b6e8768b46bace290953e018d91d05df8c886ce4ed4ae38336b5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a03db29a3d6763973d84a3302db8e0b6e68710faafa59f7f4097ca1d01e43e082a88eddc9b4c0d4c540ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b549d21b4d37fe023a6e14b2cc4939d4dbd11a01679fbf27fdd3b079f54782e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x49e005df9efc65e54970095d6fc7cbd9edc7d6c356c24054b5d3f05036af71ae",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -141,10 +148,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_EIP158" : {
+    "callcallcall_000_SuicideMiddle_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/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -156,9 +163,158 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xe783a8262d9d6fddb93ae9d7015edea03375775a24aa91c1489e40111f107e02",
-                    "mixHash" : "0x54883517de8ddf55391c51d950eb996005dcbb3d22e99a1f978a0279dafe5ff8",
-                    "nonce" : "0xdb3e407dbb8bba46",
+                    "hash" : "0x5ecaf392a7d407e9406a56c4855cbfd960a8f76906e938cc719da754eb6f5e72",
+                    "mixHash" : "0xb30889f58bfc7571e9ac04161e305d0fcade36e579cf4b2ddb5e35539b6982c3",
+                    "nonce" : "0x82aea9bc7d069fd0",
+                    "number" : "0x01",
+                    "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
+                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0b30889f58bfc7571e9ac04161e305d0fcade36e579cf4b2ddb5e35539b6982c38882aea9bc7d069fd0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5ecaf392a7d407e9406a56c4855cbfd960a8f76906e938cc719da754eb6f5e72",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "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" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f1600155",
+                "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" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_SuicideMiddle_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x5f00ddf898f356d533afb3409185dd8573965462d3cd17e8d03a722ef877844f",
+                    "mixHash" : "0xf8ce7c345527237e7cd42c9dd662dad39ef78926b4ed972ddd18508740cb22ce",
+                    "nonce" : "0x52a669e803119182",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
                     "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
@@ -167,7 +323,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a054883517de8ddf55391c51d950eb996005dcbb3d22e99a1f978a0279dafe5ff888db3e407dbb8bba46f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0f8ce7c345527237e7cd42c9dd662dad39ef78926b4ed972ddd18508740cb22ce8852a669e803119182f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -204,8 +360,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe783a8262d9d6fddb93ae9d7015edea03375775a24aa91c1489e40111f107e02",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5f00ddf898f356d533afb3409185dd8573965462d3cd17e8d03a722ef877844f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -283,10 +439,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_Frontier" : {
+    "callcallcall_000_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/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -297,19 +453,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0x4cd6fe89887bdd31d5ae9db3c3e57f76b0398c4cebdcfb721fa3c8d009f37fcc",
-                    "mixHash" : "0xd65be070398a098795de65626f9bac77593938ae65e780ce4353e522990fa4d3",
-                    "nonce" : "0xbcd2e7cac493a1a5",
+                    "gasUsed" : "0xa9c7",
+                    "hash" : "0x926e312594c6634ed8329a8726b80c868f8144e8c4c0899467292b0199b46d61",
+                    "mixHash" : "0x3ce8bd6f13ceb71abc41a002211bdc195ae95d7d78ccb3213d0aee83774e58f6",
+                    "nonce" : "0x7bebc47c1842528e",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
-                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
+                    "receiptTrie" : "0xf5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1",
+                    "stateRoot" : "0xef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0d65be070398a098795de65626f9bac77593938ae65e780ce4353e522990fa4d388bcd2e7cac493a1a5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef7b5e53a28d4a32d5a81df965b3a06d56175a9261f6c33d45a6feb52b1b6d07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f5754b7c7c594f3fa3682f9e9b13b6b6387929898aa2db57440a959d729be6e1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a03ce8bd6f13ceb71abc41a002211bdc195ae95d7d78ccb3213d0aee83774e58f6887bebc47c1842528ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -346,8 +502,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4cd6fe89887bdd31d5ae9db3c3e57f76b0398c4cebdcfb721fa3c8d009f37fcc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x926e312594c6634ed8329a8726b80c868f8144e8c4c0899467292b0199b46d61",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -373,14 +529,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
+                "balance" : "0x4563918244f4a9c7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
+                "balance" : "0x0de0b6b3a7635639",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -425,10 +581,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_Homestead" : {
+    "callcallcall_000_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/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -440,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0xb04c14d2878ca6ed8624266931c0684f3c77ad7d61a55e681ebfa89f728d9d3e",
-                    "mixHash" : "0xc843eef90011a5fe4d2929c17fe9c7faf3607a8bcdff26c28d7623c30359c0d9",
-                    "nonce" : "0xcd9465ad8e8dade0",
+                    "hash" : "0x634fdeac47d2d68d0fd09cd666310fdaf160b4c00e03eab3ec9a89c6d470ec84",
+                    "mixHash" : "0xff261b1117349a2196d4f55f93953db058ccb4bfd298217e4239f116f78c2f40",
+                    "nonce" : "0xdcd40f82b7b63f13",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
                     "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
@@ -451,7 +607,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0c843eef90011a5fe4d2929c17fe9c7faf3607a8bcdff26c28d7623c30359c0d988cd9465ad8e8dade0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0ff261b1117349a2196d4f55f93953db058ccb4bfd298217e4239f116f78c2f4088dcd40f82b7b63f13f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,8 +644,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb04c14d2878ca6ed8624266931c0684f3c77ad7d61a55e681ebfa89f728d9d3e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x634fdeac47d2d68d0fd09cd666310fdaf160b4c00e03eab3ec9a89c6d470ec84",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -567,10 +723,10 @@
             }
         }
     },
-    "callcallcall_000_SuicideMiddle_d0g0v0_Metropolis" : {
+    "callcallcall_000_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/callcallcall_000_SuicideMiddle_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -581,19 +737,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x170d1899c9f863e54bbf090a4a9f3218fd0b8f0e54f0e586cdd142133c5668b8",
-                    "mixHash" : "0xaae4ba1f6ca65bb6b5e2ba9acfe964a97acc33a4dac8d506756a1ea98eb58c41",
-                    "nonce" : "0x94495c5fbe33b747",
+                    "gasUsed" : "0x9117",
+                    "hash" : "0x398d57d41d7e354d20e0cf5290a9ccc2f2f4fe758994295a784f6d8fe2ae5fde",
+                    "mixHash" : "0xda651b2497df9d3938b5b41d4f826f6b13be616278443eea0fb9b1af94da0e50",
+                    "nonce" : "0x7c2c773568ce15ce",
                     "number" : "0x01",
                     "parentHash" : "0xc03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201",
-                    "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
-                    "stateRoot" : "0x4c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27",
+                    "receiptTrie" : "0x1c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698a",
+                    "stateRoot" : "0x488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abf",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c0803e917b286d5a7b2deea01ba0f1f869727d44751676030ac4dd1fa645f27a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0aae4ba1f6ca65bb6b5e2ba9acfe964a97acc33a4dac8d506756a1ea98eb58c418894495c5fbe33b747f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0c03ba8abebd79839ae74516d64e616e828c4264be1c091af03dbe26bbf175201a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0488316e797c2e70a47c234553cfebf1881feb282df3c07543e9cd5c7c2966abfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01c1dfc43c07e5f95f712a9b6d004648f3b9180a050b25cff79046ce47e5b698ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0da651b2497df9d3938b5b41d4f826f6b13be616278443eea0fb9b1af94da0e50887c2c773568ce15cef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -630,16 +786,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470ad33e93c3fdce8cb414584ae0688cf3601ad559cfabc3f8d8357669cbee17a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x170d1899c9f863e54bbf090a4a9f3218fd0b8f0e54f0e586cdd142133c5668b8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x398d57d41d7e354d20e0cf5290a9ccc2f2f4fe758994295a784f6d8fe2ae5fde",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -664,14 +813,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
+                "balance" : "0x4563918244f49117",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
+                "balance" : "0x0de0b6b3a7636ee9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {