Hive tests with Byzantine

1 files changed, 162 insertions, 48 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
index e33db9b24..cd1d4bf02 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_OOG_d0g0v0_EIP150" : {
+    "refund_OOG_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/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xe940eb51b2499ab2a2cf92fb3e52d1c0808c37a3f9a50cdb721d28f3018cdab3",
-                    "mixHash" : "0xe1040720da62aa505df94c95e97daae997bd783b48f88c88d64d741c3767c810",
-                    "nonce" : "0x16e3d1690d50e17d",
+                    "hash" : "0xbc12b09e0f60a6aa811e37407f8b33d9c73e4dcdc93739b8db6c75e94a54cff8",
+                    "mixHash" : "0xe2d74bbd3832a5063d18fd594ae320c8382ca9cb044f0f39cde41d821d1412a9",
+                    "nonce" : "0x59d62a639cf1512c",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
-                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
-                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
+                    "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
+                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0e1040720da62aa505df94c95e97daae997bd783b48f88c88d64d741c3767c8108816e3d1690d50e17df861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0e2d74bbd3832a5063d18fd594ae320c8382ca9cb044f0f39cde41d821d1412a98859d62a639cf1512cf861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe940eb51b2499ab2a2cf92fb3e52d1c0808c37a3f9a50cdb721d28f3018cdab3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xbc12b09e0f60a6aa811e37407f8b33d9c73e4dcdc93739b8db6c75e94a54cff8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_EIP158" : {
+    "refund_OOG_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/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x5a25e65b014ee0326dfa040ff72b1d6fb5823ad608a6d1fab4b18acbf1b694d5",
-                    "mixHash" : "0x8e4e2a31fcf7c8ee1a0ff4f539c18a0f95cc2925a4b1374b889f733d3715fd40",
-                    "nonce" : "0x22e1a9c795981998",
+                    "hash" : "0x0d113883aece06ea5dd107f6a62de9732263287ca800f1801fb811297f9f76d2",
+                    "mixHash" : "0x0461a1301b44cd530d1e321ecfda5c9ad51cfb796e1b9e028dc1d9bd536fb2b9",
+                    "nonce" : "0xf40fdaedd03c5781",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
-                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
-                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
+                    "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
+                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a08e4e2a31fcf7c8ee1a0ff4f539c18a0f95cc2925a4b1374b889f733d3715fd408822e1a9c795981998f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a00461a1301b44cd530d1e321ecfda5c9ad51cfb796e1b9e028dc1d9bd536fb2b988f40fdaedd03c5781f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a25e65b014ee0326dfa040ff72b1d6fb5823ad608a6d1fab4b18acbf1b694d5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0d113883aece06ea5dd107f6a62de9732263287ca800f1801fb811297f9f76d2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_Frontier" : {
+    "refund_OOG_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/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x55a240b2de976bc6314cddd542c4686cdaa62aefffd9b37c8813013f8d929723",
-                    "mixHash" : "0xe35b1508909c41c12bd72b03cee5ac397c75b67bba65d6af8b6b40ccc4b8e27a",
-                    "nonce" : "0x27193cbad83d03b7",
+                    "hash" : "0xbcd4e57f7688e619160d59fe27af7f3b7e0d619bfe77202a3b0d0e02988232a1",
+                    "mixHash" : "0x51630dcb22c15b43afd4b3fc279d2123b65ccc265f2e0820eeebc602f3c728ab",
+                    "nonce" : "0x2a4747fe2f111751",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0e35b1508909c41c12bd72b03cee5ac397c75b67bba65d6af8b6b40ccc4b8e27a8827193cbad83d03b7f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a051630dcb22c15b43afd4b3fc279d2123b65ccc265f2e0820eeebc602f3c728ab882a4747fe2f111751f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55a240b2de976bc6314cddd542c4686cdaa62aefffd9b37c8813013f8d929723",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbcd4e57f7688e619160d59fe27af7f3b7e0d619bfe77202a3b0d0e02988232a1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_Homestead" : {
+    "refund_OOG_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/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x6c231e966b139e8f741fcdc9670b5fbe9d1a376407976d6cedba5b2812510e49",
-                    "mixHash" : "0x666cb627420e540de364dc4fd191a9a3806509c5867e9d73301a4cb4a6dc54aa",
-                    "nonce" : "0x59953cc5038bb671",
+                    "hash" : "0xace4cf4565fc085f96a8b25c9e65d8a143bb49debb98939d319fc77e2d898d8c",
+                    "mixHash" : "0x6ca4f9e5f2a0c29e8517483ddae0fba2ab143a2369e4a5a8640c32c254b16a57",
+                    "nonce" : "0x6418df4a20178008",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0666cb627420e540de364dc4fd191a9a3806509c5867e9d73301a4cb4a6dc54aa8859953cc5038bb671f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a06ca4f9e5f2a0c29e8517483ddae0fba2ab143a2369e4a5a8640c32c254b16a57886418df4a20178008f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c231e966b139e8f741fcdc9670b5fbe9d1a376407976d6cedba5b2812510e49",
-        "network" : "Homestead",
+        "lastblockhash" : "0xace4cf4565fc085f96a8b25c9e65d8a143bb49debb98939d319fc77e2d898d8c",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_Metropolis" : {
+    "refund_OOG_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/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xc64a4e7fd829cab2c121919a116058215750cc6e940d0990957729e2168ca776",
-                    "mixHash" : "0x6b90576ba23906347416f9482f7c525acd4222c338f0da9ee0e83706fb9f343b",
-                    "nonce" : "0x111805d3bbe96769",
+                    "hash" : "0xdc77a4d1952a6111da11af15d2c751a7912ee54c23380f3d7d4604aba353bf85",
+                    "mixHash" : "0x7f68dffd4eba2964a1b1d9e009996f23d1ede66d1addc9c7b17ffbdcd9e779b3",
+                    "nonce" : "0x6807b005d0d2f29d",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
-                    "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
-                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
+                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
+                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a06b90576ba23906347416f9482f7c525acd4222c338f0da9ee0e83706fb9f343b88111805d3bbe96769f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a07f68dffd4eba2964a1b1d9e009996f23d1ede66d1addc9c7b17ffbdcd9e779b3886807b005d0d2f29df861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc64a4e7fd829cab2c121919a116058215750cc6e940d0990957729e2168ca776",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdc77a4d1952a6111da11af15d2c751a7912ee54c23380f3d7d4604aba353bf85",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f46595",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x073b8b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07a120",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_OOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x6595",
+                    "hash" : "0x3684310742858fdb2f161afa2340e351cf6c118e86e014262accc21e79319031",
+                    "mixHash" : "0x80b0518a4470708f4f4e33abcc981d80bccc7ac0e88830a7180adce0d32e4fa4",
+                    "nonce" : "0xbed4ee7c8df37b73",
+                    "number" : "0x01",
+                    "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
+                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
+                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a080b0518a4470708f4f4e33abcc981d80bccc7ac0e88830a7180adce0d32e4fa488bed4ee7c8df37b73f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x6595",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82d",
+                        "s" : "0x16dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3684310742858fdb2f161afa2340e351cf6c118e86e014262accc21e79319031",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",