-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add virtual (#644) * chore: add missing virtual keyword in LSP6 * chore: add missing virtual keyword in LSP7 * chore: add missing virtual keyword in LSP8 * chore: add missing virtual keyword in LSP9 * chore: add missing virtual keyword in LSP20 * chore: add missing virtual keyword in LSP0 * refactor: add virtual to target() in LSP6 core * chore: rename _revert in LSP20CallVerification * refactor: add virtual to all LSP6 _isAllowed checks * feat: create LSP23MultiChainDeployment (#649) * feat: create LSP23MultiChainDeployment * refactor: improve LSP23 readability (#650) * refactor: improve LSP23 readability * tests: create helper to calculate deployed addresses * tests: add test for lsp23 * refactor: add suggested changes & surther simplify * refactor: remove event split, restore the initial events. * refactor: fix generation of salt * refactor: make salt generation functions virtual * chore: fix typo * refactor: move `emit` before external call to `IPostDeploymentModule` * chore: add suggested changes * docs: improve Natspec as suggetsed * docs: fix Natspec typo * chore: remove unrelated file --------- Co-authored-by: maxvia87 <maximeviard@hotmail.fr> --------- Co-authored-by: b00ste.lyx <62855857+b00ste@users.noreply.github.com> Co-authored-by: Jean Cvllr <31145285+CJ42@users.noreply.github.com> * feat!: make reentracy status internal (#651) * chore(release): 0.11.0-rc.0 (#652) * fix: failing tests for lsp23 + add LSP23 test suite in CI (#657) * tests: fix lsp23 tests * ci: add lsp23 tests to lint workflow --------- Co-authored-by: Callum Grindle <callumgrindle@gmail.com> Co-authored-by: Skima Harvey <64636974+skimaharvey@users.noreply.github.com> Co-authored-by: b00ste.lyx <62855857+b00ste@users.noreply.github.com>
- Loading branch information
4 people
authored
Aug 7, 2023
1 parent
8bf3a12
commit 80b85d1
Showing
26 changed files
with
953 additions
and
72 deletions.
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
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
174 changes: 174 additions & 0 deletions
174
contracts/LSP23MultiChainDeployment/IOwnerControlledContractDeployer.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,174 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.4; | ||
|
|
||
| interface IOwnerControlledContractDeployer { | ||
| event DeployedContracts( | ||
| address indexed controlledContract, | ||
| address indexed ownerContract, | ||
| ControlledContractDeployment controlledContractDeployment, | ||
| OwnerContractDeployment ownerContractDeployment, | ||
| address postDeploymentModule, | ||
| bytes postDeploymentModuleCalldata | ||
| ); | ||
|
|
||
| event DeployedERC1167Proxies( | ||
| address indexed controlledContract, | ||
| address indexed ownerContract, | ||
| ControlledContractDeploymentInit controlledContractDeploymentInit, | ||
| OwnerContractDeploymentInit ownerContractDeploymentInit, | ||
| address postDeploymentModule, | ||
| bytes postDeploymentModuleCalldata | ||
| ); | ||
|
|
||
| /** | ||
| * @param salt A unique value used to ensure each created proxies are unique. (Can be used to deploy the contract at a desired address.) | ||
| * @param fundingAmount The value to be sent with the deployment transaction. | ||
| * @param creationBytecode The bytecode of the contract with the constructor params. | ||
| */ | ||
| struct ControlledContractDeployment { | ||
| bytes32 salt; | ||
| uint256 fundingAmount; | ||
| bytes creationBytecode; | ||
| } | ||
|
|
||
| /** | ||
| * @param fundingAmount The value to be sent with the deployment transaction. | ||
| * @param creationBytecode The constructor + runtime bytecode (without the controlled contract's address as param) | ||
| * @param addControlledContractAddress If set to `true`, this will append the controlled contract's address + the `extraConstructorParams` to the `creationBytecode`. | ||
| * @param extraConstructorParams Params to be appended to the `creationBytecode` (after the controlled contract address) if `addControlledContractAddress` is set to `true`. | ||
| */ | ||
| struct OwnerContractDeployment { | ||
| uint256 fundingAmount; | ||
| bytes creationBytecode; | ||
| bool addControlledContractAddress; | ||
| bytes extraConstructorParams; | ||
| } | ||
|
|
||
| /** | ||
| * @param salt A unique value used to ensure each created proxies are unique. (Can be used to deploy the contract at a desired address.) | ||
| * @param fundingAmount The value to be sent with the deployment transaction. | ||
| * @param implementationContract The address of the contract that will be used as a base contract for the proxy. | ||
| * @param initializationCalldata The calldata used to initialise the contract. (initialization should be similar to a constructor in a normal contract.) | ||
| */ | ||
| struct ControlledContractDeploymentInit { | ||
| bytes32 salt; | ||
| uint256 fundingAmount; | ||
| address implementationContract; | ||
| bytes initializationCalldata; | ||
| } | ||
|
|
||
| /** | ||
| * @param fundingAmount The value to be sent with the deployment transaction. | ||
| * @param implementationContract The address of the contract that will be used as a base contract for the proxy. | ||
| * @param initializationCalldata The first part of the initialisation calldata, everything before the controlled contract address. | ||
| * @param addControlledContractAddress If set to `true`, this will append the controlled contract's address + the `extraInitializationParams` to the `initializationCalldata`. | ||
| * @param extraInitializationParams Params to be appended to the `initializationCalldata` (after the controlled contract address) if `addControlledContractAddress` is set to `true` | ||
| */ | ||
| struct OwnerContractDeploymentInit { | ||
| uint256 fundingAmount; | ||
| address implementationContract; | ||
| bytes initializationCalldata; | ||
| bool addControlledContractAddress; | ||
| bytes extraInitializationParams; | ||
| } | ||
|
|
||
| /** | ||
| * @dev Deploys a contract and its owner contract. | ||
| * @notice Contracts deployed. Contract Address: `controlledContractAddress`. Owner Contract Address: `ownerContractAddress` | ||
| * | ||
| * @param controlledContractDeployment Contains the needed parameter to deploy a contract. (`salt`, `fundingAmount`, `creationBytecode`) | ||
| * @param ownerContractDeployment Contains the needed parameter to deploy the owner contract. (`fundingAmount`, `creationBytecode`, `addControlledContractAddress`, `extraConstructorParams`) | ||
| * @param postDeploymentModule The module to be executed after deployment | ||
| * @param postDeploymentModuleCalldata The data to be passed to the post deployment module | ||
| * | ||
| * @return controlledContractAddress The address of the deployed controlled contract. | ||
| * @return ownerContractAddress The address of the deployed owner contract. | ||
| */ | ||
| function deployContracts( | ||
| ControlledContractDeployment calldata controlledContractDeployment, | ||
| OwnerContractDeployment calldata ownerContractDeployment, | ||
| address postDeploymentModule, | ||
| bytes calldata postDeploymentModuleCalldata | ||
| ) | ||
| external | ||
| payable | ||
| returns ( | ||
| address controlledContractAddress, | ||
| address ownerContractAddress | ||
| ); | ||
|
|
||
| /** | ||
| * @dev Deploys proxies of a contract and its owner contract | ||
| * @notice Contract proxies deployed. Contract Proxy Address: `controlledContractAddress`. Owner Contract Proxy Address: `ownerContractAddress` | ||
| * | ||
| * @param controlledContractDeploymentInit Contains the needed parameter to deploy a proxy contract. (`salt`, `fundingAmount`, `implementationContract`, `initializationCalldata`) | ||
| * @param ownerContractDeploymentInit Contains the needed parameter to deploy the owner proxy contract. (`fundingAmount`, `implementationContract`, `addControlledContractAddress`, `initializationCalldata`, `extraInitializationParams`) | ||
| * @param postDeploymentModule The module to be executed after deployment. | ||
| * @param postDeploymentModuleCalldata The data to be passed to the post deployment module. | ||
| * | ||
| * @return controlledContractAddress The address of the deployed controlled contract proxy | ||
| * @return ownerContractAddress The address of the deployed owner contract proxy | ||
| */ | ||
| function deployERC1167Proxies( | ||
| ControlledContractDeploymentInit | ||
| calldata controlledContractDeploymentInit, | ||
| OwnerContractDeploymentInit calldata ownerContractDeploymentInit, | ||
| address postDeploymentModule, | ||
| bytes calldata postDeploymentModuleCalldata | ||
| ) | ||
| external | ||
| payable | ||
| returns ( | ||
| address controlledContractAddress, | ||
| address ownerContractAddress | ||
| ); | ||
|
|
||
| /** | ||
| * @dev Computes the addresses of the controlled and owner contracts to be created | ||
| * | ||
| * @param controlledContractDeployment Contains the needed parameter to deploy a contract. (`salt`, `fundingAmount`, `creationBytecode`) | ||
| * @param ownerContractDeployment Contains the needed parameter to deploy the owner contract. (`fundingAmount`, `creationBytecode`, `addControlledContractAddress`, `extraConstructorParams`) | ||
| * @param postDeploymentModule The module to be executed after deployment | ||
| * @param postDeploymentModuleCalldata The data to be passed to the post deployment module | ||
| * | ||
| * @return controlledContractAddress The address of the deployed controlled contract. | ||
| * @return ownerContractAddress The address of the deployed owner contract. | ||
| */ | ||
| function computeAddresses( | ||
| ControlledContractDeployment calldata controlledContractDeployment, | ||
| OwnerContractDeployment calldata ownerContractDeployment, | ||
| address postDeploymentModule, | ||
| bytes calldata postDeploymentModuleCalldata | ||
| ) | ||
| external | ||
| view | ||
| returns ( | ||
| address controlledContractAddress, | ||
| address ownerContractAddress | ||
| ); | ||
|
|
||
| /** | ||
| * @dev Computes the addresses of the controlled and owner contract proxies to be created. | ||
| * | ||
| * @param controlledContractDeploymentInit Contains the needed parameter to deploy a proxy contract. (`salt`, `fundingAmount`, `implementationContract`, `initializationCalldata`) | ||
| * @param ownerContractDeploymentInit Contains the needed parameter to deploy the owner proxy contract. (`fundingAmount`, `implementationContract`, `addControlledContractAddress`, `initializationCalldata`, `extraInitializationParams`) | ||
| * @param postDeploymentModule The module to be executed after deployment. | ||
| * @param postDeploymentModuleCalldata The data to be passed to the post deployment module. | ||
| * | ||
| * @return controlledContractAddress The address of the deployed controlled contract proxy | ||
| * @return ownerContractAddress The address of the deployed owner contract proxy | ||
| */ | ||
| function computeERC1167Addresses( | ||
| ControlledContractDeploymentInit | ||
| calldata controlledContractDeploymentInit, | ||
| OwnerContractDeploymentInit calldata ownerContractDeploymentInit, | ||
| address postDeploymentModule, | ||
| bytes calldata postDeploymentModuleCalldata | ||
| ) | ||
| external | ||
| view | ||
| returns ( | ||
| address controlledContractAddress, | ||
| address ownerContractAddress | ||
| ); | ||
| } |
10 changes: 10 additions & 0 deletions
10
contracts/LSP23MultiChainDeployment/IPostDeploymentModule.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,10 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.4; | ||
|
|
||
| interface IPostDeploymentModule { | ||
| function executePostDeployment( | ||
| address ownerControlledContract, | ||
| address ownerContract, | ||
| bytes calldata calldataToPostDeploymentModule | ||
| ) external; | ||
| } |
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,24 @@ | ||
| // SPDX-License-Identifier: MIT | ||
| pragma solidity ^0.8.4; | ||
|
|
||
| /** | ||
| * @dev Reverts when the `msg.value` sent is not equal to the sum of value used for the deployment of the contract & its owner contract. | ||
| * @notice Invalid value sent. | ||
| */ | ||
| error InvalidValueSum(); | ||
|
|
||
| /** | ||
| * @dev Reverts when the deployment & intialisation of the contract has failed. | ||
| * @notice Failed to deploy & initialise the Controlled Contract Proxy. Error: `errorData`. | ||
| * | ||
| * @param errorData Potentially information about why the deployment & intialisation have failed. | ||
| */ | ||
| error ControlledContractProxyInitFailureError(bytes errorData); | ||
|
|
||
| /** | ||
| * @dev Reverts when the deployment & intialisation of the owner contract has failed. | ||
| * @notice Failed to deploy & initialise the Owner Contract Proxy. Error: `errorData`. | ||
| * | ||
| * @param errorData Potentially information about why the deployment & intialisation have failed. | ||
| */ | ||
| error OwnerContractProxyInitFailureError(bytes errorData); |
Oops, something went wrong.