Hive tests with Byzantine

1 files changed, 178 insertions, 59 deletions

diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0.json
index 7f0e4ffed..37b56929a 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x32ca",
-                    "hash" : "0xb2e89832a452e351554aed24f5bd11e03c9a3c14e37186d6f43528743dff7c8f",
-                    "mixHash" : "0xb5917d02bfad22cef4880fbabd23a9fb1feee182a4405d46eaa77bc9d4875569",
-                    "nonce" : "0xa0a873d1381aef90",
+                    "hash" : "0x56335d8d44dc79476b5fb2a1a84e018e6b64d678b4b25354078486578df288f7",
+                    "mixHash" : "0x856ed24de8af576864ab27af64abdaaa7e78c55da71233e39ca92430c7c70f27",
+                    "nonce" : "0x8de5604dde46b8d6",
                     "number" : "0x01",
                     "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-                    "receiptTrie" : "0xc52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120",
-                    "stateRoot" : "0xc85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0",
+                    "receiptTrie" : "0xbdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7",
+                    "stateRoot" : "0x7662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0b5917d02bfad22cef4880fbabd23a9fb1feee182a4405d46eaa77bc9d487556988a0a873d1381aef90f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0856ed24de8af576864ab27af64abdaaa7e78c55da71233e39ca92430c7c70f27888de5604dde46b8d6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2e89832a452e351554aed24f5bd11e03c9a3c14e37186d6f43528743dff7c8f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x56335d8d44dc79476b5fb2a1a84e018e6b64d678b4b25354078486578df288f7",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f432ca",
                 "code" : "",
@@ -111,10 +118,10 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_EIP158" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -126,9 +133,128 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x32ca",
-                    "hash" : "0x4c7105fdf606951119dc9a389d03ecd44cbe5c69ec06a90d0b1bbd9d387eaf81",
-                    "mixHash" : "0x47fe91a1cd76a611484064c07dbffb773cb91e741948e5b361afc6c839d33e9f",
-                    "nonce" : "0x8646bd2fa05ea55d",
+                    "hash" : "0x36ae92982dbae5ec75aae0462009fc0a84b784f3a0bcac05d452818ae36d6af4",
+                    "mixHash" : "0x3ba6e611a73379637a7842b2a3012beaab801d35a768019f7fe413867f1e99fe",
+                    "nonce" : "0x18a468d79b63a67a",
+                    "number" : "0x01",
+                    "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+                    "receiptTrie" : "0xbdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7",
+                    "stateRoot" : "0x7662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffe",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a03ba6e611a73379637a7842b2a3012beaab801d35a768019f7fe413867f1e99fe8818a468d79b63a67af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x36ae92982dbae5ec75aae0462009fc0a84b784f3a0bcac05d452818ae36d6af4",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f432ca",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a4dd36",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x65",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x01",
+                "code" : "0x73c94f5374fce5edbc8e2a8697c15331677e6ebf0bff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x32ca",
+                    "hash" : "0x0fb08aca46f534cfd02c07a30c9c60e90b05de72ac5f0b4f43302ad3fc2a4a5e",
+                    "mixHash" : "0x0ad756e7b2fb279a9d02e29b726dcf5420f034018cdc65ea7535305a26951bfd",
+                    "nonce" : "0x0a4c71650140f076",
                     "number" : "0x01",
                     "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
                     "receiptTrie" : "0xc52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120",
@@ -137,7 +263,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a047fe91a1cd76a611484064c07dbffb773cb91e741948e5b361afc6c839d33e9f888646bd2fa05ea55df862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a00ad756e7b2fb279a9d02e29b726dcf5420f034018cdc65ea7535305a26951bfd880a4c71650140f076f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -174,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c7105fdf606951119dc9a389d03ecd44cbe5c69ec06a90d0b1bbd9d387eaf81",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0fb08aca46f534cfd02c07a30c9c60e90b05de72ac5f0b4f43302ad3fc2a4a5e",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f432ca",
@@ -223,10 +349,10 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Frontier" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -237,19 +363,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x2906",
-                    "hash" : "0xc5b3b92b72ceb2159cf618f27a78d5905361d7d7eaab01e620cd0570cdc86d3c",
-                    "mixHash" : "0x8834e8e3feab35c6e328355ca7eb27bf21d7c1aaf86dabdd012a80a2c8a1c970",
-                    "nonce" : "0xc798748ef3ac7e26",
+                    "gasUsed" : "0x32ca",
+                    "hash" : "0xdc667130024313fa5dd5a7c5d99e0b6a16f8e3f82f2a7823ab4a70289aa31e87",
+                    "mixHash" : "0x104c9a82b85fe182ae0cdfa7cf9014d1ee6b014b1c576e9ae137263043213b20",
+                    "nonce" : "0x35a42e56c72d8013",
                     "number" : "0x01",
                     "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-                    "receiptTrie" : "0x23af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07",
