more create2 collision tests

1 files changed, 52 insertions, 20 deletions

diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json
index e1dbf8160..c8143ad6e 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json
@@ -2,10 +2,10 @@
     "create2collisionStorage_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has storage != 0",
-            "filledwith" : "testeth 1.5.0.dev2+commit.e5553c60.dirty",
+            "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/create2collisionStorage_d1g0v0Filler.json",
-            "sourceHash" : "f916078403ba26e35ab508219e91b1fa87ce4d2baabf59a055d60835e1958f93"
+            "sourceHash" : "54181bee67b571f67c4db03cf9febd94a9c6c9ae1d6cf264a486372e98736d97"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xa093f1e85390526e3c9cb4780413866b0852baa454a26ae4da2b3d9cf1b189a6",
+                    "hash" : "0x0a0348178b571f4e210ac925ffc90c233181df016eb7290175b8f1b90e819c11",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x4a1dd4f2006029d402316bc1dc08ebd5d7c80e0e7125048c1070453f8d3814f8",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0x40d9852a5d51ca94935910da5caf67cd3aba6ae7524ca402aebccc9273b12d0f",
+                    "stateRoot" : "0xae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f8a04a1dd4f2006029d402316bc1dc08ebd5d7c80e0e7125048c1070453f8d3814f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d9852a5d51ca94935910da5caf67cd3aba6ae7524ca402aebccc9273b12d0fa0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "rlp" : "0xf9025ef901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013ba0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
                 "transactions" : [
                     {
                         "data" : "0x64600160015560005260006005601b6000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x4a1dd4f2006029d402316bc1dc08ebd5d7c80e0e7125048c1070453f8d3814f8",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3ac3bcc6cfca2e68cd4beb7fad9efaf986775ca9374b32a46f965de7d5f7d455",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ac3bcc6cfca2e68cd4beb7fad9efaf986775ca9374b32a46f965de7d5f7d455a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa093f1e85390526e3c9cb4780413866b0852baa454a26ae4da2b3d9cf1b189a6",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0a0348178b571f4e210ac925ffc90c233181df016eb7290175b8f1b90e819c11",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -96,6 +96,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "pre" : {
@@ -121,6 +129,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "sealEngine" : "NoProof"
@@ -128,10 +144,10 @@
     "create2collisionStorage_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has storage != 0",
-            "filledwith" : "testeth 1.5.0.dev2+commit.e5553c60.dirty",
+            "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/create2collisionStorage_d1g0v0Filler.json",
-            "sourceHash" : "f916078403ba26e35ab508219e91b1fa87ce4d2baabf59a055d60835e1958f93"
+            "sourceHash" : "54181bee67b571f67c4db03cf9febd94a9c6c9ae1d6cf264a486372e98736d97"
         },
         "blocks" : [
             {
@@ -142,18 +158,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x019e4e",
-                    "hash" : "0xb7a623d281d9bf8841b23fa83546927f55528f37168ab0daaf63649f0a91c291",
+                    "hash" : "0x2139b6fc23f1231b965d6cba5e29b50ed533f8494f9afdd254985d8b8296348c",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x4a1dd4f2006029d402316bc1dc08ebd5d7c80e0e7125048c1070453f8d3814f8",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
                     "receiptTrie" : "0x908fdf67d77ea4340d0d868e513eb0b5c689dfc14418e6beffd11356b6fbc802",
-                    "stateRoot" : "0xe5d0f6594626809dff06fe99ee75573fd8ca5da0d36700c3d53a0fad63e46e2a",
+                    "stateRoot" : "0xb7da40bf9d3f5dd8e147a49aef2ac56da8460c5ad1189d2c58ee633e1284d19a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcd",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f8a04a1dd4f2006029d402316bc1dc08ebd5d7c80e0e7125048c1070453f8d3814f8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5d0f6594626809dff06fe99ee75573fd8ca5da0d36700c3d53a0fad63e46e2aa0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0908fdf67d77ea4340d0d868e513eb0b5c689dfc14418e6beffd11356b6fbc802b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019e4e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
+                "rlp" : "0xf9025ef901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b7da40bf9d3f5dd8e147a49aef2ac56da8460c5ad1189d2c58ee633e1284d19aa0dd76ef156ad93df27e0f98a0519c55d679ce200ed4d9c1d409ec3df684afbfcda0908fdf67d77ea4340d0d868e513eb0b5c689dfc14418e6beffd11356b6fbc802b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019e4e8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f860f85e800183061a8080019264600160015560005260006005601b6000f51ca07da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84a07bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377cc0",
                 "transactions" : [
                     {
                         "data" : "0x64600160015560005260006005601b6000f5",
@@ -178,19 +194,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x4a1dd4f2006029d402316bc1dc08ebd5d7c80e0e7125048c1070453f8d3814f8",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3ac3bcc6cfca2e68cd4beb7fad9efaf986775ca9374b32a46f965de7d5f7d455",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03ac3bcc6cfca2e68cd4beb7fad9efaf986775ca9374b32a46f965de7d5f7d455a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7a623d281d9bf8841b23fa83546927f55528f37168ab0daaf63649f0a91c291",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x2139b6fc23f1231b965d6cba5e29b50ed533f8494f9afdd254985d8b8296348c",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -229,6 +245,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "pre" : {
@@ -254,6 +278,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "sealEngine" : "NoProof"