more create2 collision tests

1 files changed, 57 insertions, 5 deletions

diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
index 57274403b..2841f7cc1 100644
--- a/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
@@ -2,10 +2,10 @@
     "create2collisionSelfdestructedRevert" : {
         "_info" : {
             "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called",
-            "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/create2collisionSelfdestructedRevertFiller.json",
-            "sourceHash" : "5ee9f4ff1a2bbba51a007aab9a4fb4c771fe44b3cdf6c840d670a803c649f4a0"
+            "sourceHash" : "3cf7bd53e01efb8c6e4cc18108d35e3af6db95b868cccf728383ba65e30665c6"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0xa0652ee361902645d869d84d6cfe814679e9a318e09205e6de48a9fbdcd33760",
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0x4d7794f8ec48cb043fce08a7d9e53ead7016a4441408e05de50e0aefbaf33a08",
+                    "hash" : "0x67ee8792884cb74ca16898a91dad472752d48af97b491a004e0b04b6ff11fd1a",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xc340c1ded39af2c0921a1ff70f07e73b761a05e1872bcda26d82074aacdac7a0",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xfe7f548b1a6d01545688f701ee883f6411b6dc6e79e0b281889cff2fcc5e8cb7",
+                    "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" : [
-                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd"
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd",
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd",
+                "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd"
             ],
             "gasLimit" : [
                 "0x061a80"