Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Feature/execute in iproposal #31

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Feature/execute in iproposal #31

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4baf70
add override
novaknole Nov 7, 2024
31c85c2
canexecute overriden
novaknole Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/contracts/src/Multisig.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@
/// for reinitialization.
/// @dev WARNING: The contract should only be upgradeable through PSP to ensure that _fromBuild is not
/// incorrectly passed, and that the appropriate permissions for the upgrade are properly configured.
/// @param _fromBuild The build version number of the previous implementation contract this upgrade is transitioning from.

Check failure on line 191 in packages/contracts/src/Multisig.sol

View workflow job for this annotation

GitHub Actions / checks 

Line length must be no more than 120 but current length is 126
/// @param _initData The initialization data to be passed to via `upgradeToAndCall` (see [ERC-1967](https://docs.openzeppelin.com/contracts/4.x/api/proxy#ERC1967Upgrade)).

Check failure on line 192 in packages/contracts/src/Multisig.sol

View workflow job for this annotation

GitHub Actions / checks 

Line length must be no more than 120 but current length is 175
function initializeFrom(uint16 _fromBuild, bytes calldata _initData) external reinitializer(2) {
if (_fromBuild < 3) {
(TargetConfig memory targetConfig, bytes memory pluginMetadata) = abi.decode(
Expand Down Expand Up @@ -435,7 +435,9 @@
}

/// @inheritdoc IMultisig
function canExecute(uint256 _proposalId) external view virtual override returns (bool) {
function canExecute(
uint256 _proposalId
) external view virtual override(IMultisig, IProposal) returns (bool) {
if (!_proposalExists(_proposalId)) {
revert NonexistentProposal(_proposalId);
}
Expand Down Expand Up @@ -491,7 +493,9 @@
}

/// @inheritdoc IMultisig
function execute(uint256 _proposalId) public auth(EXECUTE_PROPOSAL_PERMISSION_ID) {
function execute(
uint256 _proposalId
) public override(IMultisig, IProposal) auth(EXECUTE_PROPOSAL_PERMISSION_ID) {
if (!_canExecute(_proposalId)) {
revert ProposalExecutionForbidden(_proposalId);
}
Expand Down
Loading