-                    "stateRoot" : "0x495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29",
+                    "receiptTrie" : "0xc52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120",
+                    "stateRoot" : "0xc85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a08834e8e3feab35c6e328355ca7eb27bf21d7c1aaf86dabdd012a80a2c8a1c97088c798748ef3ac7e26f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c85c7cb6c2621fb156503ad635bb9ecbc88e7be088a03c9aaa1b75a5ebccfbe0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0c52fe4e852471ccb501afd5d39db7d29bfed0088dd9d6993da0461e4359a9120b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0104c9a82b85fe182ae0cdfa7cf9014d1ee6b014b1c576e9ae137263043213b208835a42e56c72d8013f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -286,18 +412,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5b3b92b72ceb2159cf618f27a78d5905361d7d7eaab01e620cd0570cdc86d3c",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdc667130024313fa5dd5a7c5d99e0b6a16f8e3f82f2a7823ab4a70289aa31e87",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f42906",
+                "balance" : "0x4563918244f432ca",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4e6fa",
+                "balance" : "0xe8d4a4dd36",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,10 +461,10 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Homestead" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -350,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0x57fb3f16628bcd8a702a59e83bac9ba7bee63b5b00ce77bd77a4d98dfe9f950d",
-                    "mixHash" : "0xa4a711de650f7da461b7a44dcfe96f670f1577bf748cac9ca9a4cdd3f28c03a1",
-                    "nonce" : "0xf391c3abf99a5502",
+                    "hash" : "0x3d666b8a7aafa447b0134f1a36c62304d00cc58e066452b528848ce2fe687e36",
+                    "mixHash" : "0x0dcf8da53da17308d467a065bb9bf8d1e858a306be1f0e4ca99e7417c585491a",
+                    "nonce" : "0xd3b8b4813c788dca",
                     "number" : "0x01",
                     "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
                     "receiptTrie" : "0x23af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07",
@@ -361,7 +487,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0a4a711de650f7da461b7a44dcfe96f670f1577bf748cac9ca9a4cdd3f28c03a188f391c3abf99a5502f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a00dcf8da53da17308d467a065bb9bf8d1e858a306be1f0e4ca99e7417c585491a88d3b8b4813c788dcaf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -398,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57fb3f16628bcd8a702a59e83bac9ba7bee63b5b00ce77bd77a4d98dfe9f950d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3d666b8a7aafa447b0134f1a36c62304d00cc58e066452b528848ce2fe687e36",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f42906",
@@ -447,10 +573,10 @@
             }
         }
     },
-    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0_Metropolis" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance_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/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,19 +587,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x32ca",
-                    "hash" : "0xfed5043ae8153d0f8d1f9392836fa97a57033eaa660aaf2e882bdd9b3f78e84e",
-                    "mixHash" : "0x747c7776dc610d8f12aa5c45dca75e0c56b422abd5af0e7166c574d9c50fc791",
-                    "nonce" : "0xd027784c9dcb879c",
+                    "gasUsed" : "0x2906",
+                    "hash" : "0xa74e65f2a6cc0406aa41c928c31f949e24d0f50b944fd96fb3269563be90caf4",
+                    "mixHash" : "0x94b8a9cfe5a0ab67664bda40d40fae9f5bb06b7d32716504d5f90061da9343fa",
+                    "nonce" : "0x9c1a5abd18056999",
                     "number" : "0x01",
                     "parentHash" : "0x7eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030",
-                    "receiptTrie" : "0xbdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7",
-                    "stateRoot" : "0x7662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffe",
+                    "receiptTrie" : "0x23af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07",
+                    "stateRoot" : "0x495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07662b62b15e28df5e8219dce89f4056a2b30b6bac46fb13c6dbfa21c768acffea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bdc6970604c358a6e29ea6d74bc6182566b1d8479b2d5fdae39ff17df01813d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808232ca8203e880a0747c7776dc610d8f12aa5c45dca75e0c56b422abd5af0e7166c574d9c50fc79188d027784c9dcb879cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf9025ff901f7a07eccce6b0a68a2fc8ead9478f28fe8ce646d909965428eb8036aef41cdac0030a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0495f893c979d7339ae2bcc454fedbbd7ab1a954a61729f362dbe902e212a5f29a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a023af8c013acb7224a1f9236ddb5a824865071779bd45738a02adb65056608c07b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a094b8a9cfe5a0ab67664bda40d40fae9f5bb06b7d32716504d5f90061da9343fa889c1a5abd18056999f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -510,25 +636,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9749b7f1c36a9199b9db71547281074de106c4c784a65277da88d57727893fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfed5043ae8153d0f8d1f9392836fa97a57033eaa660aaf2e882bdd9b3f78e84e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa74e65f2a6cc0406aa41c928c31f949e24d0f50b944fd96fb3269563be90caf4",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f432ca",
+                "balance" : "0x4563918244f42906",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a4dd36",
+                "balance" : "0xe8d4a4e6fa",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {