-
Notifications
You must be signed in to change notification settings - Fork 6
Simple ImmutableBeaconProxy implementation #19
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.
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
Open
kyzia551
wants to merge
5
commits into
main
Choose a base branch
from
feat/immutabe-beacon-proxy
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
88a48e3
simple ImmutableBeaconProxy implementation
kyzia551 e5c6339
Update src/contracts/transparent-proxy/ImmutableBeaconProxy.sol
kyzia551 895d4f1
update error messages
kyzia551 e343ae3
event added to ImmutableBeaconProfy, small refactoring
kyzia551 b1e1402
typo in IBeacon import
kyzia551 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,36 @@ | ||||||
| // SPDX-License-Identifier: MIT | ||||||
| pragma solidity ^0.8.0; | ||||||
|
|
||||||
| import {IBeacon} from './interfaces/IBeacon.sol'; | ||||||
| import {Proxy} from './Proxy.sol'; | ||||||
| import {Address} from '../oz-common/Address.sol'; | ||||||
|
|
||||||
| /** | ||||||
| * @dev This contract implements a proxy that gets the implementation address for each call from an {UpgradeableBeacon}. | ||||||
| * The beacon address is immutable. The purpose of it, is to be able to access this proxy via delegatecall | ||||||
|
|
||||||
| * !!! IMPORTANT CONSIDERATION !!! | ||||||
| * We expect that that implementation will not have any storage associated, | ||||||
| * because it will not be accessible via delegatecall, and will not work as expected | ||||||
| */ | ||||||
| contract ImmutableBeaconProxy is Proxy { | ||||||
| address internal immutable _beacon; | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
|
||||||
| constructor(address beacon) { | ||||||
| require(Address.isContract(beacon), 'beacon is not a contract'); | ||||||
kyzia551 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| require( | ||||||
| Address.isContract(IBeacon(beacon).implementation()), | ||||||
| 'beacon implementation is not a contract' | ||||||
| ); | ||||||
|
|
||||||
| // there is no initialization call, because we expect that implementation should have no storage | ||||||
| _beacon = beacon; | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * @dev Returns the current implementation address of the associated beacon. | ||||||
| */ | ||||||
| function _implementation() internal view virtual override returns (address) { | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why internal? |
||||||
| return IBeacon(_beacon).implementation(); | ||||||
| } | ||||||
| } | ||||||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| // OpenZeppelin Contracts v4.4.1 (proxy/beacon/IBeacon.sol) | ||
|
|
||
| pragma solidity ^0.8.0; | ||
|
|
||
| /** | ||
| * @dev This is the interface that {BeaconProxy} expects of its beacon. | ||
| */ | ||
| interface IBeacon { | ||
| /** | ||
| * @dev Must return an address that can be used as a delegate call target. | ||
| * | ||
| * {BeaconProxy} will check that this address is a contract. | ||
| */ | ||
| function implementation() external view returns (address); | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.0; | ||
| import 'forge-std/Test.sol'; | ||
| import {ImmutableBeaconProxy, IBeacon} from '../src/contracts/transparent-proxy/ImmutableBeaconProxy.sol'; | ||
|
|
||
| contract ImplementationMock {} | ||
|
|
||
| contract BeaconMock is IBeacon { | ||
| address public implementation; | ||
|
|
||
| constructor(address newImplementation) { | ||
| implementation = newImplementation; | ||
| } | ||
| } | ||
|
|
||
| contract ImmutableBeaconProxyMock is ImmutableBeaconProxy { | ||
| constructor(address beacon) ImmutableBeaconProxy(beacon) {} | ||
|
|
||
| function implementation() public view returns (address) { | ||
| return _implementation(); | ||
| } | ||
| } | ||
|
|
||
| contract ImmutableBeaconProxyTest is Test { | ||
| function testResolvesImplementationCorrectly() public { | ||
| address implementation = address(new ImplementationMock()); | ||
| address beacon = address(new BeaconMock(implementation)); | ||
|
|
||
| assertEq(implementation, (new ImmutableBeaconProxyMock(beacon)).implementation()); | ||
| } | ||
|
|
||
| function testBeaconNotAContract() public { | ||
| vm.expectRevert(bytes('beacon is not a contract')); | ||
| new ImmutableBeaconProxy(address(1)); | ||
| } | ||
|
|
||
| function testImplementationNotAContract() public { | ||
| address beacon = address(new BeaconMock(address(1))); | ||
|
|
||
| vm.expectRevert(bytes('beacon implementation is not a contract')); | ||
| new ImmutableBeaconProxy(beacon); | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.