-
Notifications
You must be signed in to change notification settings - Fork 4
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
Add TransparentProxyFactoryBase #37
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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
This file contains 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
74 changes: 74 additions & 0 deletions
74
src/contracts/transparent-proxy/TransparentProxyFactoryBase.sol
This file contains 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,74 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity >=0.8.0; | ||
|
|
||
| import {IOwnable} from './interfaces/IOwnable.sol'; | ||
| import {ITransparentProxyFactory} from './interfaces/ITransparentProxyFactory.sol'; | ||
| import {TransparentUpgradeableProxy} from './TransparentUpgradeableProxy.sol'; | ||
| import {ProxyAdmin} from './ProxyAdmin.sol'; | ||
|
|
||
| /** | ||
| * @title TransparentProxyFactory | ||
| * @author BGD Labs | ||
| * @notice Factory contract to create transparent proxies, both with CREATE and CREATE2 | ||
| * @dev `create()` and `createDeterministic()` are not unified for clearer interface, and at the same | ||
| * time allowing `createDeterministic()` with salt == 0 | ||
| * @dev Highly recommended to pass as `admin` on creation an OZ ProxyAdmin instance | ||
| **/ | ||
| abstract contract TransparentProxyFactoryBase is ITransparentProxyFactory { | ||
| /// @inheritdoc ITransparentProxyFactory | ||
| function create( | ||
| address logic, | ||
| address admin, | ||
| bytes calldata data | ||
| ) external returns (address) { | ||
| address proxy = address(new TransparentUpgradeableProxy(logic, admin, data)); | ||
|
|
||
| emit ProxyCreated(proxy, logic, admin); | ||
| return proxy; | ||
| } | ||
|
|
||
| /// @inheritdoc ITransparentProxyFactory | ||
| function createProxyAdmin(address adminOwner) external returns (address) { | ||
| address proxyAdmin = address(new ProxyAdmin()); | ||
| IOwnable(proxyAdmin).transferOwnership(adminOwner); | ||
|
|
||
| emit ProxyAdminCreated(proxyAdmin, adminOwner); | ||
| return proxyAdmin; | ||
| } | ||
|
|
||
| /// @inheritdoc ITransparentProxyFactory | ||
| function createDeterministic( | ||
| address logic, | ||
| address admin, | ||
| bytes calldata data, | ||
| bytes32 salt | ||
| ) external returns (address) { | ||
| address proxy = address(new TransparentUpgradeableProxy{salt: salt}(logic, admin, data)); | ||
|
|
||
| emit ProxyDeterministicCreated(proxy, logic, admin, salt); | ||
| return proxy; | ||
| } | ||
|
|
||
| /// @inheritdoc ITransparentProxyFactory | ||
| function createDeterministicProxyAdmin(address adminOwner, bytes32 salt) | ||
| external | ||
| returns (address) | ||
| { | ||
| address proxyAdmin = address(new ProxyAdmin{salt: salt}()); | ||
| IOwnable(proxyAdmin).transferOwnership(adminOwner); | ||
|
|
||
| emit ProxyAdminDeterministicCreated(proxyAdmin, adminOwner, salt); | ||
| return proxyAdmin; | ||
| } | ||
|
|
||
| /// @inheritdoc ITransparentProxyFactory | ||
| function predictCreateDeterministic( | ||
| address logic, | ||
| address admin, | ||
| bytes calldata data, | ||
| bytes32 salt | ||
| ) public view virtual returns (address); | ||
|
|
||
| /// @inheritdoc ITransparentProxyFactory | ||
| function predictCreateDeterministicProxyAdmin(bytes32 salt) public view virtual returns (address); | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
missing here ITransparentProxyFactoryZkSync i guess with only the constants defined there