Merge pull request #497 from ethereum/create2

refill collision test

1 files changed, 78 insertions, 22 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json
index 5716da077..d771e9e77 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionSelfdestructed_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "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/create2collisionSelfdestructed_d0g0v0Filler.json",
-            "sourceHash" : "527a7777595f330353b70425fbf29fee7675cf8d406f9b0cef802a7d99180dfd"
+            "sourceHash" : "2428d9d4ac82e19570afb59a7431938920fcb28d446ff6a751067218680cf913"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0x5b795842170f0b507c22d903a67107e3bfeab686154c0515bd6ee4f9f39d1ed3",
+                    "hash" : "0xf4506629f36ff59dfc363382fa6b2282d974f98bba8b4147613aefe7327b8f80",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xaba8c8b7e6c1954be9bafa069bc04ec9b3aea31361d01d6a13cbcc9e975237f3",
+                    "stateRoot" : "0x43ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90279f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aba8c8b7e6c1954be9bafa069bc04ec9b3aea31361d01d6a13cbcc9e975237f3a02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
+                "rlp" : "0xf90279f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043ecc522a3fc260cb9bf3ad88eebdd082a81c5859441419825ac49c594131b56a02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b795842170f0b507c22d903a67107e3bfeab686154c0515bd6ee4f9f39d1ed3",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf4506629f36ff59dfc363382fa6b2282d974f98bba8b4147613aefe7327b8f80",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,12 +81,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -97,23 +111,37 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionSelfdestructed_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "collision with address that has been selfdestructed in the same transaction",
+            "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/create2collisionSelfdestructed_d0g0v0Filler.json",
-            "sourceHash" : "527a7777595f330353b70425fbf29fee7675cf8d406f9b0cef802a7d99180dfd"
+            "sourceHash" : "2428d9d4ac82e19570afb59a7431938920fcb28d446ff6a751067218680cf913"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x05ab8e",
-                    "hash" : "0x06a2cc23083a7b424171bb13a4c0c23cbd626cbc8cd54c3e9c305b052e79f27f",
+                    "hash" : "0x44eaddbcc1bc05da3c7aa4e65abd995ba338371132404066ecab1017fb96f7e3",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xa9b782ef61e26fa58def53065af531544dfafc2b722b766783c58ed00bff0910",
-                    "stateRoot" : "0x93811df3d9049da420fead6929f0172f941dfc0d964bc16762e61efd3977e98d",
+                    "stateRoot" : "0x0e957284c023f460719c32e9c21c8753b0b28a6520a72c3783549dbe2fcf412c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x2134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90279f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093811df3d9049da420fead6929f0172f941dfc0d964bc16762e61efd3977e98da02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0a9b782ef61e26fa58def53065af531544dfafc2b722b766783c58ed00bff0910b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408305ab8e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
+                "rlp" : "0xf90279f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e957284c023f460719c32e9c21c8753b0b28a6520a72c3783549dbe2fcf412ca02134cdbcdb539627c5697089823ee175ecb1ac50e650dd09b7a30620cba43929a0a9b782ef61e26fa58def53065af531544dfafc2b722b766783c58ed00bff0910b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408305ab8e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f87bf879800183061a808001ad6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f51ca0e2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96a032326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5",
@@ -160,19 +188,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+            "hash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4",
+            "stateRoot" : "0x0edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494e",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285bc70ba15671411d1ab396413001bcb7431a029c6068063fd17f26941e5aa4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06a2cc23083a7b424171bb13a4c0c23cbd626cbc8cd54c3e9c305b052e79f27f",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x44eaddbcc1bc05da3c7aa4e65abd995ba338371132404066ecab1017fb96f7e3",
         "network" : "Constantinople",
         "postState" : {
             "0x0000000000000000000000000000000000000010" : {
@@ -202,6 +230,20 @@
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -212,12 +254,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "0x6010ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "0x6010ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "sealEngine" : "NoProof"