Hive tests with Byzantine

1 files changed, 180 insertions, 53 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json
index 18eedf689..66d97156b 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput3_d0g0v0_EIP150" : {
+    "callcodeOutput3_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/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0x39dec6e70b6eb67cc80faaeae7665e3d3bbcda69881f130676468257c93d4317",
-                    "mixHash" : "0x5b1e94ce3258eaddc9a3871e411c84d28538591e23023b8767c8006f97d48ef6",
-                    "nonce" : "0xaed21a13baccf7ed",
+                    "hash" : "0x22485887774818004ccffda132c9b1b0f81b21ce3022a209fad9030277e181ed",
+                    "mixHash" : "0x263abde7861897e003526c100773baf07094b32e4d3ae30f76503b36429c012b",
+                    "nonce" : "0xa8bbc5a99443c16f",
                     "number" : "0x01",
                     "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0x8316f0fa7b5141820aa0972449e872afc0affdd8422d5b14aa3c070c30c87184",
-                    "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
+                    "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
+                    "stateRoot" : "0x5aa87514b296afc9004818568704039ae557a3e4bf651182f2d3fc103db7fe3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da08316f0fa7b5141820aa0972449e872afc0affdd8422d5b14aa3c070c30c87184b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a05b1e94ce3258eaddc9a3871e411c84d28538591e23023b8767c8006f97d48ef688aed21a13baccf7edf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa87514b296afc9004818568704039ae557a3e4bf651182f2d3fc103db7fe3fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0263abde7861897e003526c100773baf07094b32e4d3ae30f76503b36429c012b88a8bbc5a99443c16ff865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39dec6e70b6eb67cc80faaeae7665e3d3bbcda69881f130676468257c93d4317",
-        "network" : "EIP150",
+        "lastblockhash" : "0x22485887774818004ccffda132c9b1b0f81b21ce3022a209fad9030277e181ed",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_EIP158" : {
+    "callcodeOutput3_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/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0x13525c2302cc04be5ed9ef9e039e95cd21b3b0da90e00754bdd894e217e3c5ed",
-                    "mixHash" : "0x74d350b745dd10e1ee716fe44efdb819d2a8f1bc1b0a11e36198613cc69a45a4",
-                    "nonce" : "0xc8610e9cc005b325",
+                    "hash" : "0x3af588c4699af80054bbe5d6490f4ac58ff194a8d25d5f187b23193fe79b272b",
+                    "mixHash" : "0x0384f12b449a04f8791610bf2f3d8f081e4b66bb5becbd2ab5d322707aa42e6d",
+                    "nonce" : "0xb37966206fd1d845",
                     "number" : "0x01",
                     "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0xbde88e07f7d42ab4a06b75f1182b4888b50ddbb5e7d77f0b2106d1dd38ef53cd",
-                    "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
+                    "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
+                    "stateRoot" : "0x5aa87514b296afc9004818568704039ae557a3e4bf651182f2d3fc103db7fe3f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0bde88e07f7d42ab4a06b75f1182b4888b50ddbb5e7d77f0b2106d1dd38ef53cdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a074d350b745dd10e1ee716fe44efdb819d2a8f1bc1b0a11e36198613cc69a45a488c8610e9cc005b325f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa87514b296afc9004818568704039ae557a3e4bf651182f2d3fc103db7fe3fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a00384f12b449a04f8791610bf2f3d8f081e4b66bb5becbd2ab5d322707aa42e6d88b37966206fd1d845f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13525c2302cc04be5ed9ef9e039e95cd21b3b0da90e00754bdd894e217e3c5ed",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3af588c4699af80054bbe5d6490f4ac58ff194a8d25d5f187b23193fe79b272b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_Frontier" : {
+    "callcodeOutput3_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/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0xdbca023f500f87cd4e71ee50e322f50c2d133e267f6b32c067a3125fd558372f",
-                    "mixHash" : "0xab1212c65fe1b48e1a92cc6e75bb3fe33a8a95b7be9ba2312aa28766e05087b6",
-                    "nonce" : "0xcd90a205b2d74404",
+                    "gasUsed" : "0xb6a4",
+                    "hash" : "0x14f04e16b36df2af13636ff549ca7443b64b7de9ca2b43a466cdb5ef5a06dbf5",
+                    "mixHash" : "0x38826377a2f1c4b50d217e5b46a1a996ec3e774d77c179082ffefe796ae3f832",
+                    "nonce" : "0xcad23b65ea186864",
                     "number" : "0x01",
                     "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0x7f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7",
+                    "receiptTrie" : "0x8316f0fa7b5141820aa0972449e872afc0affdd8422d5b14aa3c070c30c87184",
                     "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a0ab1212c65fe1b48e1a92cc6e75bb3fe33a8a95b7be9ba2312aa28766e05087b688cd90a205b2d74404f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da08316f0fa7b5141820aa0972449e872afc0affdd8422d5b14aa3c070c30c87184b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a038826377a2f1c4b50d217e5b46a1a996ec3e774d77c179082ffefe796ae3f83288cad23b65ea186864f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbca023f500f87cd4e71ee50e322f50c2d133e267f6b32c067a3125fd558372f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x14f04e16b36df2af13636ff549ca7443b64b7de9ca2b43a466cdb5ef5a06dbf5",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -359,10 +373,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_Homestead" : {
