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

Merge standalone wallet into main #9793

Merged
merged 59 commits into from
Jan 13, 2022
Merged

Merge standalone wallet into main #9793

merged 59 commits into from
Jan 13, 2022

Conversation

Yostra
Copy link
Contributor

@Yostra Yostra commented Jan 12, 2022

No description provided.

Yostra and others added 30 commits January 11, 2022 18:12
Quexington and others added 21 commits January 11, 2022 18:12
@Quexington @Yostra
Add confirmations and sleeps for wallet (#9742)
05ada47
@Yostra
use pool executor
956df22
@Yostra
rever merge mistakes/cleanup
1eb16ec
@Quexington @Yostra
Fix trade test flakiness (#9751)
4e52f1b
@Yostra
remove precommit
f12f070
@Yostra
older version of black
b10a303
@Yostra
lint only in super linter
a87acad
@Quexington @Yostra
Make announcements in RPC be objects instead of bytes (#9752)
3fd09f1 
* Make announcements in RPC be objects instead of bytes

* Lint
@altendky @Yostra
misc hint'ish cleanup (#9753)
423a4be 
* misc hint'ish cleanup

* unremove some ci bits
@Quexington @Yostra
Use main cached_bls.py
48b3026
@Quexington @Yostra
Fix bad merge in main_pac (#9774)
3cacf5a 
* Fix bad merge at 71da048

* Remove unused ignores

* more unused ignores

* Fix bad merge at 3b143e7

* One more byte32.from_hexstr
@Quexington @Yostra
Remove obsolete test
2288bba
@Yostra
remove commented out
4352d02
@Yostra
remove duplicate payment object
1ec9f7f
@Yostra
remove long sync
0ebdbbb
@Yostra
remove unused test, noise
c169c4a
@Yostra
memos type
9477742
@Yostra
bytes32
d49edf9
@Yostra
make it clear it's a single state at a time
9e665ce
@Yostra
copy over asset ids from pacr
1b8f180
@Yostra
file endl linter
aa8a900
@jack60612 jack60612 mentioned this pull request Jan 12, 2022
Merged
1 task
@Yostra @xdustinface
Update chia/server/ws_connection.py
11c94d0 
Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com>
wjblanke
wjblanke approved these changes Jan 13, 2022
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

@wjblanke wjblanke merged commit 89f15f5 into main Jan 13, 2022
@AmineKhaldi AmineKhaldi deleted the main_pac branch June 18, 2022 10:27
@nuyawktuah nuyawktuah mentioned this pull request Jul 1, 2022
Merged
@xdustinface xdustinface mentioned this pull request Dec 18, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xdustinface xdustinface xdustinface left review comments

@wjblanke wjblanke wjblanke 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.
5 participants
@Yostra @wjblanke @xdustinface @Quexington @altendky