Hive tests with Byzantine

1 files changed, 171 insertions, 52 deletions

diff --git a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json
index 4869c2ef1..8b85eb03b 100644
--- a/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stHomesteadSpecific/createContractViaContract_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "createContractViaContract_d0g0v0_EIP150" : {
+    "createContractViaContract_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/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf11",
-                    "hash" : "0x379aba8dcabe6645d6a4da87141d66b2e2d22fba887828de7c53ccdb4b57fd0e",
-                    "mixHash" : "0x8edc8df68b21328d3fedd512cab83aaf1f9a351c0ef25e6c7edad15fa19a4097",
-                    "nonce" : "0x09deed22b1e34aef",
+                    "hash" : "0xc6eddfe70e69b60589fc73100a2f175ff7ca8e7448fa51b4b6f48f189fbe0e88",
+                    "mixHash" : "0xa1f2299283e36929cf2a8e46d627dfcb42cbb22111e94f0667203e53e4d7eca7",
+                    "nonce" : "0x31b27a6c22b17b10",
                     "number" : "0x01",
                     "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-                    "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
-                    "stateRoot" : "0x36d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0",
+                    "receiptTrie" : "0x74d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8",
+                    "stateRoot" : "0xe398cf09a0ceb393cd27facf4963ad29a98ba4805c23c88bf6f77132bbad0c88",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a08edc8df68b21328d3fedd512cab83aaf1f9a351c0ef25e6c7edad15fa19a40978809deed22b1e34aeff862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e398cf09a0ceb393cd27facf4963ad29a98ba4805c23c88bf6f77132bbad0c88a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa074d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a0a1f2299283e36929cf2a8e46d627dfcb42cbb22111e94f0667203e53e4d7eca78831b27a6c22b17b10f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x379aba8dcabe6645d6a4da87141d66b2e2d22fba887828de7c53ccdb4b57fd0e",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc6eddfe70e69b60589fc73100a2f175ff7ca8e7448fa51b4b6f48f189fbe0e88",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000f0",
@@ -82,7 +89,7 @@
             "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -111,10 +118,10 @@
             }
         }
     },
-    "createContractViaContract_d0g0v0_EIP158" : {
+    "createContractViaContract_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/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -126,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf11",
-                    "hash" : "0x4c4411d79488f9338adf9c15d092ac45d9eb68a1bf450604b5172533314a3375",
-                    "mixHash" : "0x2f5e10fc9024c39557e3f7aa8a3730621a17231b5204f6135c9710541f6f2785",
-                    "nonce" : "0x61fb5a176ca9c628",
+                    "hash" : "0xee9fe8d109a88ab800fe99fc966f76d81ac0f664655caf49fc113a3ad1c8c371",
+                    "mixHash" : "0x9369472f3120d5a635d90ca5a19f0994c4e98bb341df19a3cdad9064987cba80",
+                    "nonce" : "0x135c319bbc3c9faf",
                     "number" : "0x01",
                     "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-                    "receiptTrie" : "0x7ef8a7a1669068df2c413812d7a2eba79820b8d6e4b69966048589a76e8765f9",
-                    "stateRoot" : "0x0530b4d4c46c87bbfb8f957528bc87e9aa8c40822bb6e5cd9c34c0c6166c7132",
+                    "receiptTrie" : "0x74d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8",
+                    "stateRoot" : "0xe398cf09a0ceb393cd27facf4963ad29a98ba4805c23c88bf6f77132bbad0c88",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00530b4d4c46c87bbfb8f957528bc87e9aa8c40822bb6e5cd9c34c0c6166c7132a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa07ef8a7a1669068df2c413812d7a2eba79820b8d6e4b69966048589a76e8765f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a02f5e10fc9024c39557e3f7aa8a3730621a17231b5204f6135c9710541f6f27858861fb5a176ca9c628f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e398cf09a0ceb393cd27facf4963ad29a98ba4805c23c88bf6f77132bbad0c88a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa074d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a09369472f3120d5a635d90ca5a19f0994c4e98bb341df19a3cdad9064987cba8088135c319bbc3c9faff862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -174,9 +181,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4c4411d79488f9338adf9c15d092ac45d9eb68a1bf450604b5172533314a3375",
-        "network" : "EIP158",
+        "lastblockhash" : "0xee9fe8d109a88ab800fe99fc966f76d81ac0f664655caf49fc113a3ad1c8c371",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000f0",
@@ -223,10 +237,10 @@
             }
         }
     },
-    "createContractViaContract_d0g0v0_Frontier" : {
+    "createContractViaContract_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/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf11",
-                    "hash" : "0xbdd198c87f8dd258c985540a42c4eaa53a158f6f55d4799c8c9367de050ae1eb",
-                    "mixHash" : "0x864a284c3aad1862f10b9865bc8b263d367856d3ec0ae772e4e62571bb78c156",
-                    "nonce" : "0x551e5449314dfd85",
+                    "hash" : "0x1c9064dc84318ae4c9a741ff89383db55f7564e7dfa31664670a1f2754cb37cd",
+                    "mixHash" : "0xa77f57ef662d9345f121ea93dcc8652dd91959983ba6688c8c8c0ce207338f32",
+                    "nonce" : "0x1afb879628ac526b",
                     "number" : "0x01",
                     "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
                     "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
@@ -249,7 +263,7 @@
                     "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a0864a284c3aad1862f10b9865bc8b263d367856d3ec0ae772e4e62571bb78c15688551e5449314dfd85f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a0a77f57ef662d9345f121ea93dcc8652dd91959983ba6688c8c8c0ce207338f32881afb879628ac526bf862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -286,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdd198c87f8dd258c985540a42c4eaa53a158f6f55d4799c8c9367de050ae1eb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1c9064dc84318ae4c9a741ff89383db55f7564e7dfa31664670a1f2754cb37cd",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -335,10 +349,10 @@
             }
         }
     },
-    "createContractViaContract_d0g0v0_Homestead" : {
+    "createContractViaContract_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/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -350,18 +364,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf11",
-                    "hash" : "0x7ab6fc734023330e585d4032b3bed0433c60b9e88cd3462e1657f9a080e9ea56",
-                    "mixHash" : "0x8d748c081888a3d851e5c1208b457d14be4681eede874df4215d2c4f7db5be40",
-                    "nonce" : "0x36284b8577ab7647",
+                    "hash" : "0xf3d054e5925240fd853f3715265dd63420a64d6e0b406b11247cc6c5f1da1893",
+                    "mixHash" : "0x5ef87c9d28b0bb1257dcf5282946778cb95069244225de701f2f2ea32b81c976",
+                    "nonce" : "0x6e53d2159590cec3",
                     "number" : "0x01",
                     "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-                    "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
-                    "stateRoot" : "0x36d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0",
+                    "receiptTrie" : "0x7ef8a7a1669068df2c413812d7a2eba79820b8d6e4b69966048589a76e8765f9",
+                    "stateRoot" : "0x0530b4d4c46c87bbfb8f957528bc87e9aa8c40822bb6e5cd9c34c0c6166c7132",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a08d748c081888a3d851e5c1208b457d14be4681eede874df4215d2c4f7db5be408836284b8577ab7647f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00530b4d4c46c87bbfb8f957528bc87e9aa8c40822bb6e5cd9c34c0c6166c7132a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa07ef8a7a1669068df2c413812d7a2eba79820b8d6e4b69966048589a76e8765f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a05ef87c9d28b0bb1257dcf5282946778cb95069244225de701f2f2ea32b81c976886e53d2159590cec3f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -398,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ab6fc734023330e585d4032b3bed0433c60b9e88cd3462e1657f9a080e9ea56",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf3d054e5925240fd853f3715265dd63420a64d6e0b406b11247cc6c5f1da1893",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -418,7 +432,7 @@
             "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
@@ -447,10 +461,10 @@
             }
         }
     },
-    "createContractViaContract_d0g0v0_Metropolis" : {
+    "createContractViaContract_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/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,18 +476,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xcf11",
-                    "hash" : "0x5f93274e63c66c8eb14917794d3afa92ded008dcc6127ca0f58ab952afabb8ed",
-                    "mixHash" : "0x8db4277d24294ca71b0b6a479df10cbf801c8e52156b4c4ffc08e097b8445166",
-                    "nonce" : "0x545598859e402d2d",
+                    "hash" : "0xfd24876f926beabb6d4968f7adae57194156d179cf1066f6e3753d77916896da",
+                    "mixHash" : "0x33df301978777d1b942c431a7ce77e06740ca8ff1c796d65dc4eeb495ef820ff",
+                    "nonce" : "0x1a06565d5a619adc",
                     "number" : "0x01",
                     "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
-                    "receiptTrie" : "0x74d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8",
-                    "stateRoot" : "0xe398cf09a0ceb393cd27facf4963ad29a98ba4805c23c88bf6f77132bbad0c88",
+                    "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
+                    "stateRoot" : "0x36d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e398cf09a0ceb393cd27facf4963ad29a98ba4805c23c88bf6f77132bbad0c88a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa074d27dadd64d9dfb749b6d73655dd7bee9af4347be73b136f80d16370b15d9c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a08db4277d24294ca71b0b6a479df10cbf801c8e52156b4c4ffc08e097b844516688545598859e402d2df862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a033df301978777d1b942c431a7ce77e06740ca8ff1c796d65dc4eeb495ef820ff881a06565d5a619adcf862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -510,16 +524,121 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f93274e63c66c8eb14917794d3afa92ded008dcc6127ca0f58ab952afabb8ed",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfd24876f926beabb6d4968f7adae57194156d179cf1066f6e3753d77916896da",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4cf11",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xb78f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "createContractViaContract_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stHomesteadSpecific/createContractViaContract_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xcf11",
+                    "hash" : "0x6324b5f262f005bc2e35e059a20bfee826507ca3052b7703f5edee9a13266dce",
+                    "mixHash" : "0x93d6e3825975ecd557567345eabd8b47aee78e79dd3eb3c0128996afc4d8520e",
+                    "nonce" : "0x893684a8df514199",
+                    "number" : "0x01",
+                    "parentHash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
+                    "receiptTrie" : "0xdc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebc",
+                    "stateRoot" : "0x36d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x65feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0b59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036d511fb12433ba7095c44be816745db22b5dab817244f0ec549d7543d898dd0a065feff862b7bb0f9bab2fcc8331fc3a4820c20e7d71a8ba280e787315acbda2fa0dc06ada911f8cd001e5682c92fcfa392ceb7c4e978bf68873c9b5307c2d0eebcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082cf118203e880a093d6e3825975ecd557567345eabd8b47aee78e79dd3eb3c0128996afc4d8520e88893684a8df514199f862f8608001830186a094100000000000000000000000000000000000000180801ca0987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851a050ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x987657cf92dd443d69216a4b7e84788655a2d2db5cc9da1af6be13d73f985851",
+                        "s" : "0x50ca5a6552027625aef933dce2d9888039f2b2215712bb483c0c234a52ada529",
+                        "to" : "0x1000000000000000000000000000000000000001",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xb59a29bd5ce43f109acd099e1d69625e2c6d423d8be449e7c6ba50a6ffdd86bb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8a4810d6c0e1b0c93096a1faa1345ac86b45a4611c843641f6b51e046b5b6f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6324b5f262f005bc2e35e059a20bfee826507ca3052b7703f5edee9a13266dce",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x600060006000f0",
@@ -537,7 +656,7 @@
             "0x5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },