Hive tests with Byzantine

1 files changed, 194 insertions, 59 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
index d793222d3..8f9698dde 100644
--- a/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCodes/callcall_00_SuicideEnd_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcall_00_SuicideEnd_d0g0v0_EIP150" : {
+    "callcall_00_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/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x60adbb1622c784c2354d709b857a3e8d0681de57e5931aca0363f8065fdb67d2",
-                    "mixHash" : "0x972bd34a12013ff2ebbc47a12e8ed12f8fba2e6629dfd1fee8da0f04857c0225",
-                    "nonce" : "0x4cd89d85db046832",
+                    "hash" : "0xd1f7c20a7aee1c8bb1059d811014d36f00119a1fe369d657941040be48b87a72",
+                    "mixHash" : "0x47fdcdd17ead4f87044edb32af81b6d3203503ad12666a71feefd94b8c07eab0",
+                    "nonce" : "0x8b1a3996887410e0",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
-                    "stateRoot" : "0x591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xc9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0972bd34a12013ff2ebbc47a12e8ed12f8fba2e6629dfd1fee8da0f04857c0225884cd89d85db046832f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a047fdcdd17ead4f87044edb32af81b6d3203503ad12666a71feefd94b8c07eab0888b1a3996887410e0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60adbb1622c784c2354d709b857a3e8d0681de57e5931aca0363f8065fdb67d2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd1f7c20a7aee1c8bb1059d811014d36f00119a1fe369d657941040be48b87a72",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -127,10 +134,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_EIP158" : {
+    "callcall_00_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/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,9 +149,144 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ed",
-                    "hash" : "0x8ea2257cf825b92af86c4005257514529844608d99495796fa1c69ae1ea4e475",
-                    "mixHash" : "0xebb195376afc6400a16e760a00574a27b4820c4a871bf2e2a42ce31469f57d82",
-                    "nonce" : "0xe5865d04334df5e9",
+                    "hash" : "0x6c754fe9ffa7dbc7c65f286e5d4fcf2eff01fa3e0c51cbb9ac7e16e81b9879d6",
+                    "mixHash" : "0x25852de6e1cdffeca7a95ae009563462f48eceafebb0f03f789a3aaa9fac826f",
+                    "nonce" : "0x25034263ff4ebdde",
+                    "number" : "0x01",
+                    "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
+                    "stateRoot" : "0xc9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a025852de6e1cdffeca7a95ae009563462f48eceafebb0f03f789a3aaa9fac826f8825034263ff4ebddef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "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" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x41d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6c754fe9ffa7dbc7c65f286e5d4fcf2eff01fa3e0c51cbb9ac7e16e81b9879d6",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b5fb6fe400",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f7ed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7630813",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f1600155731000000000000000000000000000000000000000ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02540be400",
+                "code" : "0x6001600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_SuicideEnd_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCodes/callcall_00_SuicideEnd_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0xabff67b73a98fd8b2448c4498dd8774d37233fdf5a24f41f247bdf6e48fc8106",
+                    "mixHash" : "0x0af5554bb2cd85bee5ebbd9738863f9b4d60f6a46f29443e11059298aab47813",
+                    "nonce" : "0xb8f0b1cc2f81cf65",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
                     "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
@@ -153,7 +295,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0ebb195376afc6400a16e760a00574a27b4820c4a871bf2e2a42ce31469f57d8288e5865d04334df5e9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a00af5554bb2cd85bee5ebbd9738863f9b4d60f6a46f29443e11059298aab4781388b8f0b1cc2f81cf65f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -190,8 +332,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ea2257cf825b92af86c4005257514529844608d99495796fa1c69ae1ea4e475",
-        "network" : "EIP158",
+        "lastblockhash" : "0xabff67b73a98fd8b2448c4498dd8774d37233fdf5a24f41f247bdf6e48fc8106",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -255,10 +397,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_Frontier" : {
+    "callcall_00_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/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -269,19 +411,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3d",
-                    "hash" : "0x87f4e8a1a41a19ae56df0f17a31f052a1d54abea850b1ec8d2a012fa1a88bd96",
-                    "mixHash" : "0x064e4fb57d16483b58fdcbc18b91a7cfbd7d945ac6c83f70c0360c64a07be3ec",
-                    "nonce" : "0x95871bf9a1482b84",
+                    "gasUsed" : "0xf7ed",
+                    "hash" : "0x244244d1bf71a285f43138d912bef4f8032e011091249eb49d8cfd2c79c98692",
+                    "mixHash" : "0xabed9e3e02a9953c909f091bd463d933e0d00762785ef205546c6c5a79d4ed4a",
+                    "nonce" : "0xf67be072f65ee319",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
-                    "stateRoot" : "0xd4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
+                    "receiptTrie" : "0x117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892",
+                    "stateRoot" : "0x591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0064e4fb57d16483b58fdcbc18b91a7cfbd7d945ac6c83f70c0360c64a07be3ec8895871bf9a1482b84f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0591d0d5e39176a8456e9694a7fd368315fc36f532628a0ac9738300e15952245a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0117a0bd18ef857f4bc8d3e62765e755224a5492606c5de588722dd19a5cad892b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0abed9e3e02a9953c909f091bd463d933e0d00762785ef205546c6c5a79d4ed4a88f67be072f65ee319f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -318,8 +460,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87f4e8a1a41a19ae56df0f17a31f052a1d54abea850b1ec8d2a012fa1a88bd96",
-        "network" : "Frontier",
+        "lastblockhash" : "0x244244d1bf71a285f43138d912bef4f8032e011091249eb49d8cfd2c79c98692",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -338,14 +480,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3d",
+                "balance" : "0x4563918244f4f7ed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c3",
+                "balance" : "0x0de0b6b3a7630813",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -383,10 +525,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_Homestead" : {
+    "callcall_00_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/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -398,9 +540,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xdf3d",
-                    "hash" : "0xb071c44151d4c00166e7f158ec1c44c59156ee85172ba15cb81cda5b48c3bc92",
-                    "mixHash" : "0x306b9b3d4dd1b04e1210f4a7e7363f125a2d07c2942dcb912c059479340d1466",
-                    "nonce" : "0x03b0e897807ad764",
+                    "hash" : "0x083757ad3e95eb4a06ac4a573b06d55db4105c1ef7f87a72bd562d58243d13cd",
+                    "mixHash" : "0xd9a4af42cf2d8fefbd3f806bdfa31776469b15b0a7be05a83e92a824c2030986",
+                    "nonce" : "0x1462391809187d1a",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
                     "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
