Kyle Altendorf
eda8596481
Merge branch 'long_lived/atari' into atari-offer_rpc_stubs
2022-08-09 10:16:38 -04:00
Kyle Altendorf
a519e27aa9
another step
2022-08-09 10:14:31 -04:00
Kyle Altendorf and GitHub
54d5eca2c0
Merge pull request #12859 from Chia-Network/checkpoint/long_lived_atari_from_main_f49777885da4924362493ac1ca69003720d28365
2022-08-09 09:27:48 -04:00
Amine Khaldi
71753fd840
Merge commit 'f49777885da4924362493ac1ca69003720d28365' into checkpoint/long_lived_atari_from_main_f49777885da4924362493ac1ca69003720d28365
2022-08-09 14:25:07 +01:00
Kyle Altendorf and GitHub
062fa66dec
Merge pull request #12858 from Chia-Network/checkpoint/long_lived_atari_from_main_81b8dc45b51300537ff0bbbd5f8edcef80c10e38
2022-08-09 09:23:32 -04:00
Amine Khaldi
8db4661c76
Merge commit '81b8dc45b51300537ff0bbbd5f8edcef80c10e38' into checkpoint/long_lived_atari_from_main_81b8dc45b51300537ff0bbbd5f8edcef80c10e38
2022-08-09 14:18:59 +01:00
Kyle Altendorf and GitHub
1e0739a457
Merge pull request #12857 from Chia-Network/checkpoint/long_lived_atari_from_main_a58369cb3b1ded4b555607e0b7ebf353eb87dcef
2022-08-09 09:12:48 -04:00
Amine Khaldi
65fbd55f4f
Merge commit 'a58369cb3b1ded4b555607e0b7ebf353eb87dcef' into checkpoint/long_lived_atari_from_main_a58369cb3b1ded4b555607e0b7ebf353eb87dcef
2022-08-09 14:10:55 +01:00
Kyle Altendorf and GitHub
4b203436fe
Merge pull request #12856 from Chia-Network/checkpoint/long_lived_atari_from_main_034c9f30f318e39055c838bfbb9be34c4ed17c7e
2022-08-09 09:05:36 -04:00
Amine Khaldi
f868c0929a
Merge commit '034c9f30f318e39055c838bfbb9be34c4ed17c7e' into checkpoint/long_lived_atari_from_main_034c9f30f318e39055c838bfbb9be34c4ed17c7e
2022-08-09 13:55:56 +01:00
Kyle Altendorf and GitHub
4d830b2124
Merge pull request #12855 from Chia-Network/checkpoint/long_lived_atari_from_main_a7ea13c3cd83977aa30511b26180b8c5efcaf536
2022-08-09 08:54:36 -04:00
Amine Khaldi
6fc3a41cbd
Merge commit 'a7ea13c3cd83977aa30511b26180b8c5efcaf536' into checkpoint/long_lived_atari_from_main_a7ea13c3cd83977aa30511b26180b8c5efcaf536
2022-08-09 13:52:55 +01:00
Kyle Altendorf and GitHub
f6d6d09c82
Merge pull request #12854 from Chia-Network/checkpoint/long_lived_atari_from_main_8f54fd292a8cc60cf53994a6c06a7c1e6d6546eb
2022-08-09 08:51:43 -04:00
Amine Khaldi
cf42fc312e
Merge commit '8f54fd292a8cc60cf53994a6c06a7c1e6d6546eb' into checkpoint/long_lived_atari_from_main_8f54fd292a8cc60cf53994a6c06a7c1e6d6546eb
2022-08-09 13:43:34 +01:00
Kyle Altendorf and GitHub
e8c86de41d
Merge pull request #12851 from Chia-Network/checkpoint/long_lived_atari_from_main_f9fc1a13908d39fe4b60fd49274882bd8835df9c
2022-08-09 08:42:42 -04:00
Amine Khaldi
896265be92
Merge commit 'f9fc1a13908d39fe4b60fd49274882bd8835df9c' into checkpoint/long_lived_atari_from_main_f9fc1a13908d39fe4b60fd49274882bd8835df9c
2022-08-09 11:26:06 +01:00
Kyle Altendorf
4bfad071b3
Merge branch 'long_lived/atari' into atari-offer_rpc_stubs
2022-08-08 22:05:51 -04:00
Kyle Altendorf and GitHub
f713e23943
Merge pull request #12839 from Chia-Network/checkpoint/long_lived_atari_from_main_f2061d86d62dd8ed4a09ea4f63404784e1726adc
2022-08-08 22:04:07 -04:00
Kyle Altendorf and GitHub
0a77e94c9d
Merge pull request #12833 from Chia-Network/quex.new_proof_format
2022-08-08 22:03:40 -04:00
dustinface and GitHub
244a9dcc91
tests: Drop redundant RpcServer instances ( #12769 )
...
Just use the ones started by the actual `Service`.
2022-08-08 20:05:20 -05:00
Kyle Altendorf and GitHub
9b97e9cc00
Merge pull request #12840 from AmineKhaldi/unify_SimulatorsAndWallets_remove_extra_bt_from_dl_tests
2022-08-08 20:36:49 -04:00
922523694a
util: Force keyring migration / Deprecate legacy keyring support ( #12801 )
...
* util: Force keyring migration / Deprecate legacy keyring support
* Update chia/cmds/keys_funcs.py
Co-authored-by: Jeff <paninaro@gmail.com >
* Update chia/cmds/keys_funcs.py
Co-authored-by: Jeff <paninaro@gmail.com >
Co-authored-by: Jeff <paninaro@gmail.com >
2022-08-08 18:22:27 -05:00
51e8c8b60e
nft wallet reorg fix ( #12828 ) ( #12841 )
...
* reorg fix
* refreshing nft coins
Co-authored-by: Sebastjan Trepca <trepca@gmail.com >
2022-08-08 17:47:30 -05:00
Kronus91 and GitHub
c39d7ac64f
Fix a migration bug of NFT table change ( #12817 )
...
* Hanlde NFT reorg
* Fix pre-commit
* Change approach & add more unit tests
* Add adjust test timeout
* Fix unit tests
* Fix unit tests
* Revert unit test changes
* Unit test
* Unit test
* Unit test
* Remove limit
* Resolve comments
* Fix pre-commit
* NFT DB migration fix
* Resolve commit
2022-08-08 16:44:36 -05:00
Jeff and GitHub
76b173e36b
Bump chia-blockchain-gui submodule to 3c5edb88e38887b90b2f8a4398957bfc301c3047 ( #12834 )
...
Includes NFT <--> CAT offer support
2022-08-08 16:27:56 -05:00
Amine Khaldi
b11352a97e
Unify SimulatorsAndWallets and remove extra bt from datalayer related tests.
2022-08-08 22:08:27 +01:00
4a0659fd84
extra type for root
...
Co-authored-by: Kyle Altendorf <sda@fstab.net >
2022-08-08 15:29:07 -05:00
Matt Hauff
77d1f21c67
mypy
2022-08-08 15:12:56 -05:00
Sebastjan Trepca and GitHub
164fd158c8
nft wallet reorg fix ( #12828 )
...
* reorg fix
* refreshing nft coins
2022-08-08 14:45:54 -05:00
Amine Khaldi
5b8451303a
Reflect the change on datalayer related code.
2022-08-08 19:13:07 +01:00
Amine Khaldi
ea9e94982c
Merge commit 'f2061d86d62dd8ed4a09ea4f63404784e1726adc' into checkpoint/long_lived_atari_from_main_f2061d86d62dd8ed4a09ea4f63404784e1726adc
2022-08-08 18:46:26 +01:00
Kyle Altendorf and GitHub
131f430baa
Merge pull request #12838 from Chia-Network/checkpoint/long_lived_atari_from_main_37ab8fc3781305dc531cc3da03f91af84c226756
2022-08-08 13:45:28 -04:00
Amine Khaldi
2b224894a0
Merge commit '37ab8fc3781305dc531cc3da03f91af84c226756' into checkpoint/long_lived_atari_from_main_37ab8fc3781305dc531cc3da03f91af84c226756
2022-08-08 18:40:18 +01:00
Kyle Altendorf and GitHub
11c99d59f0
Merge pull request #12837 from Chia-Network/checkpoint/long_lived_atari_from_main_166b67247ef3482c1619342cc3593af6afbe86cd
2022-08-08 13:37:49 -04:00
Amine Khaldi
20590535b6
Merge commit '166b67247ef3482c1619342cc3593af6afbe86cd' into checkpoint/long_lived_atari_from_main_166b67247ef3482c1619342cc3593af6afbe86cd
2022-08-08 18:37:08 +01:00
Kyle Altendorf and GitHub
db29a5be43
Merge pull request #12835 from Chia-Network/checkpoint/long_lived_atari_from_main_bd5d4b13927caaaec3e9b67d88ad0398f22d1d8e
2022-08-08 13:35:52 -04:00
Amine Khaldi
647c0448cd
Merge commit 'bd5d4b13927caaaec3e9b67d88ad0398f22d1d8e' into checkpoint/long_lived_atari_from_main_bd5d4b13927caaaec3e9b67d88ad0398f22d1d8e
2022-08-08 18:32:39 +01:00
Kyle Altendorf and GitHub
98d2a03890
Merge pull request #12795 from Chia-Network/checkpoint/long_lived_atari_from_main_8ec56d1901315a5efb13202023e15930349ae504
2022-08-08 13:31:04 -04:00
Matt Hauff
f22a7e0d7c
Switch format for RPC proofs_of_inclusion for DL offers
2022-08-08 11:12:24 -05:00
Kyle Altendorf
c29a0f5aa3
progress on having a taker store
2022-08-08 10:34:31 -04:00
Kyle Altendorf
a3f488d288
start to handle taker inclusions
2022-08-07 19:45:06 -04:00
Kyle Altendorf
cfc6881472
rename to OfferSetup.maker_store_id in preparation for a taker store as well
2022-08-07 16:02:30 -04:00
Kyle Altendorf
a9ced59285
switch terminology inside functions to ours and theirs for consistency of code that might be deduplicated and shortened up unlike this commit message
2022-08-07 15:38:33 -04:00
Kyle Altendorf
c1d389b212
mild cleanup
2022-08-07 15:20:07 -04:00
Arvid Norberg and GitHub
8b70466a70
fix a few instances of coin name logging that would print binary-escaped strings instead of hex ( #12818 )
2022-08-07 14:16:52 -05:00
Kyle Altendorf
2f51b10a96
preliminary offer take
2022-08-07 11:34:20 -04:00
Kyle Altendorf
2a62540bb4
remove schema example files
2022-08-06 22:44:00 -04:00
Kyle Altendorf
c8d40e798b
pylint wants the ignore somewhere else now...
2022-08-06 22:38:22 -04:00
Kyle Altendorf
178b9495e5
start using the wallet offer creation
2022-08-06 22:26:29 -04:00
dustinface and GitHub
aa0e996ac5
util: Drop partially implemented BIP39 passphrase support ( #12748 )
2022-08-06 09:50:33 -05:00
Kyle Altendorf
Amine Khaldi
dustinfaceandGitHub
Kronus91andGitHub
JeffandGitHub
Arvid NorbergandGitHub