1 files changed, 173 insertions, 52 deletions
diff --git a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json
index 914c16296..2169e5a99 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RawCreateGas_d0g0v0_EIP150" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xd2163753a2fdecb5796912771dc0d332171b005dc412d266394a0fbe55d1ed73",
-                    "mixHash" : "0x34da71c4076a1a1ff29700db7febc731be499b7f6f71c8439837f1a6d8b69491",
-                    "nonce" : "0x8350deaa89c7d21b",
+                    "hash" : "0x4d73cb8779b1bca51f7bb8709308ee2552ab2db8d2567dc931fcfc23bc6e0817",
+                    "mixHash" : "0x993d18fa0f8518216c86dad74b207f7f7957274f40e0f2fb9f357d00ec155824",
+                    "nonce" : "0x5012109f03380708",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
-                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x03bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a034da71c4076a1a1ff29700db7febc731be499b7f6f71c8439837f1a6d8b69491888350deaa89c7d21bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0993d18fa0f8518216c86dad74b207f7f7957274f40e0f2fb9f357d00ec155824885012109f03380708f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2163753a2fdecb5796912771dc0d332171b005dc412d266394a0fbe55d1ed73",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4d73cb8779b1bca51f7bb8709308ee2552ab2db8d2567dc931fcfc23bc6e0817",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -91,7 +98,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -113,10 +120,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_EIP158" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x07c62e7b7b19952e6ab1580ba351717a7fbadb68e376f9724a7e2bbfe8eeeed9",
-                    "mixHash" : "0x3608b4dc6b0b4df6088a110ea1051e7f4f3dcb5fde55892d7e07e2be10723d4b",
-                    "nonce" : "0x09597e5892a3707d",
+                    "hash" : "0xe9d2371464dc3717d3b0d8fbfa07c6d8db014a8669eeaf9283723602bf96e76a",
+                    "mixHash" : "0xb4635abf7a10db86ea24a36e341a3eae8ccf20fee0bb21ed0d91a949a1589a26",
+                    "nonce" : "0x801d39363e671c94",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0x5f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658",
-                    "stateRoot" : "0x0ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3",
+                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
+                    "stateRoot" : "0x03bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da05f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a03608b4dc6b0b4df6088a110ea1051e7f4f3dcb5fde55892d7e07e2be10723d4b8809597e5892a3707df862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0b4635abf7a10db86ea24a36e341a3eae8ccf20fee0bb21ed0d91a949a1589a2688801d39363e671c94f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x07c62e7b7b19952e6ab1580ba351717a7fbadb68e376f9724a7e2bbfe8eeeed9",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe9d2371464dc3717d3b0d8fbfa07c6d8db014a8669eeaf9283723602bf96e76a",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_Frontier" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +256,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x27e129269573409b1ece32d1ab86c005191a546b01468df1c753540f1ad77a33",
-                    "mixHash" : "0x2fd40eef5664bff7800d1e93984985b0052dde25a3f094bddf9d2c17fa020b6a",
-                    "nonce" : "0x74470201ac8c9602",
+                    "hash" : "0xebba74f25890baa0749377f9396d84c5e0fc77da17cddbc568ef19ffa11daec1",
+                    "mixHash" : "0x8caff0492cc0206dec7db35d64fba208186473a7f907a0cba21c97237833b775",
+                    "nonce" : "0x2abd62ff9a119238",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
                     "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
@@ -253,7 +267,7 @@
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a02fd40eef5664bff7800d1e93984985b0052dde25a3f094bddf9d2c17fa020b6a8874470201ac8c9602f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a08caff0492cc0206dec7db35d64fba208186473a7f907a0cba21c97237833b775882abd62ff9a119238f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x27e129269573409b1ece32d1ab86c005191a546b01468df1c753540f1ad77a33",
-        "network" : "Frontier",
+        "lastblockhash" : "0xebba74f25890baa0749377f9396d84c5e0fc77da17cddbc568ef19ffa11daec1",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -341,10 +355,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_Homestead" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,18 +370,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0xa7d7da512392947efc9c261a46e556d51dd04ee49fa036af9b62b786a06131bd",
-                    "mixHash" : "0x2d77cdc551ce7583491ae3ebf80deb7b0527c0b48c087dcfbdcd9b80f1cb1d73",
-                    "nonce" : "0x4f43fd91ce29d0ec",
+                    "hash" : "0x66b84ffe6d59fead4d7255603ed4050be2af7f40a4fa81d98dd19c0c65671d63",
+                    "mixHash" : "0x5aa36f4053d8b6ce726679559dfe4ce5bc526e2614dc1e8db03ea3305fc8a5b9",
+                    "nonce" : "0xaf4a48bf591a39ac",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
-                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
+                    "receiptTrie" : "0x5f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658",
+                    "stateRoot" : "0x0ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a02d77cdc551ce7583491ae3ebf80deb7b0527c0b48c087dcfbdcd9b80f1cb1d73884f43fd91ce29d0ecf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ba6be2e8823f7f96e5cbc9d1b09389748483f11f8a8f11079e958771852e4f3a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da05f2cc83d79c864ecd5a1ebd0609a56bb3f2c775d72dcc8c3ef58bd758f9d8658b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a05aa36f4053d8b6ce726679559dfe4ce5bc526e2614dc1e8db03ea3305fc8a5b988af4a48bf591a39acf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -404,8 +418,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7d7da512392947efc9c261a46e556d51dd04ee49fa036af9b62b786a06131bd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x66b84ffe6d59fead4d7255603ed4050be2af7f40a4fa81d98dd19c0c65671d63",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
@@ -433,7 +447,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -455,10 +469,10 @@
             }
         }
     },
