Hive tests with Byzantine

1 files changed, 179 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG_d0g0v0.json
index 4290eb70b..392a18123 100644
--- a/BlockchainTests/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stTransactionTest/ContractStoreClearsOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ContractStoreClearsOOG_d0g0v0_EIP150" : {
+    "ContractStoreClearsOOG_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/ContractStoreClearsOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0186a0",
                     "gasUsed" : "0x59d8",
-                    "hash" : "0x4a590e796f4816022c63b85fd796caa0a94a3556cc709321b349824cc9d16e22",
-                    "mixHash" : "0xc2eec1d77a213cb47926aa935c51dabef91271c89eff5a943429797d937959cd",
-                    "nonce" : "0x53debcf4a2c238a9",
+                    "hash" : "0x00d42840781dcf4735410a27fcec2301033e3a9f28382e9553bedb536505ce36",
+                    "mixHash" : "0x7a160d12e60d3f3368004c08dc664586b542438342ec4839a6af25774088d311",
+                    "nonce" : "0x5f6de64ec773b7ff",
                     "number" : "0x01",
                     "parentHash" : "0xb4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893c",
-                    "receiptTrie" : "0x00ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25e",
-                    "stateRoot" : "0x04bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894",
+                    "receiptTrie" : "0x373de1da75dd9d50e359596d3e8cc328b712dc555a823b1bebbe593a1ba54051",
+                    "stateRoot" : "0x678f96dc2fda2c72eb287dc637dad4ec4ee00d89c7a807aadce3ebdaacbafbf3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a0c2eec1d77a213cb47926aa935c51dabef91271c89eff5a943429797d937959cd8853debcf4a2c238a9f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
+                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0678f96dc2fda2c72eb287dc637dad4ec4ee00d89c7a807aadce3ebdaacbafbf3a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa0373de1da75dd9d50e359596d3e8cc328b712dc555a823b1bebbe593a1ba54051b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a07a160d12e60d3f3368004c08dc664586b542438342ec4839a6af25774088d311885f6de64ec773b7fff861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba097c082ed288657d8a7423572c7218321dbe91f117bce11e5a30981feef01711ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830186a0808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a590e796f4816022c63b85fd796caa0a94a3556cc709321b349824cc9d16e22",
-        "network" : "EIP150",
+        "lastblockhash" : "0x00d42840781dcf4735410a27fcec2301033e3a9f28382e9553bedb536505ce36",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
                 "code" : "",
@@ -124,10 +131,10 @@
             }
         }
     },
-    "ContractStoreClearsOOG_d0g0v0_EIP158" : {
+    "ContractStoreClearsOOG_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/ContractStoreClearsOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -139,18 +146,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0186a0",
                     "gasUsed" : "0x59d8",
-                    "hash" : "0xd61b099f234c42b308d053c9cb9c5ad5e3586bc1298b3efcdef924ab64a5927b",
-                    "mixHash" : "0x7bf9762ed18a8a68687d82074af2bad84ca15869ea34c9d129f683ed7a8b27af",
-                    "nonce" : "0x372444106ea56359",
+                    "hash" : "0x988b347d488b1fe2354acf1f864dccf60768d302a2456fed0ad1a62c083400cd",
+                    "mixHash" : "0xf3b17ae54672792b0bbf0af0072d50e76df188507590ba2b13337f2ea673f147",
+                    "nonce" : "0x73183abd3796531a",
                     "number" : "0x01",
                     "parentHash" : "0xb4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893c",
-                    "receiptTrie" : "0x00ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25e",
-                    "stateRoot" : "0x04bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894",
+                    "receiptTrie" : "0x373de1da75dd9d50e359596d3e8cc328b712dc555a823b1bebbe593a1ba54051",
+                    "stateRoot" : "0x678f96dc2fda2c72eb287dc637dad4ec4ee00d89c7a807aadce3ebdaacbafbf3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a07bf9762ed18a8a68687d82074af2bad84ca15869ea34c9d129f683ed7a8b27af88372444106ea56359f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
+                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0678f96dc2fda2c72eb287dc637dad4ec4ee00d89c7a807aadce3ebdaacbafbf3a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa0373de1da75dd9d50e359596d3e8cc328b712dc555a823b1bebbe593a1ba54051b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a0f3b17ae54672792b0bbf0af0072d50e76df188507590ba2b13337f2ea673f1478873183abd3796531af861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -187,9 +194,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba097c082ed288657d8a7423572c7218321dbe91f117bce11e5a30981feef01711ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830186a0808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd61b099f234c42b308d053c9cb9c5ad5e3586bc1298b3efcdef924ab64a5927b",
-        "network" : "EIP158",
+        "lastblockhash" : "0x988b347d488b1fe2354acf1f864dccf60768d302a2456fed0ad1a62c083400cd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
                 "code" : "",
@@ -249,10 +263,10 @@
             }
         }
     },
-    "ContractStoreClearsOOG_d0g0v0_Frontier" : {
+    "ContractStoreClearsOOG_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/ContractStoreClearsOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -264,9 +278,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0186a0",
                     "gasUsed" : "0x59d8",
-                    "hash" : "0x0f9a4e0c123c9909c76c9e7b63ad272e3ba97173c89f92dfb85891fa2f956739",
-                    "mixHash" : "0x46e966187bbc10d7b138463e2dcebe565f2899a40f836994021c398c782c815a",
-                    "nonce" : "0x57079dd980bf9988",
+                    "hash" : "0x1d8fb0ab3e2c7f1c1e881b7eb001610547bc123704d705a969faf8ef77cf8a43",
+                    "mixHash" : "0xa19ea9af0af5874c109cf68b0c9facd68b12c215be57754550e0b63b2eac6243",
+                    "nonce" : "0x6a031a7762d2d777",
                     "number" : "0x01",
                     "parentHash" : "0xb4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893c",
                     "receiptTrie" : "0x00ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25e",
@@ -275,7 +289,7 @@
                     "transactionsTrie" : "0x073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a046e966187bbc10d7b138463e2dcebe565f2899a40f836994021c398c782c815a8857079dd980bf9988f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
+                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a0a19ea9af0af5874c109cf68b0c9facd68b12c215be57754550e0b63b2eac6243886a031a7762d2d777f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -312,8 +326,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba097c082ed288657d8a7423572c7218321dbe91f117bce11e5a30981feef01711ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830186a0808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f9a4e0c123c9909c76c9e7b63ad272e3ba97173c89f92dfb85891fa2f956739",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1d8fb0ab3e2c7f1c1e881b7eb001610547bc123704d705a969faf8ef77cf8a43",
+        "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
@@ -374,10 +388,10 @@
             }
         }
     },
-    "ContractStoreClearsOOG_d0g0v0_Homestead" : {
+    "ContractStoreClearsOOG_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/ContractStoreClearsOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -389,9 +403,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0186a0",
                     "gasUsed" : "0x59d8",
-                    "hash" : "0x9f793a2ea64c1dc8b7b5495e17af81ee7847b9fcb830f69ee9d566e20a397b9e",
-                    "mixHash" : "0x4157ef8587ec1608c655e17656ece6a53e1784867d6fe86e3b8eaf40c9044c36",
-                    "nonce" : "0xa662e1adfed775a4",
+                    "hash" : "0xba9298484bba62af6e71e56dd5382e51f144102bfe564548b9ad8a74d316f1d6",
+                    "mixHash" : "0xd41508a99c810b70561adeaf8d491413c7b2120c02707202c0a59109fde07848",
+                    "nonce" : "0x5147538c6b102966",
                     "number" : "0x01",
                     "parentHash" : "0xb4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893c",
                     "receiptTrie" : "0x00ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25e",
@@ -400,7 +414,7 @@
                     "transactionsTrie" : "0x073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a04157ef8587ec1608c655e17656ece6a53e1784867d6fe86e3b8eaf40c9044c3688a662e1adfed775a4f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
+                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a0d41508a99c810b70561adeaf8d491413c7b2120c02707202c0a59109fde07848885147538c6b102966f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -437,8 +451,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba097c082ed288657d8a7423572c7218321dbe91f117bce11e5a30981feef01711ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830186a0808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f793a2ea64c1dc8b7b5495e17af81ee7847b9fcb830f69ee9d566e20a397b9e",
-        "network" : "Homestead",
+        "lastblockhash" : "0xba9298484bba62af6e71e56dd5382e51f144102bfe564548b9ad8a74d316f1d6",
+        "network" : "EIP158",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
@@ -499,10 +513,10 @@
             }
         }
     },
-    "ContractStoreClearsOOG_d0g0v0_Metropolis" : {
+    "ContractStoreClearsOOG_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/ContractStoreClearsOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -514,18 +528,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0186a0",
                     "gasUsed" : "0x59d8",
-                    "hash" : "0x6a1f23176a149b571898c594bf0994874f95ee3fff64bd1e06f9b0f5383cef5e",
-                    "mixHash" : "0xa954294aecd0bc6aa56b9c30879223c7a767a98a17b2f5ad434a345886c82f15",
-                    "nonce" : "0x394e220a56359d70",
+                    "hash" : "0xb4c4b040edaaf1e57edeb2cca00729d15e44e58218d5a42774f725d9bcbb9f03",
+                    "mixHash" : "0x2a0706d026c8262d992241b525c113fabc20678a89714bd7ba094e00dcf113ad",
+                    "nonce" : "0x348b2a094ad68738",
                     "number" : "0x01",
                     "parentHash" : "0xb4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893c",
-                    "receiptTrie" : "0x373de1da75dd9d50e359596d3e8cc328b712dc555a823b1bebbe593a1ba54051",
-                    "stateRoot" : "0x678f96dc2fda2c72eb287dc637dad4ec4ee00d89c7a807aadce3ebdaacbafbf3",
+                    "receiptTrie" : "0x00ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25e",
+                    "stateRoot" : "0x04bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0a",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0678f96dc2fda2c72eb287dc637dad4ec4ee00d89c7a807aadce3ebdaacbafbf3a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa0373de1da75dd9d50e359596d3e8cc328b712dc555a823b1bebbe593a1ba54051b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a0a954294aecd0bc6aa56b9c30879223c7a767a98a17b2f5ad434a345886c82f1588394e220a56359d70f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
+                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a02a0706d026c8262d992241b525c113fabc20678a89714bd7ba094e00dcf113ad88348b2a094ad68738f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -562,16 +576,134 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba097c082ed288657d8a7423572c7218321dbe91f117bce11e5a30981feef01711ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830186a0808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a1f23176a149b571898c594bf0994874f95ee3fff64bd1e06f9b0f5383cef5e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb4c4b040edaaf1e57edeb2cca00729d15e44e58218d5a42774f725d9bcbb9f03",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4563918244f459d8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
+                "code" : "0x600060005560006001556000600255600060035560006004556000600555600060065560006007556000600855600c600955",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0c",
+                    "0x01" : "0x0c",
+                    "0x02" : "0x0c",
+                    "0x03" : "0x0c",
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c",
+                    "0x06" : "0x0c",
+                    "0x07" : "0x0c",
+                    "0x08" : "0x0c",
+                    "0x09" : "0x0c"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7530",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "0x600060005560006001556000600255600060035560006004556000600555600060065560006007556000600855600c600955",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0c",
+                    "0x01" : "0x0c",
+                    "0x02" : "0x0c",
+                    "0x03" : "0x0c",
+                    "0x04" : "0x0c",
+                    "0x05" : "0x0c",
+                    "0x06" : "0x0c",
+                    "0x07" : "0x0c",
+                    "0x08" : "0x0c",
+                    "0x09" : "0x0c"
+                }
+            }
+        }
+    },
+    "ContractStoreClearsOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stTransactionTest/ContractStoreClearsOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0186a0",
+                    "gasUsed" : "0x59d8",
+                    "hash" : "0x06ef2810a19ca1bcf596a4849242edd158023cd1f25a5c205a2b5e583b36a79b",
+                    "mixHash" : "0x8a7d3841345451371f411f3e4c1d58ef5a45e5d4de65c46fa4cf9eff706fe905",
+                    "nonce" : "0x5a4820a8f7bfb8a5",
+                    "number" : "0x01",
+                    "parentHash" : "0xb4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893c",
+                    "receiptTrie" : "0x00ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25e",
+                    "stateRoot" : "0x04bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0a",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0b4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba004bcfcae18d20ea4c815175606598c3875e29ba9951f5c87f1e4651130457894a0073fdc92ed39f73cf06fd98da8177617251c94db7e50d844acb13f48d624fe0aa000ff8a415b26ab8a9cbe545672725127b4c333d1e9a1339ba23550bc5721a25eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830186a08259d88203e880a08a7d3841345451371f411f3e4c1d58ef5a45e5d4de65c46fa4cf9eff706fe905885a4820a8f7bfb8a5f861f85f80018259d894d2571607e241ecf590ed94b12d87c94babe36db60a801ca0078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaaa06c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x59d8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x078898154e50fdfdaa1f64855a288f0ca10b822dc72b8ef2fce036e9db2edbaa",
+                        "s" : "0x6c53d939df28d8da2adc4a724609cf49ddca3017ba777c5eafadb84b352400d9",
+                        "to" : "0xd2571607e241ecf590ed94b12d87c94babe36db6",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0186a0",
+            "gasUsed" : "0x00",
+            "hash" : "0xb4e1a7e1826029d08eaf551bd218677773459093a06840ce12dada7f0cc1893c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x97c082ed288657d8a7423572c7218321dbe91f117bce11e5a30981feef01711e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba097c082ed288657d8a7423572c7218321dbe91f117bce11e5a30981feef01711ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830186a0808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x06ef2810a19ca1bcf596a4849242edd158023cd1f25a5c205a2b5e583b36a79b",
+        "network" : "Homestead",
+        "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
                 "code" : "",