+    "callcodeOutput3_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/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -373,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0x9f9d769dbf2b532999b0549ce13f261b0c841fdd42b8a43c30d3e08d6d96d274",
-                    "mixHash" : "0x34b6e9949ed56e73af485df6797958412a3efd5e6941d65c233bdf112fc40e36",
-                    "nonce" : "0x7080eb26e97fee46",
+                    "gasUsed" : "0xb6a4",
+                    "hash" : "0x66c22713e5a7f5eb45e02899cd74a64c485d08a4d7b1b5cd37272900f90a2fb4",
+                    "mixHash" : "0x3ecc8c71b31d0ef23c991e6c0c8bf4cecdd32ae65221ea97079d41ebab5cd929",
+                    "nonce" : "0x44adbbf47e0e0968",
                     "number" : "0x01",
                     "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0x7f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7",
+                    "receiptTrie" : "0xbde88e07f7d42ab4a06b75f1182b4888b50ddbb5e7d77f0b2106d1dd38ef53cd",
                     "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a034b6e9949ed56e73af485df6797958412a3efd5e6941d65c233bdf112fc40e36887080eb26e97fee46f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0bde88e07f7d42ab4a06b75f1182b4888b50ddbb5e7d77f0b2106d1dd38ef53cdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a03ecc8c71b31d0ef23c991e6c0c8bf4cecdd32ae65221ea97079d41ebab5cd9298844adbbf47e0e0968f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -422,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f9d769dbf2b532999b0549ce13f261b0c841fdd42b8a43c30d3e08d6d96d274",
-        "network" : "Homestead",
+        "lastblockhash" : "0x66c22713e5a7f5eb45e02899cd74a64c485d08a4d7b1b5cd37272900f90a2fb4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -479,10 +493,10 @@
             }
         }
     },
-    "callcodeOutput3_d0g0v0_Metropolis" : {
+    "callcodeOutput3_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/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0xf04feabbeb63cb5f083a774b873f26ef115267bb1208798dd49284d497f18e51",
-                    "mixHash" : "0x065267cbc9f9f1ead870e013d9c8ef45104a14dcd513bbf736b2b7073d65d17b",
-                    "nonce" : "0xb789a75e62fbf4e2",
+                    "gasUsed" : "0xb410",
+                    "hash" : "0x8a9938f35c4bc000fff76d7bf2da1821681ee416cc810c77bdac427109ec9a86",
+                    "mixHash" : "0x35b657cc39dde751db0d9f6c31f1f7f685cd7bdb9f63635733fc726a45d8ab71",
+                    "nonce" : "0x6f13f8c4a336a267",
                     "number" : "0x01",
                     "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
-                    "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
-                    "stateRoot" : "0x5aa87514b296afc9004818568704039ae557a3e4bf651182f2d3fc103db7fe3f",
+                    "receiptTrie" : "0x7f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7",
+                    "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05aa87514b296afc9004818568704039ae557a3e4bf651182f2d3fc103db7fe3fa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0065267cbc9f9f1ead870e013d9c8ef45104a14dcd513bbf736b2b7073d65d17b88b789a75e62fbf4e2f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a035b657cc39dde751db0d9f6c31f1f7f685cd7bdb9f63635733fc726a45d8ab71886f13f8c4a336a267f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,16 +556,129 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf04feabbeb63cb5f083a774b873f26ef115267bb1208798dd49284d497f18e51",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x8a9938f35c4bc000fff76d7bf2da1821681ee416cc810c77bdac427109ec9a86",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7627960",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/callcodeOutput3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb410",
+                    "hash" : "0xd3facbfa070443652bb3f1badaeaf783112b025708418e0d79bbc16858dfbd8d",
+                    "mixHash" : "0x93cf5cf9ed10ebb5ba91ffa8d296e7e01097a1c93080d669141aa7aa348f6b34",
+                    "nonce" : "0x1e7771dd0d8ca38e",
+                    "number" : "0x01",
+                    "parentHash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
+                    "receiptTrie" : "0x7f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7",
+                    "stateRoot" : "0x57632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0cacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042dea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057632d386c7e4538d51df0d1055c964c0429732189669ed276d6fbace804052aa07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da07f47fdba71410147378fe45d3d4b00c74491aebee336f00b706fb8ed6e6015d7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a093cf5cf9ed10ebb5ba91ffa8d296e7e01097a1c93080d669141aa7aa348f6b34881e7771dd0d8ca38ef865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0f4240",
+                        "gasPrice" : "0x00",
+                        "nonce" : "0x00",
+                        "r" : "0xc15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4",
+                        "s" : "0x05478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7b",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xcacb5a9edbbda75281b139d5605b973b66a2fcf89e656c6bb0fdce82785042de",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x74bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074bb43c1c559373e797b717d312a2c24ad27090213f90b5a5f076b1ef96250b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd3facbfa070443652bb3f1badaeaf783112b025708418e0d79bbc16858dfbd8d",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",