-
Notifications
You must be signed in to change notification settings - Fork 33
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
Revert "Replace Create3 with ZeframLou/create3-factory" #1388
Merged
+57
−10
Merged
Changes from all commits
Commits
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
26 changes: 26 additions & 0 deletions
26
packages/contracts-core/contracts/create3/CREATE3Factory.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,26 @@ | ||
// SPDX-License-Identifier: AGPL-3.0 | ||
pragma solidity ^0.8.13; | ||
|
||
import {CREATE3} from "solmate/utils/CREATE3.sol"; | ||
|
||
import {ICREATE3Factory} from "./ICREATE3Factory.sol"; | ||
|
||
/// @title Factory for deploying contracts to deterministic addresses via CREATE3 | ||
/// @author zefram.eth | ||
/// @notice Enables deploying contracts using CREATE3. Each deployer (msg.sender) has | ||
/// its own namespace for deployed addresses. | ||
contract CREATE3Factory is ICREATE3Factory { | ||
/// @inheritdoc ICREATE3Factory | ||
function deploy(bytes32 salt, bytes memory creationCode) external payable override returns (address deployed) { | ||
// hash salt with the deployer address to give each deployer its own namespace | ||
salt = keccak256(abi.encodePacked(msg.sender, salt)); | ||
return CREATE3.deploy(salt, creationCode, msg.value); | ||
} | ||
|
||
/// @inheritdoc ICREATE3Factory | ||
function getDeployed(address deployer, bytes32 salt) external view override returns (address deployed) { | ||
// hash salt with the deployer address to give each deployer its own namespace | ||
salt = keccak256(abi.encodePacked(deployer, salt)); | ||
return CREATE3.getDeployed(salt); | ||
} | ||
} |
22 changes: 22 additions & 0 deletions
22
packages/contracts-core/contracts/create3/ICREATE3Factory.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,22 @@ | ||
// SPDX-License-Identifier: AGPL-3.0 | ||
pragma solidity >=0.6.0; | ||
|
||
/// @title Factory for deploying contracts to deterministic addresses via CREATE3 | ||
/// @author zefram.eth | ||
/// @notice Enables deploying contracts using CREATE3. Each deployer (msg.sender) has | ||
/// its own namespace for deployed addresses. | ||
interface ICREATE3Factory { | ||
/// @notice Deploys a contract using CREATE3 | ||
/// @dev The provided salt is hashed together with msg.sender to generate the final salt | ||
/// @param salt The deployer-specific salt for determining the deployed contract's address | ||
/// @param creationCode The creation code of the contract to deploy | ||
/// @return deployed The address of the deployed contract | ||
function deploy(bytes32 salt, bytes memory creationCode) external payable returns (address deployed); | ||
|
||
/// @notice Predicts the address of a deployed contract | ||
/// @dev The provided salt is hashed together with the deployer address to generate the final salt | ||
/// @param deployer The deployer account that will call deploy() | ||
/// @param salt The deployer-specific salt for determining the deployed contract's address | ||
/// @return deployed The address of the contract that will be deployed | ||
function getDeployed(address deployer, bytes32 salt) external view returns (address deployed); | ||
} | ||
Submodule create3-factory
deleted from
06ec0f
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 |
---|---|---|
@@ -1,3 +1,2 @@ | ||
forge-std=lib/forge-std/src | ||
ds-test=lib/forge-std/lib/ds-test/src | ||
create3=lib/create3-factory/src | ||
ds-test=lib/forge-std/lib/ds-test/src |
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
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.
The interface
ICREATE3Factory
is well defined with clear function signatures fordeploy
andgetDeployed
. The comments provide a good understanding of what each function does. However, it would be beneficial to include more information about the parameters, especiallycreationCode
in thedeploy
function. What format should this code be in? Is there any specific requirement or limitation that the user should be aware of?