1 files changed, 85 insertions, 22 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json
index 2fa932762..67c065b10 100644
--- a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json
@@ -1,11 +1,11 @@
 {
     "create2collisionStorage_d0g0v0_Byzantium" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has storage != 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/create2collisionStorage_d0g0v0Filler.json",
-            "sourceHash" : "215a730812835e8ceb0a30b9bcff79ccf9cd163d160f0d86a63a9aa434f7902b"
+            "sourceHash" : "cb504c6d6321afb29a71bc36cfca25d289d663bc65b5897c9d96d4c1f5c32927"
         },
         "blocks" : [
             {
@@ -16,18 +16,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x061a80",
-                    "hash" : "0xf9865aa65cda4a72778a6976a33acb9d291805612c9d12089aec863d4821f8e3",
+                    "hash" : "0x49e4a88f7f0ba2f119d6596176faee3699502bdf970d062245561325a30e33aa",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
                     "receiptTrie" : "0xba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094",
-                    "stateRoot" : "0xb2a54640c5dbef94d20fb236a51a66a824dcf161a6b52e1c31400c2a988a83d8",
+                    "stateRoot" : "0xae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2a54640c5dbef94d20fb236a51a66a824dcf161a6b52e1c31400c2a988a83d8a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae19854e6b8302171306f24dc8bd539603558dc20d78c22f32e3d691514a013ba0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a0ba9991e573821b0c234e361e68d2fe4b0fc940f8380d61fc18ee6ceb963b7094b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083061a808203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -52,19 +52,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9865aa65cda4a72778a6976a33acb9d291805612c9d12089aec863d4821f8e3",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x49e4a88f7f0ba2f119d6596176faee3699502bdf970d062245561325a30e33aa",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -81,6 +81,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -88,6 +96,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "pre" : {
@@ -98,6 +114,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -105,17 +129,25 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "sealEngine" : "NoProof"
     },
     "create2collisionStorage_d0g0v0_Constantinople" : {
         "_info" : {
-            "comment" : "",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+            "comment" : "create2 generates an account that already exists and has storage != 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/create2collisionStorage_d0g0v0Filler.json",
-            "sourceHash" : "215a730812835e8ceb0a30b9bcff79ccf9cd163d160f0d86a63a9aa434f7902b"
+            "sourceHash" : "cb504c6d6321afb29a71bc36cfca25d289d663bc65b5897c9d96d4c1f5c32927"
         },
         "blocks" : [
             {
@@ -126,18 +158,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x014d78",
-                    "hash" : "0x3ab80d409cdfe96a5cad20dea8dcc90d96c81c27aa69085f8a59c05f2b94d774",
+                    "hash" : "0x598074c7d316c51d5eb6602da052366600c01b199e35da7388a749d7ad43abd6",
                     "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
                     "nonce" : "0x0000000000000000",
                     "number" : "0x01",
-                    "parentHash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+                    "parentHash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
                     "receiptTrie" : "0x0280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345",
-                    "stateRoot" : "0xb8de3d4ee275ea71447637a3d27b4f6c9fa785beaff6e6c7ea923625623b9c24",
+                    "stateRoot" : "0x20dd2218fb0755ea371bc5657ef8677477165bfd12b9571324c6a5a50a1dd283",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xb70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90255f901f8a09055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8de3d4ee275ea71447637a3d27b4f6c9fa785beaff6e6c7ea923625623b9c24a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
+                "rlp" : "0xf90255f901f8a0b43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020dd2218fb0755ea371bc5657ef8677477165bfd12b9571324c6a5a50a1dd283a0b70c74785b8b7681bc597b44ff6c81e032bc23f3351208ae1cc350ecc57e3514a00280b3d3640932e2aba7def3095917b394225ec9be38617d2b8edab23ea50345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083014d788203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f857f855800183061a808001896000600060006000f51ca0ec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41a072568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48c0",
                 "transactions" : [
                     {
                         "data" : "0x6000600060006000f5",
@@ -162,19 +194,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0x9055e9fa294c3c08c0491f856ece84799a5207646ce944cdad02f54626f9d773",
+            "hash" : "0xb43a091fee618256d54e8d9fdf02d548e1a773492799702275b43ce0225cc0fc",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01",
+            "stateRoot" : "0xd07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4747a8f3ff0eae3630afe952ee762e6770e7dc20e78e7d34a57ebf631163d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ab80d409cdfe96a5cad20dea8dcc90d96c81c27aa69085f8a59c05f2b94d774",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d07addde6420f48a5daa734b13b9c5aab5ba137c965c298be6ec3f21ca4daa22a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x598074c7d316c51d5eb6602da052366600c01b199e35da7388a749d7ad43abd6",
         "network" : "Constantinople",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -198,11 +230,26 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
+                }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
                     "0x00" : "0x01"
                 }
             }
@@ -215,6 +262,14 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
@@ -222,6 +277,14 @@
                 "storage" : {
                     "0x00" : "0x01"
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
             }
         },
         "sealEngine" : "NoProof"