Merge pull request #497 from ethereum/create2

refill collision test

1 files changed, 78 insertions, 22 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json
index b54e7d49e..b05ccd72f 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionBalance_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json",
-            "sourceHash" : "a6dbbb19e1e4568d0b846c3ccc6f470e1a4a9378672b9f79b0238e97da147a1d"
+            "sourceHash" : "2654c43bd4351356a9eaafcf540359a0c608d7b9fcbf0214da46331b0e80bab9"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x3c21af30970cb3040c54f5beda9656e343aa46cfe508e90c8f1cd910d4863a20",
+                    "hash" : "0xabbc2e834d4d06ea7a81290bd27db522598aabfe0a85a57e2d7dec0fc14624e3",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0x72f450246420cee8e36eec7ba251702e7e5bd837853571cff0fc4b31e165def2",
+                    "stateRoot" : "0x6367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa072f450246420cee8e36eec7ba251702e7e5bd837853571cff0fc4b31e165def2a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06367402df6af17bdc9f0143e58817761cdf12b7074defbfed27ebe153ee23d32a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5d",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c21af30970cb3040c54f5beda9656e343aa46cfe508e90c8f1cd910d4863a20",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xabbc2e834d4d06ea7a81290bd27db522598aabfe0a85a57e2d7dec0fc14624e3",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionBalance_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has balance != 0",
+            "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty",
             "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json",
-            "sourceHash" : "a6dbbb19e1e4568d0b846c3ccc6f470e1a4a9378672b9f79b0238e97da147a1d"
+            "sourceHash" : "2654c43bd4351356a9eaafcf540359a0c608d7b9fcbf0214da46331b0e80bab9"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x014d78",
-                    "hash" : "0x0631c550bf033c0cade9d1ac8062a2dd047cab21428675be89f5c18647188e05",
+                    "hash" : "0x4d41a66fcddf207bfbd75e2fbff9a908222fe26e6c213754acb69250f4139281",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+                    "parentHash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
                     "receiptTrie" : "0x0280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345",
-                    "stateRoot" : "0x2f10f9405b122dc144875e68134253b4f5eac633b742d1b20585891bf953bc70",
+                    "stateRoot" : "0xfee04fc073a8baf8561bfeddcc2b9bf15bdf26c361b20e79a4ee37ee29948e67",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f10f9405b122dc144875e68134253b4f5eac633b742d1b20585891bf953bc70a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a080d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fee04fc073a8baf8561bfeddcc2b9bf15bdf26c361b20e79a4ee37ee29948e67a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -160,19 +188,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9341157586e27b818594edac30e7f5f31d1835c61beaeb195ffe037da9cdc8f5",
+            "hash" : "0x80d4314228311bfe2837641c967f4013f4e463d87fcafa6493e5ceac3b5023aa",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5d",
+            "stateRoot" : "0x54baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04087d8a0d34a21f4873ae2650e1a87fa8d6761d84ccaeac32c1375f3ed1a0e5da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0631c550bf033c0cade9d1ac8062a2dd047cab21428675be89f5c18647188e05",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa054baeb2918248ea92a38f78e7f3a8d03f9d8dcbe8174ea99604947544958e71ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4d41a66fcddf207bfbd75e2fbff9a908222fe26e6c213754acb69250f4139281",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -196,12 +224,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -212,12 +254,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"