Hive tests with Byzantine

1 files changed, 187 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0.json
index 74e770271..bad168226 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallGoesOOGOnSecondLevel2_d0g0v0_EIP150" : {
+    "CallGoesOOGOnSecondLevel2_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/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xa9a73d06e123dbfd81451dd7b91faa8f2e021ed692eff3604dd111744827d0a4",
-                    "mixHash" : "0x9edf6543a87a1eccc91cc7265b789a8994297276a4e47abb8604f836a8dcb28f",
-                    "nonce" : "0x5a4e4002cd1f8415",
+                    "hash" : "0xa78f0c6e2eee2ab7ea65382ce8203c9c96cffc6271de0f724f8280900002b174",
+                    "mixHash" : "0xb60412b5e7a0d3b66d34d0f3159e217f4a12493dc193580fea1226b254691d0c",
+                    "nonce" : "0x72e759af7310e5d6",
                     "number" : "0x01",
                     "parentHash" : "0xe8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54bab",
-                    "receiptTrie" : "0x9f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1",
-                    "stateRoot" : "0x446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0x35aa12782062a19c3b2fefa242eb4e9786531c14d56e39ab4a17124742162cfa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a09edf6543a87a1eccc91cc7265b789a8994297276a4e47abb8604f836a8dcb28f885a4e4002cd1f8415f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035aa12782062a19c3b2fefa242eb4e9786531c14d56e39ab4a17124742162cfaa048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0b60412b5e7a0d3b66d34d0f3159e217f4a12493dc193580fea1226b254691d0c8872e759af7310e5d6f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b96926f7fc274bed02485656a83a4ebb0af860bc8b2d71ef789edc7405f58590a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9a73d06e123dbfd81451dd7b91faa8f2e021ed692eff3604dd111744827d0a4",
-        "network" : "EIP150",
+        "lastblockhash" : "0xa78f0c6e2eee2ab7ea65382ce8203c9c96cffc6271de0f724f8280900002b174",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000114620927c0f1600955",
@@ -132,10 +139,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2_d0g0v0_EIP158" : {
+    "CallGoesOOGOnSecondLevel2_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/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -147,18 +154,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xd9dd4b3afb188552abfb6b4ec60030e33d6c321563613f792f1ad7e0e56ef3aa",
-                    "mixHash" : "0xdfce8c836c3f85569deba23b5de1091db4eb09a1d4f64de07c729dc6adc39687",
-                    "nonce" : "0x42e20618fa6f67e9",
+                    "hash" : "0x77d775273683ced720b6ab0e9d71b8429fce47a2585b354ed4cbf7063b837b18",
+                    "mixHash" : "0xe5f0dff11e09d399831b8541a58acf77c2d63b2b379e5201621c37a21c154863",
+                    "nonce" : "0xe1bd9d77da4d1210",
                     "number" : "0x01",
                     "parentHash" : "0xe8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54bab",
-                    "receiptTrie" : "0x9f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1",
-                    "stateRoot" : "0x446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3",
+                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
+                    "stateRoot" : "0x35aa12782062a19c3b2fefa242eb4e9786531c14d56e39ab4a17124742162cfa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0dfce8c836c3f85569deba23b5de1091db4eb09a1d4f64de07c729dc6adc396878842e20618fa6f67e9f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035aa12782062a19c3b2fefa242eb4e9786531c14d56e39ab4a17124742162cfaa048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e5f0dff11e09d399831b8541a58acf77c2d63b2b379e5201621c37a21c15486388e1bd9d77da4d1210f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -195,9 +202,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b96926f7fc274bed02485656a83a4ebb0af860bc8b2d71ef789edc7405f58590a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9dd4b3afb188552abfb6b4ec60030e33d6c321563613f792f1ad7e0e56ef3aa",
-        "network" : "EIP158",
+        "lastblockhash" : "0x77d775273683ced720b6ab0e9d71b8429fce47a2585b354ed4cbf7063b837b18",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000114620927c0f1600955",
@@ -265,10 +279,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2_d0g0v0_Frontier" : {
+    "CallGoesOOGOnSecondLevel2_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/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -280,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xf7a6b84d02c3ff6e87e3db8e1bc224bd062965348b0ffaad2f8eb7e0124ebd80",
-                    "mixHash" : "0xeae24b6ee34cb2ea4914ced61a8ffefcaffc4c710fdfd4575827f79b1d5fb4b2",
-                    "nonce" : "0x61906f31e2d0d2d4",
+                    "hash" : "0xa78cf13ec17b8d354ee3c5e35adc8f9e9f4d3ce6026537387a0d9d83c489bbdb",
+                    "mixHash" : "0x51eb73b730ab859c5868a53bd574e547a452c1838a5f302a93ea4db119d72256",
+                    "nonce" : "0x229f12858fd396d7",
                     "number" : "0x01",
                     "parentHash" : "0xe8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54bab",
                     "receiptTrie" : "0x9f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1",
@@ -291,7 +305,7 @@
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0eae24b6ee34cb2ea4914ced61a8ffefcaffc4c710fdfd4575827f79b1d5fb4b28861906f31e2d0d2d4f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a051eb73b730ab859c5868a53bd574e547a452c1838a5f302a93ea4db119d7225688229f12858fd396d7f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -328,8 +342,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b96926f7fc274bed02485656a83a4ebb0af860bc8b2d71ef789edc7405f58590a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7a6b84d02c3ff6e87e3db8e1bc224bd062965348b0ffaad2f8eb7e0124ebd80",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa78cf13ec17b8d354ee3c5e35adc8f9e9f4d3ce6026537387a0d9d83c489bbdb",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
@@ -398,10 +412,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2_d0g0v0_Homestead" : {
+    "CallGoesOOGOnSecondLevel2_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/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -413,9 +427,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xf17d68d488ed66232b89ebc4e95152c13050da5b7ec6f7009e639d5eb564ca07",
-                    "mixHash" : "0xe7a46cceec38667d45b172b05486e3407e5aa577e85c93c401cbf22cea378b8a",
-                    "nonce" : "0xbb09a90517995de9",
+                    "hash" : "0x4275ca1502c892ba3b997785db3075fa6a8faba3821ff61235c9873e2473836c",
+                    "mixHash" : "0x6ab9a13d0bc78027c671d0278318319d0203abe7fdfa1d1b295f1f235f3c6bfc",
+                    "nonce" : "0x47993eb5d39d913a",
                     "number" : "0x01",
                     "parentHash" : "0xe8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54bab",
                     "receiptTrie" : "0x9f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1",
@@ -424,7 +438,7 @@
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0e7a46cceec38667d45b172b05486e3407e5aa577e85c93c401cbf22cea378b8a88bb09a90517995de9f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a06ab9a13d0bc78027c671d0278318319d0203abe7fdfa1d1b295f1f235f3c6bfc8847993eb5d39d913af862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -461,8 +475,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b96926f7fc274bed02485656a83a4ebb0af860bc8b2d71ef789edc7405f58590a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf17d68d488ed66232b89ebc4e95152c13050da5b7ec6f7009e639d5eb564ca07",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4275ca1502c892ba3b997785db3075fa6a8faba3821ff61235c9873e2473836c",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
@@ -531,10 +545,10 @@
             }
         }
     },
-    "CallGoesOOGOnSecondLevel2_d0g0v0_Metropolis" : {
+    "CallGoesOOGOnSecondLevel2_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/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -546,18 +560,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x027100",
-                    "hash" : "0xc2e33af3651b00a26518307ed0e4a13779977db38aaf7ca300b42238117ef5d6",
-                    "mixHash" : "0xf549db3c604465ea3a081533ddedeeed547e6c794f694bae5a0d0f862b1a05ea",
-                    "nonce" : "0xe01bf4ac45ad8f70",
+                    "hash" : "0x283248c4783cf67fec9eea8dc270f98e12e335d2b8ad4ce983331938c86213b6",
+                    "mixHash" : "0xc3736eb54d7bc22e263f5925541c992fca1571094c3c2669aac2b6e43624e70d",
+                    "nonce" : "0x73891b3e5435e1a6",
                     "number" : "0x01",
                     "parentHash" : "0xe8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54bab",
-                    "receiptTrie" : "0x3bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219c",
-                    "stateRoot" : "0x35aa12782062a19c3b2fefa242eb4e9786531c14d56e39ab4a17124742162cfa",
+                    "receiptTrie" : "0x9f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1",
+                    "stateRoot" : "0x446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035aa12782062a19c3b2fefa242eb4e9786531c14d56e39ab4a17124742162cfaa048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca03bad232520ae4f837dcf8149d87076661065f025fb999b80b24542cb0dd5219cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0f549db3c604465ea3a081533ddedeeed547e6c794f694bae5a0d0f862b1a05ea88e01bf4ac45ad8f70f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0c3736eb54d7bc22e263f5925541c992fca1571094c3c2669aac2b6e43624e70d8873891b3e5435e1a6f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -594,16 +608,142 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b96926f7fc274bed02485656a83a4ebb0af860bc8b2d71ef789edc7405f58590a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc2e33af3651b00a26518307ed0e4a13779977db38aaf7ca300b42238117ef5d6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x283248c4783cf67fec9eea8dc270f98e12e335d2b8ad4ce983331938c86213b6",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x1000000000000000000000000000000000000113" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000114620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000114" : {
+                "balance" : "0x00",
+                "code" : "0x5a6008555a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f67100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a29f00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000113620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000113" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000114620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000114" : {
                 "balance" : "0x00",
+                "code" : "0x5a6008555a6009555a600a55",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000113620927c0f1600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallGoesOOGOnSecondLevel2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150Specific/CallGoesOOGOnSecondLevel2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x027100",
+                    "hash" : "0x486d97ddc9f7b68b3d48284ca483c88597db93c1956fbdc655e73dbd4ae90ff4",
+                    "mixHash" : "0x006e546c53fdaf296a0b8aa80c3200f3d925f96c70ae8ae7f8b908d8974793f1",
+                    "nonce" : "0x58043873dad89627",
+                    "number" : "0x01",
+                    "parentHash" : "0xe8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54bab",
+                    "receiptTrie" : "0x9f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1",
+                    "stateRoot" : "0x446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x48de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54baba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0446b361d12723e05f725e0519de8f784642492736d4b3ea5a41a57d7a38971c3a048de76fecf3aeeaae1e83fbc52c474652e21443a3dbe2c1d17b806dcd3e5564ca09f4a3d6e3875d008e4645907985d858bbf5dee0c23c4e068278690cae3b7ebe1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830271008203e880a0006e546c53fdaf296a0b8aa80c3200f3d925f96c70ae8ae7f8b908d8974793f18858043873dad89627f862f86080018302710094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba0fb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4a0109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x027100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xfb701574e75cc01b4264dd2ed3f33461f7c79a389f14b9ab573b954bd91f2ac4",
+                        "s" : "0x109929d030f5e49fefa7b3319c75d134b76f6bd7c60e2375714633a7fede8db0",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe8bb1860e966ac9fe7b779c3e6b3b50923f0852959a7dc106455a62528d54bab",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb96926f7fc274bed02485656a83a4ebb0af860bc8b2d71ef789edc7405f58590",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b96926f7fc274bed02485656a83a4ebb0af860bc8b2d71ef789edc7405f58590a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x486d97ddc9f7b68b3d48284ca483c88597db93c1956fbdc655e73dbd4ae90ff4",
+        "network" : "Homestead",
+        "postState" : {
             "0x1000000000000000000000000000000000000113" : {
                 "balance" : "0x00",
                 "code" : "0x5a60085560006000600060006000731000000000000000000000000000000000000114620927c0f1600955",