Hive tests with Byzantine

1 files changed, 190 insertions, 61 deletions

diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0.json
index c83ea2cad..7bc1c552a 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP150" : {
+    "NonZeroValue_CALLCODE_ToEmpty_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_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "0x3239e4690cf58c05ee26d706d53c8370fe52f14396c4804456e56d48a1a80597",
-                    "mixHash" : "0xaea05db1f51337caeb4dc98c11490716b4d4b7652597eef1d111c20198234feb",
-                    "nonce" : "0x7e17bc2fb632e220",
+                    "hash" : "0x505a90a68b9db11f9af43f7b22fa82c8b58ade0ad403b6f89aa953b7d7021e85",
+                    "mixHash" : "0x1608016c442923158596a1281fc5319b1c2730036572f4e5b1704315e7be3335",
+                    "nonce" : "0x40ff77d14d79f535",
                     "number" : "0x01",
                     "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-                    "receiptTrie" : "0x7fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9",
-                    "stateRoot" : "0xbda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2d",
+                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
+                    "stateRoot" : "0xee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0aea05db1f51337caeb4dc98c11490716b4d4b7652597eef1d111c20198234feb887e17bc2fb632e220f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a01608016c442923158596a1281fc5319b1c2730036572f4e5b1704315e7be33358840ff77d14d79f535f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3239e4690cf58c05ee26d706d53c8370fe52f14396c4804456e56d48a1a80597",
-        "network" : "EIP150",
+        "lastblockhash" : "0x505a90a68b9db11f9af43f7b22fa82c8b58ade0ad403b6f89aa953b7d7021e85",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
                 "code" : "",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP158" : {
+    "NonZeroValue_CALLCODE_ToEmpty_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_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "0xec24b6d4043ee6028fb1d6c37f7227bbcd30dc34ac60610ef49a0257011c5fbd",
-                    "mixHash" : "0x2e2e647453991c53ac89590f020367335bd826f3a8bd1d7bca549cebdef71348",
-                    "nonce" : "0xcf393dccf852faa1",
+                    "hash" : "0x9f7db923b5f297d1ccef02da4cee73d1bb90f3fa3fff7b483b7826eca0315a8b",
+                    "mixHash" : "0x1bf33aa8b9097ef9276e2981b6ed5ec4935ad23c552b19a62b9b3e45f7d0c262",
+                    "nonce" : "0xfbb6a0ef3ea630e0",
+                    "number" : "0x01",
+                    "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
+                    "stateRoot" : "0xee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a01bf33aa8b9097ef9276e2981b6ed5ec4935ad23c552b19a62b9b3e45f7d0c26288fbb6a0ef3ea630e0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "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" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9f7db923b5f297d1ccef02da4cee73d1bb90f3fa3fff7b483b7826eca0315a8b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55972",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3b68e",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x081c71"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015972",
+                    "hash" : "0xaeb1557005c9b4fe4d8ece7eab5e301fca70893e3312e6b941cbc84c25f96751",
+                    "mixHash" : "0x2c672f3508d10d567c8953aa2037124c1b35e2ed72512ef62fc7a1fe2c8657ad",
+                    "nonce" : "0x0112a137fcbe4d08",
                     "number" : "0x01",
                     "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
                     "receiptTrie" : "0x7fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a02e2e647453991c53ac89590f020367335bd826f3a8bd1d7bca549cebdef7134888cf393dccf852faa1f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a02c672f3508d10d567c8953aa2037124c1b35e2ed72512ef62fc7a1fe2c8657ad880112a137fcbe4d08f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xec24b6d4043ee6028fb1d6c37f7227bbcd30dc34ac60610ef49a0257011c5fbd",
-        "network" : "EIP158",
+        "lastblockhash" : "0xaeb1557005c9b4fe4d8ece7eab5e301fca70893e3312e6b941cbc84c25f96751",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_Frontier" : {
+    "NonZeroValue_CALLCODE_ToEmpty_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_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0156de",
-                    "hash" : "0x0342ce902ada1d50a63d157f899ad8a23db61b2c9fc8ed41bd49b680e8289845",
-                    "mixHash" : "0xbefc3213233d345939014905efcea9336fdcbe2b3e7955b0e5d7b9af7c5fba57",
-                    "nonce" : "0xe15f0491d1e80e67",
+                    "gasUsed" : "0x015972",
+                    "hash" : "0x0377b9063330ff436b7c44c39c8609adbba4a8585a132e9ec7db003a55cc2d85",
+                    "mixHash" : "0x6491bff6f3207877d8c754980b35c37b1d09e36961134503a6256c867e767291",
+                    "nonce" : "0x6ae968514d3a3380",
                     "number" : "0x01",
                     "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-                    "receiptTrie" : "0x40b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12",
