-
Notifications
You must be signed in to change notification settings - Fork 6
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
feature: targets and standardized proposal #99
base: develop
Are you sure you want to change the base?
Conversation
* feat: add test for checking the ExecuteFailed is properly emitted * feat: add new case in mock executor to simulate the tests * feat: refactor code to avoid duplications * ci: fix solhint warnings * ci: fix lint issues
function proposalCount() public view override returns (uint256) { | ||
return proposalCounter.current(); | ||
function proposalCount() public pure override returns (uint256) { | ||
return type(uint256).max; |
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.
We probably should add here a comment to explain why we are doing this now.
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.
Description is added in IProposal
which is clear as this function has inheritdoc
above which dev should go and check in IProposal anyways.
/// @param _allowFailureMap Bitmap-encoded number. TODO: | ||
/// @return execResults address of the implementation contract. | ||
/// @return failureMap address of the implementation contract. | ||
function _execute( |
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.
We have quite some code duplication over all different Plugin* contracts.. probably worth refactoring it to have those methods only in one place..
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.
LGTM!
* add params byte approach * add simple executor (#103) * add simple executor * action as free level export
/// Most useful use-case is to deploy as non-upgradeable and call from another contract via delegatecall. | ||
/// If used with delegatecall, DO NOT add state variables in sequential slots, otherwise this will overwrite | ||
/// the storage of the calling contract. | ||
contract Executor is IExecutor { |
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.
Shouldn't this contract be abstract?
error TooManyActions(); | ||
|
||
/// @notice Thrown if an action has insufficient gas left. | ||
error InsufficientGas(); |
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.
error InsufficientGas(); | |
error InsufficientGasLeft(); |
import {IDAO} from "../dao/IDAO.sol"; | ||
|
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.
import {IDAO} from "../dao/IDAO.sol"; |
/// @title IDAO | ||
/// @author Aragon X - 2022-2023 |
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.
/// @title IDAO | |
/// @author Aragon X - 2022-2023 | |
/// @title IExecutor | |
/// @author Aragon X - 2022-2024 |
/// @notice Checks if this or the parent contract supports an interface by its ID. | ||
/// @notice Returns the currently set target contract. | ||
/// @return TargetConfig The currently set target. | ||
function getCurrentTargetConfig() public view virtual returns (TargetConfig memory) { |
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.
function getCurrentTargetConfig() public view virtual returns (TargetConfig memory) { | |
function getRawTargetConfig() public view virtual returns (TargetConfig memory) { |
@@ -3,6 +3,7 @@ | |||
pragma solidity ^0.8.8; | |||
|
|||
import {IDAO} from "../../../dao/IDAO.sol"; |
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.
import {IDAO} from "../../../dao/IDAO.sol"; |
Action[] memory actions, | ||
bytes memory metadata |
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.
Why are these parameters needed here?
- If it is to create an ID using them as entropy, why aren't we also receiving
data
?
/// @param _allowFailureMap A bitmap allowing the proposal to succeed, even if individual actions might revert. If the bit at index `i` is 1, the proposal succeeds even if the `i`th action reverts. A failure map value of 0 requires every action to not revert. | ||
/// @return execResults The array with the results of the executed actions. | ||
/// @return failureMap The failure map encoding which actions have failed. | ||
function _executeProposal( |
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.
Assuming that this is removed because plugins will be targeting an executor, rather than calling execute()
locally
type(IProposal).interfaceId ^ | ||
IProposal.createProposal.selector ^ | ||
IProposal.canExecute.selector ^ | ||
IProposal.createProposalId.selector ^ | ||
IProposal.createProposalParamsABI.selector || |
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.
Shouldn't this be a versioned IProposalv1
and IProposalv2
interface?
It makes little sense that we are checking 2 different subsets of one interface
_interfaceId == | ||
type(IProposal).interfaceId ^ | ||
IProposal.createProposal.selector ^ | ||
IProposal.canExecute.selector ^ | ||
IProposal.createProposalId.selector ^ | ||
IProposal.createProposalParamsABI.selector || | ||
_interfaceId == type(IProposal).interfaceId || |
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.
Same (versioned)
Description
A couple of things remaining:
targets
andexecute
functions are duplicated in abstract contracts. Either:_execute
functions but it might be desirable to leave this choice to consumer, but if we do so, consumer will have to do this decode stuff manually which is also not ideal. Considering how OZ does such stuff, the current way seems better than others.Task ID: OS-1481
Checklist:
CHANGELOG.md
file in the root folder.