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

Jump to bottom

fix(protocol): add 1 to _REENTRY_SLOT in EssentialContract #16593

Merged
merged 3 commits into from
Apr 3, 2024
Merged

fix(protocol): add 1 to _REENTRY_SLOT in EssentialContract #16593

merged 3 commits into from
Apr 3, 2024

Conversation

dantaik
Copy link
Contributor

@dantaik dantaik commented Apr 2, 2024

Change _REENTRY_SLOT from 0xa5054f728453d3dbe953bdc43e4d0cb97e662ea32d7958190f3dc2da31d9721a to 0xa5054f728453d3dbe953bdc43e4d0cb97e662ea32d7958190f3dc2da31d9721a + 1

Based on code-423n4/2024-03-taiko-findings#11

@dantaik dantaik requested review from Brechtpd and adaki2004 April 2, 2024 03:07
@dantaik dantaik marked this pull request as ready for review April 2, 2024 03:07
@dantaik dantaik mentioned this pull request Apr 2, 2024
Open
@openzeppelin-code OpenZeppelin Code
Copy link

openzeppelin-code bot commented Apr 2, 2024 •
edited
Loading

fix(protocol): add 1 to _REENTRY_SLOT in EssentialContract

Generated at commit: a8f68bb49168eb8761de4e3d446c6fd1a0fce77c

🚨 Report Summary

Severity Level Results
Contracts Critical
High
Medium
Low
Note
Total		 2
2
0
3
39
46
Dependencies Critical
High
Medium
Low
Note
Total		 0
0
0
0
0
0

For more details view the full report in OpenZeppelin Code Inspector

Brechtpd
Brechtpd approved these changes Apr 2, 2024
View reviewed changes
Copy link
Contributor

@Brechtpd Brechtpd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved, but we do assume the string being used is unique to already prevent collisions from happening. I guess a good general recommendation to be super super sure, but wouldn't call this an issue.

@dantaik dantaik requested a review from davidtaikocha April 3, 2024 00:25
davidtaikocha
davidtaikocha approved these changes Apr 3, 2024
View reviewed changes
Copy link
Member

@davidtaikocha davidtaikocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emmm looks like we need to upgrade every contract we deployed both on L1 / L2 for this change...

@dantaik dantaik added this pull request to the merge queue Apr 3, 2024
@dantaik dantaik removed this pull request from the merge queue due to a manual request Apr 3, 2024
@dantaik
Copy link
Contributor Author

dantaik commented Apr 3, 2024

Emmm looks like we need to upgrade every contract we deployed both on L1 / L2 for this change...

We don't have to apply the change anytime soon. The previous code works fine.

@dantaik dantaik added this pull request to the merge queue Apr 3, 2024
Merged via the queue into main with commit a381ddd Apr 3, 2024
10 checks passed
@dantaik dantaik deleted the _REENTRY_SLOT branch April 3, 2024 03:24
This was referenced Apr 3, 2024
Merged
Closed
@taiko-kitty taiko-kitty mentioned this pull request Apr 10, 2024
Closed
@taiko-kitty taiko-kitty mentioned this pull request Apr 25, 2024
Closed
adaki2004 pushed a commit that referenced this pull request Apr 29, 2024
Revert "fix(protocol): add 1 to _REENTRY_SLOT in EssentialContract (#…
f297dd7 
…16593)"

This reverts commit a381ddd.
adaki2004 pushed a commit that referenced this pull request Apr 29, 2024
Revert "Revert "fix(protocol): add 1 to _REENTRY_SLOT in EssentialCon…
6db0382 
…tract (#16593)""

This reverts commit fdd6d0303abad7a2fa37366b5ffcd08a61bf975f.
@taiko-kitty taiko-kitty mentioned this pull request May 11, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtaikocha davidtaikocha davidtaikocha approved these changes

@Brechtpd Brechtpd Brechtpd approved these changes

@adaki2004 adaki2004 Awaiting requested review from adaki2004

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dantaik @Brechtpd @davidtaikocha