-                    "stateRoot" : "0xc1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0",
+                    "receiptTrie" : "0x7fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9",
+                    "stateRoot" : "0xbda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0befc3213233d345939014905efcea9336fdcbe2b3e7955b0e5d7b9af7c5fba5788e15f0491d1e80e67f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bda41e439b969d4eb21517d5eae6fae3d1175205edc51df040549e961c19ac2da059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a07fb7353e38604f28f21651d12e70055d88740bf64e8f27e3889de98f3fcfcac9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a06491bff6f3207877d8c754980b35c37b1d09e36961134503a6256c867e767291886ae968514d3a3380f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,18 +442,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0342ce902ada1d50a63d157f899ad8a23db61b2c9fc8ed41bd49b680e8289845",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0377b9063330ff436b7c44c39c8609adbba4a8585a132e9ec7db003a55cc2d85",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f556de",
+                "balance" : "0x4563918244f55972",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b922",
+                "balance" : "0xe8d4a3b68e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -330,7 +466,7 @@
                 "storage" : {
                     "0x00" : "0x08d5b6",
                     "0x01" : "0x01",
-                    "0x64" : "0x081f05"
+                    "0x64" : "0x081c71"
                 }
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -365,10 +501,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_Homestead" : {
+    "NonZeroValue_CALLCODE_ToEmpty_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_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "0x1130ea60f2d4cd38fb5cd9b1589bf08b35d17a85fa156b2389fe97a7b224611b",
-                    "mixHash" : "0x4b059ea7d923cf38d078a4f9e983e1b014a9353dc2de840fd8bad793a8a56cd6",
-                    "nonce" : "0x0387b8167972e4ee",
+                    "hash" : "0xcc9f1cfcca2d7266c424c3454455a47eba41928ecb76957e2c46941e5f747022",
+                    "mixHash" : "0x8dc03b5beaf1fb42f5574d774abd317d7ad4a10d4bc0f2360d07174e5a0f06e3",
+                    "nonce" : "0xf8a3efa07e6096e5",
                     "number" : "0x01",
                     "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
                     "receiptTrie" : "0x40b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a04b059ea7d923cf38d078a4f9e983e1b014a9353dc2de840fd8bad793a8a56cd6880387b8167972e4eef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a08dc03b5beaf1fb42f5574d774abd317d7ad4a10d4bc0f2360d07174e5a0f06e388f8a3efa07e6096e5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1130ea60f2d4cd38fb5cd9b1589bf08b35d17a85fa156b2389fe97a7b224611b",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcc9f1cfcca2d7266c424c3454455a47eba41928ecb76957e2c46941e5f747022",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_ToEmpty_d0g0v0_Metropolis" : {
+    "NonZeroValue_CALLCODE_ToEmpty_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_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015972",
-                    "hash" : "0x34e5de4dd77300d6e5fba55820e5daefcef22be50a6ca2adbba840a9ac730ad0",
-                    "mixHash" : "0x8f25e0760f9e417e5d66d6862e17cdfdb492888bdad00fb1b1fb5bf3e63b994a",
-                    "nonce" : "0x0fe27489c6fc17fc",
+                    "gasUsed" : "0x0156de",
+                    "hash" : "0xeee51884c38fef0af145f978c768b306cd80024cd4690c61b779e23e14cec0b9",
+                    "mixHash" : "0x8b8a5b21038e8f703fad6385f470bb2861cbdd388a46e62b6656670edf7b4c62",
+                    "nonce" : "0x77a7ef4bebe8ed46",
                     "number" : "0x01",
                     "parentHash" : "0x9385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110",
-                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
-                    "stateRoot" : "0xee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3",
+                    "receiptTrie" : "0x40b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12",
+                    "stateRoot" : "0xc1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ee926178981c5741dcac3fe6668785d9700d1224831571a1b19900e9a4005ad3a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a08f25e0760f9e417e5d66d6862e17cdfdb492888bdad00fb1b1fb5bf3e63b994a880fe27489c6fc17fcf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09385f2ae2a1d1f7fcb389ced2ab15ae02feedb262dbae098fdaf6540e10c2110a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1bf1f3bea000131650e3605a4a39ca9b305405cf7743e560079374ca264bcd0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a040b343d2c6884dba0db2688e87b24ca01ec04f04af672aed1af29a2493e0bf12b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a08b8a5b21038e8f703fad6385f470bb2861cbdd388a46e62b6656670edf7b4c628877a7ef4bebe8ed46f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,25 +686,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b581d4cfc01ddf5f25d418234a2fed8cc7eedecfae6da89fa6ad93aea8587f5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34e5de4dd77300d6e5fba55820e5daefcef22be50a6ca2adbba840a9ac730ad0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xeee51884c38fef0af145f978c768b306cd80024cd4690c61b779e23e14cec0b9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55972",
+                "balance" : "0x4563918244f556de",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b68e",
+                "balance" : "0xe8d4a3b922",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -581,7 +710,7 @@
                 "storage" : {
                     "0x00" : "0x08d5b6",
                     "0x01" : "0x01",
-                    "0x64" : "0x081c71"
+                    "0x64" : "0x081f05"
                 }
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {