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

Two-phase voting #8

Merged
merged 50 commits into from
Jun 28, 2022
Merged

Two-phase voting #8

merged 50 commits into from
Jun 28, 2022

Conversation

folkyatina
Copy link
Member

Add a special period that starts after the voting time ends. During that period only 'no' votes can be submitted

@folkyatina folkyatina marked this pull request as draft April 29, 2022 09:38
@folkyatina folkyatina marked this pull request as ready for review May 3, 2022 13:05
@TheDZhon TheDZhon self-requested a review May 3, 2022 14:28
@folkyatina folkyatina requested a review from bulbozaur May 24, 2022 08:25
bulbozaur
bulbozaur approved these changes May 24, 2022
View reviewed changes
Copy link

@bulbozaur bulbozaur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but need to clarify description for _canVote _isVoteOpen

TheDZhon
TheDZhon requested changes May 24, 2022
View reviewed changes
Copy link

@TheDZhon TheDZhon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM except some minor points 🚀

apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Show resolved Hide resolved
skozin
skozin requested changes May 25, 2022
View reviewed changes
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Show resolved Hide resolved
apps/voting/contracts/Voting.sol Show resolved Hide resolved
apps/voting/contracts/Voting.sol Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
apps/voting/contracts/Voting.sol Outdated Show resolved Hide resolved
@skozin
Copy link
Member

skozin commented May 25, 2022

LGTM except few places in documentation

@folkyatina folkyatina requested review from skozin and TheDZhon May 25, 2022 07:28
Alexey Potapkin added 6 commits June 3, 2022 19:04
@folkyatina
fix: gas optimization
7d040e7 
Fix LOW-5 from MixBytes Voting V2 audit
@folkyatina
fix: add missing natspec docs
3fccffe 
Fix LOW-8 from MixBytes Voting V2 audit
@folkyatina
fix: change the approach to two-phase voting
1aa5fc6 
Vote time becomes the overall time when voting is possible and vote is opened. Main phase is the first period of the vote time when one can vote yes or no and objection phase is a second period of the vote time when one can vote only no.
@folkyatina
fix: add Closed phase to maintain consistency.
c96387a
@folkyatina
fix: tune boundary checks
8184c94
@folkyatina
fix: rename objectionTime to objectionPhaseTime
32d56a7
@folkyatina folkyatina mentioned this pull request Jun 6, 2022
Merged
Alexey Potapkin and others added 21 commits June 7, 2022 10:23
fix: fix docs
4f7646f
fix: enable abi-exporter for hardhat
878ec56
@TheDZhon @folkyatina
test: init when voteTime <= objectionTime
f942592
@TheDZhon @folkyatina
test: remove newVoteExt, improve test coverage
980571d
@TheDZhon @folkyatina
test: canVote check added
c38ec32
@TheDZhon @folkyatina
test: add events check
5b3ef8a
@TheDZhon @folkyatina
test: add getVote() current phase return check
6be4fea
@TheDZhon @folkyatina
fix: add acl checks and missing awaits
496a3e9
@failingtwice @folkyatina
feat: update voting UI for TPV
bb8b272
@failingtwice @folkyatina
fix: use phase text instead of icons
0391790
@failingtwice @folkyatina
fix: use text for phases
3ea5c55
@failingtwice @folkyatina
fix: fix voteable states
251a1f4
@failingtwice @folkyatina
fix: update vote info
b046154
@failingtwice @folkyatina
fix: build assets to root
0280600
@krogla @folkyatina
feat: ipfs upload task
943fb0f
@failingtwice @folkyatina
feat: print contentUri after uploading to IPFS
2b4a3de
@failingtwice @folkyatina
fix: use commonjs export
df70f84
@failingtwice @folkyatina
fix: use consistent case for file imports
316f620
@failingtwice @folkyatina
fix: use public folder for pngs
6cd692b 
using bundler for png generates unpredictable hash based on the absolute path which makes it difficult to reproduce the IPFS hash
@failingtwice @folkyatina
docs: add a guide on ipfs hash verification
c184458
chore: remove prod ci
f37c22f 
Because prod should work over ipfs now
@folkyatina folkyatina merged commit 1433962 into master Jun 28, 2022
@folkyatina folkyatina deleted the feature/two_phase_voting branch June 28, 2022 08:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bulbozaur bulbozaur bulbozaur approved these changes

@TheDZhon TheDZhon TheDZhon approved these changes

@skozin skozin skozin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@folkyatina @skozin @bulbozaur @TheDZhon @failingtwice @krogla