@@ -409,7 +551,7 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0306b9b3d4dd1b04e1210f4a7e7363f125a2d07c2942dcb912c059479340d14668803b0e897807ad764f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a0d9a4af42cf2d8fefbd3f806bdfa31776469b15b0a7be05a83e92a824c2030986881462391809187d1af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -446,8 +588,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb071c44151d4c00166e7f158ec1c44c59156ee85172ba15cb81cda5b48c3bc92",
-        "network" : "Homestead",
+        "lastblockhash" : "0x083757ad3e95eb4a06ac4a573b06d55db4105c1ef7f87a72bd562d58243d13cd",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
@@ -511,10 +653,10 @@
             }
         }
     },
-    "callcall_00_SuicideEnd_d0g0v0_Metropolis" : {
+    "callcall_00_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/callcall_00_SuicideEnd_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -525,19 +667,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ed",
-                    "hash" : "0x33dc317e9e91d7b8bcce1e0728f6503f5717c7a8c3d530f0c6a54b73a03854a1",
-                    "mixHash" : "0xbce28bd0655238dbd7447314842e562ed6ea405f6c79c8ee36fc185ee86c8c2d",
-                    "nonce" : "0x540cfec846e47c70",
+                    "gasUsed" : "0xdf3d",
+                    "hash" : "0x4ff5ca6fe5cfc53e775cca67dacbb06874254ddd47351e26e860e0fb82cb2de9",
+                    "mixHash" : "0x82c3b6782a5eceb02c17a29a53e9e399614ad14d635e356dcabd61d3f456e777",
+                    "nonce" : "0xb565093a8f63d53a",
                     "number" : "0x01",
                     "parentHash" : "0x391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dc",
-                    "receiptTrie" : "0xd2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6",
-                    "stateRoot" : "0xc9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499d",
+                    "receiptTrie" : "0xbe59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352",
+                    "stateRoot" : "0xd4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c9c8d41dec8208f6955f5c0cb10b517ef0a35859d163799118788109623c499da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2f0f725c26ae5285a16e9dfbde95c51f2ea36c4582b6d5233da72f5592849e6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ed8203e880a0bce28bd0655238dbd7447314842e562ed6ea405f6c79c8ee36fc185ee86c8c2d88540cfec846e47c70f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0391a078a9d04ac17dcc4d23a91170015383a97024d25b7d85d234ef1cf3eb9dca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d4c4d1dac9d144065b58906afd684273b19e05e6ca44b1884e1126e50ec0aac6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0be59586357b9d68d781cbac1e64fe87b72b8a3c959c9ada4cb444bfc7c0b2352b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3d8203e880a082c3b6782a5eceb02c17a29a53e9e399614ad14d635e356dcabd61d3f456e77788b565093a8f63d53af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -574,16 +716,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041d82e1089e4c9ec64dd5d823e47b695a5f902ba87dd993e6b3558360ff54828a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33dc317e9e91d7b8bcce1e0728f6503f5717c7a8c3d530f0c6a54b73a03854a1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4ff5ca6fe5cfc53e775cca67dacbb06874254ddd47351e26e860e0fb82cb2de9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b5fb6fe400",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f1600055",
@@ -601,14 +736,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ed",
+                "balance" : "0x4563918244f4df3d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630813",
+                "balance" : "0x0de0b6b3a76320c3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {