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

Single Choice and Multiple Choice Veto #752

Merged
merged 55 commits into from
Dec 4, 2023
Merged

Single Choice and Multiple Choice Veto #752

merged 55 commits into from
Dec 4, 2023

Conversation

JakeHartnell
Copy link
Member

Closes #736

@codecov
Copy link

codecov bot commented Oct 20, 2023 •
edited
Loading

Codecov Report

Attention: 18 lines in your changes are missing coverage. Please review.

Comparison is base (db42d45) 96.25% compared to head (54c5484) 95.71%.

Additional details and impacted files 
@@               Coverage Diff               @@
##           development     #752      +/-   ##
===============================================
- Coverage        96.25%   95.71%   -0.54%     
===============================================
  Files              203      204       +1     
  Lines            50082    50581     +499     
===============================================
+ Hits             48207    48415     +208     
- Misses            1875     2166     +291
Files Coverage Δ
contracts/external/dao-migrator/src/contract.rs 95.14% <100.00%> (+0.03%) ⬆️
contracts/external/dao-migrator/src/msg.rs 25.00% <ø> (-8.34%) ⬇️
...racts/external/dao-migrator/src/testing/helpers.rs 96.23% <100.00%> (ø)
...ntracts/external/dao-migrator/src/testing/setup.rs 97.08% <100.00%> (+<0.01%) ⬆️
...external/dao-migrator/src/testing/state_helpers.rs 100.00% <100.00%> (ø)
...xternal/dao-migrator/src/testing/test_migration.rs 100.00% <100.00%> (ø)
contracts/external/dao-migrator/src/types.rs 83.33% <100.00%> (-11.91%) ⬇️
...s/external/dao-migrator/src/utils/query_helpers.rs 71.79% <ø> (ø)
...s/external/dao-migrator/src/utils/state_queries.rs 95.37% <100.00%> (ø)
...opose/dao-pre-propose-approval-single/src/tests.rs 99.92% <100.00%> (+<0.01%) ⬆️
... and 20 more

... and 71 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@0xJayak 0xJayak mentioned this pull request Oct 23, 2023
Merged
@JakeHartnell
Initial timelock / veto implementation
50725d5
@JakeHartnell
Add refund logic for veto
b69911d
@JakeHartnell
Refactor timelock
45e6e0d 
Should break less of the existing tests, doesn't lead to weird migration
state (passed at time zero), and if timelock configuration is updated it
won't affect currently open proposals.
@JakeHartnell
Start v2 migration
e0f594e
@JakeHartnell
Start writing tests
c956305
@JakeHartnell
Fix build and basic tests
9a09cb4
@JakeHartnell
Fix veto checks, add more tests
be89ce7
@JakeHartnell
Cleanup unneeded changes
9a90cba
@JakeHartnell
Veto before proposal passes feature (early veto)
f80bc40 
Allows for the vetoer to veto a proposal before it passes is
veto_before_passed is set to true. Some DAOs may want this to be able to
speed up their process.
@JakeHartnell
Improve code reuse with proposal_completed_hooks
bb69e94
@bekauz bekauz self-assigned this Nov 16, 2023
@codecov Codecov
Copy link

codecov bot commented Nov 16, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

❗ No coverage uploaded for pull request base (development@db42d45). Click here to learn what that means.

Additional details and impacted files 
@@              Coverage Diff               @@
##             development     #752   +/-   ##
==============================================
  Coverage               ?   96.19%           
==============================================
  Files                  ?      204           
  Lines                  ?    51088           
  Branches               ?        0           
==============================================
  Hits                   ?    49144           
  Misses                 ?     1944           
  Partials               ?        0

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

NoahSaso
NoahSaso requested changes Dec 1, 2023
View reviewed changes
Copy link
Member

@NoahSaso NoahSaso left a comment

Choose a reason for hiding this comment

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

sick so so close

Cargo.toml Outdated Show resolved Hide resolved
contracts/external/dao-migrator/Cargo.toml Outdated Show resolved Hide resolved
@NoahSaso NoahSaso changed the title Veto Single Choice Veto Dec 2, 2023
@NoahSaso NoahSaso mentioned this pull request Dec 2, 2023
Merged
@NoahSaso NoahSaso changed the title Single Choice Veto Single Choice and Multiple Choice Veto Dec 4, 2023
@NoahSaso NoahSaso merged commit 4cc8cc4 into development Dec 4, 2023
9 checks passed
@NoahSaso NoahSaso deleted the veto branch December 4, 2023 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xJayak 0xJayak 0xJayak left review comments

@bekauz bekauz bekauz left review comments

@NoahSaso NoahSaso NoahSaso approved these changes

Assignees

@bekauz bekauz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Timelock on proposal execution
4 participants
@JakeHartnell @bekauz @NoahSaso @0xJayak