Hive tests with Byzantine

1 files changed, 190 insertions, 61 deletions

diff --git a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0.json b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0.json
index 0e2b41aad..ae3749ec9 100644
--- a/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP150" : {
+    "ZeroValue_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/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f46",
-                    "hash" : "0x6bbef73a1cbea1680a4bfb3b6efc1e938ab79bed14840af4e42ed6947f83d90d",
-                    "mixHash" : "0x0db6d2cc27cd7299fafc964e1e9a5858fa1004357f57dc7f5a4b281ace02443c",
-                    "nonce" : "0x3339c8a2fd6928a8",
+                    "hash" : "0x960f4848325d841958913136e16442f6d4d94c1371ab4f12d8584de014cf030b",
+                    "mixHash" : "0xede2192ebff1ea893c80c266a79d183049e826ef7cca10d0496faf3ee550a94f",
+                    "nonce" : "0xd7b538a9f41146d0",
                     "number" : "0x01",
                     "parentHash" : "0xda94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05",
-                    "receiptTrie" : "0x2c834008ddac6d54cde6c70a31ce3b702eef787260fed4f06ec7c6ea441bc735",
-                    "stateRoot" : "0x89192fa346efbe99f363c19c08876c0fce3594df701a24f283694c7f3959b291",
+                    "receiptTrie" : "0x840fbfdc8a2a6a42357cea58538d46bb318cfee96d376d97eb0e6db9fd81c3f4",
+                    "stateRoot" : "0x17f01f4803f62217a37e0f2eba5cf1854e90ee0fa771fb2e40d914f5d84d5c72",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089192fa346efbe99f363c19c08876c0fce3594df701a24f283694c7f3959b291a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02c834008ddac6d54cde6c70a31ce3b702eef787260fed4f06ec7c6ea441bc735b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f468203e880a00db6d2cc27cd7299fafc964e1e9a5858fa1004357f57dc7f5a4b281ace02443c883339c8a2fd6928a8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017f01f4803f62217a37e0f2eba5cf1854e90ee0fa771fb2e40d914f5d84d5c72a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0840fbfdc8a2a6a42357cea58538d46bb318cfee96d376d97eb0e6db9fd81c3f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f468203e880a0ede2192ebff1ea893c80c266a79d183049e826ef7cca10d0496faf3ee550a94f88d7b538a9f41146d0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050484caf25ac30ffc51784b749572fc9be72d6608b06ee77c6a600f66965c906a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bbef73a1cbea1680a4bfb3b6efc1e938ab79bed14840af4e42ed6947f83d90d",
-        "network" : "EIP150",
+        "lastblockhash" : "0x960f4848325d841958913136e16442f6d4d94c1371ab4f12d8584de014cf030b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f46",
                 "code" : "",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP158" : {
+    "ZeroValue_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/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f46",
-                    "hash" : "0x59e473453c82e81db8dae3cfb4aacb1decfb44f8fef49c04eaee9ebc857743dd",
-                    "mixHash" : "0x909cb688c3eb8fef23fa8e09a8a74f9af86e275d180f072032ffcd57c207d166",
-                    "nonce" : "0xb5ed785cdb77ff89",
+                    "hash" : "0x396df7c2e94aad1ad2ca25b9f874e3f1e049a11c5e0be8230a0eef039e5e8b3d",
+                    "mixHash" : "0xc65290cfadb36824604a87b9b763241fe446ac43feecaafba25a3423b8526035",
+                    "nonce" : "0x24e348692ead6330",
+                    "number" : "0x01",
+                    "parentHash" : "0xda94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05",
+                    "receiptTrie" : "0x840fbfdc8a2a6a42357cea58538d46bb318cfee96d376d97eb0e6db9fd81c3f4",
+                    "stateRoot" : "0x17f01f4803f62217a37e0f2eba5cf1854e90ee0fa771fb2e40d914f5d84d5c72",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017f01f4803f62217a37e0f2eba5cf1854e90ee0fa771fb2e40d914f5d84d5c72a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0840fbfdc8a2a6a42357cea58538d46bb318cfee96d376d97eb0e6db9fd81c3f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f468203e880a0c65290cfadb36824604a87b9b763241fe446ac43feecaafba25a3423b85260358824e348692ead6330f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "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" : "0xda94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x50484caf25ac30ffc51784b749572fc9be72d6608b06ee77c6a600f66965c906",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050484caf25ac30ffc51784b749572fc9be72d6608b06ee77c6a600f66965c906a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x396df7c2e94aad1ad2ca25b9f874e3f1e049a11c5e0be8230a0eef039e5e8b3d",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f46",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0ba",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x08d5b6",
+                    "0x01" : "0x01",
+                    "0x64" : "0x08369d"
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6000556000600060006000600073c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ZeroValue_CALLCODE_ToEmpty_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f46",
+                    "hash" : "0xb193b48389eab5e048fb2c96d515cb553c76831ef957a17d0c279c5707f7b910",
+                    "mixHash" : "0x8b024af42e9b4d7f8656611f77e6b774b586ad96db2a778603da021a72876335",
+                    "nonce" : "0x0988f99b4c619c09",
                     "number" : "0x01",
                     "parentHash" : "0xda94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05",
                     "receiptTrie" : "0x2c834008ddac6d54cde6c70a31ce3b702eef787260fed4f06ec7c6ea441bc735",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089192fa346efbe99f363c19c08876c0fce3594df701a24f283694c7f3959b291a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02c834008ddac6d54cde6c70a31ce3b702eef787260fed4f06ec7c6ea441bc735b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f468203e880a0909cb688c3eb8fef23fa8e09a8a74f9af86e275d180f072032ffcd57c207d16688b5ed785cdb77ff89f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089192fa346efbe99f363c19c08876c0fce3594df701a24f283694c7f3959b291a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02c834008ddac6d54cde6c70a31ce3b702eef787260fed4f06ec7c6ea441bc735b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f468203e880a08b024af42e9b4d7f8656611f77e6b774b586ad96db2a778603da021a72876335880988f99b4c619c09f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050484caf25ac30ffc51784b749572fc9be72d6608b06ee77c6a600f66965c906a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59e473453c82e81db8dae3cfb4aacb1decfb44f8fef49c04eaee9ebc857743dd",
