Hive tests with Byzantine

1 files changed, 172 insertions, 59 deletions

diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json
index 894145dd2..c1149cceb 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CALLCODESha256_5_d0g0v0_EIP150" : {
+    "CALLCODESha256_5_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/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0xef11ef84ef57fdcf646b07b30c49d2b92fb4ea7c82335c55113ace500b722ba9",
-                    "mixHash" : "0xcb6b61c34764940603f7e7efec00ba6245860f8c978b08a90ed70fa4854e4e8d",
-                    "nonce" : "0xf53c081f6dac5f1d",
+                    "hash" : "0x53f4d193dce69919935ae054ed8f711921d2373efb689de670836f00f0d208f1",
+                    "mixHash" : "0x5e4ea911b43e05e9901fdedaa5f43bd79fce3e63a780ca81cab09331edcccd40",
+                    "nonce" : "0xe8e1fb4a6043f5cd",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
-                    "receiptTrie" : "0xab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2b",
-                    "stateRoot" : "0xd9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cb",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0x328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0cb6b61c34764940603f7e7efec00ba6245860f8c978b08a90ed70fa4854e4e8d88f53c081f6dac5f1df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a05e4ea911b43e05e9901fdedaa5f43bd79fce3e63a780ca81cab09331edcccd4088e8e1fb4a6043f5cdf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef11ef84ef57fdcf646b07b30c49d2b92fb4ea7c82335c55113ace500b722ba9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x53f4d193dce69919935ae054ed8f711921d2373efb689de670836f00f0d208f1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_EIP158" : {
+    "CALLCODESha256_5_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/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f41b8",
-                    "hash" : "0xd61cc960e725389fdf1401a54f40f2003b593ae8ed055a442ce23a6c396c3d44",
-                    "mixHash" : "0x9f3da210b4df0dbd4088a457f427346581f2b961e08887a308256ef4a97a5aef",
-                    "nonce" : "0xc73fbedb2b3bb37d",
+                    "hash" : "0x4914bead859236088a0a8421c28859d2c1ff488dab2d44e228be62492b5adec8",
+                    "mixHash" : "0x573c3b20dc988b7282bcf153d977f57d16ed3c51b29d69693897f5783a95039f",
+                    "nonce" : "0xba7470a63985067e",
+                    "number" : "0x01",
+                    "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
+                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
+                    "stateRoot" : "0x328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0573c3b20dc988b7282bcf153d977f57d16ed3c51b29d69693897f5783a95039f88ba7470a63985067ef865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4",
+                        "s" : "0x433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4914bead859236088a0a8421c28859d2c1ff488dab2d44e228be62492b5adec8",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182451341b8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a74337a8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CALLCODESha256_5_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0xc3d8c024e3b38bb6f6315f7515421e58cd1d04a94ab75876de08233225002274",
+                    "mixHash" : "0x5d17668612cb1ea2e7f48972a4af541c4e1e3e3a32f58cec0bfcb91d2b3c78ae",
+                    "nonce" : "0x85e5088618b7279d",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
                     "receiptTrie" : "0xab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2b",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a09f3da210b4df0dbd4088a457f427346581f2b961e08887a308256ef4a97a5aef88c73fbedb2b3bb37df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a05d17668612cb1ea2e7f48972a4af541c4e1e3e3a32f58cec0bfcb91d2b3c78ae8885e5088618b7279df865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd61cc960e725389fdf1401a54f40f2003b593ae8ed055a442ce23a6c396c3d44",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc3d8c024e3b38bb6f6315f7515421e58cd1d04a94ab75876de08233225002274",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_Frontier" : {
+    "CALLCODESha256_5_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/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f3f24",
-                    "hash" : "0xee59ffb9b454d99c3f6659f69c274e8f256c65f9d13f9b95bb9ec828aa765e0e",
-                    "mixHash" : "0xedfac31f292ff350e75115cec55c16c1ce5d99fe9bbbcbe18959b1d0881779ab",
-                    "nonce" : "0xdc9234c2790f9eef",
+                    "gasUsed" : "0x1f41b8",
+                    "hash" : "0xabb7ad5ccdb2e713fd48d7ab5f885503b86bb8b721744f9d54ef582983745ee9",
+                    "mixHash" : "0xaea26e73b9a5e6916df2e5d0e1feae19e87523d2dd8b4809222ad9c7a6bde57a",
+                    "nonce" : "0xac3c86523025be13",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
-                    "receiptTrie" : "0x3f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91d",
-                    "stateRoot" : "0x8f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95d",
+                    "receiptTrie" : "0xab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2b",
+                    "stateRoot" : "0xd9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a0edfac31f292ff350e75115cec55c16c1ce5d99fe9bbbcbe18959b1d0881779ab88dc9234c2790f9eeff865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d9b4c2cc6d992643dcdbcfe5bf1af9ae8e8eda36bc01fb0f246e59308ada19cba0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a0ab59ced1e49feb153294df74c6e06f04616df551d22b327e90ae5b0389f16a2bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0aea26e73b9a5e6916df2e5d0e1feae19e87523d2dd8b4809222ad9c7a6bde57a88ac3c86523025be13f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee59ffb9b454d99c3f6659f69c274e8f256c65f9d13f9b95bb9ec828aa765e0e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xabb7ad5ccdb2e713fd48d7ab5f885503b86bb8b721744f9d54ef582983745ee9",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245133f24",
+                "balance" : "0x45639182451341b8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7433a3c",
+                "balance" : "0x0de0b6b3a74337a8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_Homestead" : {
+    "CALLCODESha256_5_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/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x1f3f24",
-                    "hash" : "0x895c996c2eb16914f3d4d182671a88115d3ebf41ed03cad3b2d6a5abbc6f3273",
-                    "mixHash" : "0x82b904120808ac0a826dd6efe66e9e0f871095bd77f2688f7a563e31e5015bc4",
-                    "nonce" : "0xdf7d678f32e567e0",
+                    "hash" : "0xeb236ffa4b63912f10264b3693a35d017f5b2859153381e55185b684f878482f",
+                    "mixHash" : "0xba871cabeedc85f75c81fd750b9238e8736d592f3b6e6671c9f9ff8e18ccd0a3",
+                    "nonce" : "0x54aed455d2be469b",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
                     "receiptTrie" : "0x3f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91d",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a082b904120808ac0a826dd6efe66e9e0f871095bd77f2688f7a563e31e5015bc488df7d678f32e567e0f865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a0ba871cabeedc85f75c81fd750b9238e8736d592f3b6e6671c9f9ff8e18ccd0a38854aed455d2be469bf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x895c996c2eb16914f3d4d182671a88115d3ebf41ed03cad3b2d6a5abbc6f3273",
-        "network" : "Homestead",
+        "lastblockhash" : "0xeb236ffa4b63912f10264b3693a35d017f5b2859153381e55185b684f878482f",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "CALLCODESha256_5_d0g0v0_Metropolis" : {
+    "CALLCODESha256_5_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/CALLCODESha256_5_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x1f41b8",
-                    "hash" : "0x04e6819b6b476854c31c09e3f0b0c8fa0f79661b078baa21cf553495a6d9ea7a",
-                    "mixHash" : "0xb7b90be8f0ee0dc32442335b3c11695d60dd7afd14ddc3323bb4ab58bbe22cd6",
-                    "nonce" : "0xf2ee4a8f5cc858da",
+                    "gasUsed" : "0x1f3f24",
+                    "hash" : "0x702ad891be793270744fe6aacad88f378f3d510388c7b27325d0c3c33ad73ea9",
+                    "mixHash" : "0x78aba0e4dbb79e08a1e6caf247fc2a0aabca6d008a330d7e444823aeb9a6a2c8",
+                    "nonce" : "0x52946a5c6e59facd",
                     "number" : "0x01",
                     "parentHash" : "0x91c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ad",
-                    "receiptTrie" : "0x24a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7",
-                    "stateRoot" : "0x328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4",
+                    "receiptTrie" : "0x3f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91d",
+                    "stateRoot" : "0x8f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0328b73a40cef5d09acae6f461d68f844d837c600cc0f4d3ddbfbe280f03dadc4a0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a024a7d4c6ed76a9638f12fd6ac540b795fb606180a4017459934db393289cd4c7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f41b88203e880a0b7b90be8f0ee0dc32442335b3c11695d60dd7afd14ddc3323bb4ab58bbe22cd688f2ee4a8f5cc858daf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
+                "rlp" : "0xf90263f901f8a091c93d66fb20bf64335275f6ebcc749d50ede533e37434a850112b1dc92c63ada01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f308a14c00e17248054153e6cbd247448b8ada68b8ba117a4bce43176b2f95da0138e622ff34e8a4bed7c2631ee946b094d23bd208e8285e710fc5fa254318627a03f8e8eacc4956780fec514440376c2da09299f62fa734eab89ce2e0901e3f91db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680831f3f248203e880a078aba0e4dbb79e08a1e6caf247fc2a0aabca6d008a330d7e444823aeb9a6a2c88852946a5c6e59facdf865f86380018398968094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca0c8c5469bcab2d89c9083cecdf26c9d3a9e40597d1d82744bc0e5e582f9dc48a4a0433eb07127e317522d4e08b89cd3824eee8bf1c75a2871db940e0c54d0dd09d2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0085cf2051d97b623fc928daa56282e9c7faa7e24b2b4f4915cd617b8035a02c5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04e6819b6b476854c31c09e3f0b0c8fa0f79661b078baa21cf553495a6d9ea7a",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x702ad891be793270744fe6aacad88f378f3d510388c7b27325d0c3c33ad73ea9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x45639182451341b8",
+                "balance" : "0x4563918245133f24",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a74337a8",
+                "balance" : "0x0de0b6b3a7433a3c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {