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

Feature/execute into iproposal #42

Merged
merged 2 commits into from
Nov 8, 2024
Merged

Feature/execute into iproposal #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0949988
override add
novaknole Nov 7, 2024
a2d794a
canExecute from IProposal 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: 5 additions & 3 deletions packages/contracts/src/MajorityVotingBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,8 +369,10 @@ abstract contract MajorityVotingBase is
_vote(_proposalId, _voteOption, account, _tryEarlyExecution);
}

/// @inheritdoc IMajorityVoting
function execute(uint256 _proposalId) public virtual auth(EXECUTE_PROPOSAL_PERMISSION_ID) {
/// @inheritdoc IProposal
function execute(
uint256 _proposalId
) public virtual override(IMajorityVoting, IProposal) auth(EXECUTE_PROPOSAL_PERMISSION_ID) {
if (!_canExecute(_proposalId)) {
revert ProposalExecutionForbidden(_proposalId);
}
Expand Down Expand Up @@ -401,7 +403,7 @@ abstract contract MajorityVotingBase is
/// @inheritdoc IMajorityVoting
function canExecute(
uint256 _proposalId
) public view virtual override(IMajorityVoting) returns (bool) {
) public view virtual override(IMajorityVoting, IProposal) returns (bool) {
if (!_proposalExists(_proposalId)) {
revert NonexistentProposal(_proposalId);
}
Expand Down
Loading