1 files changed, 180 insertions, 53 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json
index 17afd029a..7b9cabe33 100644
--- a/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "callcodeOutput2_d0g0v0_EIP150" : {
+    "callcodeOutput2_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/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0x9ad8bcf68479a683145e9fafefd1bdfc047444b2f12f70828f30461c922f75df",
-                    "mixHash" : "0xfe10f7f70565d88d53f96abca361499871ad3505f9220be0314a46fd92dc98fe",
-                    "nonce" : "0xf1f008077d361586",
+                    "hash" : "0x49b9a3a79510489110f93f097df9d5ede6bd96147449bea7984e8cae00e86283",
+                    "mixHash" : "0x9e146446f143ba884861592afe868dc4ca5e7ec05166f1639df26e1bcac11a84",
+                    "nonce" : "0xc74636c739e120c1",
                     "number" : "0x01",
                     "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0xb694fdac44d0e97436ddffd833a8c7a72e2e81e9499a57289ff5c82f197cf0a5",
-                    "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
+                    "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
+                    "stateRoot" : "0x9bac2e40019e0fdbf7f2b24e06a7b1d179487c161c438fec0aaf968a711e450b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0b694fdac44d0e97436ddffd833a8c7a72e2e81e9499a57289ff5c82f197cf0a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0fe10f7f70565d88d53f96abca361499871ad3505f9220be0314a46fd92dc98fe88f1f008077d361586f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bac2e40019e0fdbf7f2b24e06a7b1d179487c161c438fec0aaf968a711e450ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a09e146446f143ba884861592afe868dc4ca5e7ec05166f1639df26e1bcac11a8488c74636c739e120c1f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ad8bcf68479a683145e9fafefd1bdfc047444b2f12f70828f30461c922f75df",
-        "network" : "EIP150",
+        "lastblockhash" : "0x49b9a3a79510489110f93f097df9d5ede6bd96147449bea7984e8cae00e86283",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
@@ -119,10 +126,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_EIP158" : {
+    "callcodeOutput2_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/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a4",
-                    "hash" : "0x4276c2a4541442f619970cd7c43ea67cf6195b57442a520da7a3850a2cb46f3a",
-                    "mixHash" : "0x513d522f33cd274bf86e779c56da8397223537eec04a40b85495b33a4558a86a",
-                    "nonce" : "0x07e0b813e6fde271",
+                    "hash" : "0x4c15acb9be7edfce5424845ae75a9d98e38ef91436de13649d8823b39215ad82",
+                    "mixHash" : "0xb477c2018b57260dc59caabcca02763f19e0e1c7549cf7f56860bd60b2c896a4",
+                    "nonce" : "0x198cf5d0cd6c9603",
                     "number" : "0x01",
                     "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0xf003b32943eac96f82682119dde8c37d0718c03e018c7c4ccd32086e972eae12",
-                    "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
+                    "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
+                    "stateRoot" : "0x9bac2e40019e0fdbf7f2b24e06a7b1d179487c161c438fec0aaf968a711e450b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f003b32943eac96f82682119dde8c37d0718c03e018c7c4ccd32086e972eae12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0513d522f33cd274bf86e779c56da8397223537eec04a40b85495b33a4558a86a8807e0b813e6fde271f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bac2e40019e0fdbf7f2b24e06a7b1d179487c161c438fec0aaf968a711e450ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0b477c2018b57260dc59caabcca02763f19e0e1c7549cf7f56860bd60b2c896a488198cf5d0cd6c9603f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4276c2a4541442f619970cd7c43ea67cf6195b57442a520da7a3850a2cb46f3a",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4c15acb9be7edfce5424845ae75a9d98e38ef91436de13649d8823b39215ad82",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_Frontier" : {
+    "callcodeOutput2_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/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0xd741415ba0f4ec8a6063a455ba11d14b107a7b1266f91e8e797371f84b568ee9",
-                    "mixHash" : "0x3a5eeff3d52bd56d0efea79e1b5e3f5e78bd1f357a0b332673d2dd2c219feae7",
-                    "nonce" : "0x35b4c0e5b1213601",
+                    "gasUsed" : "0xb6a4",
+                    "hash" : "0xaeec06274e14469db07ae175d6945ed86d57d51b67b2feddc43e935914a8985b",
+                    "mixHash" : "0xe1daa40210133e85d3f9ac8cb55c7476ad0d6ef5283994cea90695f0efe3dcd0",
+                    "nonce" : "0xd790b4f54ca05f12",
                     "number" : "0x01",
                     "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0x2487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073",
+                    "receiptTrie" : "0xb694fdac44d0e97436ddffd833a8c7a72e2e81e9499a57289ff5c82f197cf0a5",
                     "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a03a5eeff3d52bd56d0efea79e1b5e3f5e78bd1f357a0b332673d2dd2c219feae78835b4c0e5b1213601f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0b694fdac44d0e97436ddffd833a8c7a72e2e81e9499a57289ff5c82f197cf0a5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a0e1daa40210133e85d3f9ac8cb55c7476ad0d6ef5283994cea90695f0efe3dcd088d790b4f54ca05f12f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -302,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd741415ba0f4ec8a6063a455ba11d14b107a7b1266f91e8e797371f84b568ee9",
-        "network" : "Frontier",
+        "lastblockhash" : "0xaeec06274e14469db07ae175d6945ed86d57d51b67b2feddc43e935914a8985b",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -359,10 +373,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_Homestead" : {
+    "callcodeOutput2_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/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -373,19 +387,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb410",
-                    "hash" : "0x9d7fe01ef7a640d6ce2c7760e465a3daf9c2168c45e560ab100f26fdf47ef2c4",
-                    "mixHash" : "0x9cdec87ea930fef135c2adfa37fe7e1c5346233a93f797d0f5f77835aebad0b7",
-                    "nonce" : "0x564b71b1c8ea768f",
+                    "gasUsed" : "0xb6a4",
+                    "hash" : "0x2f69efb0e0be2a7071b67db85996f99104b92ba6b15c5708a99f66457c7bf0af",
+                    "mixHash" : "0x9d07a5794d657aa09e9b8079b5733016a1fc8f6fcd86775e48870d47371888ac",
+                    "nonce" : "0xa911e0d457953015",
                     "number" : "0x01",
                     "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0x2487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073",
+                    "receiptTrie" : "0xf003b32943eac96f82682119dde8c37d0718c03e018c7c4ccd32086e972eae12",
                     "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a09cdec87ea930fef135c2adfa37fe7e1c5346233a93f797d0f5f77835aebad0b788564b71b1c8ea768ff865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da0f003b32943eac96f82682119dde8c37d0718c03e018c7c4ccd32086e972eae12b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a09d07a5794d657aa09e9b8079b5733016a1fc8f6fcd86775e48870d47371888ac88a911e0d457953015f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -422,8 +436,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d7fe01ef7a640d6ce2c7760e465a3daf9c2168c45e560ab100f26fdf47ef2c4",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2f69efb0e0be2a7071b67db85996f99104b92ba6b15c5708a99f66457c7bf0af",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
@@ -479,10 +493,10 @@
             }
         }
     },
-    "callcodeOutput2_d0g0v0_Metropolis" : {
+    "callcodeOutput2_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/callcodeOutput2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +507,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a4",
-                    "hash" : "0x9ad833e39e678aeb4f4a8488fe2ddde859a6329f234338e240a880ef0f7e6b1b",
-                    "mixHash" : "0x1178f25bf80f948278fe7dea57a855c1c3ed4a6d26deb561f41686332422bd0a",
-                    "nonce" : "0xc9745a4aee827883",
+                    "gasUsed" : "0xb410",
+                    "hash" : "0x21eb99bf429a05a7ab6c8ac65716bc1d0048d83980193287725c020cae67b1cf",
+                    "mixHash" : "0x36b04e84aaa86c7ee3bc142998c842b3f5e791024941538373c4967c61837285",
+                    "nonce" : "0x6614feb45894b7cd",
                     "number" : "0x01",
                     "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
-                    "receiptTrie" : "0x3e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286dd",
-                    "stateRoot" : "0x9bac2e40019e0fdbf7f2b24e06a7b1d179487c161c438fec0aaf968a711e450b",
+                    "receiptTrie" : "0x2487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073",
+                    "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bac2e40019e0fdbf7f2b24e06a7b1d179487c161c438fec0aaf968a711e450ba07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da03e738e5bd3576ad10b6e222171b7ca439e2aeb4522c0e4a2d1c3b58af63286ddb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a48203e880a01178f25bf80f948278fe7dea57a855c1c3ed4a6d26deb561f41686332422bd0a88c9745a4aee827883f865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a036b04e84aaa86c7ee3bc142998c842b3f5e791024941538373c4967c61837285886614feb45894b7cdf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -542,16 +556,129 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ad833e39e678aeb4f4a8488fe2ddde859a6329f234338e240a880ef0f7e6b1b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x21eb99bf429a05a7ab6c8ac65716bc1d0048d83980193287725c020cae67b1cf",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a76586a0",
+                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "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" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodeOutput2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stCallCreateCallCodeTest/callcodeOutput2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb410",
+                    "hash" : "0xf720025e15dd74ab13bd8a29db83b550e98ff98e87aad7b8dfa672cfad2092e2",
+                    "mixHash" : "0x6cae7bfc95135536e48da29f61fa649a70081c6c1e8b41886dc9a7f885fdc00f",
+                    "nonce" : "0x61064f283826689c",
+                    "number" : "0x01",
+                    "parentHash" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
+                    "receiptTrie" : "0x2487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073",
+                    "stateRoot" : "0xcc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a07f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc7084c94606c699f9129d51d71bae4bbe6fa4f3ff89ff4b244ff089a38981e9a07f85854b8b30dcca56f94318c7332e05eafa1635dafc57e2abe1fac35c7efa8da02487285651f18a83bdb3024fbaef4da016f899ba13c05d279b73aaee0934d073b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b4108203e880a06cae7bfc95135536e48da29f61fa649a70081c6c1e8b41886dc9a7f885fdc00f8861064f283826689cf865f8638080830f424094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0c15d34d194f0b39f15741df45c99593bf0cb642d4ca50088d1f8a289c430c9d4a005478f3b062fccb0c87482a930aa211a8dcfdcc00cafbfbb5b60995fe7b15e7bc0",
+                "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" : "0x7f10a41c9cf39d852bfd3384f64f179b5a9847d29b4ff500e08858babcb4d86f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cb9c97edb90873e3d8eedd219ff19db0bbda0480a1e49343695939c8bd8d896a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf720025e15dd74ab13bd8a29db83b550e98ff98e87aad7b8dfa672cfad2092e2",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a76586a0",
                 "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526000600060206000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",