Use immutable beacon address in BeaconProxy#4435
Merged
Merged
Conversation
🦋 Changeset detectedLatest commit: 6e2594e The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Amxx
reviewed
Jul 7, 2023
Amxx
reviewed
Jul 7, 2023
Amxx
reviewed
Jul 8, 2023
Amxx
previously approved these changes
Jul 8, 2023
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
frangio
approved these changes
Jul 8, 2023
frangio
left a comment
Contributor
There was a problem hiding this comment.
I've updated docs to describe the potential issue with upgradeToAndCall.
Amxx
approved these changes
Jul 8, 2023
|
Congrats, your important contribution to this open-source project has earned you a GitPOAP! GitPOAP: 2023 OpenZeppelin Contracts Contributor: Head to gitpoap.io & connect your GitHub account to mint! Learn more about GitPOAPs here. |
3 tasks
This was referenced Sep 10, 2024
This was referenced Sep 12, 2024
This was referenced Nov 9, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Fixes #2538
Uses an immutable variable to store the beacon's address in BeaconProxy, in addition to the beacon storage slot. This avoids an extra SLOAD when retrieving the beacon address before each delegate call.
The immutable variable is used in
_implementation()to read the beacon address before each delegate call.The beacon slot is still written during construction, so that the beacon address can be read externally according to ERC-1967. This beacon slot is required because the immutable variable must be private to avoid generating a getter function that could clash with a function from the implementation.
Rationale:
upgradeBeaconToAndCallinternal function in ERC1967Utils which sets the beacon slot, that function is not exposed in BeaconProxy but is only called on construction. The BeaconProxy itself does not provide a way to modify the beacon address after the BeaconProxy is deployed.PR Checklist
npx changeset add)