Merge pull request ethereum#497 from ethereum/create2

refill collision test
mattdean-digicatapult · Sep 5, 2018 · dde85c7 · dde85c7
2 parents b44cea1 + 2117e60
commit dde85c7
Show file tree

Hide file tree

Showing 58 changed files with 7,547 additions and 223 deletions.
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0.json
diff --git a/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0.json
diff --git a/GeneralStateTests/stCreate2/create2collisionBalance.json b/GeneralStateTests/stCreate2/create2collisionBalance.json
@@ -2,10 +2,10 @@
     "create2collisionBalance" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has balance != 0",
-            "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/create2collisionBalanceFiller.json",
-            "sourceHash" : "bd0821b3a8bde26a77b61300b4d2a6fb39c6fc13ddbd6f2ecfd9d23edbe943c7"
+            "sourceHash" : "1245420c316e622ebba93f732e8500dd971bd2de495d552a67868a66223484ed"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,78 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0x455afcc8ac854a58135d6b56c9b71446b6f13fd49bc75444572be50918a4a9e5",
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0xac2995edb932912509f3202ee433ed00712b9d0e6cf5578369da03ff73d50f01",
+                    "hash" : "0x69b97ecb350ab7c49e0ffbea5dd5ee872dc2dab90e8fca9d6ecae2b16f61c3cf",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x8d299acd82371ffd6826b9cdcfc0be4c45be08342871fae38bd934e536c4416f",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x126134d4e196a778bb0a5a4dc8740f837fad149dfd5a76741e7b7b82eb583319",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xa616341f188981f5b84d7e67e3e8c9f460c77255b725bf6a79a4b024d6169f54",
+                    "indexes" : {
+                        "data" : 3,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +101,34 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x01",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x01",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000f5"
+                "0x6000600060006000f5",
+                "0x64600160015560005260006005601b6000f5",
+                "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+                "0x6000600060006001f5"
             ],
             "gasLimit" : [
                 "0x061a80"

diff --git a/GeneralStateTests/stCreate2/create2collisionCode.json b/GeneralStateTests/stCreate2/create2collisionCode.json
@@ -2,10 +2,10 @@
     "create2collisionCode" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has not empty code",
-            "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/create2collisionCodeFiller.json",
-            "sourceHash" : "4f997537a448d0024ea20a53d9673afa9324d9633ec7e8b97bd74073b40a25b9"
+            "sourceHash" : "a29d584a2e2c0ef915616ed1fbc5696ccbceca975f22d3089733f6e01cb72ccb"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0x99f1f2d802c0e3d46619a143e236f1a8390f8b524553c8fd18b678317b377654",
+                    "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0x171ffc2b7bf5a9a8fcfb5d7a4b799c4069dc16f3b5b4d3837606b17b696b15f7",
+                    "hash" : "0x72761ce2124ae982e88a5df41c464119c592355ad9c41c9c5b8435d69ab52103",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x9feab867ac14d2dd0d61befa8486adf4c9b70c13d47453d66f382f0a20202da6",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xee7e793da89342c335e3c6dba89d64ea1068cb9ee6d56276a0f351e079beba83",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "0x010203",
                 "nonce" : "0x00",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "0x010203",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000f5"
+                "0x6000600060006000f5",
+                "0x64600160015560005260006005601b6000f5",
+                "0x6d6460016001556000526005601bf36000526000600e60126000f5"
             ],
             "gasLimit" : [
                 "0x061a80"

diff --git a/GeneralStateTests/stCreate2/create2collisionNonce.json b/GeneralStateTests/stCreate2/create2collisionNonce.json
@@ -2,10 +2,10 @@
     "create2collisionNonce" : {
         "_info" : {
             "comment" : "create2 generates an account that already exists and has nonce != 0",
-            "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/create2collisionNonceFiller.json",
-            "sourceHash" : "7431f28384a4f97499e69173aed899f15fe936a5ed4e955e86cd428285f1b914"
+            "sourceHash" : "d04a1fa39a8582d4ec0e9297d0f2139cc88bbe13ce063007bc850c5bc5d88c32"
         },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -18,24 +18,60 @@
         "post" : {
             "Byzantium" : [
                 {
-                    "hash" : "0x2f7b8ca16fa10a0164dedaac1c008f20ea5ea0cf67a74d173336a7b6baab71fd",
+                    "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ],
             "Constantinople" : [
                 {
-                    "hash" : "0x1f471deaed5abf11e6b12d254b69d228ce820dad5a8e248c506d47a7d2e820f1",
+                    "hash" : "0x8b8cabd2a732dc61eeb2994112158afd4fe7efd40ffd32ed5a706e879a660898",
                     "indexes" : {
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
                     },
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x4d42c80258f15c835e22e74dc8db15f00365406b23371074199b6fa0ad093626",
+                    "indexes" : {
+                        "data" : 1,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x8b248f79f0627f2400a0a72d9cf6d3b078828072f7e7e205ee644396c4a747d1",
+                    "indexes" : {
+                        "data" : 2,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 }
             ]
         },
@@ -47,17 +83,33 @@
                 "storage" : {
                 }
             },
+            "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
             "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
             }
         },
         "transaction" : {
             "data" : [
-                "0x6000600060006000f5"
+                "0x6000600060006000f5",
+                "0x64600160015560005260006005601b6000f5",
+                "0x6d6460016001556000526005601bf36000526000600e60126000f5"
             ],
             "gasLimit" : [
                 "0x061a80"