-        "network" : "EIP158",
+        "lastblockhash" : "0xb193b48389eab5e048fb2c96d515cb553c76831ef957a17d0c279c5707f7b910",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53f46",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_d0g0v0_Frontier" : {
+    "ZeroValue_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/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013cb2",
-                    "hash" : "0xa54c6364f88413e985a8a470fbd0e2a4997e719ea8cb206e416129a89c1df469",
-                    "mixHash" : "0x17db90e6b7ed092d213d98dccb42204544f1bad8c9411f434df235fa5311dba6",
-                    "nonce" : "0xc1c999f123c9e382",
+                    "gasUsed" : "0x013f46",
+                    "hash" : "0x5ae47f485ac85802fa7344334f8533ca162228937ec21378ba14bcdf159e925c",
+                    "mixHash" : "0x1082611637689ead1f7f0d49c893e2fa031fe02469c33f38242ca3c793d06f71",
+                    "nonce" : "0x74691213aa38766c",
                     "number" : "0x01",
                     "parentHash" : "0xda94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05",
-                    "receiptTrie" : "0xfaa3267cebec59818d4904bc9f5cad0ad9732f1efc70164df9040f1d6f8569c7",
-                    "stateRoot" : "0xb855d4eccce5c2262a2b42dda43d922f7ca4fd097d96f6596b27e2237028e35e",
+                    "receiptTrie" : "0x2c834008ddac6d54cde6c70a31ce3b702eef787260fed4f06ec7c6ea441bc735",
+                    "stateRoot" : "0x89192fa346efbe99f363c19c08876c0fce3594df701a24f283694c7f3959b291",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b855d4eccce5c2262a2b42dda43d922f7ca4fd097d96f6596b27e2237028e35ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0faa3267cebec59818d4904bc9f5cad0ad9732f1efc70164df9040f1d6f8569c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb28203e880a017db90e6b7ed092d213d98dccb42204544f1bad8c9411f434df235fa5311dba688c1c999f123c9e382f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089192fa346efbe99f363c19c08876c0fce3594df701a24f283694c7f3959b291a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a02c834008ddac6d54cde6c70a31ce3b702eef787260fed4f06ec7c6ea441bc735b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f468203e880a01082611637689ead1f7f0d49c893e2fa031fe02469c33f38242ca3c793d06f718874691213aa38766cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,18 +442,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050484caf25ac30ffc51784b749572fc9be72d6608b06ee77c6a600f66965c906a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa54c6364f88413e985a8a470fbd0e2a4997e719ea8cb206e416129a89c1df469",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5ae47f485ac85802fa7344334f8533ca162228937ec21378ba14bcdf159e925c",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53cb2",
+                "balance" : "0x4563918244f53f46",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d34e",
+                "balance" : "0xe8d4a3d0ba",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -330,7 +466,7 @@
                 "storage" : {
                     "0x00" : "0x08d5b6",
                     "0x01" : "0x01",
-                    "0x64" : "0x083931"
+                    "0x64" : "0x08369d"
                 }
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -365,10 +501,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_d0g0v0_Homestead" : {
+    "ZeroValue_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/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -380,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013cb2",
-                    "hash" : "0x4a961db7760ecd546b8bb9b67ffc3f1a1f3e64cb827613f7c7172c31174f2b90",
-                    "mixHash" : "0xa96474cff5a0ac4ea71b3740432d885aac5403b89e0498cfb8c56361ae364bb3",
-                    "nonce" : "0x8c846873b91f4b20",
+                    "hash" : "0x53314ee8899dd329d46099aa1ff7aef4c23fe0b853b134368487429150ddd095",
+                    "mixHash" : "0x9c74c3e7e9064e6327b48e313b464445cdc632e35d6e44beee8be12256927eab",
+                    "nonce" : "0xf4087224c7a162ef",
                     "number" : "0x01",
                     "parentHash" : "0xda94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05",
                     "receiptTrie" : "0xfaa3267cebec59818d4904bc9f5cad0ad9732f1efc70164df9040f1d6f8569c7",
@@ -391,7 +527,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b855d4eccce5c2262a2b42dda43d922f7ca4fd097d96f6596b27e2237028e35ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0faa3267cebec59818d4904bc9f5cad0ad9732f1efc70164df9040f1d6f8569c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb28203e880a0a96474cff5a0ac4ea71b3740432d885aac5403b89e0498cfb8c56361ae364bb3888c846873b91f4b20f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b855d4eccce5c2262a2b42dda43d922f7ca4fd097d96f6596b27e2237028e35ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0faa3267cebec59818d4904bc9f5cad0ad9732f1efc70164df9040f1d6f8569c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb28203e880a09c74c3e7e9064e6327b48e313b464445cdc632e35d6e44beee8be12256927eab88f4087224c7a162eff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -428,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050484caf25ac30ffc51784b749572fc9be72d6608b06ee77c6a600f66965c906a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a961db7760ecd546b8bb9b67ffc3f1a1f3e64cb827613f7c7172c31174f2b90",
-        "network" : "Homestead",
+        "lastblockhash" : "0x53314ee8899dd329d46099aa1ff7aef4c23fe0b853b134368487429150ddd095",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f53cb2",
@@ -487,10 +623,10 @@
             }
         }
     },
-    "ZeroValue_CALLCODE_ToEmpty_d0g0v0_Metropolis" : {
+    "ZeroValue_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/stZeroCallsTest/ZeroValue_CALLCODE_ToEmpty_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -501,19 +637,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f46",
-                    "hash" : "0xd2c747eb7cf27a4ffb8221a4077f0aa9189af31f6a9494214deb830d45d5906a",
-                    "mixHash" : "0x7a30011a67c708c2e4db8c1f5e84995d6a700549abc1409156d06112d7c1740b",
-                    "nonce" : "0x06ba0d380eab8e10",
+                    "gasUsed" : "0x013cb2",
+                    "hash" : "0x9c395885e98e0fab93bf963339dcf925a9641e5b2b11736fbdd59d70edcca37e",
+                    "mixHash" : "0x2bea701deed2b769b4ec6cbc7b6e5a3ff20043ef4f0ae0181952104a6f7205ec",
+                    "nonce" : "0xa370e87790179a4c",
                     "number" : "0x01",
                     "parentHash" : "0xda94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05",
-                    "receiptTrie" : "0x840fbfdc8a2a6a42357cea58538d46bb318cfee96d376d97eb0e6db9fd81c3f4",
-                    "stateRoot" : "0x17f01f4803f62217a37e0f2eba5cf1854e90ee0fa771fb2e40d914f5d84d5c72",
+                    "receiptTrie" : "0xfaa3267cebec59818d4904bc9f5cad0ad9732f1efc70164df9040f1d6f8569c7",
+                    "stateRoot" : "0xb855d4eccce5c2262a2b42dda43d922f7ca4fd097d96f6596b27e2237028e35e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017f01f4803f62217a37e0f2eba5cf1854e90ee0fa771fb2e40d914f5d84d5c72a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0840fbfdc8a2a6a42357cea58538d46bb318cfee96d376d97eb0e6db9fd81c3f4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f468203e880a07a30011a67c708c2e4db8c1f5e84995d6a700549abc1409156d06112d7c1740b8806ba0d380eab8e10f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0da94488bd0d9a3d27c3c5766acdff582a57404cb68cddf842683c706c4d56e05a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b855d4eccce5c2262a2b42dda43d922f7ca4fd097d96f6596b27e2237028e35ea059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0faa3267cebec59818d4904bc9f5cad0ad9732f1efc70164df9040f1d6f8569c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013cb28203e880a02bea701deed2b769b4ec6cbc7b6e5a3ff20043ef4f0ae0181952104a6f7205ec88a370e87790179a4cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -550,25 +686,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050484caf25ac30ffc51784b749572fc9be72d6608b06ee77c6a600f66965c906a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2c747eb7cf27a4ffb8221a4077f0aa9189af31f6a9494214deb830d45d5906a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9c395885e98e0fab93bf963339dcf925a9641e5b2b11736fbdd59d70edcca37e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f46",
+                "balance" : "0x4563918244f53cb2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0ba",
+                "balance" : "0xe8d4a3d34e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -581,7 +710,7 @@
                 "storage" : {
                     "0x00" : "0x08d5b6",
                     "0x01" : "0x01",
-                    "0x64" : "0x08369d"
+                    "0x64" : "0x083931"
                 }
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {