Hive tests with Byzantine

1 files changed, 191 insertions, 62 deletions

diff --git a/BlockchainTests/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP_d0g0v0.json b/BlockchainTests/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP_d0g0v0.json
index 27c4ebc6d..d895d4307 100644
--- a/BlockchainTests/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stEIP150Specific/DelegateCallOnEIP_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "DelegateCallOnEIP_d0g0v0_EIP150" : {
+    "DelegateCallOnEIP_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/DelegateCallOnEIP_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f44",
-                    "hash" : "0x90151bb980635b8cba04c5900b21bb13497555b556f836095cd764af9d463f48",
-                    "mixHash" : "0x25411a0442cdc4e5aaf334e3ae68af60a4b8ea7f92edb20516dc52631eb90b4e",
-                    "nonce" : "0xd4d460a2e14c2360",
+                    "hash" : "0x492ec597e997285a5da2a430864c9090cc671840af2538d716b5ee757a9f38ee",
+                    "mixHash" : "0xb4692911612ab77da59654eb3965cd0d1fb197f6ccaf713d17c1c986ec34faf9",
+                    "nonce" : "0xf6b93c699ea5a080",
                     "number" : "0x01",
                     "parentHash" : "0x9c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2",
-                    "receiptTrie" : "0xf90e3087eb2727356104748ec4708ff1f85bc449a6c698eec5539d7b6dd7d783",
-                    "stateRoot" : "0xf653c65ee25deb7af048e3028ab79a39584dd357434c1d459c9cd819d56c6d57",
+                    "receiptTrie" : "0xbf3289d7414d5ddeb115335e01a98a57fd002bcb18aee694b56ff97feed29860",
+                    "stateRoot" : "0x0813a442d9dd0e3c78ddf9401353e4c74f30ff50e52ea10edaf9c3b843e73b33",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f653c65ee25deb7af048e3028ab79a39584dd357434c1d459c9cd819d56c6d57a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f90e3087eb2727356104748ec4708ff1f85bc449a6c698eec5539d7b6dd7d783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f448203e880a025411a0442cdc4e5aaf334e3ae68af60a4b8ea7f92edb20516dc52631eb90b4e88d4d460a2e14c2360f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00813a442d9dd0e3c78ddf9401353e4c74f30ff50e52ea10edaf9c3b843e73b33a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bf3289d7414d5ddeb115335e01a98a57fd002bcb18aee694b56ff97feed29860b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f448203e880a0b4692911612ab77da59654eb3965cd0d1fb197f6ccaf713d17c1c986ec34faf988f6b93c699ea5a080f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071dde4c40fda8168785d76c203ceb14c6d14a05d292a909c25b691e4a50790a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x90151bb980635b8cba04c5900b21bb13497555b556f836095cd764af9d463f48",
-        "network" : "EIP150",
+        "lastblockhash" : "0x492ec597e997285a5da2a430864c9090cc671840af2538d716b5ee757a9f38ee",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
@@ -121,10 +128,10 @@
             }
         }
     },
-    "DelegateCallOnEIP_d0g0v0_EIP158" : {
+    "DelegateCallOnEIP_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/DelegateCallOnEIP_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -136,9 +143,138 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013f44",
-                    "hash" : "0xbf89a5ebdd9722fa180dbc74e4bd4bf37d2f33a8e592de1feb7e20c4dacc4def",
-                    "mixHash" : "0x5c09d018ebe8be956b59ddbcfad7a95ca4c4a19288d08a11213e595cd8c830a4",
-                    "nonce" : "0x678e629871d271b0",
+                    "hash" : "0x68a13648e3d199345f8cfe8c3d55fb1288a6569ad730bf4e4ce7b5fbd06fc005",
+                    "mixHash" : "0x7293356a6e2cc1b2beb37c729b597c719fc7f08fcd06a4d85c28d079689436ca",
+                    "nonce" : "0x1f8d4c3f645f6e61",
+                    "number" : "0x01",
+                    "parentHash" : "0x9c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2",
+                    "receiptTrie" : "0xbf3289d7414d5ddeb115335e01a98a57fd002bcb18aee694b56ff97feed29860",
+                    "stateRoot" : "0x0813a442d9dd0e3c78ddf9401353e4c74f30ff50e52ea10edaf9c3b843e73b33",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00813a442d9dd0e3c78ddf9401353e4c74f30ff50e52ea10edaf9c3b843e73b33a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bf3289d7414d5ddeb115335e01a98a57fd002bcb18aee694b56ff97feed29860b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f448203e880a07293356a6e2cc1b2beb37c729b597c719fc7f08fcd06a4d85c28d079689436ca881f8d4c3f645f6e61f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0927c0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6",
+                        "s" : "0x02f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7c",
+                        "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x9c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x71dde4c40fda8168785d76c203ceb14c6d14a05d292a909c25b691e4a50790a6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071dde4c40fda8168785d76c203ceb14c6d14a05d292a909c25b691e4a50790a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x68a13648e3d199345f8cfe8c3d55fb1288a6569ad730bf4e4ce7b5fbd06fc005",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000105" : {
+                "balance" : "0x00",
+                "code" : "0x6012600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f53f44",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a3d0bc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6008556000600060006000731000000000000000000000000000000000000105620927c0f4600955",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x12",
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000105" : {
+                "balance" : "0x00",
+                "code" : "0x6012600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xe8d4a51000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x5a6008556000600060006000731000000000000000000000000000000000000105620927c0f4600955",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "DelegateCallOnEIP_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stEIP150Specific/DelegateCallOnEIP_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x013f44",
+                    "hash" : "0x27929d349352b203ffb79f4e68c088eea9246d58f60d8de2d2a59b271ec50113",
+                    "mixHash" : "0xb22c848974af8b3d4d52f38420d8afdce3d8ab4c1a2966310d4b29bb9ed47902",
+                    "nonce" : "0x7608caecdbb47c46",
                     "number" : "0x01",
                     "parentHash" : "0x9c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2",
                     "receiptTrie" : "0xf90e3087eb2727356104748ec4708ff1f85bc449a6c698eec5539d7b6dd7d783",
@@ -147,7 +283,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f653c65ee25deb7af048e3028ab79a39584dd357434c1d459c9cd819d56c6d57a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f90e3087eb2727356104748ec4708ff1f85bc449a6c698eec5539d7b6dd7d783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f448203e880a05c09d018ebe8be956b59ddbcfad7a95ca4c4a19288d08a11213e595cd8c830a488678e629871d271b0f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f653c65ee25deb7af048e3028ab79a39584dd357434c1d459c9cd819d56c6d57a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f90e3087eb2727356104748ec4708ff1f85bc449a6c698eec5539d7b6dd7d783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f448203e880a0b22c848974af8b3d4d52f38420d8afdce3d8ab4c1a2966310d4b29bb9ed47902887608caecdbb47c46f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -184,8 +320,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071dde4c40fda8168785d76c203ceb14c6d14a05d292a909c25b691e4a50790a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf89a5ebdd9722fa180dbc74e4bd4bf37d2f33a8e592de1feb7e20c4dacc4def",
-        "network" : "EIP158",
+        "lastblockhash" : "0x27929d349352b203ffb79f4e68c088eea9246d58f60d8de2d2a59b271ec50113",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
@@ -243,10 +379,10 @@
             }
         }
     },
-    "DelegateCallOnEIP_d0g0v0_Frontier" : {
+    "DelegateCallOnEIP_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/DelegateCallOnEIP_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -257,19 +393,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0927c0",
-                    "hash" : "0x094ca23c550319b781ed5fb16b1e652d4fff936166443b51f2c45971ab06f9af",
-                    "mixHash" : "0xb8708667293a0d7d650c0c9023138d55e82b5b59c3ce651a4a2540528e637613",
-                    "nonce" : "0x060ebbcb102ff3c6",
+                    "gasUsed" : "0x013f44",
+                    "hash" : "0xf957a0cd6b6d31b211afc8d1cd2450a30153e128da88c5944357f2edb1e074ac",
+                    "mixHash" : "0x29a9b097844aa24ae46ccea94590cafb1ee79ae3a105e21271c4b84eae97b062",
+                    "nonce" : "0x450a46a2c6a27ab6",
                     "number" : "0x01",
                     "parentHash" : "0x9c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2",
-                    "receiptTrie" : "0x9fe9846dff5aa5e26d4f42dc5f49a6894abe5d6dd3b01928a6f1543cc393302c",
-                    "stateRoot" : "0x0268ff98b043d098a40b21c06b0d49a650160b253a31a1807464582cedf67de0",
+                    "receiptTrie" : "0xf90e3087eb2727356104748ec4708ff1f85bc449a6c698eec5539d7b6dd7d783",
+                    "stateRoot" : "0xf653c65ee25deb7af048e3028ab79a39584dd357434c1d459c9cd819d56c6d57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00268ff98b043d098a40b21c06b0d49a650160b253a31a1807464582cedf67de0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a09fe9846dff5aa5e26d4f42dc5f49a6894abe5d6dd3b01928a6f1543cc393302cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a0b8708667293a0d7d650c0c9023138d55e82b5b59c3ce651a4a2540528e63761388060ebbcb102ff3c6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f653c65ee25deb7af048e3028ab79a39584dd357434c1d459c9cd819d56c6d57a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0f90e3087eb2727356104748ec4708ff1f85bc449a6c698eec5539d7b6dd7d783b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f448203e880a029a9b097844aa24ae46ccea94590cafb1ee79ae3a105e21271c4b84eae97b06288450a46a2c6a27ab6f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -306,8 +442,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071dde4c40fda8168785d76c203ceb14c6d14a05d292a909c25b691e4a50790a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x094ca23c550319b781ed5fb16b1e652d4fff936166443b51f2c45971ab06f9af",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf957a0cd6b6d31b211afc8d1cd2450a30153e128da88c5944357f2edb1e074ac",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
@@ -317,14 +453,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fd27c0",
+                "balance" : "0x4563918244f53f44",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d49be840",
+                "balance" : "0xe8d4a3d0bc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,6 +471,9 @@
                 "code" : "0x5a6008556000600060006000731000000000000000000000000000000000000105620927c0f4600955",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x12",
+                    "0x08" : "0x08d5b6",
+                    "0x09" : "0x01"
                 }
             }
         },
@@ -362,10 +501,10 @@
             }
         }
     },
-    "DelegateCallOnEIP_d0g0v0_Homestead" : {
+    "DelegateCallOnEIP_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/DelegateCallOnEIP_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -377,9 +516,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0927c0",
-                    "hash" : "0xb2a81cd47e1fbb72da74fe8ccc9a61339320da764c337af9aed7ccb5b5d57208",
-                    "mixHash" : "0x43b7a9caf0452482f07e03cb6168c6649e407e9fee6d3c8f7557a7cc3834b496",
-                    "nonce" : "0x9fb13803ff1dc056",
+                    "hash" : "0xc38218efade117f7b35dbebf2aac3372d04ffa24e152e9cc3882a64a6fa21297",
+                    "mixHash" : "0x2b51c0fc927ad0c9a0524ee2141af19c8899aff3d29baf66b19f7c56901a3c1e",
+                    "nonce" : "0x13e37d2a07c2178c",
                     "number" : "0x01",
                     "parentHash" : "0x9c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2",
                     "receiptTrie" : "0x9fe9846dff5aa5e26d4f42dc5f49a6894abe5d6dd3b01928a6f1543cc393302c",
@@ -388,7 +527,7 @@
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00268ff98b043d098a40b21c06b0d49a650160b253a31a1807464582cedf67de0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a09fe9846dff5aa5e26d4f42dc5f49a6894abe5d6dd3b01928a6f1543cc393302cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a043b7a9caf0452482f07e03cb6168c6649e407e9fee6d3c8f7557a7cc3834b496889fb13803ff1dc056f862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00268ff98b043d098a40b21c06b0d49a650160b253a31a1807464582cedf67de0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a09fe9846dff5aa5e26d4f42dc5f49a6894abe5d6dd3b01928a6f1543cc393302cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a02b51c0fc927ad0c9a0524ee2141af19c8899aff3d29baf66b19f7c56901a3c1e8813e37d2a07c2178cf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -425,8 +564,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071dde4c40fda8168785d76c203ceb14c6d14a05d292a909c25b691e4a50790a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2a81cd47e1fbb72da74fe8ccc9a61339320da764c337af9aed7ccb5b5d57208",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc38218efade117f7b35dbebf2aac3372d04ffa24e152e9cc3882a64a6fa21297",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
@@ -481,10 +620,10 @@
             }
         }
     },
-    "DelegateCallOnEIP_d0g0v0_Metropolis" : {
+    "DelegateCallOnEIP_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stEIP150Specific/DelegateCallOnEIP_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -495,19 +634,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013f44",
-                    "hash" : "0x2c4cc69c58bc007a0e98164039ab179632479f584d392cecfc7542d0b2e1b3ea",
-                    "mixHash" : "0x94c0a45ef8257db66b1f338fe5553150454b6b648cde578573338bd1f339696b",
-                    "nonce" : "0xcc971805297eb8cc",
+                    "gasUsed" : "0x0927c0",
+                    "hash" : "0xc05188d6fe9c189dcde178a39be2ee43ac89e6f5fc57b062fbe185fc3651d138",
+                    "mixHash" : "0x7303f10f2d737c170bea0c06370801fcba70fd51bf97d8a14088227dcae2e9c8",
+                    "nonce" : "0xd0648b428a4cd35a",
                     "number" : "0x01",
                     "parentHash" : "0x9c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2",
-                    "receiptTrie" : "0xbf3289d7414d5ddeb115335e01a98a57fd002bcb18aee694b56ff97feed29860",
-                    "stateRoot" : "0x0813a442d9dd0e3c78ddf9401353e4c74f30ff50e52ea10edaf9c3b843e73b33",
+                    "receiptTrie" : "0x9fe9846dff5aa5e26d4f42dc5f49a6894abe5d6dd3b01928a6f1543cc393302c",
+                    "stateRoot" : "0x0268ff98b043d098a40b21c06b0d49a650160b253a31a1807464582cedf67de0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x59652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00813a442d9dd0e3c78ddf9401353e4c74f30ff50e52ea10edaf9c3b843e73b33a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a0bf3289d7414d5ddeb115335e01a98a57fd002bcb18aee694b56ff97feed29860b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083013f448203e880a094c0a45ef8257db66b1f338fe5553150454b6b648cde578573338bd1f339696b88cc971805297eb8ccf862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
+                "rlp" : "0xf90260f901f8a09c6e4d459505d36318606ba74b85c0be504082f1ef297b3014b41d0bb75405f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00268ff98b043d098a40b21c06b0d49a650160b253a31a1807464582cedf67de0a059652e5662eb625efd106d67b9b25d3c12a15e69494d1d24f59d867c211f6761a09fe9846dff5aa5e26d4f42dc5f49a6894abe5d6dd3b01928a6f1543cc393302cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830927c08203e880a07303f10f2d737c170bea0c06370801fcba70fd51bf97d8a14088227dcae2e9c888d0648b428a4cd35af862f8608001830927c094b94f5374fce5edbc8e2a8697c15331677e6ebf0b80801ba08d0699f23d032b86db35ed7bb39c2357bec870fbfbe7db30b1795d320d8965c6a002f578fd949e84f0dc1307f5dd714c9a7158b31891d43f45459edcb52e345f7cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -544,16 +683,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071dde4c40fda8168785d76c203ceb14c6d14a05d292a909c25b691e4a50790a6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c4cc69c58bc007a0e98164039ab179632479f584d392cecfc7542d0b2e1b3ea",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc05188d6fe9c189dcde178a39be2ee43ac89e6f5fc57b062fbe185fc3651d138",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000105" : {
                 "balance" : "0x00",
                 "code" : "0x6012600055",
@@ -562,14 +694,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53f44",
+                "balance" : "0x4563918244fd27c0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xe8d4a3d0bc",
+                "balance" : "0xe8d49be840",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -580,9 +712,6 @@
                 "code" : "0x5a6008556000600060006000731000000000000000000000000000000000000105620927c0f4600955",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x12",
-                    "0x08" : "0x08d5b6",
-                    "0x09" : "0x01"
                 }
             }
         },