Hive tests with Byzantine

1 files changed, 180 insertions, 57 deletions

diff --git a/BlockchainTests/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0.json
index 18604e96a..417842e65 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CreateAndGasInsideCreate_d0g0v0_EIP150" : {
+    "CreateAndGasInsideCreate_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/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0xa5360128785fe49174634be653f2aaa136486ffa6624da677cb5e99ced8a970f",
-                    "mixHash" : "0xdf01d235bf92fc8ba173e5d4129a972ddf5df8b9879c47a9ad3ff784773d9a8d",
-                    "nonce" : "0x9b6ee33d017464b6",
+                    "hash" : "0x430e442657da8ac1a1722a33b89f660a89ea9c1aace4844cff47969588e5b6fd",
+                    "mixHash" : "0x3d673c0bc6aa67a908e9bcdf351b22443ad491e4adffbe9258a702d9f1904b28",
+                    "nonce" : "0xbcf93f9d40e10f47",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0xf9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93",
-                    "stateRoot" : "0xc0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43",
+                    "receiptTrie" : "0x3079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6",
+                    "stateRoot" : "0xcc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0df01d235bf92fc8ba173e5d4129a972ddf5df8b9879c47a9ad3ff784773d9a8d889b6ee33d017464b6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a03d673c0bc6aa67a908e9bcdf351b22443ad491e4adffbe9258a702d9f1904b2888bcf93f9d40e10f47f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa5360128785fe49174634be653f2aaa136486ffa6624da677cb5e99ced8a970f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x430e442657da8ac1a1722a33b89f660a89ea9c1aace4844cff47969588e5b6fd",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
                 "code" : "",
@@ -92,7 +99,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0xfd" : "0x07ea53"
                 }
@@ -115,10 +122,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreate_d0g0v0_EIP158" : {
+    "CreateAndGasInsideCreate_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/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -130,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0xa1d3d6c25af64bbf561e91d3800a6a1ef0678cb024dd802f080ebce4e1a2c82c",
-                    "mixHash" : "0x86a85767a6933a3d9b0a5e6a0cf30068486db5f3062a0121f3c436cdfc726f76",
-                    "nonce" : "0x20c55c9018b9275e",
+                    "hash" : "0xf879677b640bb2e5f30cdcaab5a6613547a41c0faefa4978de37900bfb445001",
+                    "mixHash" : "0xbb7c0a9cc2617fdc3d9e588a2bfe7fccaf16803735b7c94bf68c093006583ad1",
+                    "nonce" : "0x0bca78aec04de4ae",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0xf9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4",
-                    "stateRoot" : "0xb10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0a",
+                    "receiptTrie" : "0x3079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6",
+                    "stateRoot" : "0xcc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a086a85767a6933a3d9b0a5e6a0cf30068486db5f3062a0121f3c436cdfc726f768820c55c9018b9275ef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0bb7c0a9cc2617fdc3d9e588a2bfe7fccaf16803735b7c94bf68c093006583ad1880bca78aec04de4aef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -178,9 +185,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1d3d6c25af64bbf561e91d3800a6a1ef0678cb024dd802f080ebce4e1a2c82c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf879677b640bb2e5f30cdcaab5a6613547a41c0faefa4978de37900bfb445001",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
                 "code" : "",
@@ -231,10 +245,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreate_d0g0v0_Frontier" : {
+    "CreateAndGasInsideCreate_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -246,18 +260,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0xc7fd41ab04295ba65b451e81065b3f748604d89a9861a12f893933ceec1857d4",
-                    "mixHash" : "0xe75bbb30f59505fe068c63d2cbd27b549f4d714bf888900d916f5a747f90ef70",
-                    "nonce" : "0x027be9cbf89d1b67",
+                    "hash" : "0x80bdc8ca1cf8e0fbf1c69d1c8b2666de6e4be627f92da9b926fb9a93b0a3e840",
+                    "mixHash" : "0x266c664fc40422354c00b37e1c9ea8b0fd27415e1db7a9a305d39097200eb4ea",
+                    "nonce" : "0xb1503de304792593",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
-                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
+                    "receiptTrie" : "0xf9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93",
+                    "stateRoot" : "0xc0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0e75bbb30f59505fe068c63d2cbd27b549f4d714bf888900d916f5a747f90ef7088027be9cbf89d1b67f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0d8f84140a496f6d85554a51c2374eef36e56ce823b4c64d0a48382cd8bdd43a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9aedb4150841f56035800e5c93d055b42880a699ef947dc340f2735c2d3bb93b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0266c664fc40422354c00b37e1c9ea8b0fd27415e1db7a9a305d39097200eb4ea88b1503de304792593f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -294,8 +308,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7fd41ab04295ba65b451e81065b3f748604d89a9861a12f893933ceec1857d4",
-        "network" : "Frontier",
+        "lastblockhash" : "0x80bdc8ca1cf8e0fbf1c69d1c8b2666de6e4be627f92da9b926fb9a93b0a3e840",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
@@ -326,7 +340,7 @@
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0xfd" : "0x080a7c"
+                    "0xfd" : "0x07ea53"
                 }
             }
         },
@@ -347,10 +361,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreate_d0g0v0_Homestead" : {
+    "CreateAndGasInsideCreate_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/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -362,18 +376,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0x926fc293ddfa70fc0f7caff3de98cffcc76dca7c4d8355755b3f67198454351d",
-                    "mixHash" : "0x7cf12ba21d764f353cac4492ff6229798e491b1bb2eaafa67de5fca16352b454",
-                    "nonce" : "0xceac81f16ec0940c",
+                    "hash" : "0x125336d236bea7f9bd1d21a2b6334ba7ee92d50790b5661eb23f19b68960be18",
+                    "mixHash" : "0xb252df705b2ceeed44a49fd61cbca4c91cb7f37ece110c27350a5a701f8c66bb",
+                    "nonce" : "0x7eb8d1c9b99054d4",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
-                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
+                    "receiptTrie" : "0xf9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4",
+                    "stateRoot" : "0xb10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a07cf12ba21d764f353cac4492ff6229798e491b1bb2eaafa67de5fca16352b45488ceac81f16ec0940cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b10089c46aa858dc34da5d250081158aa76cf07163aa5441f906c17742b9fe0aa059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f9f75bebe69d80b64ba5e92f01249f43e74bfc731f610153ae0705f50feb21d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0b252df705b2ceeed44a49fd61cbca4c91cb7f37ece110c27350a5a701f8c66bb887eb8d1c9b99054d4f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -410,8 +424,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x926fc293ddfa70fc0f7caff3de98cffcc76dca7c4d8355755b3f67198454351d",
-        "network" : "Homestead",
+        "lastblockhash" : "0x125336d236bea7f9bd1d21a2b6334ba7ee92d50790b5661eb23f19b68960be18",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
@@ -440,9 +454,9 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
-                    "0xfd" : "0x080a7c"
+                    "0xfd" : "0x07ea53"
                 }
             }
         },
@@ -463,10 +477,10 @@
             }
         }
     },
-    "CreateAndGasInsideCreate_d0g0v0_Metropolis" : {
+    "CreateAndGasInsideCreate_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/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -478,18 +492,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0207af",
-                    "hash" : "0x51b9f255a8bc2b18ceecd3ed23393ca5fd76e18de0e60510ed1d5be2251d2b5b",
-                    "mixHash" : "0x81f2e2545a4151fdf05ff979c63db2512ff7dfa34a36ec77bc27f1abde5bca50",
-                    "nonce" : "0x66cdefe550a088ee",
+                    "hash" : "0x492466309a34b9a3eaad4a79a01f73a39c29a1e1f55f6a1521eaf2b724b0fa2b",
+                    "mixHash" : "0xb66e8c0f283da7b1c21c0949d3a12f6e1d1f2d383b678ea1d06d76278470487f",
+                    "nonce" : "0x047d0a6a1c4623bf",
                     "number" : "0x01",
                     "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
-                    "receiptTrie" : "0x3079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6",
-                    "stateRoot" : "0xcc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55",
+                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
+                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc9c9c24c4408ed18e2e4dc185bc9de159e3a33f8b4788b870325021a07b5f55a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a03079979d3a12866b44058a88925099b0560e7fc405ad398927b9c17a13ff3ab6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a081f2e2545a4151fdf05ff979c63db2512ff7dfa34a36ec77bc27f1abde5bca508866cdefe550a088eef862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0b66e8c0f283da7b1c21c0949d3a12f6e1d1f2d383b678ea1d06d76278470487f88047d0a6a1c4623bff862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -526,16 +540,125 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51b9f255a8bc2b18ceecd3ed23393ca5fd76e18de0e60510ed1d5be2251d2b5b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x492466309a34b9a3eaad4a79a01f73a39c29a1e1f55f6a1521eaf2b724b0fa2b",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f607af",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a30851",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x09" : "0x076e34",
+                    "0x0a" : "0x08d5b6",
+                    "0x0b" : "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0xfd" : "0x080a7c"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600a55635a60fd556000526004601c6000f0600b555a600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateAndGasInsideCreate_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150Specific/CreateAndGasInsideCreate_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0207af",
+                    "hash" : "0xfbfd461a8633d8b466b0af35a0fff2b1b0b7813e4fd9a868358b9726320b67db",
+                    "mixHash" : "0x652cc636b80a8f039c60173e06f751b1d5148af3ba939a57792656f0ba2e7746",
+                    "nonce" : "0x5130ff04cd69f873",
+                    "number" : "0x01",
+                    "parentHash" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
+                    "receiptTrie" : "0x74ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3",
+                    "stateRoot" : "0x80c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbd",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080c3907aa549d2cf30511571dc2d70298895a11c38162db6e52501e971aedfbda059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a074ad47931862108759ee86129ebe393746c29ad17c0bfa11c1cf5683baf04ec3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830207af8203e880a0652cc636b80a8f039c60173e06f751b1d5148af3ba939a57792656f0ba2e7746885130ff04cd69f873f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "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" : "0xe00e8bd713945f0fcc267339bcaebdc98e231fa7d1f1a4f59996b4687f20006a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x32a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032a4c483da77f1e295f94aef0a7b2a913a33b93abdbd4ec35708a40f60612b66a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xfbfd461a8633d8b466b0af35a0fff2b1b0b7813e4fd9a868358b9726320b67db",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f607af",
                 "code" : "",
@@ -563,9 +686,9 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0xfd" : "0x07ea53"
+                    "0xfd" : "0x080a7c"
                 }
             }
         },