Hive tests with Byzantine

1 files changed, 176 insertions, 61 deletions

diff --git a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0.json
index 6a732b809..703f7f5ed 100644
--- a/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "NonZeroValue_CALLCODE_d0g0v0_EIP150" : {
+    "NonZeroValue_CALLCODE_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_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "0xa469318c6e64dd943f9314f1fdbd9bf683b7fef81d1350a62a360abce04458c2",
-                    "mixHash" : "0x60862f9bf7484cbb8b24c991a84f0eef303a333d71a6d36743449b0bbabad51e",
-                    "nonce" : "0xe7e2195ff54c6fe5",
+                    "hash" : "0xcaeb968edea6811032be048649035c6b7abfe282befb345e5203e73976cff745",
+                    "mixHash" : "0x569ff28048c4530a294634fc2caf9731c3a0bd9c7a66e5e2881b2fd4a9cb8b31",
+                    "nonce" : "0x8750be24ca355045",
                     "number" : "0x01",
                     "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-                    "receiptTrie" : "0x6e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5",
-                    "stateRoot" : "0x84d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838",
+                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
+                    "stateRoot" : "0xe4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a060862f9bf7484cbb8b24c991a84f0eef303a333d71a6d36743449b0bbabad51e88e7e2195ff54c6fe5f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0569ff28048c4530a294634fc2caf9731c3a0bd9c7a66e5e2881b2fd4a9cb8b31888750be24ca355045f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa469318c6e64dd943f9314f1fdbd9bf683b7fef81d1350a62a360abce04458c2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xcaeb968edea6811032be048649035c6b7abfe282befb345e5203e73976cff745",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
                 "code" : "",
@@ -107,10 +114,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_d0g0v0_EIP158" : {
+    "NonZeroValue_CALLCODE_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_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -122,9 +129,124 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015972",
-                    "hash" : "0x595c02bbb88f3047650b4b75136702599c50afc9aecd086dfa7da88a5b619263",
-                    "mixHash" : "0x9967a38b9486b90d8401cc053893a0e4d25765e52a4b3927dc79744a8578185b",
-                    "nonce" : "0x944b11eea6355394",
+                    "hash" : "0xf70ddc1392b2a5e553b0fb250522ea9bcf0227b60deabdee6ef3bcd814af26f8",
+                    "mixHash" : "0xc3d27aac9bb2a058f2ee662db85fd5407ae6c467a02a99efa54882082c589f83",
+                    "nonce" : "0xde807a4c03d15955",
+                    "number" : "0x01",
+                    "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
+                    "stateRoot" : "0xe4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0c3d27aac9bb2a058f2ee662db85fd5407ae6c467a02a99efa54882082c589f8388de807a4c03d15955f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "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" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bd",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf70ddc1392b2a5e553b0fb250522ea9bcf0227b60deabdee6ef3bcd814af26f8",
+        "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"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x64",
+                "code" : "0x5a6000556000600060006000600173c94f5374fce5edbc8e2a8697c15331677e6ebf0b61ea60f26001555a606455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "NonZeroValue_CALLCODE_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stNonZeroCallsTest/NonZeroValue_CALLCODE_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015972",
+                    "hash" : "0x9630f97861930a76c9f38914a005b422c9d458791e5ec2a5e11a8804f39fc53d",
+                    "mixHash" : "0x8ad14d22291983aee5c58a927b8f3a6c255c26d09b79fe856433faacdd6c43ff",
+                    "nonce" : "0x899033c9cf1cef68",
                     "number" : "0x01",
                     "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
                     "receiptTrie" : "0x6e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5",
@@ -133,7 +255,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a09967a38b9486b90d8401cc053893a0e4d25765e52a4b3927dc79744a8578185b88944b11eea6355394f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a08ad14d22291983aee5c58a927b8f3a6c255c26d09b79fe856433faacdd6c43ff88899033c9cf1cef68f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -170,8 +292,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x595c02bbb88f3047650b4b75136702599c50afc9aecd086dfa7da88a5b619263",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9630f97861930a76c9f38914a005b422c9d458791e5ec2a5e11a8804f39fc53d",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55972",
@@ -215,10 +337,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_d0g0v0_Frontier" : {
+    "NonZeroValue_CALLCODE_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_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -229,19 +351,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0156de",
-                    "hash" : "0xd7e0ae63074df3a7f5012c041a37c291931378d176de7f47813a7e5957d0255b",
-                    "mixHash" : "0x6753f6549a328ad4d3318fe08c9bd1d8977b3f32645ab7f11d21fbaf7671f095",
-                    "nonce" : "0x4164b5bab36abae7",
+                    "gasUsed" : "0x015972",
+                    "hash" : "0x8b32cc2b42ea27b0a69901218d03b00ecc1067dc9fd2aa2d691ff9c9c609ed10",
+                    "mixHash" : "0x2435aa7b938a8d4d8d8e2fa2dbfa74c8ddf135f4f2e0e3f0c22ebc17108352dc",
+                    "nonce" : "0xf25dbef14481d96b",
                     "number" : "0x01",
                     "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-                    "receiptTrie" : "0x0f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4",
-                    "stateRoot" : "0xbcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8",
+                    "receiptTrie" : "0x6e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5",
+                    "stateRoot" : "0x84d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a06753f6549a328ad4d3318fe08c9bd1d8977b3f32645ab7f11d21fbaf7671f095884164b5bab36abae7f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084d3d54cd426f6d38d193549a3e87863411e6ed48e03d27b496926ca3164d838a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a06e589aa3d3c6f1e92d01f0827e130a69461ab987b07d8a1a02f105e9df0dd9b5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a02435aa7b938a8d4d8d8e2fa2dbfa74c8ddf135f4f2e0e3f0c22ebc17108352dc88f25dbef14481d96bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -278,18 +400,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7e0ae63074df3a7f5012c041a37c291931378d176de7f47813a7e5957d0255b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8b32cc2b42ea27b0a69901218d03b00ecc1067dc9fd2aa2d691ff9c9c609ed10",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f556de",
+                "balance" : "0x4563918244f55972",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3b922",
+                "balance" : "0xe8d4a3b68e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -302,7 +424,7 @@
                 "storage" : {
                     "0x00" : "0x08d5b6",
                     "0x01" : "0x01",
-                    "0x64" : "0x081f05"
+                    "0x64" : "0x081c71"
                 }
             }
         },
@@ -323,10 +445,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_d0g0v0_Homestead" : {
+    "NonZeroValue_CALLCODE_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_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -338,9 +460,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0156de",
-                    "hash" : "0xbc0b570e0995f97a79951c90b56c59926cbd82720dea986a1237d9dbb971159a",
-                    "mixHash" : "0xb7e67165298e5ba9edfb22f9193bc03f9c47c46acb86a5e93cfb363bbff96343",
-                    "nonce" : "0x1b779192b0277cc8",
+                    "hash" : "0x5814ca88d48a1088a3474b7a7ef4d0ee4a1977360222309f23b9eddcaf9cc57d",
+                    "mixHash" : "0x0fc9025f78db2cffb3486ef00234ae864f8052d9274c3ada22ef9ea3ee13b23e",
+                    "nonce" : "0xfeb53f952a088376",
                     "number" : "0x01",
                     "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
                     "receiptTrie" : "0x0f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4",
@@ -349,7 +471,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a0b7e67165298e5ba9edfb22f9193bc03f9c47c46acb86a5e93cfb363bbff96343881b779192b0277cc8f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a00fc9025f78db2cffb3486ef00234ae864f8052d9274c3ada22ef9ea3ee13b23e88feb53f952a088376f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -386,8 +508,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc0b570e0995f97a79951c90b56c59926cbd82720dea986a1237d9dbb971159a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x5814ca88d48a1088a3474b7a7ef4d0ee4a1977360222309f23b9eddcaf9cc57d",
+        "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f556de",
@@ -431,10 +553,10 @@
             }
         }
     },
-    "NonZeroValue_CALLCODE_d0g0v0_Metropolis" : {
+    "NonZeroValue_CALLCODE_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_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -445,19 +567,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015972",
-                    "hash" : "0x0429b6f499a3849b164853d2050a08d0e3661c0e9d5c48914d880787005b396a",
-                    "mixHash" : "0xaebf906cd9d6a72f515962ea9cf73a42f3ea28373c49f81276bb11806b5d19ee",
-                    "nonce" : "0xdd3ad818562fed1b",
+                    "gasUsed" : "0x0156de",
+                    "hash" : "0x5d63e11749566d74e5fc923d6b5adb8951267fd1fbd769580b7471a3e8f716da",
+                    "mixHash" : "0x9d82f966cf34ff9a22c535e84f08187905bafdf6cb5a5b3db3561745763bf036",
+                    "nonce" : "0x6833735ee1911458",
                     "number" : "0x01",
                     "parentHash" : "0x0f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037",
-                    "receiptTrie" : "0x540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546",
-                    "stateRoot" : "0xe4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1",
+                    "receiptTrie" : "0x0f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4",
+                    "stateRoot" : "0xbcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e4dba02356ea8d88a5ad96ea4d8e18295d1c5fe93a1df6201a36f8dee3af53f1a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0540ef40122c0819161100cb02570d8bacc522b2db8c86e328ed93907dfc77546b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830159728203e880a0aebf906cd9d6a72f515962ea9cf73a42f3ea28373c49f81276bb11806b5d19ee88dd3ad818562fed1bf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a00f0bfbedafb1a54f74c847571b77dc12f3a26384e149d28aeecc8c0b06651037a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bcdfd44814da5f27dde588b34ccdd997caa1770ec1ba81361bbca4351f316fe8a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a00f35941aff0bf43d184c8b43135c83e1dc1fed3ec3c98327b7b48dc0b45b43c4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156de8203e880a09d82f966cf34ff9a22c535e84f08187905bafdf6cb5a5b3db3561745763bf036886833735ee1911458f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -494,25 +616,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c895eeb38fa8601258132246d152654a654dea4bf4f681d3b11fb31db1f63bda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0429b6f499a3849b164853d2050a08d0e3661c0e9d5c48914d880787005b396a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5d63e11749566d74e5fc923d6b5adb8951267fd1fbd769580b7471a3e8f716da",
+        "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" : {
@@ -525,7 +640,7 @@
                 "storage" : {
                     "0x00" : "0x08d5b6",
                     "0x01" : "0x01",
-                    "0x64" : "0x081c71"
+                    "0x64" : "0x081f05"
                 }
             }
         },