more create2 collision tests

1 files changed, 57 insertions, 5 deletions

diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
index 804d05fff..f33a0725f 100644
--- a/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
@@ -2,10 +2,10 @@
     "create2collisionSelfdestructedOOG" : {
         "_info" : {
             "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG",
-            "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.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/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json",
-            "sourceHash" : "6b3e76fd94ad0d4b63c4f0709b9a08e407681128ee046157ac29be87f61610ea"
+            "sourceHash" : "77cbd98bf19a333fb67d41d07874d0d68b9087ffdcbadcb79f0e88dd9ea5eec0"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720",
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720",
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "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" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055"
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055",
+                "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f55062112233600055",
+                "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f55062112233600055"
             ],
             "gasLimit" : [
                 "0x030d40"