Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EIP7610 - Revert on create collision on non empty storage #1367

Merged
merged 3 commits into from
Apr 30, 2024
Merged

EIP7610 - Revert on create collision on non empty storage #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6fd010
create fail on collision with account that has storage on all networks
winsvega Apr 22, 2024
2a15b88
fill tests
winsvega Apr 22, 2024
73e31a2
fix LegacyTests create collision
winsvega Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 41 additions & 44 deletions BlockchainTests/GeneralStateTests/stCreate2/RevertInCreateInInitCreate2.json
View file
Open in desktop

Large diffs are not rendered by default.

166 changes: 80 additions & 86 deletions BlockchainTests/GeneralStateTests/stCreate2/RevertInCreateInInitCreate2Paris.json
View file
Open in desktop

Large diffs are not rendered by default.

246 changes: 126 additions & 120 deletions BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorage.json
View file
Open in desktop

Large diffs are not rendered by default.

480 changes: 246 additions & 234 deletions BlockchainTests/GeneralStateTests/stCreate2/create2collisionStorageParis.json
View file
Open in desktop

Large diffs are not rendered by default.

118 changes: 50 additions & 68 deletions BlockchainTests/GeneralStateTests/stExtCodeHash/dynamicAccountOverwriteEmpty.json
View file
Open in desktop

Large diffs are not rendered by default.

238 changes: 98 additions & 140 deletions BlockchainTests/GeneralStateTests/stExtCodeHash/dynamicAccountOverwriteEmpty_Paris.json
View file
Open in desktop

Large diffs are not rendered by default.

85 changes: 41 additions & 44 deletions BlockchainTests/GeneralStateTests/stRevertTest/RevertInCreateInInit.json
View file
Open in desktop

Large diffs are not rendered by default.

166 changes: 80 additions & 86 deletions BlockchainTests/GeneralStateTests/stRevertTest/RevertInCreateInInit_Paris.json
View file
Open in desktop

Large diffs are not rendered by default.

316 changes: 161 additions & 155 deletions BlockchainTests/GeneralStateTests/stSStoreTest/InitCollision.json
View file
Open in desktop

Large diffs are not rendered by default.

616 changes: 314 additions & 302 deletions BlockchainTests/GeneralStateTests/stSStoreTest/InitCollisionParis.json
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions GeneralStateTests/stCreate2/RevertInCreateInInitCreate2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"RevertInCreateInInitCreate2" : {
"_info" : {
"comment" : "RevertInCreateInInit for CREATE2",
"filling-rpc-server" : "evm version 1.13.11-unstable-765f2904-20240124",
"filling-tool-version" : "retesteth-0.3.2-cancun+commit.021b8dfd.Linux.g++",
"generatedTestHash" : "e6960074e68c5563a08d2295a898901e0d0f9e31649dc607f0294c91d481a0de",
"filling-rpc-server" : "evm version 1.14.0-unstable-a208e725-20240416",
"filling-tool-version" : "retesteth-0.3.2-cancun+commit.166949a5.Linux.g++",
"generatedTestHash" : "7b5086121a8d25fb219679941c87dd3cda2c855e9fe2a8b940614d1ca1ab336d",
"lllcversion" : "Version: 0.5.14-develop.2023.7.11+commit.c58ab2c6.mod.Linux.g++",
"solidity" : "Version: 0.8.21+commit.d9974bed.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/RevertInCreateInInitCreate2Filler.json",
"sourceHash" : "a3aece6a5711e7e3fb605fc4a716203f0b28f1aec5802b8ec77a1b63ec69e8b8"
"sourceHash" : "2aa031ae24803c113e6983ea0b01948580cab53f9134145f2947d90327af96a4"
},
"env" : {
"currentBaseFee" : "0x0a",
Expand All @@ -23,7 +23,7 @@
"post" : {
"Berlin" : [
{
"hash" : "0xe0cfa6916b126d6a08639aa0b928a053b7bba1390535e166c1f5d41068a4fc45",
"hash" : "0x5c909919be50eb74177909035f65aaeebd416d956f0b6bc2fbd4e6c15daa889f",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -35,7 +35,7 @@
],
"Istanbul" : [
{
"hash" : "0x10d9c3f9d4ee9d2420a2c1b625ac7617fef931d427c8a26cda91bf5366284b4f",
"hash" : "0x5c909919be50eb74177909035f65aaeebd416d956f0b6bc2fbd4e6c15daa889f",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -47,7 +47,7 @@
],
"London" : [
{
"hash" : "0x1630efc059d561192a9aa46c6540a9909e96630de6fb3959616f2c2d7699e5cd",
"hash" : "0xb90073dec9b4d9075782a4d8677aa3452c91637e21b4e8923971fa56815a7d1a",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand Down
20 changes: 10 additions & 10 deletions GeneralStateTests/stCreate2/RevertInCreateInInitCreate2Paris.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"RevertInCreateInInitCreate2Paris" : {
"_info" : {
"comment" : "RevertInCreateInInit for CREATE2",
"filling-rpc-server" : "evm version 1.13.11-unstable-765f2904-20240124",
"filling-tool-version" : "retesteth-0.3.2-cancun+commit.021b8dfd.Linux.g++",
"generatedTestHash" : "5d446baa917e02775ec8d372111906c3fadd21758422761daa23101271c1ddc7",
"filling-rpc-server" : "evm version 1.14.0-unstable-a208e725-20240416",
"filling-tool-version" : "retesteth-0.3.2-cancun+commit.166949a5.Linux.g++",
"generatedTestHash" : "f10c8d059c517d71467fed541c7277691ed06a69522c9442e82f6945f80971c4",
"lllcversion" : "Version: 0.5.14-develop.2023.7.11+commit.c58ab2c6.mod.Linux.g++",
"solidity" : "Version: 0.8.21+commit.d9974bed.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/RevertInCreateInInitCreate2ParisFiller.json",
"sourceHash" : "b19a35d675b09ac65090bb76f324a7a5886d7f7398366418aadf55fba43ff545"
"sourceHash" : "0ff52f5c09f0e78ae8ee5c6f5eeb8afb0efe97b78a9896dd85491c4372715dcb"
},
"env" : {
"currentBaseFee" : "0x0a",
Expand All @@ -23,7 +23,7 @@
"post" : {
"Berlin" : [
{
"hash" : "0xfdfd5e3afeada256af5eff7dd0deca44de26340f3812ad067f704d0a611ac9ba",
"hash" : "0x654e44cac0594200b168f2d9515d564a3d119838c5fc01f2de4c8a3691b67b6a",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -35,7 +35,7 @@
],
"Cancun" : [
{
"hash" : "0x64dd3e2e4f1edddb8854d6a384e7dde2123857489de111704d8c6c63b5c9e14a",
"hash" : "0x3e518e0ca76504209a2a44b6c11af9537e7872c4005ce49b633ee0f1d845049f",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -47,7 +47,7 @@
],
"Istanbul" : [
{
"hash" : "0x3d46b7e7378a3b57a68a441cd7d0c3e1935af13456487b8c879bdf4f24aaea1c",
"hash" : "0x654e44cac0594200b168f2d9515d564a3d119838c5fc01f2de4c8a3691b67b6a",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -59,7 +59,7 @@
],
"London" : [
{
"hash" : "0xf0f8ad8a9c7e033bbcf456d0b16845a4b2f9c65d3c9321b9491c0b3622abf908",
"hash" : "0x3e518e0ca76504209a2a44b6c11af9537e7872c4005ce49b633ee0f1d845049f",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -71,7 +71,7 @@
],
"Paris" : [
{
"hash" : "0xf0f8ad8a9c7e033bbcf456d0b16845a4b2f9c65d3c9321b9491c0b3622abf908",
"hash" : "0x3e518e0ca76504209a2a44b6c11af9537e7872c4005ce49b633ee0f1d845049f",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -83,7 +83,7 @@
],
"Shanghai" : [
{
"hash" : "0x64dd3e2e4f1edddb8854d6a384e7dde2123857489de111704d8c6c63b5c9e14a",
"hash" : "0x3e518e0ca76504209a2a44b6c11af9537e7872c4005ce49b633ee0f1d845049f",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand Down
26 changes: 13 additions & 13 deletions GeneralStateTests/stCreate2/create2collisionStorage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"create2collisionStorage" : {
"_info" : {
"comment" : "create2 generates an account that already exists and has storage != 0",
"filling-rpc-server" : "evm version 1.13.11-unstable-765f2904-20240124",
"filling-tool-version" : "retesteth-0.3.2-cancun+commit.021b8dfd.Linux.g++",
"generatedTestHash" : "bdaed60ba355181718408a52a874c2c92bd54e7bf7736aef8ea84bb4a72e7fc0",
"filling-rpc-server" : "evm version 1.14.0-unstable-a208e725-20240416",
"filling-tool-version" : "retesteth-0.3.2-cancun+commit.166949a5.Linux.g++",
"generatedTestHash" : "65031ae45fded0d20a55f470e4c34d793430cbe7b8e8219510fd4fffe4d759da",
"lllcversion" : "Version: 0.5.14-develop.2023.7.11+commit.c58ab2c6.mod.Linux.g++",
"solidity" : "Version: 0.8.21+commit.d9974bed.Linux.g++",
"source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json",
"sourceHash" : "7c85d1eb6a1c8d0ec7cbae22596b41fd92dca07caa178a319d2c59ca57fe4558"
"sourceHash" : "380623d3fb4c87dd224dbf9d99e49b48652a15b0685db607f4b00efd364a50fe"
},
"env" : {
"currentBaseFee" : "0x0a",
Expand All @@ -23,7 +23,7 @@
"post" : {
"Berlin" : [
{
"hash" : "0xf25ae1681e4ab49730dbe86bffad974765d125e8840e4c382f494706d205a106",
"hash" : "0x2323d8785a0b61eb9343e6c90be2e3200f8b50a0fead77032450b8c17a9c6e5c",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -33,7 +33,7 @@
"txbytes" : "0xf856800a83061a8080018a6000600060006000f5001ba0acade9bf40dc1c5bc8284052adf76c7736f775577152af5af88eeae247cabb06a01bd8f8c798e61698b3ec58d81a20b859157b7737a21f6d1e249486b480fc0a06"
},
{
"hash" : "0xc24ed60f38101cf206c81abff6318be45e7a9b98904b3cef9aad8376af5abbcb",
"hash" : "0xbb5ac94ae25dd07fb9a1192ba7103bbf4d2fa1ce791f19b8222d13d027f6f9a5",
"indexes" : {
"data" : 1,
"gas" : 0,
Expand All @@ -43,7 +43,7 @@
"txbytes" : "0xf85f800a83061a8080019364600160015560005260006005601b6000f5001ca04428bd071fe02fd35003fb0bedc883c3520cd0d487412183723f68ab9dc1a279a07e06e4ba75635a89e699fbe7d0d77e0bc82c39d9d091a6c5f3bbe1fe1608ee16"
},
{
"hash" : "0x89913d196929ba3a79d4beb75d582a0f20fc51890b27e4b83048aee0e9bdea51",
"hash" : "0xd36a158aa6f4ecee70409810d28777e554a891f33360c67d51ae81cfe41836be",
"indexes" : {
"data" : 2,
"gas" : 0,
Expand All @@ -55,7 +55,7 @@
],
"Istanbul" : [
{
"hash" : "0xf25ae1681e4ab49730dbe86bffad974765d125e8840e4c382f494706d205a106",
"hash" : "0x2323d8785a0b61eb9343e6c90be2e3200f8b50a0fead77032450b8c17a9c6e5c",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -65,7 +65,7 @@
"txbytes" : "0xf856800a83061a8080018a6000600060006000f5001ba0acade9bf40dc1c5bc8284052adf76c7736f775577152af5af88eeae247cabb06a01bd8f8c798e61698b3ec58d81a20b859157b7737a21f6d1e249486b480fc0a06"
},
{
"hash" : "0xf9aab098178328ab0be949ffbc41ad181e48ddc39e2d68fd49f199437e600202",
"hash" : "0xbb5ac94ae25dd07fb9a1192ba7103bbf4d2fa1ce791f19b8222d13d027f6f9a5",
"indexes" : {
"data" : 1,
"gas" : 0,
Expand All @@ -75,7 +75,7 @@
"txbytes" : "0xf85f800a83061a8080019364600160015560005260006005601b6000f5001ca04428bd071fe02fd35003fb0bedc883c3520cd0d487412183723f68ab9dc1a279a07e06e4ba75635a89e699fbe7d0d77e0bc82c39d9d091a6c5f3bbe1fe1608ee16"
},
{
"hash" : "0x89913d196929ba3a79d4beb75d582a0f20fc51890b27e4b83048aee0e9bdea51",
"hash" : "0xd36a158aa6f4ecee70409810d28777e554a891f33360c67d51ae81cfe41836be",
"indexes" : {
"data" : 2,
"gas" : 0,
Expand All @@ -87,7 +87,7 @@
],
"London" : [
{
"hash" : "0xa04a8cd0a44276f71e3d54c93dfb6e9bac585b7faa8bb1399e6593b5661910b7",
"hash" : "0xe290dd41e1c683f449154c8b00f8aa2a45a955f4046af57ec8914bee60485dea",
"indexes" : {
"data" : 0,
"gas" : 0,
Expand All @@ -97,7 +97,7 @@
"txbytes" : "0xf856800a83061a8080018a6000600060006000f5001ba0acade9bf40dc1c5bc8284052adf76c7736f775577152af5af88eeae247cabb06a01bd8f8c798e61698b3ec58d81a20b859157b7737a21f6d1e249486b480fc0a06"
},
{
"hash" : "0x92a996658cf53956063fafa353868625f71397348a84ac65f53c581b95a24e40",
"hash" : "0xcc2af6bf0f73b581b6dea3d36ff2015929ebcf236fea18e3cc09743c10f9a0de",
"indexes" : {
"data" : 1,
"gas" : 0,
Expand All @@ -107,7 +107,7 @@
"txbytes" : "0xf85f800a83061a8080019364600160015560005260006005601b6000f5001ca04428bd071fe02fd35003fb0bedc883c3520cd0d487412183723f68ab9dc1a279a07e06e4ba75635a89e699fbe7d0d77e0bc82c39d9d091a6c5f3bbe1fe1608ee16"
},
{
"hash" : "0x00d2ff9b0eeb08acfabc922782c9bcc97e796bd1a502dececfad6618c2d457b6",
"hash" : "0x45ad75ba9683981392cde9426e04e897a61b2b3aee3de6dcbc02d94fca99e94a",
"indexes" : {
"data" : 2,
"gas" : 0,
Expand Down
Loading