Skip to content

Revert with supplied proposalId for unknown proposals in GovernorStorage #6160

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

Merged
Amxx merged 2 commits into from
Dec 5, 2025
Merged

Revert with supplied proposalId for unknown proposals in GovernorStorage #6160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd51b0a
fix: revert with supplied proposalId in id-only wrappers for unknown …
sashass1315 Dec 1, 2025
569bdb2
testing
Amxx Dec 1, 2025
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
9 changes: 9 additions & 0 deletions contracts/governance/extensions/GovernorStorage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ abstract contract GovernorStorage is Governor {
function queue(uint256 proposalId) public virtual {
// here, using storage is more efficient than memory
ProposalDetails storage details = _proposalDetails[proposalId];
if (details.descriptionHash == 0) {
revert GovernorNonexistentProposal(proposalId);
}
queue(details.targets, details.values, details.calldatas, details.descriptionHash);
}

Expand All @@ -64,6 +67,9 @@ abstract contract GovernorStorage is Governor {
function execute(uint256 proposalId) public payable virtual {
// here, using storage is more efficient than memory
ProposalDetails storage details = _proposalDetails[proposalId];
if (details.descriptionHash == 0) {
revert GovernorNonexistentProposal(proposalId);
}
execute(details.targets, details.values, details.calldatas, details.descriptionHash);
}

Expand All @@ -73,6 +79,9 @@ abstract contract GovernorStorage is Governor {
function cancel(uint256 proposalId) public virtual {
// here, using storage is more efficient than memory
ProposalDetails storage details = _proposalDetails[proposalId];
if (details.descriptionHash == 0) {
revert GovernorNonexistentProposal(proposalId);
}
cancel(details.targets, details.values, details.calldatas, details.descriptionHash);
}

Expand Down
20 changes: 20 additions & 0 deletions test/governance/extensions/GovernorStorage.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,26 @@ describe('GovernorStorage', function () {
.to.emit(this.mock, 'ProposalCanceled')
.withArgs(this.proposal.id);
});

describe('with non-existing proposalId', function () {
it('queue', async function () {
await expect(this.mock.queue(this.proposal.id))
.to.be.revertedWithCustomError(this.mock, 'GovernorNonexistentProposal')
.withArgs(this.proposal.id);
});

it('execute', async function () {
await expect(this.mock.execute(this.proposal.id))
.to.be.revertedWithCustomError(this.mock, 'GovernorNonexistentProposal')
.withArgs(this.proposal.id);
});

it('cancel', async function () {
await expect(this.mock.cancel(this.proposal.id))
.to.be.revertedWithCustomError(this.mock, 'GovernorNonexistentProposal')
.withArgs(this.proposal.id);
});
});
});
}
});
Loading