-    "RawCreateGas_d0g0v0_Metropolis" : {
+    "RawCreateGas_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/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -470,18 +484,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x016b5d",
-                    "hash" : "0x70d601af698651d388ad81cd50497debb3124f5bee417f9e14dc7d132b4c2626",
-                    "mixHash" : "0xc447b687781af85bf62ca414ccaa6d6ccda16e810c610919f06d4d20bf6cd235",
-                    "nonce" : "0x8003f1b8e562cfb6",
+                    "hash" : "0x3f1c1b6f7da532b526adb1e1bd5a55eb409e62f71649b22d4859bdf2c1516b5d",
+                    "mixHash" : "0xa36728b13fc85d99763af5e3a51216fb85e3f33df307964800efdc0b7dc8ff85",
+                    "nonce" : "0x1e811a8ac2551f2b",
                     "number" : "0x01",
                     "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
-                    "receiptTrie" : "0xa1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2e",
-                    "stateRoot" : "0x03bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866b",
+                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
+                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003bb70e936e3f7ab1307bd3362740710aeb5cda361755731d491affe4ff0866ba0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da0a1f85aefb1a3dee8321a71dc1d674eec623ab583673e6d678f88af9ff98c8f2eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0c447b687781af85bf62ca414ccaa6d6ccda16e810c610919f06d4d20bf6cd235888003f1b8e562cfb6f862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a0a36728b13fc85d99763af5e3a51216fb85e3f33df307964800efdc0b7dc8ff85881e811a8ac2551f2bf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -518,16 +532,123 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70d601af698651d388ad81cd50497debb3124f5bee417f9e14dc7d132b4c2626",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3f1c1b6f7da532b526adb1e1bd5a55eb409e62f71649b22d4859bdf2c1516b5d",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f56b5d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3a4a3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000f0505a600155",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x074f16",
+                    "0x01" : "0x0683e6"
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a600055600060006000f0505a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RawCreateGas_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150singleCodeGasPrices/RawCreateGas_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x016b5d",
+                    "hash" : "0x1df3392f60ec793596ff62dfd5489b318200333d0d997c8f17e207b66b63bf30",
+                    "mixHash" : "0x70a47129833ba047a67d78414b7232a8404e6821e3c924d135288329f15ad569",
+                    "nonce" : "0xe294a9768c0657cd",
+                    "number" : "0x01",
+                    "parentHash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
+                    "receiptTrie" : "0x88c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5d",
+                    "stateRoot" : "0x4b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xc9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a08a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b91d0c9688b3c7f8f112a9cdf87ac0918c89fe64ca4068f13c5d813628d0444a0c9ef516963b47edfe603957134938a47fa7a07af2a32ff83d7174a3e16e0ac4da088c02f40ef90cd7334a42dd1037215e7a24f22bdcc5d613b78f173a71e5f4d5db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083016b5d8203e880a070a47129833ba047a67d78414b7232a8404e6821e3c924d135288329f15ad56988e294a9768c0657cdf862f86080018307a12094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ca0c64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509a0620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x07a120",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc64fecd63fb7581111203bc67252e36da223a5425a79a6fd70d7d9095fd37509",
+                        "s" : "0x620d962d4f52b72f66b94cecc770faa079838a4a074bc885aa3b6495c33a5268",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x8a9e47f97b132ce8374545c95dbc8797819d051a527bcc810d6e8ee1a62f32e2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4d4b3d50266bf7beaeccef645730e8c6b64725d0a48a6a41ea41a68c0677284a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1df3392f60ec793596ff62dfd5489b318200333d0d997c8f17e207b66b63bf30",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f56b5d",
                 "code" : "",
@@ -554,7 +675,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }