Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

1 files changed, 40 insertions, 47 deletions

diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
index 5ef2a82f7..8f1be178d 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
@@ -2,7 +2,7 @@
     "AmbiguousMethod_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1cb",
-                    "hash" : "0x426b0c05d0437ee1ebfbc69d5e72f0814b600bc021187c75595e129a65a22e61",
-                    "mixHash" : "0xb0f2f9ab23d313b699ee21ede3c30d0a3a70c9722cb10b9d21b6ac3820254b8a",
-                    "nonce" : "0x5eaf6922e432ea5e",
+                    "hash" : "0x8835e1693db1f15660699fa8cf98d0512d7aa3ad5d3318bca9693a1387d88293",
+                    "mixHash" : "0x441b4e044750ef21a00ee144b3841e1d5607a5f8ba7d56f7c12387e7649565ca",
+                    "nonce" : "0x579aa64497865eb8",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
-                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
+                    "stateRoot" : "0x1f7b60cac5f9c174595c9b94b4d05b08d7a347d6e0f0c1dceab4d9cbfe1906f3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0b0f2f9ab23d313b699ee21ede3c30d0a3a70c9722cb10b9d21b6ac3820254b8a885eaf6922e432ea5ef866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f7b60cac5f9c174595c9b94b4d05b08d7a347d6e0f0c1dceab4d9cbfe1906f3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0441b4e044750ef21a00ee144b3841e1d5607a5f8ba7d56f7c12387e7649565ca88579aa64497865eb8f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x426b0c05d0437ee1ebfbc69d5e72f0814b600bc021187c75595e129a65a22e61",
+        "lastblockhash" : "0x8835e1693db1f15660699fa8cf98d0512d7aa3ad5d3318bca9693a1387d88293",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1cb",
+                "balance" : "0x29a2241af62ca1cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -115,7 +108,7 @@
     "AmbiguousMethod_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +120,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1cb",
-                    "hash" : "0x0e59ed2758b5338c350a5185c6726fe8e94a7018096e3dffedfeb0c55e816c5f",
-                    "mixHash" : "0xea2d711ef0b9ea2ef5b79720497fef5960e3812aae73770d8d1a12c2ae73727c",
-                    "nonce" : "0xe4fa0ca45fd146e7",
+                    "hash" : "0x7f725135c8c2fc1907fbf5f1d71e7bad043364a6b6f78a33e89393c8d507102c",
+                    "mixHash" : "0x101efae6f88dc42754fb96d95f52fafb6eedd2c683c4075a6339d28d49fe3c27",
+                    "nonce" : "0x41a809aef68a76f9",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
-                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
+                    "stateRoot" : "0xfb5e8f293ee61608367f8296a18984e510e0c5c6c4056d1b4ec6b77f0f664920",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0ea2d711ef0b9ea2ef5b79720497fef5960e3812aae73770d8d1a12c2ae73727c88e4fa0ca45fd146e7f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb5e8f293ee61608367f8296a18984e510e0c5c6c4056d1b4ec6b77f0f664920a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0101efae6f88dc42754fb96d95f52fafb6eedd2c683c4075a6339d28d49fe3c278841a809aef68a76f9f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -175,7 +168,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e59ed2758b5338c350a5185c6726fe8e94a7018096e3dffedfeb0c55e816c5f",
+        "lastblockhash" : "0x7f725135c8c2fc1907fbf5f1d71e7bad043364a6b6f78a33e89393c8d507102c",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -194,7 +187,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1cb",
+                "balance" : "0x29a2241af62ca1cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -228,7 +221,7 @@
     "AmbiguousMethod_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -240,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1a3",
-                    "hash" : "0x5b79cce665cc548e0069d3ec6867707712623f995680fac73cfed7e365e636a1",
-                    "mixHash" : "0x69065fbbf7dcc86c02b8aeab3e046377ade2d03290b1667d08170e4b0f58ee86",
-                    "nonce" : "0x0fe52b5a3f553034",
+                    "hash" : "0x5aed7f319f5e28b076dda3008794b84e4c31dcd38d33fd134bf43baddb3c373b",
+                    "mixHash" : "0x235ffa7965a237fb8c6516a42466a605e27d0fa2538b77f4797fc1eac4621ef5",
+                    "nonce" : "0xd597fa9ebb923b25",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
@@ -251,7 +244,7 @@
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a069065fbbf7dcc86c02b8aeab3e046377ade2d03290b1667d08170e4b0f58ee86880fe52b5a3f553034f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a0235ffa7965a237fb8c6516a42466a605e27d0fa2538b77f4797fc1eac4621ef588d597fa9ebb923b25f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -288,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b79cce665cc548e0069d3ec6867707712623f995680fac73cfed7e365e636a1",
+        "lastblockhash" : "0x5aed7f319f5e28b076dda3008794b84e4c31dcd38d33fd134bf43baddb3c373b",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -334,7 +327,7 @@
     "AmbiguousMethod_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +339,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1cb",
-                    "hash" : "0x57f9169766ec55fa6f1d401a117eef8022c39fe400086cfcb05bb23ba34a55c7",
-                    "mixHash" : "0xc663c69f64447744d26d54809d88fbe58b3e477fe0540bf81f6cdba1d3352749",
-                    "nonce" : "0xe96a9ad8c7d4ae12",
+                    "hash" : "0xd038f9b028c5610de7a78a08ee8571fbfaf1043bdebf5d29671042b300098b24",
+                    "mixHash" : "0x44901977907fe4f370e1d5d0877af0928ee4e2c3e4940739628c080d5e410a56",
+                    "nonce" : "0x17b66c927932d060",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0x9048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83",
@@ -357,7 +350,7 @@
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005ba0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a09048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0c663c69f64447744d26d54809d88fbe58b3e477fe0540bf81f6cdba1d335274988e96a9ad8c7d4ae12f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005ba0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a09048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a044901977907fe4f370e1d5d0877af0928ee4e2c3e4940739628c080d5e410a568817b66c927932d060f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -394,7 +387,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57f9169766ec55fa6f1d401a117eef8022c39fe400086cfcb05bb23ba34a55c7",
+        "lastblockhash" : "0xd038f9b028c5610de7a78a08ee8571fbfaf1043bdebf5d29671042b300098b24",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -440,7 +433,7 @@
     "AmbiguousMethod_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -452,9 +445,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1a3",
-                    "hash" : "0x3c5ba07bbe8357306b643d382ebf1f6092530c71af694ffec60d28d59825fa07",
-                    "mixHash" : "0xbeca28f0ed2a6f257f1e9db5fa90a8663f58b9ed91c65a9a5b09e156a0c057a3",
-                    "nonce" : "0xdddf8868c2e675fc",
+                    "hash" : "0x0ce87b1039017f078f02150783e88cf9dfa4df3ba3b41a9062769b5066aa0554",
+                    "mixHash" : "0x868f07b734a76f7f1a9daaab9870214e0f13f58e32c89f9f0e406ddfebfc2fbf",
+                    "nonce" : "0x771694844447e35a",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
@@ -463,7 +456,7 @@
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a0beca28f0ed2a6f257f1e9db5fa90a8663f58b9ed91c65a9a5b09e156a0c057a388dddf8868c2e675fcf866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a0868f07b734a76f7f1a9daaab9870214e0f13f58e32c89f9f0e406ddfebfc2fbf88771694844447e35af866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -500,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c5ba07bbe8357306b643d382ebf1f6092530c71af694ffec60d28d59825fa07",
+        "lastblockhash" : "0x0ce87b1039017f078f02150783e88cf9dfa4df3ba3b41a9062769b5066aa0554",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -546,7 +539,7 @@
     "AmbiguousMethod_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -558,9 +551,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1a3",
-                    "hash" : "0xc71aa2e3ea633527700c9506bd7747f829766d23ebbb7753be0a1f948f1cf0da",
-                    "mixHash" : "0x6b7add39a49903552b95f84dd1dcc065134747a8a3b70aaead2312ead3b51b40",
-                    "nonce" : "0xa0d8d77802922edf",
+                    "hash" : "0x0d2020c95bf5ed83dc601ad9da3df016c751caa1c238620850f1e83dd5a56408",
+                    "mixHash" : "0x751a6c3b926dd1eef58fa64cf5717071126d18a2cdaf2a31d51d55efed35df5b",
+                    "nonce" : "0x6da32ff212d9d0cf",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
@@ -569,7 +562,7 @@
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a06b7add39a49903552b95f84dd1dcc065134747a8a3b70aaead2312ead3b51b4088a0d8d77802922edff866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a0751a6c3b926dd1eef58fa64cf5717071126d18a2cdaf2a31d51d55efed35df5b886da32ff212d9d0cff866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -606,7 +599,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc71aa2e3ea633527700c9506bd7747f829766d23ebbb7753be0a1f948f1cf0da",
+        "lastblockhash" : "0x0d2020c95bf5ed83dc601ad9da3df016c751caa1c238620850f1e83dd5a56408",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {