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

Dao wallet #16500

Merged
merged 188 commits into from
Oct 11, 2023
Merged

Dao wallet #16500

merged 188 commits into from
Oct 11, 2023

Conversation

geoffwalmsley
Copy link
Contributor

Purpose:
Reopen the PR for merging dao-wallet into main. Since CI hadn't run for a while there were some pre-commit issues which have ben fixed. And further internal testing was requested before merging. Any updates from that testing will be commited here.

Testing Notes:
tests/wallet/dao_wallet

aqk and others added 30 commits June 20, 2023 08:59
@aqk
DAO Wallet changes
e10960f
@aqk
Newly created DAO Files
413263c
@matt-o-how
add assertion to prevent voting with 0 value
e012ea7
@aqk
Take changes from dao_unlock_cat_fix
4ccaa22
@aqk
Bring in chia/wallet/wallet_state_manager.py changes from dao_unlock_…
d106a35 
…cat_fix
@aqk
Bring chia/wallet/wallet_state_manager.py up to date with main
41b4cd3
@aqk
Merge branch 'main' into dao-wallet
381260b
@aqk
Typechecking and function input validation
ac6ff8b
@aqk
linting
ceb62d6
@geoffwalmsley
add singleton aggregator back into branch
17727a4
@matt-o-how
add singleton aggregator back into branch (#15662)
d3f61ba
@matt-o-how
fix dao_wallet bug and commit hex files
2535a8b
@matt-o-how
re-add amount check assertion to proposal voting
ade81b1
@matt-o-how
delete unused tests
b2f13b8
@geoffwalmsley
remove unused dao_util funcs
f5d9ddc
@geoffwalmsley
move singleton funcs from dao_utils to singleton.py
6f5d997
@matt-o-how
add concurrency test to check wallet isn't locking up coins when spen…
fb91d31 
…d fails
@matt-o-how
fix API bug and remove unused clsphex
225b5b9
@geoffwalmsley
spend timer coin during proposal self destruct
e5ec333
@geoffwalmsley
add proposal_minimum_amount to CLI
639203d
@geoffwalmsley
remove debug statements from dao_lockup
bda91b8
@geoffwalmsley
add hints for p2_singletons and brute-force the treasury balance
7c3ddde
@geoffwalmsley
return proposal id when creating new proposals
974b452
@geoffwalmsley
improve consistency of xch / mojo units in CLI
2e878a9
@geoffwalmsley
Revert "spend timer coin during proposal self destruct"
6d49421 
This reverts commit e5ec333.
@matt-o-how
DAO wallet todos (#15682)
8dfb947 
- cleanup dao utils and move get_singleton_struct to singleton.py
- spend the timer coin during proposal self destruct
@matt-o-how
change lockup to use self-hash and add in a test for coin removal
4f76efe
@matt-o-how
prep for moving proposal to 2 stage curry
3a3c9d3
@geoffwalmsley
add self destruct option to CLI and RPC
70af4b4
@geoffwalmsley
remove a breakpoint
2c04929
@geoffwalmsley geoffwalmsley requested a review from a team as a code owner October 3, 2023 15:42
Quexington
Quexington previously approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@Quexington Quexington left a comment

Choose a reason for hiding this comment

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

Reviewed the merge commit and seems fine to me 👍

@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Oct 5, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Oct 6, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 6, 2023

Conflicts have been resolved. A maintainer will review the pull request shortly.

Quexington
Quexington previously approved these changes Oct 6, 2023
View reviewed changes
wjblanke
wjblanke approved these changes Oct 11, 2023
View reviewed changes
Copy link
Contributor

@wjblanke wjblanke left a comment

Choose a reason for hiding this comment

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

aok

@cmmarslender cmmarslender reopened this Oct 11, 2023
@coveralls-official
Copy link

Pull Request Test Coverage Report for Build 6485324713

  • 5424 of 5424 (100.0%) changed or added relevant lines in 24 files are covered.
  • 102 unchanged lines in 11 files lost coverage.
  • Overall coverage increased (+0.5%) to 90.012%
Files with Coverage Reduction New Missed Lines %
chia/timelord/timelord_launcher.py 1 69.77%
chia/wallet/wallet_node.py 1 87.33%
tests/simulation/test_simulation.py 1 96.53%
chia/timelord/timelord_api.py 2 87.85%
chia/full_node/full_node.py 3 85.89%
chia/server/node_discovery.py 3 77.66%
chia/full_node/full_node_api.py 7 77.42%
chia/server/address_manager.py 7 90.36%
chia/server/server.py 8 79.54%
chia/timelord/timelord_state.py 20 69.47%
Totals Coverage Status
Change from base Build 6485221138: 0.5%
Covered Lines: 92865
Relevant Lines: 103103
💛 - Coveralls

@cmmarslender cmmarslender merged commit 75af6a9 into main Oct 11, 2023
484 checks passed
@cmmarslender cmmarslender deleted the dao-wallet branch October 11, 2023 19:19
fchirica pushed a commit that referenced this pull request Oct 17, 2023
@geoffwalmsley @aqk
@matt-o-how @kimsk @trepca @AmineKhaldi @altendky @fchirica
Dao wallet (#16500)
4b95c67 
Co-authored-by: Adam Kelly <338792+aqk@users.noreply.github.com>
Co-authored-by: Matthew Howard <m.o.howard97@gmail.com>
Co-authored-by: matt-o-how <48453825+matt-o-how@users.noreply.github.com>
Co-authored-by: Karlkim Suwanmongkol <karlkim@gmail.com>
Co-authored-by: Sebastjan Trepca <trepca@gmail.com>
Co-authored-by: Amine Khaldi <amine.khaldi@reactos.org>
Co-authored-by: Kyle Altendorf <sda@fstab.net>
This was referenced Oct 28, 2023
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjblanke wjblanke wjblanke approved these changes

@Quexington Quexington Quexington approved these changes

@aqk aqk Awaiting requested review from aqk

Assignees
No one assigned
Labels
Changed Required label for PR that categorizes merge commit message as "Changed" for changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@geoffwalmsley @wjblanke @Quexington @cmmarslender @aqk @matt-o-how @kimsk @trepca @AmineKhaldi @altendky