Hive tests with Byzantine

1 files changed, 203 insertions, 60 deletions

diff --git a/BlockchainTests/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert_d0g1v0.json b/BlockchainTests/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert_d0g1v0.json
index 5ccc06fa1..87e889706 100644
--- a/BlockchainTests/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "static_LoopCallsThenRevert_d0g1v0_EIP150" : {
+    "static_LoopCallsThenRevert_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x8791f3",
-                    "hash" : "0x57270fb6c3531b47b78db59c70479a5beb76ee7c9e6479834c3cda973ed270d0",
-                    "mixHash" : "0xd5b187bdc74d679f6659d3f806bdb9a0244b71ed37d8f134d23a5a0ad971ce0e",
-                    "nonce" : "0xaaec584228c337bf",
+                    "hash" : "0x5790096078e218025b6d8eea296e4b36449c830dd6365128745383ef919402ef",
+                    "mixHash" : "0xff1b3eb0fc5cc152d24fa538aea3070d47a0daa3d04603fc49bec0dc39ac0dad",
+                    "nonce" : "0xa96676e0b9b8687b",
                     "number" : "0x01",
                     "parentHash" : "0xe3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801",
-                    "receiptTrie" : "0x5ec9b5ebf347fd62ec8750aa3132c4141d8d734bb042551b5f20beadeadad189",
-                    "stateRoot" : "0xfdf3157ec51390d3a6f4c30553dbae4a5d3f56079e5194718f89d275848e3ebe",
+                    "receiptTrie" : "0x82b7952b2f182d46559c4474badf0028ac018a0ce2357a2f5f440a244edbdde0",
+                    "stateRoot" : "0x66fd47935c98a9d0614e5b6e27968e821b56648f0880b725789e57d7f615dc74",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdf3157ec51390d3a6f4c30553dbae4a5d3f56079e5194718f89d275848e3ebea081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a05ec9b5ebf347fd62ec8750aa3132c4141d8d734bb042551b5f20beadeadad189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838791f38203e880a0d5b187bdc74d679f6659d3f806bdb9a0244b71ed37d8f134d23a5a0ad971ce0e88aaec584228c337bff862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
+                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066fd47935c98a9d0614e5b6e27968e821b56648f0880b725789e57d7f615dc74a081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a082b7952b2f182d46559c4474badf0028ac018a0ce2357a2f5f440a244edbdde0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838791f38203e880a0ff1b3eb0fc5cc152d24fa538aea3070d47a0daa3d04603fc49bec0dc39ac0dad88a96676e0b9b8687bf862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b45b95a7e8625a0465216c17b7d2b8ec3308235a98533684bb98bc7deaa03ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57270fb6c3531b47b78db59c70479a5beb76ee7c9e6479834c3cda973ed270d0",
-        "network" : "EIP150",
+        "lastblockhash" : "0x5790096078e218025b6d8eea296e4b36449c830dd6365128745383ef919402ef",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6103526000526000600060206000600073a0000000000000000000000000000000000000006127105a03f16000555a600155",
@@ -135,10 +142,10 @@
             }
         }
     },
-    "static_LoopCallsThenRevert_d0g1v0_EIP158" : {
+    "static_LoopCallsThenRevert_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -150,9 +157,152 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x8791f3",
-                    "hash" : "0x2383e49832488fc446a978115296ef358643dbf0b871d8c9a9969b4a093375a0",
-                    "mixHash" : "0xb1824961e8551493a5de69adfe1dd1dfe573a5e2148b472619163feac6d0003e",
-                    "nonce" : "0x39f3bf90ec6332fd",
+                    "hash" : "0x57fdafc17630df2624a7df5334519e848fa87be0873f652df133da21567f196b",
+                    "mixHash" : "0x1f4657dd41eba5e5384bd47496432eb897a91f642f6146de1fa00c11c3085629",
+                    "nonce" : "0x84675cff4f208744",
+                    "number" : "0x01",
+                    "parentHash" : "0xe3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801",
+                    "receiptTrie" : "0x82b7952b2f182d46559c4474badf0028ac018a0ce2357a2f5f440a244edbdde0",
+                    "stateRoot" : "0x66fd47935c98a9d0614e5b6e27968e821b56648f0880b725789e57d7f615dc74",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x81493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066fd47935c98a9d0614e5b6e27968e821b56648f0880b725789e57d7f615dc74a081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a082b7952b2f182d46559c4474badf0028ac018a0ce2357a2f5f440a244edbdde0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838791f38203e880a01f4657dd41eba5e5384bd47496432eb897a91f642f6146de1fa00c11c30856298884675cff4f208744f862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x895440",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x73c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3e",
+                        "s" : "0x6711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4b45b95a7e8625a0465216c17b7d2b8ec3308235a98533684bb98bc7deaa03ff",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b45b95a7e8625a0465216c17b7d2b8ec3308235a98533684bb98bc7deaa03ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x57fdafc17630df2624a7df5334519e848fa87be0873f652df133da21567f196b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6103526000526000600060206000600073a0000000000000000000000000000000000000006127105a03f16000555a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x021070"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182457b91f3",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x5b600160003503600052600060006000600073b00000000000000000000000000000000000000061c350fa50600051600057",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0352"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d41d7e0d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600051600101600052",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6103526000526000600060206000600073a0000000000000000000000000000000000000006127105a03f16000555a600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x5b600160003503600052600060006000600073b00000000000000000000000000000000000000061c350fa50600051600057",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0352"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600051600101600052",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "static_LoopCallsThenRevert_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_LoopCallsThenRevert_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x8791f3",
+                    "hash" : "0x81bdd12bb2b37cf9003786cd52ddbce53552950a311dff01160b0269553af26f",
+                    "mixHash" : "0x6f87c02a7bf1391b8881ba0b9e571d18306e95e4818728f672d6fe1e8df55c5a",
+                    "nonce" : "0x61c7a32b2e2d6643",
                     "number" : "0x01",
                     "parentHash" : "0xe3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801",
                     "receiptTrie" : "0x5ec9b5ebf347fd62ec8750aa3132c4141d8d734bb042551b5f20beadeadad189",
@@ -161,7 +311,7 @@
                     "transactionsTrie" : "0x81493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdf3157ec51390d3a6f4c30553dbae4a5d3f56079e5194718f89d275848e3ebea081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a05ec9b5ebf347fd62ec8750aa3132c4141d8d734bb042551b5f20beadeadad189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838791f38203e880a0b1824961e8551493a5de69adfe1dd1dfe573a5e2148b472619163feac6d0003e8839f3bf90ec6332fdf862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
+                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdf3157ec51390d3a6f4c30553dbae4a5d3f56079e5194718f89d275848e3ebea081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a05ec9b5ebf347fd62ec8750aa3132c4141d8d734bb042551b5f20beadeadad189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838791f38203e880a06f87c02a7bf1391b8881ba0b9e571d18306e95e4818728f672d6fe1e8df55c5a8861c7a32b2e2d6643f862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -198,8 +348,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b45b95a7e8625a0465216c17b7d2b8ec3308235a98533684bb98bc7deaa03ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2383e49832488fc446a978115296ef358643dbf0b871d8c9a9969b4a093375a0",
-        "network" : "EIP158",
+        "lastblockhash" : "0x81bdd12bb2b37cf9003786cd52ddbce53552950a311dff01160b0269553af26f",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -271,10 +421,10 @@
             }
         }
     },
-    "static_LoopCallsThenRevert_d0g1v0_Frontier" : {
+    "static_LoopCallsThenRevert_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -285,19 +435,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x895440",
-                    "hash" : "0x03454f9f272c921e063462186ac2e1cb5983054fdb22ac764991be501e59056f",
-                    "mixHash" : "0xb38535b754fb122a9e35613a65aeeec8ad0d879269a493b7b5c6b1007eb8a5d9",
-                    "nonce" : "0xcb6d9fc0406647e5",
+                    "gasUsed" : "0x8791f3",
+                    "hash" : "0x21e43ae6c4fd999a1e6c8853d1e5e9851aa46762aae7f8080f0089a1f9611030",
+                    "mixHash" : "0x2edfaf985ea6bf50cd971045d39816d587b61a1b4cb34917b001d85ac0c3bb09",
+                    "nonce" : "0x4e3da2716c523baf",
                     "number" : "0x01",
                     "parentHash" : "0xe3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801",
-                    "receiptTrie" : "0x0303cf68ec9b49d0cc72db000d8a0e78324879a593e64bb23d2131fe36ed626b",
-                    "stateRoot" : "0xb61fe3782401f43b63be270015742ddfa171ff77daf01cf6ba1583cb8f12b508",
+                    "receiptTrie" : "0x5ec9b5ebf347fd62ec8750aa3132c4141d8d734bb042551b5f20beadeadad189",
+                    "stateRoot" : "0xfdf3157ec51390d3a6f4c30553dbae4a5d3f56079e5194718f89d275848e3ebe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61fe3782401f43b63be270015742ddfa171ff77daf01cf6ba1583cb8f12b508a081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a00303cf68ec9b49d0cc72db000d8a0e78324879a593e64bb23d2131fe36ed626bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a0b38535b754fb122a9e35613a65aeeec8ad0d879269a493b7b5c6b1007eb8a5d988cb6d9fc0406647e5f862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
+                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdf3157ec51390d3a6f4c30553dbae4a5d3f56079e5194718f89d275848e3ebea081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a05ec9b5ebf347fd62ec8750aa3132c4141d8d734bb042551b5f20beadeadad189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838791f38203e880a02edfaf985ea6bf50cd971045d39816d587b61a1b4cb34917b001d85ac0c3bb09884e3da2716c523baff862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -334,18 +484,19 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b45b95a7e8625a0465216c17b7d2b8ec3308235a98533684bb98bc7deaa03ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03454f9f272c921e063462186ac2e1cb5983054fdb22ac764991be501e59056f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x21e43ae6c4fd999a1e6c8853d1e5e9851aa46762aae7f8080f0089a1f9611030",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6103526000526000600060206000600073a0000000000000000000000000000000000000006127105a03f16000555a600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x021070"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182457d5440",
+                "balance" : "0x45639182457b91f3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -360,7 +511,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d41bbbc0",
+                "balance" : "0xe8d41d7e0d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -406,10 +557,10 @@
             }
         }
     },
-    "static_LoopCallsThenRevert_d0g1v0_Homestead" : {
+    "static_LoopCallsThenRevert_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -421,9 +572,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x895440",
-                    "hash" : "0x14adc78fc3acbbdc6b6f0ca044e2eeab1b5db069999122c893e481e645f513c7",
-                    "mixHash" : "0xff27bcb70dcd3e2e7d157d906dec60c36f5240cbfbdf522f777c5fb72de61f64",
-                    "nonce" : "0x3a2908c3cf50ca6c",
+                    "hash" : "0x178a3c76a1dd0af02fa57e5267d069a8e6013d99c2b6a1aecc9d86273a7bcc7a",
+                    "mixHash" : "0x1ac04b58dc9952731b47338f04a64de4471f5fa44ed1093e0b83cdff867742df",
+                    "nonce" : "0x57f53a7b8102d127",
                     "number" : "0x01",
                     "parentHash" : "0xe3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801",
                     "receiptTrie" : "0x0303cf68ec9b49d0cc72db000d8a0e78324879a593e64bb23d2131fe36ed626b",
@@ -432,7 +583,7 @@
                     "transactionsTrie" : "0x81493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61fe3782401f43b63be270015742ddfa171ff77daf01cf6ba1583cb8f12b508a081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a00303cf68ec9b49d0cc72db000d8a0e78324879a593e64bb23d2131fe36ed626bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a0ff27bcb70dcd3e2e7d157d906dec60c36f5240cbfbdf522f777c5fb72de61f64883a2908c3cf50ca6cf862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
+                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61fe3782401f43b63be270015742ddfa171ff77daf01cf6ba1583cb8f12b508a081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a00303cf68ec9b49d0cc72db000d8a0e78324879a593e64bb23d2131fe36ed626bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a01ac04b58dc9952731b47338f04a64de4471f5fa44ed1093e0b83cdff867742df8857f53a7b8102d127f862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -469,8 +620,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b45b95a7e8625a0465216c17b7d2b8ec3308235a98533684bb98bc7deaa03ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14adc78fc3acbbdc6b6f0ca044e2eeab1b5db069999122c893e481e645f513c7",
-        "network" : "Homestead",
+        "lastblockhash" : "0x178a3c76a1dd0af02fa57e5267d069a8e6013d99c2b6a1aecc9d86273a7bcc7a",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -541,10 +692,10 @@
             }
         }
     },
-    "static_LoopCallsThenRevert_d0g1v0_Metropolis" : {
+    "static_LoopCallsThenRevert_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_LoopCallsThenRevert_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -555,19 +706,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x8791f3",
-                    "hash" : "0x9c589d708d57fbc5c130caac331db110c0077fca26d7d87337e95b79cf730cf5",
-                    "mixHash" : "0x4c13d2e8e34b9e69595383974e3b8da8f5eb6190c78b03dbba6f8655859f649f",
-                    "nonce" : "0x83cea00e4ecb48b0",
+                    "gasUsed" : "0x895440",
+                    "hash" : "0x425086163e2969cef9b3b77b99d5d40ac20037b749e4d9ba99c2ff99875f4113",
+                    "mixHash" : "0xa7cbea397ece15b75539ebec433029a922e2af87ccaefc9248254c26feebb9a0",
+                    "nonce" : "0x91a5d31a6c4410af",
                     "number" : "0x01",
                     "parentHash" : "0xe3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801",
-                    "receiptTrie" : "0x82b7952b2f182d46559c4474badf0028ac018a0ce2357a2f5f440a244edbdde0",
-                    "stateRoot" : "0x66fd47935c98a9d0614e5b6e27968e821b56648f0880b725789e57d7f615dc74",
+                    "receiptTrie" : "0x0303cf68ec9b49d0cc72db000d8a0e78324879a593e64bb23d2131fe36ed626b",
+                    "stateRoot" : "0xb61fe3782401f43b63be270015742ddfa171ff77daf01cf6ba1583cb8f12b508",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x81493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa066fd47935c98a9d0614e5b6e27968e821b56648f0880b725789e57d7f615dc74a081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a082b7952b2f182d46559c4474badf0028ac018a0ce2357a2f5f440a244edbdde0b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838791f38203e880a04c13d2e8e34b9e69595383974e3b8da8f5eb6190c78b03dbba6f8655859f649f8883cea00e4ecb48b0f862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
+                "rlp" : "0xf90260f901f8a0e3ddb900224835013cd35fff070ff631b117b62677c5c579b5c305c7c681a801a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b61fe3782401f43b63be270015742ddfa171ff77daf01cf6ba1583cb8f12b508a081493849ad5828f9331f2c8a877f69e3d5bc1e7ede6c0f0457db373b129b96a2a00303cf68ec9b49d0cc72db000d8a0e78324879a593e64bb23d2131fe36ed626bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680838954408203e880a0a7cbea397ece15b75539ebec433029a922e2af87ccaefc9248254c26feebb9a08891a5d31a6c4410aff862f86080018389544094100000000000000000000000000000000000000080801ba073c6fc401d96e8f4ac0c03b220ce80e6c24cf80ef823acc5952c24f420eede3ea06711fe14217e98757e67cc81b199a23099497909ca3277a80c119f55625402a3c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -604,26 +755,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b45b95a7e8625a0465216c17b7d2b8ec3308235a98533684bb98bc7deaa03ffa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c589d708d57fbc5c130caac331db110c0077fca26d7d87337e95b79cf730cf5",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x425086163e2969cef9b3b77b99d5d40ac20037b749e4d9ba99c2ff99875f4113",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x6103526000526000600060206000600073a0000000000000000000000000000000000000006127105a03f16000555a600155",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x021070"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182457b91f3",
+                "balance" : "0x45639182457d5440",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -638,7 +781,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d41d7e0d",
+                "balance" : "0xe8d41bbbc0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {