1 files changed, 170 insertions, 57 deletions
diff --git a/BlockchainTests/GeneralStateTests/stTransactionTest/StoreGasOnCreate_d0g0v0.json b/BlockchainTests/GeneralStateTests/stTransactionTest/StoreGasOnCreate_d0g0v0.json
index 048f17396..e6e53e4e2 100644
--- a/BlockchainTests/GeneralStateTests/stTransactionTest/StoreGasOnCreate_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stTransactionTest/StoreGasOnCreate_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "StoreGasOnCreate_d0g0v0_EIP150" : {
+    "StoreGasOnCreate_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/stTransactionTest/StoreGasOnCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d42",
-                    "hash" : "0xcdf3681647505eedc6eb707df941f1fa7fc2122ce78c7e47fb5e2c5c39042120",
-                    "mixHash" : "0xf6e218ffe0bbfd000bdb361b869d55c3ddac5b2fd81f2f124c631f1a8cf20225",
-                    "nonce" : "0x204e59968f3458d3",
+                    "hash" : "0x8c523fb34e47f474b1314769129a643c84d15c4a632d80ef3cd26279e95fed92",
+                    "mixHash" : "0x4e6aaff986f0a172555134b199c7c0d2d707682a949ea163250b2694cca43159",
+                    "nonce" : "0xf51321f1e98d2b2a",
                     "number" : "0x01",
                     "parentHash" : "0xdaf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8",
-                    "receiptTrie" : "0x6ebdb5354c5f6c07619dbeedfc87ba9c721305a2dee32cac6731b98ed6af1e37",
-                    "stateRoot" : "0xa5efca3bf20283cd422c9aa2742395d72c0ee871a14349d98661686a1a51ef38",
+                    "receiptTrie" : "0x9aff0795d3e543580f20c6827dd7582d4d9d28589a71010c501850310620bf9b",
+                    "stateRoot" : "0xed0a5ff232fb3d7014d5aa26bc451f6ae2046a54b9e514ce76ee8cb39b3c2259",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a5efca3bf20283cd422c9aa2742395d72c0ee871a14349d98661686a1a51ef38a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a06ebdb5354c5f6c07619dbeedfc87ba9c721305a2dee32cac6731b98ed6af1e37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a0f6e218ffe0bbfd000bdb361b869d55c3ddac5b2fd81f2f124c631f1a8cf2022588204e59968f3458d3f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
+                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed0a5ff232fb3d7014d5aa26bc451f6ae2046a54b9e514ce76ee8cb39b3c2259a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a09aff0795d3e543580f20c6827dd7582d4d9d28589a71010c501850310620bf9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a04e6aaff986f0a172555134b199c7c0d2d707682a949ea163250b2694cca4315988f51321f1e98d2b2af862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f6918d02bd8d819afd08bdfad13813cc7f7672e62ee18a07e3a52f627069cc4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdf3681647505eedc6eb707df941f1fa7fc2122ce78c7e47fb5e2c5c39042120",
-        "network" : "EIP150",
+        "lastblockhash" : "0x8c523fb34e47f474b1314769129a643c84d15c4a632d80ef3cd26279e95fed92",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x04fcda",
                 "code" : "",
@@ -82,7 +89,7 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0xfd" : "0x012f3b"
                 }
@@ -105,10 +112,10 @@
             }
         }
     },
-    "StoreGasOnCreate_d0g0v0_EIP158" : {
+    "StoreGasOnCreate_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/stTransactionTest/StoreGasOnCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d42",
-                    "hash" : "0x3d63bb16a202d337375df382ffea03f5be8264281ea780427bd4110ce1058573",
-                    "mixHash" : "0xecc701eb99edaa124b722fd5d461662686c7c713a79bac8684164898e4cda8b7",
-                    "nonce" : "0xe90b771696d14d53",
+                    "hash" : "0x88fa4b1f204c194256bf6152059a9f81950cbae4b0dd77bde75ca2373eef41d6",
+                    "mixHash" : "0x9a2b997c28b60537d47d1d9a61974b087d80a73be1e602b3daa519b3f8b07fdc",
+                    "nonce" : "0x4c41b6bad5228e4d",
                     "number" : "0x01",
                     "parentHash" : "0xdaf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8",
-                    "receiptTrie" : "0x0b80ea784768bd9dd3aeda477fd2d2c863cd7b18341c2b90d70e73de219a43f5",
-                    "stateRoot" : "0xcc70629b66a429ab9660ef4dd3531a99ed1d8c6fff39c2c5e74ebb7af75fe307",
+                    "receiptTrie" : "0x9aff0795d3e543580f20c6827dd7582d4d9d28589a71010c501850310620bf9b",
+                    "stateRoot" : "0xed0a5ff232fb3d7014d5aa26bc451f6ae2046a54b9e514ce76ee8cb39b3c2259",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cc70629b66a429ab9660ef4dd3531a99ed1d8c6fff39c2c5e74ebb7af75fe307a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a00b80ea784768bd9dd3aeda477fd2d2c863cd7b18341c2b90d70e73de219a43f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a0ecc701eb99edaa124b722fd5d461662686c7c713a79bac8684164898e4cda8b788e90b771696d14d53f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
+                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed0a5ff232fb3d7014d5aa26bc451f6ae2046a54b9e514ce76ee8cb39b3c2259a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a09aff0795d3e543580f20c6827dd7582d4d9d28589a71010c501850310620bf9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a09a2b997c28b60537d47d1d9a61974b087d80a73be1e602b3daa519b3f8b07fdc884c41b6bad5228e4df862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f6918d02bd8d819afd08bdfad13813cc7f7672e62ee18a07e3a52f627069cc4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d63bb16a202d337375df382ffea03f5be8264281ea780427bd4110ce1058573",
-        "network" : "EIP158",
+        "lastblockhash" : "0x88fa4b1f204c194256bf6152059a9f81950cbae4b0dd77bde75ca2373eef41d6",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x04fcda",
                 "code" : "",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "StoreGasOnCreate_d0g0v0_Frontier" : {
+    "StoreGasOnCreate_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/stTransactionTest/StoreGasOnCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,18 +240,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d42",
-                    "hash" : "0x69300a448a4d7b8716416cfb790b1885098ca020136a936ce689adfde2484756",
-                    "mixHash" : "0x915a934de058cbabbcacb365e419397a8f161f3274684654e9b76245e868f171",
-                    "nonce" : "0x014f36c3b888f366",
+                    "hash" : "0x9b1164a395925ac4e8c98c7e69414edb545a2f68812c7e6d28a8ef7c47164da4",
+                    "mixHash" : "0x13416a04340af9c3f82dca8e2675fcc4cda4f7d3962e0d7ac169c757bf96665a",
+                    "nonce" : "0x2b9387c3b5920b90",
                     "number" : "0x01",
                     "parentHash" : "0xdaf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8",
-                    "receiptTrie" : "0x16b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7b",
-                    "stateRoot" : "0x7de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663",
+                    "receiptTrie" : "0x6ebdb5354c5f6c07619dbeedfc87ba9c721305a2dee32cac6731b98ed6af1e37",
+                    "stateRoot" : "0xa5efca3bf20283cd422c9aa2742395d72c0ee871a14349d98661686a1a51ef38",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a016b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a0915a934de058cbabbcacb365e419397a8f161f3274684654e9b76245e868f17188014f36c3b888f366f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
+                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0a5efca3bf20283cd422c9aa2742395d72c0ee871a14349d98661686a1a51ef38a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a06ebdb5354c5f6c07619dbeedfc87ba9c721305a2dee32cac6731b98ed6af1e37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a013416a04340af9c3f82dca8e2675fcc4cda4f7d3962e0d7ac169c757bf96665a882b9387c3b5920b90f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f6918d02bd8d819afd08bdfad13813cc7f7672e62ee18a07e3a52f627069cc4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69300a448a4d7b8716416cfb790b1885098ca020136a936ce689adfde2484756",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9b1164a395925ac4e8c98c7e69414edb545a2f68812c7e6d28a8ef7c47164da4",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x04fcda",
@@ -296,7 +310,7 @@
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0xfd" : "0x01340b"
+                    "0xfd" : "0x012f3b"
                 }
             }
         },
@@ -317,10 +331,10 @@
             }
         }
     },
-    "StoreGasOnCreate_d0g0v0_Homestead" : {
+    "StoreGasOnCreate_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/stTransactionTest/StoreGasOnCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,18 +346,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d42",
-                    "hash" : "0x79511f02f5cf7954047c7d6cd4713b121344828743b66f62c222eb051bce302e",
-                    "mixHash" : "0xd10cfa5f3e81b052090d98688337330019a3b4ce5271eb91edd5e4a6b8c7eeeb",
-                    "nonce" : "0x6b51a4706f505131",
+                    "hash" : "0x7b8aebae0334edd22f6dc394e04c2cafe76897625bb3b5df4d57f39f269b9fe9",
+                    "mixHash" : "0x0a663a1e5fb9e4a82c9c50c7cb6d15fedaffbda0d08de43349775eadd66b5f9f",
+                    "nonce" : "0xb828b05eee331536",
                     "number" : "0x01",
                     "parentHash" : "0xdaf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8",
-                    "receiptTrie" : "0x16b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7b",
-                    "stateRoot" : "0x7de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663",
+                    "receiptTrie" : "0x0b80ea784768bd9dd3aeda477fd2d2c863cd7b18341c2b90d70e73de219a43f5",
+                    "stateRoot" : "0xcc70629b66a429ab9660ef4dd3531a99ed1d8c6fff39c2c5e74ebb7af75fe307",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a016b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a0d10cfa5f3e81b052090d98688337330019a3b4ce5271eb91edd5e4a6b8c7eeeb886b51a4706f505131f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
+                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cc70629b66a429ab9660ef4dd3531a99ed1d8c6fff39c2c5e74ebb7af75fe307a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a00b80ea784768bd9dd3aeda477fd2d2c863cd7b18341c2b90d70e73de219a43f5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a00a663a1e5fb9e4a82c9c50c7cb6d15fedaffbda0d08de43349775eadd66b5f9f88b828b05eee331536f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f6918d02bd8d819afd08bdfad13813cc7f7672e62ee18a07e3a52f627069cc4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79511f02f5cf7954047c7d6cd4713b121344828743b66f62c222eb051bce302e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7b8aebae0334edd22f6dc394e04c2cafe76897625bb3b5df4d57f39f269b9fe9",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x04fcda",
@@ -400,9 +414,9 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
-                    "0xfd" : "0x01340b"
+                    "0xfd" : "0x012f3b"
                 }
             }
         },
@@ -423,10 +437,10 @@
             }
         }
     },
-    "StoreGasOnCreate_d0g0v0_Metropolis" : {
+    "StoreGasOnCreate_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/stTransactionTest/StoreGasOnCreate_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d42",
-                    "hash" : "0xee2d7339fef1624b1bdceb64a38e42ec38459ffa8fb199057bbb07afe415624c",
-                    "mixHash" : "0x67ffcd0f178b921a08456428ebd179c94d6859990435d15290fb46b128554288",
-                    "nonce" : "0x2f58a822d24c21c0",
+                    "hash" : "0x5c03a93a54752afe38311e31a79de3a8e661963ad612a7ed1d53d5c625a80b9c",
+                    "mixHash" : "0xfbed11770a17cc9f4e61ade93836c9a9e0eb44c3f20b0b1974a9d3410d5a20d8",
+                    "nonce" : "0x8164862d5b891eda",
                     "number" : "0x01",
                     "parentHash" : "0xdaf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8",
-                    "receiptTrie" : "0x9aff0795d3e543580f20c6827dd7582d4d9d28589a71010c501850310620bf9b",
-                    "stateRoot" : "0xed0a5ff232fb3d7014d5aa26bc451f6ae2046a54b9e514ce76ee8cb39b3c2259",
+                    "receiptTrie" : "0x16b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7b",
+                    "stateRoot" : "0x7de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xbe70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed0a5ff232fb3d7014d5aa26bc451f6ae2046a54b9e514ce76ee8cb39b3c2259a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a09aff0795d3e543580f20c6827dd7582d4d9d28589a71010c501850310620bf9bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a067ffcd0f178b921a08456428ebd179c94d6859990435d15290fb46b128554288882f58a822d24c21c0f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
+                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a016b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a0fbed11770a17cc9f4e61ade93836c9a9e0eb44c3f20b0b1974a9d3410d5a20d8888164862d5b891edaf862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f6918d02bd8d819afd08bdfad13813cc7f7672e62ee18a07e3a52f627069cc4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee2d7339fef1624b1bdceb64a38e42ec38459ffa8fb199057bbb07afe415624c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x5c03a93a54752afe38311e31a79de3a8e661963ad612a7ed1d53d5c625a80b9c",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x04fcda",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f51da6",
+                "code" : "0x635a60fd556000526004601c6000f0",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0xfd" : "0x01340b"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x061a80",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x635a60fd556000526004601c6000f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "StoreGasOnCreate_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/StoreGasOnCreate_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x011d42",
+                    "hash" : "0xd36d7cc1e4980a9b1f9fe2942be1619a99ab589cb6e8951ef2157611086a50a4",
+                    "mixHash" : "0xcd97a5070f965ee694b0698bb298c589deb14c0067a9274962c3402e64c51e74",
+                    "nonce" : "0x330f7a34391c52d1",
+                    "number" : "0x01",
+                    "parentHash" : "0xdaf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8",
+                    "receiptTrie" : "0x16b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7b",
+                    "stateRoot" : "0x7de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xbe70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0daf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07de8bb3aaee3cb16376e97490cdbb96c33c716e98a65db14912818ac1ac8f663a0be70b05b1df4522aec758c4f6d268369e578251620b129377f8d38f5a4373ef5a016b309c510bec7011464bfaad4ba29495b6272164e552fb0c2bb0b90cd163f7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d428203e880a0cd97a5070f965ee694b0698bb298c589deb14c0067a9274962c3402e64c51e7488330f7a34391c52d1f862f86080018302032a94b94f5374fce5edbc8e2a8697c15331677e6ebf0b64801ca0e50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561a067228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17dc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x02032a",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xe50d3284baffc47daf12571b58a6b472a679708b3b417fd8f233a1762f862561",
+                        "s" : "0x67228488d10eced039910ed1b669a24baf0c7537751a78af977cdc22d0b4a17d",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x64"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xdaf5049877c5fe0266eab89c02f5c9b9bd132fac57fbad13d3ef909f9097dbc8",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf6918d02bd8d819afd08bdfad13813cc7f7672e62ee18a07e3a52f627069cc4b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f6918d02bd8d819afd08bdfad13813cc7f7672e62ee18a07e3a52f627069cc4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd36d7cc1e4980a9b1f9fe2942be1619a99ab589cb6e8951ef2157611086a50a4",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x04fcda",
                 "code" : "",
@@ -513,9 +626,9 @@
             "0xf1ecf98489fa9ed60a664fc4998db699cfa39d40" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0xfd" : "0x012f3b"
+                    "0xfd" : "0x01340b"
                 }
             }
         },