Skip to content

Fix vote snapshot to proposal creation block #7

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

Open
Sukanto01899 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix vote snapshot to proposal creation block #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions contracts/governance/DegenDAOInterfaces.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ contract DegenDAOStorageV1 is DegenDAOProxyStorage {
struct Proposal {
uint256 id;
address proposer;
uint256 creationBlock;
uint256 proposalThreshold;
uint256 quorumVotes;
uint256 eta;
Expand Down
3 changes: 2 additions & 1 deletion contracts/governance/DegenDAOLogicV1.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ contract DegenDAOLogicV1 is DegenDAOStorageV1, DegenDAOEvents {

newProposal.id = proposalCount;
newProposal.proposer = msg.sender;
newProposal.creationBlock = block.number;
newProposal.proposalThreshold = temp.proposalThreshold;
newProposal.quorumVotes = bps2Uint(quorumVotesBPS, temp.totalSupply);
newProposal.eta = 0;
Expand Down Expand Up @@ -494,7 +495,7 @@ contract DegenDAOLogicV1 is DegenDAOStorageV1, DegenDAOEvents {
Receipt storage receipt = proposal.receipts[voter];
require(receipt.hasVoted == false, 'DegenDAO::castVoteInternal: voter already voted');

uint96 votes = dogs.getPriorVotes(voter, proposal.startBlock - votingDelay);
uint96 votes = dogs.getPriorVotes(voter, proposal.creationBlock);

if (support == 0) {
proposal.againstVotes = proposal.againstVotes + votes;
Expand Down