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.

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

Dao wallet #16500

Merged
merged 188 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from 186 commits
Commits
Show all changes
188 commits
Select commit Hold shift + click to select a range
e10960f
DAO Wallet changes
aqk Jun 20, 2023
413263c
Newly created DAO Files
aqk Jun 20, 2023
e012ea7
add assertion to prevent voting with 0 value
matt-o-how Jun 27, 2023
4ccaa22
Take changes from dao_unlock_cat_fix
aqk Jun 28, 2023
d106a35
Bring in chia/wallet/wallet_state_manager.py changes from dao_unlock_…
aqk Jun 28, 2023
41b4cd3
Bring chia/wallet/wallet_state_manager.py up to date with main
aqk Jun 28, 2023
381260b
Merge branch 'main' into dao-wallet
aqk Jun 28, 2023
ac6ff8b
Typechecking and function input validation
aqk Jun 28, 2023
ceb62d6
linting
aqk Jun 28, 2023
17727a4
add singleton aggregator back into branch
geoffwalmsley Jun 29, 2023
d3f61ba
add singleton aggregator back into branch (#15662)
matt-o-how Jun 29, 2023
2535a8b
fix dao_wallet bug and commit hex files
matt-o-how Jun 29, 2023
ade81b1
re-add amount check assertion to proposal voting
matt-o-how Jun 29, 2023
b2f13b8
delete unused tests
matt-o-how Jun 29, 2023
f5d9ddc
remove unused dao_util funcs
geoffwalmsley Jun 30, 2023
6f5d997
move singleton funcs from dao_utils to singleton.py
geoffwalmsley Jun 30, 2023
fb91d31
add concurrency test to check wallet isn't locking up coins when spen…
matt-o-how Jun 30, 2023
225b5b9
fix API bug and remove unused clsphex
matt-o-how Jun 30, 2023
e5ec333
spend timer coin during proposal self destruct
geoffwalmsley Jul 4, 2023
639203d
add proposal_minimum_amount to CLI
geoffwalmsley Jul 5, 2023
bda91b8
remove debug statements from dao_lockup
geoffwalmsley Jul 5, 2023
7c3ddde
add hints for p2_singletons and brute-force the treasury balance
geoffwalmsley Jul 6, 2023
974b452
return proposal id when creating new proposals
geoffwalmsley Jul 7, 2023
2e878a9
improve consistency of xch / mojo units in CLI
geoffwalmsley Jul 7, 2023
6d49421
Revert "spend timer coin during proposal self destruct"
geoffwalmsley Jul 7, 2023
8dfb947
DAO wallet todos (#15682)
matt-o-how Jul 7, 2023
4f76efe
change lockup to use self-hash and add in a test for coin removal
matt-o-how Jul 7, 2023
3a3c9d3
prep for moving proposal to 2 stage curry
matt-o-how Jul 7, 2023
70af4b4
add self destruct option to CLI and RPC
geoffwalmsley Jul 7, 2023
2c04929
remove a breakpoint
geoffwalmsley Jul 7, 2023
870b697
fix partial vote on proposal creation
geoffwalmsley Jul 7, 2023
3419827
add a function to get the treasury id
geoffwalmsley Jul 10, 2023
f10be41
clarify the blocks until closable numbers
geoffwalmsley Jul 10, 2023
07baeee
begin move to add proposal self hash
matt-o-how Jul 11, 2023
4a5bfe4
remove redundant else
geoffwalmsley Jul 11, 2023
e1d3d0c
CLI fixes for DAO wallets (#15692)
matt-o-how Jul 12, 2023
95f2afe
clean up dao creation funcs
geoffwalmsley Jul 12, 2023
08494ef
fix puzzle announcement mismatch and further optimise dao_lockup.clsp
matt-o-how Jul 12, 2023
35b3209
wallet fixes
matt-o-how Jul 12, 2023
0b65d6b
reorder standard wallet funcs and remove is_spend_retrievable
geoffwalmsley Jul 12, 2023
5abf2e5
fix proposal timer coin creation
matt-o-how Jul 12, 2023
2ab6d38
another fix
matt-o-how Jul 12, 2023
276303a
refactoring
geoffwalmsley Jul 13, 2023
1f046b1
remove old comments and breakpoints
geoffwalmsley Jul 13, 2023
105e158
Merge branch 'dao-wallet' into gw.dao_wallet_cleanup
geoffwalmsley Jul 13, 2023
9aef781
split out singleton struct across the two currys
matt-o-how Jul 13, 2023
e5b74cc
fix sync error
matt-o-how Jul 13, 2023
b4bb48d
fix bad spendbundle reveal
matt-o-how Jul 14, 2023
38c14cc
fix remaining bugs
matt-o-how Jul 14, 2023
f59f206
revert get_balance to using the node to find coins
geoffwalmsley Jul 14, 2023
e5cde0c
fix missing self_destruct in rpc and test
geoffwalmsley Jul 14, 2023
ccb42c5
dao wallet cleanup (#15753)
matt-o-how Jul 14, 2023
eb19698
Merge branch 'dao-wallet' into dao_curry_twice
matt-o-how Jul 14, 2023
49e51b1
remove debug (x) from proposal_validator
matt-o-how Jul 14, 2023
0177745
move comment for clarification
matt-o-how Jul 14, 2023
cd2feb4
move to await wallet sync instead of sleep in loop
matt-o-how Jul 14, 2023
6f0d933
remove long block farming
matt-o-how Jul 14, 2023
18dd050
Dao curry twice (#15773)
matt-o-how Jul 14, 2023
75dbabd
remove unused clvm
matt-o-how Jul 17, 2023
bac8d1b
remove unused files and partial fix clvm tests
matt-o-how Jul 19, 2023
8f22214
fix clvm tests
geoffwalmsley Jul 19, 2023
5a7e1a5
update dao files listed in deployed_puzzle_hashes.json
matt-o-how Jul 19, 2023
246ec4c
Address sebs comments for dao_wallet
geoffwalmsley Jul 20, 2023
d4bbe41
fix error in dao_get_treasury_balance RPC
kimsk Jul 20, 2023
b47cd23
add docstrings and comments to clvm tests
geoffwalmsley Jul 21, 2023
495f473
fix timings in dao_wallet_tests
geoffwalmsley Jul 21, 2023
de74ef4
fix error in dao_get_treasury_balance RPC (#15818)
trepca Jul 21, 2023
78e4991
Merge branch 'main' into dao-wallet
geoffwalmsley Jul 21, 2023
669f56e
fixes for wsm, wallet, rpc after merging main
geoffwalmsley Jul 21, 2023
fe9e238
remove execute_with_wallet and use get_wallet_client
kimsk Jul 22, 2023
8c16f83
pre-commit fixes
geoffwalmsley Jul 22, 2023
be13862
bring trade manager up to date with main
geoffwalmsley Jul 24, 2023
b0e25bd
Merge branch 'dao-wallet' into karlkim.dao-cmds
geoffwalmsley Jul 24, 2023
db016af
dao-wallet -- fixes dao cmds, remove execute_with_wallet and use get_…
geoffwalmsley Jul 24, 2023
8289054
pre-commit fixes for dao_funcs
geoffwalmsley Jul 24, 2023
a25b2a6
Merge main into dao-wallet
AmineKhaldi Jul 25, 2023
52092ad
add reorg tests
geoffwalmsley Jul 25, 2023
e47dfe5
revert cat wallet to use generate_signed_transaction
geoffwalmsley Jul 26, 2023
04a4c6d
revert get_most_recent_singleton_coin_from_coin_spend in pool_puzzles
geoffwalmsley Jul 26, 2023
337a206
move genesis_by_id_or_singleton puzzle into cat_wallet/puzzles
geoffwalmsley Jul 26, 2023
e9b457b
forgot to update clvm tests
geoffwalmsley Jul 26, 2023
2d8224d
lint
geoffwalmsley Jul 26, 2023
4ea15ee
fixes for failing CI tests
geoffwalmsley Jul 26, 2023
0e9134c
mypy for test_dao_wallets
geoffwalmsley Jul 26, 2023
c690970
add missing proposal_min_amt into update proposal clsp
geoffwalmsley Jul 26, 2023
0de780d
catch funding coins as change from proposals
geoffwalmsley Aug 3, 2023
c2a22ad
fixes to chialisp for update and minting proposals
geoffwalmsley Aug 3, 2023
5fc0415
rewrite proposal tests
geoffwalmsley Aug 3, 2023
8e3c16c
pre-commit fixes
geoffwalmsley Aug 3, 2023
3f4fd00
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 3, 2023
448ff6a
fix WSM imports after merging main
geoffwalmsley Aug 3, 2023
bcc15ad
Create config.py
altendky Aug 3, 2023
90f6d1c
p2_singleton_aggregator fixes and tests
geoffwalmsley Aug 4, 2023
65d1298
mypy for clvm tests
geoffwalmsley Aug 4, 2023
5937fd2
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 4, 2023
1a69948
fix up merge conflicts
geoffwalmsley Aug 4, 2023
f6d0ebd
add match_hinted_coin method now required by wallets
geoffwalmsley Aug 4, 2023
91b7dfa
add override_memos to GSTOptionalArgs
geoffwalmsley Aug 4, 2023
f071540
Merge branch 'dao-wallet' into dao-chialisp-fixes
geoffwalmsley Aug 5, 2023
f6384a9
clvm tests for updated p2_singleton_aggregator puz
geoffwalmsley Aug 5, 2023
3470884
add check for distinct voting coin ids to proposal
geoffwalmsley Aug 5, 2023
95ce24e
calculate coin ids and add todo about using ASSERT_EPHEMERAL in future
geoffwalmsley Aug 8, 2023
6f3db71
improve test consistency
geoffwalmsley Aug 8, 2023
dfc4a56
more test improvements
geoffwalmsley Aug 9, 2023
331b443
Merge branch 'dao-wallet' into dao-chialisp-fixes
geoffwalmsley Aug 9, 2023
a26cfb9
attempting to fix hanging untrusted funding test
geoffwalmsley Aug 9, 2023
07eff5e
wait for wallet sync in funding test
geoffwalmsley Aug 9, 2023
e747e48
farm extra block and increase timeout in funding test
geoffwalmsley Aug 9, 2023
7617c9a
typo
geoffwalmsley Aug 9, 2023
562be18
new attempt at funding test
geoffwalmsley Aug 9, 2023
c6478c7
if untrusted funding test get the actual coin record from the peer
geoffwalmsley Aug 9, 2023
0be1378
try creating the second wallet earlier
geoffwalmsley Aug 9, 2023
2d1fa55
Merge branch 'dao-wallet' into dao-chialisp-fixes
geoffwalmsley Aug 10, 2023
17f6786
comments and remove unused defconst
geoffwalmsley Aug 10, 2023
04088a6
check for duplicate coin_ids in loop_over_vote_coins
geoffwalmsley Aug 10, 2023
ceb891d
remove unused singleton_inner_puzhash from dao cat tail
geoffwalmsley Aug 10, 2023
43f47ae
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 11, 2023
0f4143b
Merge branch 'dao-wallet' into dao-chialisp-fixes
geoffwalmsley Aug 11, 2023
eb14d0e
add sleep to block farming for flaky windows tests
geoffwalmsley Aug 11, 2023
8bcb5f4
coverage
geoffwalmsley Aug 14, 2023
d43cb3f
minor fixes for spend cat proposals
geoffwalmsley Aug 14, 2023
01fd1c3
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 14, 2023
0e7a3ab
Merge branch 'dao-wallet' into dao-chialisp-fixes
geoffwalmsley Aug 14, 2023
80fd1f7
remove debug statement
geoffwalmsley Aug 14, 2023
f506a5d
remove unused debug code from wallet
geoffwalmsley Aug 14, 2023
31d097f
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 15, 2023
93e39db
add cli tests
geoffwalmsley Aug 15, 2023
b6f3d18
pre-commit fix
geoffwalmsley Aug 15, 2023
2ce5788
get config from get_wallet_client in dao_funcs
geoffwalmsley Aug 15, 2023
2192f7d
no asset_ids in dict keys for rpc resp. plus coverage
geoffwalmsley Aug 16, 2023
a5e9227
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 16, 2023
86aadfa
add rpc request type hints
geoffwalmsley Aug 16, 2023
05c19c0
coverage for dao_cat_wallet
geoffwalmsley Aug 16, 2023
eff0b2f
coverage for dao_utils
geoffwalmsley Aug 16, 2023
2935ceb
coverage for dao_wallet and misc others
geoffwalmsley Aug 16, 2023
778c2a7
more dao_wallet coverage
geoffwalmsley Aug 16, 2023
aaadb21
last bit of coverage
geoffwalmsley Aug 16, 2023
ad879dd
Merge branch 'dao-wallet' into dao-chialisp-fixes
geoffwalmsley Aug 16, 2023
4a53bf9
Dao chialisp fixes (#15997)
geoffwalmsley Aug 17, 2023
864bbb2
updates to singleton store and tests
geoffwalmsley Aug 17, 2023
6cd58ef
remove creation of 0 value change coins and fix cat tailhash loop
geoffwalmsley Aug 29, 2023
9eed2f2
update wallet for clsp changes, add a test for complex spend proposals
geoffwalmsley Aug 29, 2023
324d8e9
minor fix for cli
geoffwalmsley Aug 29, 2023
8f50750
update coverage exclusions for new tests
geoffwalmsley Aug 29, 2023
b809575
clvm test mistake
geoffwalmsley Aug 29, 2023
ba83bc6
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 29, 2023
bb2ea2d
use TXConfig everywhere
geoffwalmsley Aug 30, 2023
2cf877d
Merge branch 'main' into dao-wallet
geoffwalmsley Aug 30, 2023
81fa93b
add extra_conditions to wallet and rpc
geoffwalmsley Aug 30, 2023
9bf90be
coverage
geoffwalmsley Aug 30, 2023
e29e32f
cover all proposal types in rpc_api test
geoffwalmsley Aug 31, 2023
6d072d6
chialisp edits from matts comments
geoffwalmsley Aug 31, 2023
10fd033
first set of fixes from quex's review
geoffwalmsley Sep 5, 2023
04761c4
Merge branch 'main' into dao-wallet
geoffwalmsley Sep 5, 2023
63c3ecb
more quex fixes
geoffwalmsley Sep 5, 2023
88e2819
remove push option from wallets
geoffwalmsley Sep 7, 2023
a44cf52
Merge branch 'main' into dao-wallet
geoffwalmsley Sep 7, 2023
fd7f1d8
move proposal generate funcs to utils, remove tandem tx
geoffwalmsley Sep 8, 2023
5fa3f31
use consensus_mode=PLAIN for dao tests
geoffwalmsley Sep 8, 2023
1e2621d
rework funding puzzles to not use treasury id in hint
geoffwalmsley Sep 9, 2023
9e4994d
remove raise from uncurry_lockup to prevent error or gui start
geoffwalmsley Sep 9, 2023
b8b8941
flaky reorg test
geoffwalmsley Sep 9, 2023
adbdf47
flaky test fixes
geoffwalmsley Sep 9, 2023
515803c
more test fixes and coverage
geoffwalmsley Sep 10, 2023
15a78e2
cli fixes
geoffwalmsley Sep 10, 2023
c6e6430
dao balances always 1, and fix tx_ids
geoffwalmsley Sep 10, 2023
721ccf4
revert change to decimal display of mojo-only wallets
geoffwalmsley Sep 10, 2023
fadde31
Merge branch 'main' into dao-wallet
geoffwalmsley Sep 12, 2023
ab8830e
add fee to tail and fix coin release
geoffwalmsley Sep 12, 2023
f249e75
remove an unused push in dao cat wallet
geoffwalmsley Sep 12, 2023
b954915
Merge branch 'main' into dao-wallet and add valid_times to wallets
geoffwalmsley Sep 12, 2023
1973d22
add fee_for_cat
geoffwalmsley Sep 14, 2023
f46d687
fix partial vote amounts in proposal creation
geoffwalmsley Sep 14, 2023
6cb9f3a
convert spend_bundle to tx_id in CLI
geoffwalmsley Sep 14, 2023
9e534a3
vote amount defaults for other cli funcs
geoffwalmsley Sep 14, 2023
0d18d65
add endpoint for dao rules
geoffwalmsley Sep 16, 2023
6783ba5
Merge branch 'main' into dao-wallet
geoffwalmsley Sep 16, 2023
3eece4f
option to include closed props in list_proposals
geoffwalmsley Sep 17, 2023
b8a435e
CLI tweaks
geoffwalmsley Sep 18, 2023
cabd650
coverage
geoffwalmsley Sep 19, 2023
4ec5c0d
Merge branch 'main' into dao-wallet
geoffwalmsley Oct 3, 2023
0361ff5
fix #16456
geoffwalmsley Oct 3, 2023
cdcbfe8
fixed #16469
geoffwalmsley Oct 5, 2023
84f2065
Merge branch 'main' into dao-wallet
geoffwalmsley Oct 5, 2023
023b319
use full_node_server.get_port in wallet tests
geoffwalmsley Oct 5, 2023
e7e98f3
Merge branch 'main' into dao-wallet
geoffwalmsley Oct 6, 2023
6c2f540
flaky test
geoffwalmsley Oct 9, 2023
67b5ce8
increase blocks for flacy concurrency test
geoffwalmsley Oct 9, 2023
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
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ per-file-ignores =
tests/util/test_network_protocol_files.py:F405
tests/util/test_network_protocol_json.py:F405
tests/util/protocol_messages_json.py:E501
chia/wallet/dao_wallet/dao_utils.py:E501
chia/wallet/dao_wallet/dao_wallet.py:E501
chia/wallet/cat_wallet/dao_cat_wallet.py:E501
tests/wallet/dao_wallet/test_dao_clvm.py:E501
2 changes: 2 additions & 0 deletions chia/cmds/chia.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
from chia.cmds.beta import beta_cmd
from chia.cmds.completion import completion
from chia.cmds.configure import configure_cmd
from chia.cmds.dao import dao_cmd
from chia.cmds.data import data_cmd
from chia.cmds.db import db_cmd
from chia.cmds.dev import dev_cmd
Expand Down Expand Up @@ -128,6 +129,7 @@ def run_daemon_cmd(ctx: click.Context, wait_for_unlock: bool) -> None:
cli.add_command(passphrase_cmd)
cli.add_command(beta_cmd)
cli.add_command(completion)
cli.add_command(dao_cmd)
cli.add_command(dev_cmd)


Expand Down
Loading
Loading