Hive tests with Byzantine

1 files changed, 173 insertions, 59 deletions

diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json
index 750d680ec..b9270827b 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODEIdentity_4_gas18_d0g0v0_EIP150" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0x307813146ce9894d02cc90613f793cb034d05bf904d31c06de1ae7f321b90e2f",
-                    "mixHash" : "0xa84117330810ddcea127f9f1afc9bb0977bf941397178dd221b337c637ba5ffc",
-                    "nonce" : "0x82f1523b92ec0098",
+                    "hash" : "0x361857add396521dc1556d9a424a85d511e08617598d1703c8e2b8dd572ce101",
+                    "mixHash" : "0x4fd8881878665b879b9599d6f465f20c5ea7af18ff1761c7b72dad82f9314c7f",
+                    "nonce" : "0x7000147642183fde",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
-                    "receiptTrie" : "0x11243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1",
-                    "stateRoot" : "0xfeb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0xf0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0a84117330810ddcea127f9f1afc9bb0977bf941397178dd221b337c637ba5ffc8882f1523b92ec0098f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a04fd8881878665b879b9599d6f465f20c5ea7af18ff1761c7b72dad82f9314c7f887000147642183fdef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x307813146ce9894d02cc90613f793cb034d05bf904d31c06de1ae7f321b90e2f",
-        "network" : "EIP150",
+        "lastblockhash" : "0x361857add396521dc1556d9a424a85d511e08617598d1703c8e2b8dd572ce101",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
@@ -106,10 +113,124 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_EIP158" : {
+    "CALLCODEIdentity_4_gas18_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x5c33633902b3b5a0093c273bad112f860beae8c70d08b9e00f5d91216c30daac",
+                    "mixHash" : "0x42d9eabbf4193a8ee6f00a43387e2e50d7342b4f59c00e1ea3d775ea32db60c8",
+                    "nonce" : "0x2e52532ea0eb46e8",
+                    "number" : "0x01",
+                    "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
+                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
+                    "stateRoot" : "0xf0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a042d9eabbf4193a8ee6f00a43387e2e50d7342b4f59c00e1ea3d775ea32db60c8882e52532ea0eb46e8f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "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" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5c33633902b3b5a0093c273bad112f860beae8c70d08b9e00f5d91216c30daac",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f143",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761881d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf143",
-                    "hash" : "0x84407754531652576f40c252108dae61890a1803456b3ff951a9bc4ca58f6d13",
-                    "mixHash" : "0xf9cdf47f404d560bd2bace6953959de5d094477a98d580ab4dd1c194b38b6c47",
-                    "nonce" : "0xc79dc31259591029",
+                    "hash" : "0x4dd5c64e011932a7638f91d6f7d2f64eba517154d2b15c3827d5039c4703017e",
+                    "mixHash" : "0xc4d9ced2bf8e6a5dc90535c4007d2d34c2fe0a509f0ff410cb6b6f1ec639df3c",
+                    "nonce" : "0xd5f75dd0b36cd794",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
                     "receiptTrie" : "0x11243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1",
@@ -132,7 +253,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0f9cdf47f404d560bd2bace6953959de5d094477a98d580ab4dd1c194b38b6c4788c79dc31259591029f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0c4d9ced2bf8e6a5dc90535c4007d2d34c2fe0a509f0ff410cb6b6f1ec639df3c88d5f75dd0b36cd794f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x84407754531652576f40c252108dae61890a1803456b3ff951a9bc4ca58f6d13",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4dd5c64e011932a7638f91d6f7d2f64eba517154d2b15c3827d5039c4703017e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -213,10 +334,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_Frontier" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +348,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xeeaf",
-                    "hash" : "0xf7e479e860cf5ec831927f0bfc780e3bfa48db7c14a37cc44a5ef11bdd2fac70",
-                    "mixHash" : "0xc2d84273ec859ebc691ff6e01b180af72a204553600761cf8581171f3422950f",
-                    "nonce" : "0xd233b126b3a8ad74",
+                    "gasUsed" : "0xf143",
+                    "hash" : "0x7d0e81e8017374b6fd3ccca7d54e10411c63e80bdd526bfa7cae83a3e41d276e",
+                    "mixHash" : "0x51c2199b3d3475822469420de6d42bf58dac35774d0824ceaa551ba4bbb754de",
+                    "nonce" : "0x24dae7f40b2e4919",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
-                    "receiptTrie" : "0x49856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7",
-                    "stateRoot" : "0x4258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12",
+                    "receiptTrie" : "0x11243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1",
+                    "stateRoot" : "0xfeb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0c2d84273ec859ebc691ff6e01b180af72a204553600761cf8581171f3422950f88d233b126b3a8ad74f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feb71a64a32a29b876601daa566abb7d564b6c6dbae689eb61595900c7b86db9a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba011243289a926c46bcd92b6b413128c44533b526ef708841f92f5275d0aa60fd1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a051c2199b3d3475822469420de6d42bf58dac35774d0824ceaa551ba4bbb754de8824dae7f40b2e4919f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7e479e860cf5ec831927f0bfc780e3bfa48db7c14a37cc44a5ef11bdd2fac70",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7d0e81e8017374b6fd3ccca7d54e10411c63e80bdd526bfa7cae83a3e41d276e",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -289,14 +410,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4eeaf",
+                "balance" : "0x4563918244f4f143",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618ab1",
+                "balance" : "0x0de0b6b3a761881d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -320,10 +441,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_Homestead" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xeeaf",
-                    "hash" : "0xded45ad72add20037b29fd0054e6753cb48994f3a4e16ef3aacd0a5792e680c0",
-                    "mixHash" : "0xfd66c9a80c84ca63c04b2642337e3c452d6c319ba748d6769db14837eb196925",
-                    "nonce" : "0xe8360292b202293e",
+                    "hash" : "0x4a629a68d02514aae964aa32e6db6e8d24a76e1fb73e043dec238cc519043cca",
+                    "mixHash" : "0xd40bdf71a4267b2cda23c4aa27dc9086b0171f3e536b09da6e856fec93394ba1",
+                    "nonce" : "0xfad688a9d44ed37c",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
                     "receiptTrie" : "0x49856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7",
@@ -346,7 +467,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0fd66c9a80c84ca63c04b2642337e3c452d6c319ba748d6769db14837eb19692588e8360292b202293ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a0d40bdf71a4267b2cda23c4aa27dc9086b0171f3e536b09da6e856fec93394ba188fad688a9d44ed37cf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xded45ad72add20037b29fd0054e6753cb48994f3a4e16ef3aacd0a5792e680c0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4a629a68d02514aae964aa32e6db6e8d24a76e1fb73e043dec238cc519043cca",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -427,10 +548,10 @@
             }
         }
     },
-    "CALLCODEIdentity_4_gas18_d0g0v0_Metropolis" : {
+    "CALLCODEIdentity_4_gas18_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/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -441,19 +562,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf143",
-                    "hash" : "0x2a41bba47184798d771437bd3e2a521c353222996138fec9d8592b523c9de8b8",
-                    "mixHash" : "0xdc0c60eafdc86733ad1261c84bace96448b6aa33e165e0c34940e7e6d954f829",
-                    "nonce" : "0x902aa62adf899b4f",
+                    "gasUsed" : "0xeeaf",
+                    "hash" : "0xd3747a6922987b75d9ac6a0bf5dc964a867ca93d8a04fa3f4473edc19bfe3370",
+                    "mixHash" : "0x73db242269f2d7d55dac9b32a852ee85505b0c6ad90ba6003158c51b1bc54bcf",
+                    "nonce" : "0x99494043589cfb79",
                     "number" : "0x01",
                     "parentHash" : "0x62c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2c",
-                    "receiptTrie" : "0xf501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067",
-                    "stateRoot" : "0xf0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10",
+                    "receiptTrie" : "0x49856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7",
+                    "stateRoot" : "0x4258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0f7991241dde2d9f6286deab991e73037ab16c226e0cceaa7892946d7a4bc10a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0f501cbb2cbb0aac8c126103b0fd4e0a0def5a185d6be4bd61059958e1fc5f067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f1438203e880a0dc0c60eafdc86733ad1261c84bace96448b6aa33e165e0c34940e7e6d954f82988902aa62adf899b4ff865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a062c02a379806ee3939260a2bd40583868ac3608543f17eb6aadc0a185a44cc2ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04258ab664e6048c6e5dd0990f511e1eb369cb27109bfac1a6495a194e22e8c12a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba049856b23ab23b697294c91b10368dddc586798255dde24f30f43542851058ac7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082eeaf8203e880a073db242269f2d7d55dac9b32a852ee85505b0c6ad90ba6003158c51b1bc54bcf8899494043589cfb79f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +611,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff08234dac174229d9e20343142b91a3f6fff32b0ac73f6ba383467bfbde2388a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a41bba47184798d771437bd3e2a521c353222996138fec9d8592b523c9de8b8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd3747a6922987b75d9ac6a0bf5dc964a867ca93d8a04fa3f4473edc19bfe3370",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055",
@@ -510,14 +624,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f143",
+                "balance" : "0x4563918244f4eeaf",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761881d",
+                "balance" : "0x0de0b6b3a7618ab1",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {