Hive tests with Byzantine

1 files changed, 174 insertions, 60 deletions

diff --git a/BlockchainTests/GeneralStateTests/stStaticCall/static_CallIdentity_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stStaticCall/static_CallIdentity_2_d0g0v0.json
index 921e52350..d42dbde61 100644
--- a/BlockchainTests/GeneralStateTests/stStaticCall/static_CallIdentity_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stStaticCall/static_CallIdentity_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "static_CallIdentity_2_d0g0v0_EIP150" : {
+    "static_CallIdentity_2_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/stStaticCall/static_CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0592a8",
-                    "hash" : "0xb8d87bcdf709567bee0346c6256dbdad7133d1364f5c2c1f79d72ed57862b713",
-                    "mixHash" : "0xaabfc7e63b2c5feae1d6224ceee9b2103868a440067bf88aa711430c9f2984ef",
-                    "nonce" : "0x9327e3bd93e55627",
+                    "gasUsed" : "0xf146",
+                    "hash" : "0x27c14e7e135fe8c7551f8432223ea85dd20ab7b1aac10568a17e0f9ba665399f",
+                    "mixHash" : "0xe85143ef2be95a7d67cd5f0a66f1810fbb8d30724d32853167b997772502588d",
+                    "nonce" : "0xd02e05d40551efac",
                     "number" : "0x01",
                     "parentHash" : "0xbd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3f",
-                    "receiptTrie" : "0x1ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292",
-                    "stateRoot" : "0xb220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8c",
+                    "receiptTrie" : "0x14cfb5003d810d6db0417172def8a4e75aa4c348d111e6d0ea6501c9e5052855",
+                    "stateRoot" : "0xcd55120ee23886cc7c39b82875d5069742f2120a83482266fbe61f5e5bf28abb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a0aabfc7e63b2c5feae1d6224ceee9b2103868a440067bf88aa711430c9f2984ef889327e3bd93e55627f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd55120ee23886cc7c39b82875d5069742f2120a83482266fbe61f5e5bf28abba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba014cfb5003d810d6db0417172def8a4e75aa4c348d111e6d0ea6501c9e5052855b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1468203e880a0e85143ef2be95a7d67cd5f0a66f1810fbb8d30724d32853167b997772502588d88d02e05d40551efacf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,41 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d17ce36838d0ec283191d39a55103ff5cc95f655e554821d688d7743679fbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8d87bcdf709567bee0346c6256dbdad7133d1364f5c2c1f79d72ed57862b713",
-        "network" : "EIP150",
+        "lastblockhash" : "0x27c14e7e135fe8c7551f8432223ea85dd20ab7b1aac10568a17e0f9ba665399f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600052602060006025600060046101f4fa600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf34578907f",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f146",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761881a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600052602060006025600060046101f4fa600255600051600055",
@@ -72,15 +104,106 @@
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "static_CallIdentity_2_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stStaticCall/static_CallIdentity_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf146",
+                    "hash" : "0x5fa4c6df516250b1077f5e1272e51c52fd3f6147ccf093cf31a1e35bd94993d9",
+                    "mixHash" : "0x87238f46bd7da9fef474b8f66a107adf934a4db19eae377865253901ebfdb64f",
+                    "nonce" : "0xe4731bdeb675aa4d",
+                    "number" : "0x01",
+                    "parentHash" : "0xbd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3f",
+                    "receiptTrie" : "0x14cfb5003d810d6db0417172def8a4e75aa4c348d111e6d0ea6501c9e5052855",
+                    "stateRoot" : "0xcd55120ee23886cc7c39b82875d5069742f2120a83482266fbe61f5e5bf28abb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd55120ee23886cc7c39b82875d5069742f2120a83482266fbe61f5e5bf28abba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba014cfb5003d810d6db0417172def8a4e75aa4c348d111e6d0ea6501c9e5052855b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1468203e880a087238f46bd7da9fef474b8f66a107adf934a4db19eae377865253901ebfdb64f88e4731bdeb675aa4df865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0592a8",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x82cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67f",
+                        "s" : "0x4a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc7d17ce36838d0ec283191d39a55103ff5cc95f655e554821d688d7743679fbe",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d17ce36838d0ec283191d39a55103ff5cc95f655e554821d688d7743679fbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5fa4c6df516250b1077f5e1272e51c52fd3f6147ccf093cf31a1e35bd94993d9",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x64f34578907f600052602060006025600060046101f4fa600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xf34578907f",
+                    "0x02" : "0x01"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f992a8",
+                "balance" : "0x4563918244f4f146",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75e6d58",
+                "balance" : "0x0de0b6b3a761881a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -104,10 +227,10 @@
             }
         }
     },
-    "static_CallIdentity_2_d0g0v0_EIP158" : {
+    "static_CallIdentity_2_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/stStaticCall/static_CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0592a8",
-                    "hash" : "0x64243f77e8c17d80984d19ea10f1f09ca43b6a75161dc65c03d1e40125e95879",
-                    "mixHash" : "0xdb7a117e9eb04c0e212b96a0b8521e060fc13b111b9673987348319d6c5c4fa1",
-                    "nonce" : "0x84f690a17eb236ab",
+                    "hash" : "0x7dfa2899fc49bf6d9529837874913a7942714559fc8ac7f190455727ef779316",
+                    "mixHash" : "0x0896b2acb10597eff42adfe7e94a38e737019c79abb0069d072390871c4e2298",
+                    "nonce" : "0xaacbf04c93d7d80b",
                     "number" : "0x01",
                     "parentHash" : "0xbd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3f",
                     "receiptTrie" : "0x1ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292",
@@ -130,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a0db7a117e9eb04c0e212b96a0b8521e060fc13b111b9673987348319d6c5c4fa18884f690a17eb236abf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a00896b2acb10597eff42adfe7e94a38e737019c79abb0069d072390871c4e229888aacbf04c93d7d80bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -167,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d17ce36838d0ec283191d39a55103ff5cc95f655e554821d688d7743679fbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x64243f77e8c17d80984d19ea10f1f09ca43b6a75161dc65c03d1e40125e95879",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7dfa2899fc49bf6d9529837874913a7942714559fc8ac7f190455727ef779316",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
@@ -209,10 +332,10 @@
             }
         }
     },
-    "static_CallIdentity_2_d0g0v0_Frontier" : {
+    "static_CallIdentity_2_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/stStaticCall/static_CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +347,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0592a8",
-                    "hash" : "0xb4401bb5fdc88132cc60b09fad16f34b55becd6834dfaafd1a6370b8dc9a6cd3",
-                    "mixHash" : "0xfbf2afd9e208ca8cd3b5809c9ec388097f6ce3495e5d3f4e64d303388cd8e3da",
-                    "nonce" : "0x8829dfda2fd84733",
+                    "hash" : "0x9df6b20d108374568e649332b82d34dce5440fea90b7679a2f21cfd9b64b71a4",
+                    "mixHash" : "0x321e38b301384aa84f61f967f97f8898e9b32dbcbaa40ee64d7baf74423bdd03",
+                    "nonce" : "0x262ae65e5ddf4090",
                     "number" : "0x01",
                     "parentHash" : "0xbd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3f",
                     "receiptTrie" : "0x1ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292",
@@ -235,7 +358,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a0fbf2afd9e208ca8cd3b5809c9ec388097f6ce3495e5d3f4e64d303388cd8e3da888829dfda2fd84733f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a0321e38b301384aa84f61f967f97f8898e9b32dbcbaa40ee64d7baf74423bdd0388262ae65e5ddf4090f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -272,8 +395,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d17ce36838d0ec283191d39a55103ff5cc95f655e554821d688d7743679fbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4401bb5fdc88132cc60b09fad16f34b55becd6834dfaafd1a6370b8dc9a6cd3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9df6b20d108374568e649332b82d34dce5440fea90b7679a2f21cfd9b64b71a4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
@@ -314,10 +437,10 @@
             }
         }
     },
-    "static_CallIdentity_2_d0g0v0_Homestead" : {
+    "static_CallIdentity_2_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/stStaticCall/static_CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0592a8",
-                    "hash" : "0x50989abfccf56afa78869b52e78068a09e7577d8307f35d95695c36fe3fcd5d1",
-                    "mixHash" : "0xa1a3542bfb5010df3a3a18ca6331f82857ab95c1f207af77dc6b9e78229091ed",
-                    "nonce" : "0x7e046e8c4f15b2e1",
+                    "hash" : "0x8efc8355da770d2615715ef1840b7a8db57ab707cd45bfdb759d41181d2bff4a",
+                    "mixHash" : "0x1501a38dd1bfbaec190330757c9a91c4456b580dc389fcdaed8ac3b3327ab14d",
+                    "nonce" : "0x588bc8e2566858c6",
                     "number" : "0x01",
                     "parentHash" : "0xbd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3f",
                     "receiptTrie" : "0x1ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292",
@@ -340,7 +463,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a0a1a3542bfb5010df3a3a18ca6331f82857ab95c1f207af77dc6b9e78229091ed887e046e8c4f15b2e1f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a01501a38dd1bfbaec190330757c9a91c4456b580dc389fcdaed8ac3b3327ab14d88588bc8e2566858c6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -377,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d17ce36838d0ec283191d39a55103ff5cc95f655e554821d688d7743679fbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50989abfccf56afa78869b52e78068a09e7577d8307f35d95695c36fe3fcd5d1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8efc8355da770d2615715ef1840b7a8db57ab707cd45bfdb759d41181d2bff4a",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x01312d00",
@@ -419,10 +542,10 @@
             }
         }
     },
-    "static_CallIdentity_2_d0g0v0_Metropolis" : {
+    "static_CallIdentity_2_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/stStaticCall/static_CallIdentity_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf146",
-                    "hash" : "0x56a015b9f500e9b8709f6b406a85b537004164a4b589edbcc98c27fd20f8c074",
-                    "mixHash" : "0x17acdff5bab6ca324dcb993837e4ff16d3fa1e735bb34eff79270b656d1648b8",
-                    "nonce" : "0x007f21f58053137b",
+                    "gasUsed" : "0x0592a8",
+                    "hash" : "0x76442a0d440568e8dead0581dab1f6d61e223dae1c5fdce823e7986cf570fd1d",
+                    "mixHash" : "0xd6f37bbe3b50a320985bc73eb943487e27c317bf22c48c21e0047fe70e65cdd7",
+                    "nonce" : "0x88558ad299f0d385",
                     "number" : "0x01",
                     "parentHash" : "0xbd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3f",
-                    "receiptTrie" : "0x14cfb5003d810d6db0417172def8a4e75aa4c348d111e6d0ea6501c9e5052855",
-                    "stateRoot" : "0xcd55120ee23886cc7c39b82875d5069742f2120a83482266fbe61f5e5bf28abb",
+                    "receiptTrie" : "0x1ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292",
+                    "stateRoot" : "0xb220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd55120ee23886cc7c39b82875d5069742f2120a83482266fbe61f5e5bf28abba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba014cfb5003d810d6db0417172def8a4e75aa4c348d111e6d0ea6501c9e5052855b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1468203e880a017acdff5bab6ca324dcb993837e4ff16d3fa1e735bb34eff79270b656d1648b888007f21f58053137bf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a0bd37f68dc620ffe17fd9e159c2243bd0e71ec6d31f65c9fe95de489731c3fa3fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b220002d8be3924cf485b6a2d8243864772e9f72253b8b9da5efff8c17b10f8ca098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba01ca2ad7da4de28a4bf478429e4e3f990acdf944b431ba0b47cfd5eb406a83292b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830592a88203e880a0d6f37bbe3b50a320985bc73eb943487e27c317bf22c48c21e0047fe70e65cdd78888558ad299f0d385f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -482,34 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7d17ce36838d0ec283191d39a55103ff5cc95f655e554821d688d7743679fbea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56a015b9f500e9b8709f6b406a85b537004164a4b589edbcc98c27fd20f8c074",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x76442a0d440568e8dead0581dab1f6d61e223dae1c5fdce823e7986cf570fd1d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0132b3a0",
+                "balance" : "0x01312d00",
                 "code" : "0x64f34578907f600052602060006025600060046101f4fa600255600051600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0xf34578907f",
-                    "0x02" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f146",
+                "balance" : "0x4563918244f992a8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761881a",
+                "balance" : "0x0de0b6b3a75e6d58",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {