Hive tests with Byzantine

1 files changed, 167 insertions, 66 deletions

diff --git a/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0.json b/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0.json
index 1ba176c2a..ca1b08ded 100644
--- a/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "OutOfGasPrefundedContractCreation_d0g0v0_EIP150" : {
+    "OutOfGasPrefundedContractCreation_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/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "0x2d7d670ff5bcdcaace951f7732256dcb75795107661857c05eeb64c062d1d8dd",
-                    "mixHash" : "0xfcf4612b7000203242ef7e02eeb73dd0bb54a78514f3d119929b02e42426ae9d",
-                    "nonce" : "0xb92932418e3514a0",
+                    "hash" : "0x32b495974585774e56be2d73f5c96840c163afe4250bd41cdf0472ad52f93380",
+                    "mixHash" : "0xdca96356b80f66604307c33b6a3548df98fbbbded41e259d2fd02c12f79bcf6d",
+                    "nonce" : "0xf914e85091192956",
                     "number" : "0x01",
                     "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
+                    "stateRoot" : "0x3e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0fcf4612b7000203242ef7e02eeb73dd0bb54a78514f3d119929b02e42426ae9d88b92932418e3514a0c0c0",
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0dca96356b80f66604307c33b6a3548df98fbbbded41e259d2fd02c12f79bcf6d88f914e85091192956c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -51,9 +51,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2d7d670ff5bcdcaace951f7732256dcb75795107661857c05eeb64c062d1d8dd",
-        "network" : "EIP150",
+        "lastblockhash" : "0x32b495974585774e56be2d73f5c96840c163afe4250bd41cdf0472ad52f93380",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -93,10 +100,10 @@
             }
         }
     },
-    "OutOfGasPrefundedContractCreation_d0g0v0_EIP158" : {
+    "OutOfGasPrefundedContractCreation_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/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -108,18 +115,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "0xce7e4d581b2ba77f87acd63925ebd4dbb350592b2eaa7d5747f33f8cdbfa5c67",
-                    "mixHash" : "0x3a47cb57a467d39f1e5b4e0768e635eab8d28113bd857ab45738103a3e6f929e",
-                    "nonce" : "0xe4c3f7208d363ffd",
+                    "hash" : "0x64a7d3f5a35067f7c408f8471855c7e7c512ee42679c75d99f69b34d3fd26eab",
+                    "mixHash" : "0xe80bb33dc55813876ec4a2b60b9d0298d50c2f5fbbedcc9d92c84a1088fb8998",
+                    "nonce" : "0x50db0599ede4d19b",
                     "number" : "0x01",
                     "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
+                    "stateRoot" : "0x3e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a03a47cb57a467d39f1e5b4e0768e635eab8d28113bd857ab45738103a3e6f929e88e4c3f7208d363ffdc0c0",
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0e80bb33dc55813876ec4a2b60b9d0298d50c2f5fbbedcc9d92c84a1088fb89988850db0599ede4d19bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -145,9 +152,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce7e4d581b2ba77f87acd63925ebd4dbb350592b2eaa7d5747f33f8cdbfa5c67",
-        "network" : "EIP158",
+        "lastblockhash" : "0x64a7d3f5a35067f7c408f8471855c7e7c512ee42679c75d99f69b34d3fd26eab",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",
@@ -187,10 +201,10 @@
             }
         }
     },
-    "OutOfGasPrefundedContractCreation_d0g0v0_Frontier" : {
+    "OutOfGasPrefundedContractCreation_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/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -201,31 +215,20 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xd2f0",
-                    "hash" : "0xe0cb8353cc625348bbade7002c9398065f6fffe1c8569953c1db93a9dee08a07",
-                    "mixHash" : "0x912806ccd13752c8f710a547c2fae97c1d53f786e32215d65b6ccbf4ba0350b0",
-                    "nonce" : "0x1799b8c67c652a1f",
+                    "gasUsed" : "0x00",
+                    "hash" : "0xdf2840879100fa220f1e526624d5a24f063140400aee3bf88bbfa3c61f6d746b",
+                    "mixHash" : "0xcfa2f9176b3ee33c1f416dc8d2c9c75f66fd657f074f965a2fc7f45252a753b1",
+                    "nonce" : "0xd717856270fccf91",
                     "number" : "0x01",
                     "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-                    "receiptTrie" : "0x084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378",
-                    "stateRoot" : "0x7be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f8a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838a0b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024a0084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d2f08203e880a0912806ccd13752c8f710a547c2fae97c1d53f786e32215d65b6ccbf4ba0350b0881799b8c67c652a1ff863f861800382d2f0800196600a80600c6000396000f200600160008035811a81001ba09fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749da0066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19c0",
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0cfa2f9176b3ee33c1f416dc8d2c9c75f66fd657f074f965a2fc7f45252a753b188d717856270fccf91c0c0",
                 "transactions" : [
-                    {
-                        "data" : "0x600a80600c6000396000f200600160008035811a8100",
-                        "gasLimit" : "0xd2f0",
-                        "gasPrice" : "0x03",
-                        "nonce" : "0x00",
-                        "r" : "0x9fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749d",
-                        "s" : "0x066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19",
-                        "to" : "",
-                        "v" : "0x1b",
-                        "value" : "0x01"
-                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -250,11 +253,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe0cb8353cc625348bbade7002c9398065f6fffe1c8569953c1db93a9dee08a07",
-        "network" : "Frontier",
+        "lastblockhash" : "0xdf2840879100fa220f1e526624d5a24f063140400aee3bf88bbfa3c61f6d746b",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f678d0",
+                "balance" : "0x4563918244f40000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -268,9 +271,9 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0cc970",
+                "balance" : "0x0f4240",
                 "code" : "",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
@@ -292,10 +295,10 @@
             }
         }
     },
-    "OutOfGasPrefundedContractCreation_d0g0v0_Homestead" : {
+    "OutOfGasPrefundedContractCreation_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/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -307,9 +310,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x00",
-                    "hash" : "0xad853372ac075299d986361cc347cb6ac11a407ac8eeee1830f6840428c7512c",
-                    "mixHash" : "0x76bd781d4cca0154e382cbe27c18da2cb4132f4b56cd1d0d6c388fae364a2fd6",
-                    "nonce" : "0x0cb3b6978904c125",
+                    "hash" : "0xcccd1f2557dfb8722472c98b809e0141db64558ab92f9600aa36268ee2d3a978",
+                    "mixHash" : "0x25489b28537751ef183354c64bee951270c054eb9f5e63762644aed49073e678",
+                    "nonce" : "0x912dd6853828df99",
                     "number" : "0x01",
                     "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -318,7 +321,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a076bd781d4cca0154e382cbe27c18da2cb4132f4b56cd1d0d6c388fae364a2fd6880cb3b6978904c125c0c0",
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a025489b28537751ef183354c64bee951270c054eb9f5e63762644aed49073e67888912dd6853828df99c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -344,8 +347,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad853372ac075299d986361cc347cb6ac11a407ac8eeee1830f6840428c7512c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xcccd1f2557dfb8722472c98b809e0141db64558ab92f9600aa36268ee2d3a978",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
@@ -386,10 +389,10 @@
             }
         }
     },
-    "OutOfGasPrefundedContractCreation_d0g0v0_Metropolis" : {
+    "OutOfGasPrefundedContractCreation_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/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -400,20 +403,31 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x6a87466aeb83f9646c168b2a73870ca9e79ce2508eb827b3ee18bc9000cf379f",
-                    "mixHash" : "0xc792223fc65b33027b68fd00d2c4e042f3af6528098a98739f3176795ca27063",
-                    "nonce" : "0xaac191c0e076f220",
+                    "gasUsed" : "0xd2f0",
+                    "hash" : "0xd956a790a18de1d181a722d8c547467f305c864b26214cc8574692261d8b3633",
+                    "mixHash" : "0xdaadcf35f93fe2661c4abad3199546babddb2856b9ec36002ce88dd1943f0603",
+                    "nonce" : "0x4b5200e97639bb92",
                     "number" : "0x01",
                     "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x3e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072",
+                    "receiptTrie" : "0x084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378",
+                    "stateRoot" : "0x7be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "transactionsTrie" : "0xb9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e3ba5748c33544524fa7e39f0f9cf48188e4f10114c466765a2d00377940072a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a0c792223fc65b33027b68fd00d2c4e042f3af6528098a98739f3176795ca2706388aac191c0e076f220c0c0",
+                "rlp" : "0xf90261f901f8a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07be96cf40604a6c8f9f5765c72261ce00d3a00c5922f0334a07cd896128ec838a0b9596915d0b9f03553bfec451943a20989371a6de5870f6bd918b40bbde5e024a0084924526258c0adf33208bb6533096282a9e5ad562e2fe5ea3cd60c9c2aa378b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082d2f08203e880a0daadcf35f93fe2661c4abad3199546babddb2856b9ec36002ce88dd1943f0603884b5200e97639bb92f863f861800382d2f0800196600a80600c6000396000f200600160008035811a81001ba09fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749da0066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19c0",
                 "transactions" : [
+                    {
+                        "data" : "0x600a80600c6000396000f200600160008035811a8100",
+                        "gasLimit" : "0xd2f0",
+                        "gasPrice" : "0x03",
+                        "nonce" : "0x00",
+                        "r" : "0x9fd6e1efe17b6f72982e12502ff580b25fc8776fec34a3aa0baba0626f1d749d",
+                        "s" : "0x066143fce8887ba2bd54e02508846ae0c4e500252c9f04d11f3ad63268aa2e19",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
                 ],
                 "uncleHeaders" : [
                 ]
@@ -438,16 +452,103 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6a87466aeb83f9646c168b2a73870ca9e79ce2508eb827b3ee18bc9000cf379f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd956a790a18de1d181a722d8c547467f305c864b26214cc8574692261d8b3633",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f678d0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0cc970",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "OutOfGasPrefundedContractCreation_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stInitCodeTest/OutOfGasPrefundedContractCreation_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x00",
+                    "hash" : "0x588e471b3ae192abddf63cac046dafa615f59414c64c2713fe9bc98de7b7d6f8",
+                    "mixHash" : "0x2006487659cfd1b6c9a49651e803f1e2b13d6a7c68f9fd58a83fb74b3cace079",
+                    "nonce" : "0x3151f80364d166f2",
+                    "number" : "0x01",
+                    "parentHash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "stateRoot" : "0x6ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf901fbf901f6a0eebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ef7fd8c613526a87919e1382cf83bf96e158e7403937a4d56b549a812fc24e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100808203e880a02006487659cfd1b6c9a49651e803f1e2b13d6a7c68f9fd58a83fb74b3cace079883151f80364d166f2c0c0",
+                "transactions" : [
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xeebe930b22787b719c99599088c8588c1299ca92124d546d5fef4b00b331c011",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820dea567b5028afad5568712a2bbfcf60e44f845b8d9d5668e8abf00763867ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x588e471b3ae192abddf63cac046dafa615f59414c64c2713fe9bc98de7b7d6f8",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f40000",
                 "code" : "",