Build 1.2 new changes #18
Merged
Conversation
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
brickpop
requested changes
Oct 8, 2024
packages/contracts/src/Admin.sol
Outdated
Comment on lines
78
to
79
| Action[] calldata _actions, | ||
| bytes memory _metadata |
There was a problem hiding this comment.
Same as for multisig
aragon#19 (comment)
| @@ -20,8 +22,7 @@ contract Admin is IMembership, PluginCloneable, ProposalUpgradeable { | |||
| using SafeCastUpgradeable for uint256; | |||
|
|
|||
| /// @notice The [ERC-165](https://eips.ethereum.org/EIPS/eip-165) interface ID of the contract. | |||
| bytes4 internal constant ADMIN_INTERFACE_ID = | |||
| this.initialize.selector ^ this.executeProposal.selector; | |||
| bytes4 internal constant ADMIN_INTERFACE_ID = this.executeProposal.selector; | |||
There was a problem hiding this comment.
Same as for multisig
aragon#19 (review)
This interface is now deprecated
packages/contracts/src/Admin.sol
Outdated
| } | ||
|
|
||
| /// @inheritdoc IProposal | ||
| /// @dev Admin doesn't allow creating a proposal, so we return empty string. |
| @@ -67,19 +118,33 @@ contract Admin is IMembership, PluginCloneable, ProposalUpgradeable { | |||
| // of 0 requires every action to not revert. | |||
| function executeProposal( | |||
There was a problem hiding this comment.
Suggested change
| function executeProposal( | |
| /// @dev This function is deprecated, as createProposal achieves the same effect | |
| function executeProposal( |
Comment on lines
42
to
45
| (address admin, PluginCloneable.TargetConfig memory targetConfig) = abi.decode( | ||
| _data, | ||
| (address, PluginCloneable.TargetConfig) | ||
| ); |
There was a problem hiding this comment.
Same as with multisig. Let's encode and decode data using a standard mechanism:
Rekard0
reviewed
Oct 14, 2024
Comment on lines
33
to
+38
| /// @dev This method is required to support [ERC-1167](https://eips.ethereum.org/EIPS/eip-1167). | ||
| function initialize(IDAO _dao) external initializer { | ||
| function initialize(IDAO _dao, TargetConfig calldata _targetConfig) external initializer { | ||
| __PluginCloneable_init(_dao); | ||
|
|
||
| _setTargetConfig(_targetConfig); | ||
|
|
There was a problem hiding this comment.
Shouldn't we use reintializer(n) here, and then create another function for initializing from other versions?
There was a problem hiding this comment.
Admin is non-upgradeable but cloneable, so no..
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.
The PR introduces the several changes:
ADMIN_INTERFACE_IDchanged as it no longer includes theinitialize's selector.osx-commons's IProposal.PluginCloneable- i.e allowing targets to be set with eithercallordelegatecalloperation types.SET_TARGET_CONFIG_PERMISSION_IDto the dao to reduce gas costs. Most of the time, admin needs its target to bedaoand stay that way.