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

Delay the Pending state until strictly after proposal.voteStart #2892

Merged
merged 10 commits into from Oct 6, 2021
Merged

Delay the Pending state until strictly after proposal.voteStart #2892

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e4157c9
Delay the Pending state until strictly after proposal.voteStart to avoid
Amxx Sep 30, 2021
5b5a6b8
change voteEnd detection to match bravo
Amxx Oct 4, 2021
bc6b88b
fix governor behavior
Amxx Oct 5, 2021
7f12df8
fix typo
Amxx Oct 5, 2021
a3cb901
force github action
frangio Oct 6, 2021
26bca3b
changelog and doc
Amxx Oct 6, 2021
246b699
working in changelog
Amxx Oct 6, 2021
624f310
capitalization and typos
frangio Oct 6, 2021
866173f
Merge branch 'master' into fix/extra-pending-security
frangio Oct 6, 2021
0e1d4a0
reword changelog entry for clarity
frangio Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion contracts/governance/Governor.sol
View file
Open in desktop
Expand Up @@ -115,7 +115,8 @@ abstract contract Governor is Context, ERC165, EIP712, IGovernor {
return ProposalState.Executed;
} else if (proposal.canceled) {
return ProposalState.Canceled;
} else if (proposal.voteStart.isPending()) {
} else if (proposal.voteStart.getDeadline() >= block.number) {
// prevent voting until voteStart is passed, so that getVotes never tries to get value for the current block.
return ProposalState.Pending;
} else if (proposal.voteEnd.isPending()) {
frangio marked this conversation as resolved.
Show resolved Hide resolved
return ProposalState.Active;
Expand Down
4 changes: 4 additions & 0 deletions test/governance/Governor.test.js
View file
Open in desktop
Expand Up @@ -559,6 +559,10 @@ contract('Governor', function (accounts) {

await time.advanceBlockTo(this.snapshot);

expect(await this.mock.state(this.id)).to.be.bignumber.equal(Enums.ProposalState.Pending);

await time.advanceBlock();

expect(await this.mock.state(this.id)).to.be.bignumber.equal(Enums.ProposalState.Active);
});
runGovernorWorkflow();
Expand Down