Hive tests with Byzantine

1 files changed, 173 insertions, 60 deletions

diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
index 2c10e7b81..5a07440cd 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/modexp_d29g0v0.json
@@ -1,8 +1,8 @@
 {
-    "modexp_d29g0v0_EIP150" : {
+    "modexp_d29g0v0_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/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x44f019a61e37ddedb8e9d7234926f2434ef5d993c49af7b7037ed4eb994b2647",
-                    "mixHash" : "0xbb4e54a4b1a53348190352fd58e6ac13725814dbf187f58ad05745fe7f96d4c7",
-                    "nonce" : "0xa728f0b34190f7fc",
+                    "hash" : "0x966af1c9d9c1983115422d32072871fce75c83044934b8d633c268f4c76a949f",
+                    "mixHash" : "0x57ddbd56ed3f05ca89b80d03ed2816bc2ed4f49af8c311a8972cf49a6a220494",
+                    "nonce" : "0xb88a941eb92e6fa8",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
-                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
+                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
+                    "stateRoot" : "0x7923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0bb4e54a4b1a53348190352fd58e6ac13725814dbf187f58ad05745fe7f96d4c788a728f0b34190f7fcf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbca08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a057ddbd56ed3f05ca89b80d03ed2816bc2ed4f49af8c311a8972cf49a6a22049488b88a941eb92e6fa8f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44f019a61e37ddedb8e9d7234926f2434ef5d993c49af7b7037ed4eb994b2647",
-        "network" : "EIP150",
+        "lastblockhash" : "0x966af1c9d9c1983115422d32072871fce75c83044934b8d633c268f4c76a949f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "modexp_d29g0v0_EIP158" : {
+    "modexp_d29g0v0_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/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0xb841",
-                    "hash" : "0x42a52ff4a5f386e11d18633a16f3c0864482593f7cb80a8ab0f61ba3fc9c3fd7",
-                    "mixHash" : "0x2c76221e272261f08814ae7ff2bb32d01e4b0277539880e88b66bca0b1f85483",
-                    "nonce" : "0x9e94acce9b728ff2",
+                    "hash" : "0x80f1dc9863fd9c9ef683e949b00e2d794cfd9cc0b2d1bebedf922e32518a7d4b",
+                    "mixHash" : "0x09582dd55efac88eff4b803e055b32b4bfa88c28e4c901f600663f0ae23d0004",
+                    "nonce" : "0x27f8d75a5c6db444",
+                    "number" : "0x01",
+                    "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
+                    "stateRoot" : "0x7923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbc",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbca08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a009582dd55efac88eff4b803e055b32b4bfa88c28e4c901f600663f0ae23d00048827f8d75a5c6db444f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438",
+                        "s" : "0x6135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0x00",
+            "hash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484ca",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x80f1dc9863fd9c9ef683e949b00e2d794cfd9cc0b2d1bebedf922e32518a7d4b",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b841",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5de9f47bf",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "modexp_d29g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/modexp_d29g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x02540be400",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0xc0ce3adf656424676688eec5886611e0b9eef758b73f765c9006b9149b3c8e27",
+                    "mixHash" : "0x8bed1585717e690eede4a138af4179e1a81ee62075ebfa42cfd5180f8dc4b85d",
+                    "nonce" : "0x7ff3912a287fc66b",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a02c76221e272261f08814ae7ff2bb32d01e4b0277539880e88b66bca0b1f85483889e94acce9b728ff2f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a08bed1585717e690eede4a138af4179e1a81ee62075ebfa42cfd5180f8dc4b85d887ff3912a287fc66bf8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x42a52ff4a5f386e11d18633a16f3c0864482593f7cb80a8ab0f61ba3fc9c3fd7",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc0ce3adf656424676688eec5886611e0b9eef758b73f765c9006b9149b3c8e27",
+        "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "modexp_d29g0v0_Frontier" : {
+    "modexp_d29g0v0_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/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd1f264370b2fc39cfe14d038e11518acbc6422a1cdf86c081546d00d951a718a",
-                    "mixHash" : "0xb3c882145c10f9cedfc72ad2391cfa7c0af108da27820c020565c98a694824c5",
-                    "nonce" : "0x9aeb9e46b75f4a5a",
+                    "gasUsed" : "0xb841",
+                    "hash" : "0x37dd344f3a64e3d81e4db12c66384ad4885c901d9aa991081f17fbf753028079",
+                    "mixHash" : "0xe9902735514654e66de3a3aed722bc022fc6055ee1f7d96082d663e9b1c3af6d",
+                    "nonce" : "0x468994e019415c8f",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
-                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
+                    "receiptTrie" : "0x3a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85",
+                    "stateRoot" : "0x41214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40af",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0b3c882145c10f9cedfc72ad2391cfa7c0af108da27820c020565c98a694824c5889aeb9e46b75f4a5af8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041214e18c1e664353bc4e8e38c1abd74e4cea876afc4d894bcaae34adeac40afa08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a03a4426a01220b01801cab4dec10092b025798cb1b5f506ea310fe387f4dfcc85b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a0e9902735514654e66de3a3aed722bc022fc6055ee1f7d96082d663e9b1c3af6d88468994e019415c8ff8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -274,25 +394,26 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1f264370b2fc39cfe14d038e11518acbc6422a1cdf86c081546d00d951a718a",
-        "network" : "Frontier",
+        "lastblockhash" : "0x37dd344f3a64e3d81e4db12c66384ad4885c901d9aa991081f17fbf753028079",
+        "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824ae9e100",
+                "balance" : "0x4563918244f4b841",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5d8aa1f00",
+                "balance" : "0x3635c9adc5de9f47bf",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -316,10 +437,10 @@
             }
         }
     },
-    "modexp_d29g0v0_Homestead" : {
+    "modexp_d29g0v0_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/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -331,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
                     "gasUsed" : "0x05f5e100",
-                    "hash" : "0xd3f59a7d7282975b622216051ea212bc8ad35590ab56df576820368bd4009811",
-                    "mixHash" : "0x6fb806210190e9d916cba48928981757d5b95dc871ca4160324063e40e09b422",
-                    "nonce" : "0x28edbdc6734432fe",
+                    "hash" : "0xbacfcc72bf808bcb5485bafd68dd5f54f9f296baca5a18ced4d0a0f0594a3715",
+                    "mixHash" : "0xd9d0724a065cbe282f6d2cff0d86db432574839bd1540a7f1f394a3a3439f774",
+                    "nonce" : "0x8ed5d9b4b6db98de",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
                     "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
@@ -342,7 +463,7 @@
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a06fb806210190e9d916cba48928981757d5b95dc871ca4160324063e40e09b4228828edbdc6734432fef8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a0d9d0724a065cbe282f6d2cff0d86db432574839bd1540a7f1f394a3a3439f774888ed5d9b4b6db98def8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -379,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3f59a7d7282975b622216051ea212bc8ad35590ab56df576820368bd4009811",
-        "network" : "Homestead",
+        "lastblockhash" : "0xbacfcc72bf808bcb5485bafd68dd5f54f9f296baca5a18ced4d0a0f0594a3715",
+        "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
@@ -421,10 +542,10 @@
             }
         }
     },
-    "modexp_d29g0v0_Metropolis" : {
+    "modexp_d29g0v0_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/modexp_d29g0v0Filler.json"
         },
         "blocks" : [
@@ -435,19 +556,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x02540be400",
-                    "gasUsed" : "0xb841",
-                    "hash" : "0xf07fc488dc11a74fc242490267f3f31dc30f33c267fe45ca201a2f7ec5b88b42",
-                    "mixHash" : "0x4d3e876d54128ed642cb82fa1f155be6befc3401c3c2ff26b1aee82d84515279",
-                    "nonce" : "0x38ffc60105632e17",
+                    "gasUsed" : "0x05f5e100",
+                    "hash" : "0x3dbafdcc110e94a8d5451adfdb6bf8e3660adee3e4800953c74a66f4cfd03f3f",
+                    "mixHash" : "0x31ba300075986d2cc611d67509e81e00a7e4600e17c2e26a27e5f0dd402ac67d",
+                    "nonce" : "0xd8f270ef7ef8c1f2",
                     "number" : "0x01",
                     "parentHash" : "0x70fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273",
-                    "receiptTrie" : "0x62203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055",
-                    "stateRoot" : "0x7923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbc",
+                    "receiptTrie" : "0x8c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfe",
+                    "stateRoot" : "0x8935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ad",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf902a3f901f9a070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07923a1d5b752bc08dfae44f9311dcf88667f95d34cd9d39b3272789029071dbca08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a062203b0f5618301b94309d80d02bedb1332969699aaa022cbd0957db899b3055b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be40082b8418203e880a04d3e876d54128ed642cb82fa1f155be6befc3401c3c2ff26b1aee82d845152798838ffc60105632e17f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
+                "rlp" : "0xf902a5f901fba070fd8962467cac8e2412f97cc4f775613ccc23d5340252ee5cca67b868639273a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08935f97a1c08cc75c47ed2af4f96c76d025d18e81759f475797c25ed7f19f3ada08f6a5d81ad3bce19270215c747c226eea81d0d0e1378d71266dc6707700331f0a08c260d4e2be943a410d9e289f5c826464a7c71de230bf3ebf53cd365f26d0dfeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018502540be4008405f5e1008203e880a031ba300075986d2cc611d67509e81e00a7e4600e17c2e26a27e5f0dd402ac67d88d8f270ef7ef8c1f2f8a4f8a280018405f5e10094100000000000000000000000000000000000000080b840000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000001ba0d80cda2ef8580545dea07a2a976b41a6e3c00e8fa7adc4ded857678b5ecaa438a06135c0be99ea33d6a6024bd5de576a5e36a820f56209e9cb21e1a8c494ba7188c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000",
@@ -484,33 +605,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0afba507e6fef0e690450e0c590ea05c53f4d93ea93a7b92449c437591484caa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808502540be400808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf07fc488dc11a74fc242490267f3f31dc30f33c267fe45ca201a2f7ec5b88b42",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3dbafdcc110e94a8d5451adfdb6bf8e3660adee3e4800953c74a66f4cfd03f3f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x00",
                 "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b841",
+                "balance" : "0x456391824ae9e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x3635c9adc5de9f47bf",
+                "balance" : "0x3635c9adc5d8aa1f00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {