1 files changed, 172 insertions, 59 deletions
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
index 1daf94dd2..5ef2a82f7 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "AmbiguousMethod_d0g0v0_EIP150" : {
+    "AmbiguousMethod_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/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa1a3",
-                    "hash" : "0xc44950b8116e2ac5945230848ea2e935939435fa7797c63d7993e7c02404f2d3",
-                    "mixHash" : "0x34434bbc8948b5c2f97a83a9ccdd442c3605c983e7a1e053d9b340fc2d7f5c28",
-                    "nonce" : "0x3f18f54794ced62f",
+                    "gasUsed" : "0xa1cb",
+                    "hash" : "0x426b0c05d0437ee1ebfbc69d5e72f0814b600bc021187c75595e129a65a22e61",
+                    "mixHash" : "0xb0f2f9ab23d313b699ee21ede3c30d0a3a70c9722cb10b9d21b6ac3820254b8a",
+                    "nonce" : "0x5eaf6922e432ea5e",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
-                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
+                    "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
+                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a034434bbc8948b5c2f97a83a9ccdd442c3605c983e7a1e053d9b340fc2d7f5c28883f18f54794ced62ff866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0b0f2f9ab23d313b699ee21ede3c30d0a3a70c9722cb10b9d21b6ac3820254b8a885eaf6922e432ea5ef866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc44950b8116e2ac5945230848ea2e935939435fa7797c63d7993e7c02404f2d3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x426b0c05d0437ee1ebfbc69d5e72f0814b600bc021187c75595e129a65a22e61",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1a3",
+                "balance" : "0x4563918244f4a1cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x06ff7c",
+                "balance" : "0x06ff54",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_EIP158" : {
+    "AmbiguousMethod_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/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1cb",
-                    "hash" : "0x877080fde429767d4fef6e2aedc7e7f7c414e17c335fcded2358387b94f85cbd",
-                    "mixHash" : "0x11ee2098bc38845f09ee2219496d4fb1257803e2923648dbd5135e6627c51fa0",
-                    "nonce" : "0x9470fff15ef022c2",
+                    "hash" : "0x0e59ed2758b5338c350a5185c6726fe8e94a7018096e3dffedfeb0c55e816c5f",
+                    "mixHash" : "0xea2d711ef0b9ea2ef5b79720497fef5960e3812aae73770d8d1a12c2ae73727c",
+                    "nonce" : "0xe4fa0ca45fd146e7",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0x9048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83",
-                    "stateRoot" : "0xe51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005b",
+                    "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
+                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005ba0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a09048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a011ee2098bc38845f09ee2219496d4fb1257803e2923648dbd5135e6627c51fa0889470fff15ef022c2f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0ea2d711ef0b9ea2ef5b79720497fef5960e3812aae73770d8d1a12c2ae73727c88e4fa0ca45fd146e7f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x877080fde429767d4fef6e2aedc7e7f7c414e17c335fcded2358387b94f85cbd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0e59ed2758b5338c350a5185c6726fe8e94a7018096e3dffedfeb0c55e816c5f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_Frontier" : {
+    "AmbiguousMethod_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/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1a3",
-                    "hash" : "0x09844b0e87c74ac61c1a8928f8eff0849c05fa71f7d54efc4d36f9bded5d87cb",
-                    "mixHash" : "0x5dd147f379e82a2808cfeced637ef3fac282e0fda7bd3ccac9d5ef06598bae96",
-                    "nonce" : "0xf980d8cf3c8f8f07",
+                    "hash" : "0x5b79cce665cc548e0069d3ec6867707712623f995680fac73cfed7e365e636a1",
+                    "mixHash" : "0x69065fbbf7dcc86c02b8aeab3e046377ade2d03290b1667d08170e4b0f58ee86",
+                    "nonce" : "0x0fe52b5a3f553034",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a05dd147f379e82a2808cfeced637ef3fac282e0fda7bd3ccac9d5ef06598bae9688f980d8cf3c8f8f07f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a069065fbbf7dcc86c02b8aeab3e046377ade2d03290b1667d08170e4b0f58ee86880fe52b5a3f553034f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09844b0e87c74ac61c1a8928f8eff0849c05fa71f7d54efc4d36f9bded5d87cb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5b79cce665cc548e0069d3ec6867707712623f995680fac73cfed7e365e636a1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_Homestead" : {
+    "AmbiguousMethod_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/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa1a3",
-                    "hash" : "0xf45b63cd308b7046c45db164354c145c69ed7e89f02cd3749ac751e4028c08b8",
-                    "mixHash" : "0x31dddc6d684189061f291aabcc944c565bb346354f956c52bfc42fa147da2862",
-                    "nonce" : "0xd085a4f4eb06d34b",
+                    "gasUsed" : "0xa1cb",
+                    "hash" : "0x57f9169766ec55fa6f1d401a117eef8022c39fe400086cfcb05bb23ba34a55c7",
+                    "mixHash" : "0xc663c69f64447744d26d54809d88fbe58b3e477fe0540bf81f6cdba1d3352749",
+                    "nonce" : "0xe96a9ad8c7d4ae12",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
-                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
+                    "receiptTrie" : "0x9048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83",
+                    "stateRoot" : "0xe51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a031dddc6d684189061f291aabcc944c565bb346354f956c52bfc42fa147da286288d085a4f4eb06d34bf866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005ba0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a09048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0c663c69f64447744d26d54809d88fbe58b3e477fe0540bf81f6cdba1d335274988e96a9ad8c7d4ae12f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf45b63cd308b7046c45db164354c145c69ed7e89f02cd3749ac751e4028c08b8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x57f9169766ec55fa6f1d401a117eef8022c39fe400086cfcb05bb23ba34a55c7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1a3",
+                "balance" : "0x4563918244f4a1cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x06ff7c",
+                "balance" : "0x06ff54",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_Metropolis" : {
+    "AmbiguousMethod_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/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa1cb",
-                    "hash" : "0xe6a1e5b2d67f45f1f82e457d82dbaaa884f22407608913b00a0099924b45e5ad",
-                    "mixHash" : "0x91cdfef85e5afe73cd097eafeb1315eb80cb797c666e0780acb052b5621e0d16",
-                    "nonce" : "0xb81209939ebc5540",
+                    "gasUsed" : "0xa1a3",
+                    "hash" : "0x3c5ba07bbe8357306b643d382ebf1f6092530c71af694ffec60d28d59825fa07",
+                    "mixHash" : "0xbeca28f0ed2a6f257f1e9db5fa90a8663f58b9ed91c65a9a5b09e156a0c057a3",
+                    "nonce" : "0xdddf8868c2e675fc",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
-                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
+                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
+                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a091cdfef85e5afe73cd097eafeb1315eb80cb797c666e0780acb052b5621e0d1688b81209939ebc5540f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a0beca28f0ed2a6f257f1e9db5fa90a8663f58b9ed91c65a9a5b09e156a0c057a388dddf8868c2e675fcf866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6a1e5b2d67f45f1f82e457d82dbaaa884f22407608913b00a0099924b45e5ad",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3c5ba07bbe8357306b643d382ebf1f6092530c71af694ffec60d28d59825fa07",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a1",
+                "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x014f"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a1a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x06ff7c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07a120",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "AmbiguousMethod_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa1a3",
+                    "hash" : "0xc71aa2e3ea633527700c9506bd7747f829766d23ebbb7753be0a1f948f1cf0da",
+                    "mixHash" : "0x6b7add39a49903552b95f84dd1dcc065134747a8a3b70aaead2312ead3b51b40",
+                    "nonce" : "0xa0d8d77802922edf",
+                    "number" : "0x01",
+                    "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
+                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
+                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a06b7add39a49903552b95f84dd1dcc065134747a8a3b70aaead2312ead3b51b4088a0d8d77802922edff866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071",
+                        "s" : "0x6e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc71aa2e3ea633527700c9506bd7747f829766d23ebbb7753be0a1f948f1cf0da",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1cb",
+                "balance" : "0x4563918244f4a1a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x06ff54",
+                "balance" : "0x06ff7c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {