more create2 collision tests

1 files changed, 78 insertions, 22 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json
index 0d6146582..271d87d21 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionSelfdestructedOOG_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 but then OOG",
+            "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/create2collisionSelfdestructedOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086f4c264b6bba7858a07d31bf7871aa7fb33cb00b9882ca33238909242ad8e"
+            "sourceHash" : "34523f6c79c063d5963718093beea76aea0e7f14a2dc221a21074b90ebd1c5d9"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x030d40",
-                    "hash" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+                    "hash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
-                    "stateRoot" : "0x50a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391a05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
+                "rlp" : "0xf90281f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055",
@@ -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" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
         "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"
     },
     "create2collisionSelfdestructedOOG_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 but then OOG",
+            "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/create2collisionSelfdestructedOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086f4c264b6bba7858a07d31bf7871aa7fb33cb00b9882ca33238909242ad8e"
+            "sourceHash" : "34523f6c79c063d5963718093beea76aea0e7f14a2dc221a21074b90ebd1c5d9"
         },
         "blocks" : [
             {
@@ -124,18 +152,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x030d40",
-                    "hash" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+                    "hash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x83412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92",
+                    "parentHash" : "0x9e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771e",
                     "receiptTrie" : "0xea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cf",
-                    "stateRoot" : "0x50a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391",
+                    "stateRoot" : "0x949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90281f901f8a083412b2da490407f7283a5a88d61635a076620076d11b5511f856bb8102e0c92a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050a3173679e84912c431f8076b98e651e3a3d006913d4f82c18f188e94ac8391a05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
+                "rlp" : "0xf90281f901f8a09e403072017b50f3e1bf4af66a01ace806703dc9e22f9edb5041a2f0a197771ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0949a0fbebf77736d17deecf88eee64427ed5721f481f1d89ec2f9ab4c7ded75fa05bd6891b6058848787d00a4ecd2dc6510fc3f7fd4646f6ef9af4ca9e233bf400a0ea5b87d12423d7570eb418dcdbb9f547f8fcc0577bd026d2189fd8fb550b85cfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083030d408203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f883f881800183030d408001b56000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000551ca05f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64aa04a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055",
@@ -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" : "0x73cb949853684df61a322ac8670e58b1c276d6e258a08aa5c1a30b86b15b6223",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00edf4ab8df4ed5fbf6225445f8a37a4176d466fe14a0b485c6ddcd1a7968494ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2fbaee6ba96ad35e991b8dd5e943674bb2e024e1c266328ef241acba75d75243",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -189,12 +217,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" : {
@@ -205,12 +247,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"