1 files changed, 172 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json
index d5b96963d..75ffd7d1e 100644
--- a/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallEcrecover2_d0g0v0_EIP150" : {
+    "CallEcrecover2_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/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01389a",
-                    "hash" : "0x252240d8d8ddc70260a7fc997f7ad0b66d316ffd341459d77246f8ec3a762985",
-                    "mixHash" : "0x14d7a1cf273002c153561d14aa50d1b7cc09e8a2be44e8ab4454a159e3976918",
-                    "nonce" : "0x4743d12e112ea932",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x6cfa818466af40622f4b707a42cc28988c7f782a0074f4e02ead586c7c40da76",
+                    "mixHash" : "0xc4d1fddf9657ddc76fa9a7951001e073d66038ca7225b4b5458087c5c0f094c4",
+                    "nonce" : "0x87368146ef6363f5",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xb3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7",
-                    "stateRoot" : "0x1047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734ee",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x22bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734eea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a014d7a1cf273002c153561d14aa50d1b7cc09e8a2be44e8ab4454a159e3976918884743d12e112ea932f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0c4d1fddf9657ddc76fa9a7951001e073d66038ca7225b4b5458087c5c0f094c48887368146ef6363f5f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,10 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x252240d8d8ddc70260a7fc997f7ad0b66d316ffd341459d77246f8ec3a762985",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6cfa818466af40622f4b707a42cc28988c7f782a0074f4e02ead586c7c40da76",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -81,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5389a",
+                "balance" : "0x4563918244f4d71a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76140c6",
+                "balance" : "0x0de0b6b3a761a246",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +112,10 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_EIP158" : {
+    "CallEcrecover2_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/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xd71a",
-                    "hash" : "0x6c5c8cf9e21c535619c2c61fdc631eec4cf3bcfb7c754a57d32868a7fbadb317",
-                    "mixHash" : "0x97debb9af45205507d9441657b8ee8263943f8918fe6b0e781690ffe1ff1077e",
-                    "nonce" : "0x57ccdc5969262c63",
+                    "hash" : "0xdc55eb8b5478a9c19d7ba147e4f2908ade437e2d92be86c29a008a26f891cf89",
+                    "mixHash" : "0x2478aa4b7239bf9a83b4e6c5f4bcbebbd4e33f10475c17bc9319228b31089414",
+                    "nonce" : "0xb70f92f1a53cb7ab",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xc9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3",
-                    "stateRoot" : "0x5570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eb",
+                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
+                    "stateRoot" : "0x22bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a097debb9af45205507d9441657b8ee8263943f8918fe6b0e781690ffe1ff1077e8857ccdc5969262c63f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a02478aa4b7239bf9a83b4e6c5f4bcbebbd4e33f10475c17bc9319228b3108941488b70f92f1a53cb7abf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c5c8cf9e21c535619c2c61fdc631eec4cf3bcfb7c754a57d32868a7fbadb317",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdc55eb8b5478a9c19d7ba147e4f2908ade437e2d92be86c29a008a26f891cf89",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0132b3a0",
                 "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155",
@@ -218,10 +225,10 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_Frontier" : {
+    "CallEcrecover2_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/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -232,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x013570",
-                    "hash" : "0x5df9c26b681ba38bc682609e9bf38fa413c854a0907556a9f0d91992e0cefe47",
-                    "mixHash" : "0xe801f788c99ca06aaaef1bcf7e4a1347a5012f0705616e5b6c7f3b8f06d26b76",
-                    "nonce" : "0x8689c78d5bec90a2",
+                    "gasUsed" : "0x01389a",
+                    "hash" : "0xefa1adb4c086528396d414b2c1c6adc40654ad1ec10738e584ae46d974b2d874",
+                    "mixHash" : "0x384be86da004fab4a5ff1e6d635add200ba806bc867578e17697d4b1b95b53ac",
+                    "nonce" : "0xbf5db3fd3bf0a2fd",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xb9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750",
-                    "stateRoot" : "0xc84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809db",
+                    "receiptTrie" : "0xb3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7",
+                    "stateRoot" : "0x1047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734ee",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0e801f788c99ca06aaaef1bcf7e4a1347a5012f0705616e5b6c7f3b8f06d26b76888689c78d5bec90a2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01047fdcac932d340ec8fc5ede06b3d3ebaf9f3cb78080668546a639b0ad734eea098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b3c88768f6fced69549e1c437185b3630fa2d2f9bf691995ea443f99e404ddd7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301389a8203e880a0384be86da004fab4a5ff1e6d635add200ba806bc867578e17697d4b1b95b53ac88bf5db3fd3bf0a2fdf865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -281,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5df9c26b681ba38bc682609e9bf38fa413c854a0907556a9f0d91992e0cefe47",
-        "network" : "Frontier",
+        "lastblockhash" : "0xefa1adb4c086528396d414b2c1c6adc40654ad1ec10738e584ae46d974b2d874",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -300,14 +307,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f53570",
+                "balance" : "0x4563918244f5389a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76143f0",
+                "balance" : "0x0de0b6b3a76140c6",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -331,10 +338,116 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_Homestead" : {
+    "CallEcrecover2_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/CallEcrecover2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xd71a",
+                    "hash" : "0x77a0b1edfb1e758d8732608671dc3145bd8f5310950ca9c23067ac452acda90d",
+                    "mixHash" : "0x6ec93183bce0c09d811b208a85d264c716f355d891899fe219bc1f78e73b068f",
+                    "nonce" : "0xb2806bcf0a57dfc6",
+                    "number" : "0x01",
+                    "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
+                    "receiptTrie" : "0xc9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3",
+                    "stateRoot" : "0x5570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05570cf4726a561cfbeb26731623128edb40625b3acf11bb66469dbf7c24984eba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0c9e793b5f418101e8dff95ac9e6b130e132d868e0c3549ccf46040919c3485b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a06ec93183bce0c09d811b208a85d264c716f355d891899fe219bc1f78e73b068f88b2806bcf0a57dfc6f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "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" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x45d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x77a0b1edfb1e758d8732608671dc3145bd8f5310950ca9c23067ac452acda90d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0132b3a0",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4d71a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a761a246",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x01312d00",
+                "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallEcrecover2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +459,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x013570",
-                    "hash" : "0xce015ede553bb54adf6c6f36a673d95e89201564d073507323aa9df1594921dd",
-                    "mixHash" : "0x312776771675ce40782df6a23ce089cf7b100b42163b2059f9f8808f5124db07",
-                    "nonce" : "0xba2fd8bed27728e9",
+                    "hash" : "0x3ae693e73a41508f5618045bad362e7654c8a60332b06e761946f8a6230db0fd",
+                    "mixHash" : "0x11161237fed5f49307f82582707df8404c11b9f6d5d468a1d6a6312cb3cbf32a",
+                    "nonce" : "0x2a9a87e03a2585c2",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
                     "receiptTrie" : "0xb9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750",
@@ -357,7 +470,7 @@
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0312776771675ce40782df6a23ce089cf7b100b42163b2059f9f8808f5124db0788ba2fd8bed27728e9f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a011161237fed5f49307f82582707df8404c11b9f6d5d468a1d6a6312cb3cbf32a882a9a87e03a2585c2f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,8 +507,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xce015ede553bb54adf6c6f36a673d95e89201564d073507323aa9df1594921dd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3ae693e73a41508f5618045bad362e7654c8a60332b06e761946f8a6230db0fd",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -444,10 +557,10 @@
             }
         }
     },
-    "CallEcrecover2_d0g0v0_Metropolis" : {
+    "CallEcrecover2_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/CallEcrecover2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,19 +571,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xd71a",
-                    "hash" : "0xd0e0649a8758b15c7fba05428c6f751cf43b4862c6be909930b8941d468a2d29",
-                    "mixHash" : "0xec2b92c33a5408f845d60ecdf9c6104e35926ea12a8068a16de7d4a6fa48bbf3",
-                    "nonce" : "0xc57098ada3637f4e",
+                    "gasUsed" : "0x013570",
+                    "hash" : "0xd4fb8b227ec8ee6575bcacfa3b6352a00b465e0ae68c6102b97f3aa6b0638374",
+                    "mixHash" : "0xa1b5760611fe4fb32934bbaee65c4941d3f50215c48ea435d9c9751473acf5a8",
+                    "nonce" : "0x6221c7ad4adefe80",
                     "number" : "0x01",
                     "parentHash" : "0x0251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048",
-                    "receiptTrie" : "0xbab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6",
-                    "stateRoot" : "0x22bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915",
+                    "receiptTrie" : "0xb9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750",
+                    "stateRoot" : "0xc84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809db",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x98fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022bedd687434b34b1b9adb2afb1e75e838341d408525c7fb13a09e715cc3d915a098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0bab77b6d2af3e413706e6b3dd483362965f902401bfa23179a005c7c52aa8ce6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082d71a8203e880a0ec2b92c33a5408f845d60ecdf9c6104e35926ea12a8068a16de7d4a6fa48bbf388c57098ada3637f4ef865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
+                "rlp" : "0xf90263f901f8a00251afea9c358777623b2cef742b5144f27b276c0c3cbd0cd214dda014718048a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c84bd095f70d1fa939448d11c0964978df9c38bfd01400cbd32f612336f809dba098fa170d192a6eff341cc8b8392cf1c8256997c28117ae4c20481271ffe00b0ba0b9d6d26b2b261dd574b9c1f3a39ec35686e6024214bc9b41f1d7295f7bcf7750b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830135708203e880a0a1b5760611fe4fb32934bbaee65c4941d3f50215c48ea435d9c9751473acf5a8886221c7ad4adefe80f865f8638001830592a894095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca082cfe09a590896d5e895674505c40f1701ab05245f9f568bf506b9558e61c67fa04a98fee75f6fbf3fa4b3e104a9bb7283a6e076670719bac8af481531151b7b3cc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -507,10 +620,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045d32ee80de1ab9862bdb47b1651e8c014a310099128618a1ee7b660eddcc990a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0e0649a8758b15c7fba05428c6f751cf43b4862c6be909930b8941d468a2d29",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd4fb8b227ec8ee6575bcacfa3b6352a00b465e0ae68c6102b97f3aa6b0638374",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -526,14 +639,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4d71a",
+                "balance" : "0x4563918244f53570",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761a246",
+                "balance" : "0x0de0b6b3a76143f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {