Amine Khaldi
22038d4614
Merge commit '13558fdb75213c9b591b8b54062cbb796ece37ac' into checkpoint/long_lived_atari_from_main_13558fdb75213c9b591b8b54062cbb796ece37ac
2022-08-13 20:43:34 +01:00
Kyle Altendorf and GitHub
c5a9d65511
Merge pull request #12958 from Chia-Network/checkpoint/long_lived_atari_from_main_de09c3f1eb415bd93c79fa9deb9fb15fe9e3721e
...
checkpoint: into long_lived/atari from main @ de09c3f1eb
2022-08-13 15:42:49 -04:00
Amine Khaldi
80cb7ef2fb
Merge commit 'de09c3f1eb415bd93c79fa9deb9fb15fe9e3721e' into checkpoint/long_lived_atari_from_main_de09c3f1eb415bd93c79fa9deb9fb15fe9e3721e
2022-08-13 20:39:37 +01:00
Kyle Altendorf and GitHub
ac13954446
Merge pull request #12957 from Chia-Network/checkpoint/long_lived_atari_from_main_f527926f6044b1fe618b2b80faddd2f16e1d077b
...
checkpoint: into long_lived/atari from main @ f527926f60
2022-08-13 15:38:24 -04:00
Amine Khaldi
90a29e6b84
Merge commit 'f527926f6044b1fe618b2b80faddd2f16e1d077b' into checkpoint/long_lived_atari_from_main_f527926f6044b1fe618b2b80faddd2f16e1d077b
2022-08-13 20:36:28 +01:00
Kyle Altendorf
a0eb388645
tidy
2022-08-13 15:24:46 -04:00
Kyle Altendorf and GitHub
5d0d05e855
Merge pull request #12944 from Chia-Network/checkpoint/long_lived_atari_from_main_1910c3891c425a4a50c83f310b134fe528867f49
...
checkpoint: into long_lived/atari from main @ 1910c3891c
2022-08-13 14:14:23 -04:00
Jack Nelson
8ff42336c8
Merge branch 'main' into jn.cmds-refactor
2022-08-13 13:59:28 -04:00
Amine Khaldi
e4602add7c
Merge commit 'a041576c12c23b03d665c9ade775ee3f2bfc32a5' into checkpoint/main_from_release_1.5.1_a041576c12c23b03d665c9ade775ee3f2bfc32a5
2022-08-13 16:27:52 +01:00
Jeff and GitHub
dbe79f2139
Couple of small key migration changes to speed up launching ( #12950 )
...
* Skip legacy keyring migration check for wallet commands
* Skip subsequent incremental legacy keyring migration checks
2022-08-13 03:39:02 -05:00
Jack Nelson and GitHub
5080daabad
add catch for 100% royalties as the nft's are broken. ( #12951 )
2022-08-13 03:37:23 -05:00
William Allen and GitHub
d5462d372e
Merge pull request #12947 from Chia-Network/checkpoint/main_from_release_1.5.1_50af8dfe3915192857a39cb3e82567c87216a430
...
checkpoint: into main from release/1.5.1 @ 50af8dfe39
2022-08-13 03:11:34 -05:00
Arvid Norberg and GitHub
b4b37be2ee
optimize simple_solution_generator() ( #12798 )
2022-08-12 17:03:36 -05:00
Amine Khaldi
6a96356e63
Merge commit '50af8dfe3915192857a39cb3e82567c87216a430' into checkpoint/main_from_release_1.5.1_50af8dfe3915192857a39cb3e82567c87216a430
2022-08-12 23:02:50 +01:00
William Allen and GitHub
dc2a2bd12d
Merge pull request #12938 from Chia-Network/checkpoint/main_from_release_1.5.1_5e36274be213033852ff38b306352238a9ff94c7
...
checkpoint: into main from release/1.5.1 @ 5e36274be2
2022-08-12 17:02:04 -05:00
Amine Khaldi
ff16206500
Merge commit '1910c3891c425a4a50c83f310b134fe528867f49' into checkpoint/long_lived_atari_from_main_1910c3891c425a4a50c83f310b134fe528867f49
2022-08-12 22:29:02 +01:00
Kyle Altendorf and GitHub
72308136d5
Merge pull request #12943 from Chia-Network/checkpoint/long_lived_atari_from_main_e5c3dc89cfea5006c26ddf739247f16b0d0559da
...
checkpoint: into long_lived/atari from main @ e5c3dc89cf
2022-08-12 17:28:01 -04:00
Amine Khaldi
55d3ff45e2
Merge commit 'e5c3dc89cfea5006c26ddf739247f16b0d0559da' into checkpoint/long_lived_atari_from_main_e5c3dc89cfea5006c26ddf739247f16b0d0559da
2022-08-12 22:19:11 +01:00
Kyle Altendorf and GitHub
63f750798f
Merge pull request #12942 from Chia-Network/checkpoint/long_lived_atari_from_main_d508d2a3603c1dc020552c645b63b3cf8bb031bb
...
checkpoint: into long_lived/atari from main @ d508d2a360
2022-08-12 17:14:59 -04:00
Amine Khaldi
50bfa5bf20
Merge commit 'd508d2a3603c1dc020552c645b63b3cf8bb031bb' into checkpoint/long_lived_atari_from_main_d508d2a3603c1dc020552c645b63b3cf8bb031bb
2022-08-12 22:05:04 +01:00
Kyle Altendorf and GitHub
8c117b2c96
Merge pull request #12941 from Chia-Network/checkpoint/long_lived_atari_from_main_ba3c6361478586fbf91dea51aab702d0ef91fce2
...
checkpoint: into long_lived/atari from main @ ba3c636147
2022-08-12 16:32:05 -04:00
Amine Khaldi
8a46cf5f00
Merge commit 'ba3c6361478586fbf91dea51aab702d0ef91fce2' into checkpoint/long_lived_atari_from_main_ba3c6361478586fbf91dea51aab702d0ef91fce2
2022-08-12 20:58:16 +01:00
Kyle Altendorf and GitHub
c54d278b9f
Merge pull request #12940 from Chia-Network/checkpoint/long_lived_atari_from_main_11ddc8c27ef1410dcafb1e8d885fc549b6bbc18c
...
checkpoint: into long_lived/atari from main @ 11ddc8c27e
2022-08-12 15:57:32 -04:00
Amine Khaldi
1130bf940c
Merge commit '11ddc8c27ef1410dcafb1e8d885fc549b6bbc18c' into checkpoint/long_lived_atari_from_main_11ddc8c27ef1410dcafb1e8d885fc549b6bbc18c
2022-08-12 19:58:24 +01:00
Kyle Altendorf and GitHub
ac21ea8a45
Merge pull request #12939 from Chia-Network/checkpoint/long_lived_atari_from_main_1355c8bd77cddaf6d4cde86791a071e2ecccc80f
...
checkpoint: into long_lived/atari from main @ 1355c8bd77
2022-08-12 14:55:03 -04:00
Amine Khaldi
c6f6e8ac7e
Merge commit '1355c8bd77cddaf6d4cde86791a071e2ecccc80f' into checkpoint/long_lived_atari_from_main_1355c8bd77cddaf6d4cde86791a071e2ecccc80f
2022-08-12 19:47:56 +01:00
William Allen and GitHub
32967f78e2
Merge pull request #12937 from Chia-Network/paninaro.bump_gui_1c91c3db3bbf7c3c4b58452f5ed1cd2063aa5db8
...
Bump chia-blockchain-gui to 1c91c3db3bbf7c3c4b58452f5ed1cd2063aa5db8
2022-08-12 13:42:02 -05:00
Amine Khaldi
53967cd59c
Merge commit '5e36274be213033852ff38b306352238a9ff94c7' into checkpoint/main_from_release_1.5.1_5e36274be213033852ff38b306352238a9ff94c7
2022-08-12 19:21:28 +01:00
Jeff Cruikshank
bd896e81e4
Bump chia-blockchain-gui to 1c91c3db3bbf7c3c4b58452f5ed1cd2063aa5db8
...
Includes:
* Update localizations in preparation for 1.5.1
* Force legacy keyring migration. Legacy keyring support is now deprecated.
* NFTCard loading improvement by setting minimum height
Fixes:
* Show the image hash mismatch status for large files
2022-08-12 10:59:10 -07:00
William Allen and GitHub
7775b71527
Merge pull request #12936 from Chia-Network/checkpoint/main_from_release_1.5.1_bcec9e232b9a121418e6dc3aeaf4704f9f23ecb3
...
checkpoint: into main from release/1.5.1 @ bcec9e232b
2022-08-12 12:54:43 -05:00
Jeff and GitHub
b5cff3b39d
Bump chia-blockchain-gui to 380fbff2dc28c578410c4e959fe9ed4ae65f09c3 ( #12915 )
...
Changes:
* series_number/series_total -> edition_number/edition_total
2022-08-12 11:58:49 -05:00
Amine Khaldi and GitHub
4366520b90
Bring-in Mariano's Remove accidentally added debugging logs ( #12928 )
2022-08-12 11:52:16 -05:00
Amine Khaldi
4b41f775b1
Merge commit 'bcec9e232b9a121418e6dc3aeaf4704f9f23ecb3' into checkpoint/main_from_release_1.5.1_bcec9e232b9a121418e6dc3aeaf4704f9f23ecb3
2022-08-12 17:38:08 +01:00
William Allen and GitHub
c2ad3379ba
Merge pull request #12929 from Chia-Network/checkpoint/main_from_release_1.5.1_e311bf4bd4679f97f41f407fecfe0cc0ca94497b
...
checkpoint: into main from release/1.5.1 @ e311bf4bd4
2022-08-12 11:37:23 -05:00
Matt Hauff
ab62cda658
shatree
2022-08-12 11:30:27 -05:00
Kyle Altendorf and GitHub
e9afe4b5e6
Merge pull request #12867 from Chia-Network/fc.atari_discovery
...
Atari discovery draft.
2022-08-12 11:57:06 -04:00
Kyle Altendorf and GitHub
4f694c93c6
Merge pull request #12933 from Chia-Network/checkpoint/long_lived_atari_from_main_2adcc382cb934843dbe87f7f85e6479a3fcc698e
...
checkpoint: into long_lived/atari from main @ 2adcc382cb
2022-08-12 11:23:58 -04:00
Matt Hauff
8cd4b89cd4
Change DL offers to prove a branch instead of a leaf
2022-08-12 09:57:37 -05:00
Florin Chirica and GitHub
0bf2a877c5
Remove debug log.
2022-08-12 16:36:39 +03:00
4f159937fe
Update chia/rpc/data_layer_rpc_api.py
...
Co-authored-by: Kyle Altendorf <sda@fstab.net >
2022-08-12 16:35:01 +03:00
Florin Chirica
ba603375b2
Fix empty url subscribe.
2022-08-12 15:34:08 +02:00
Amine Khaldi
9dd7ed11d4
Merge commit '2adcc382cb934843dbe87f7f85e6479a3fcc698e' into checkpoint/long_lived_atari_from_main_2adcc382cb934843dbe87f7f85e6479a3fcc698e
2022-08-12 14:18:05 +01:00
Kyle Altendorf and GitHub
faa00369f6
Merge pull request #12932 from Chia-Network/checkpoint/long_lived_atari_from_main_3251cd384ab3adaa86aec735bdb522b3337b774e
...
checkpoint: into long_lived/atari from main @ 3251cd384a
2022-08-12 09:17:07 -04:00
Amine Khaldi
dcd71d0377
Merge commit '3251cd384ab3adaa86aec735bdb522b3337b774e' into checkpoint/long_lived_atari_from_main_3251cd384ab3adaa86aec735bdb522b3337b774e
2022-08-12 14:15:43 +01:00
Kyle Altendorf and GitHub
05bd3196c8
Merge pull request #12931 from Chia-Network/checkpoint/long_lived_atari_from_main_8435f1dde1aad6fb4e947aad28c7ce9ba9c13bdb
...
checkpoint: into long_lived/atari from main @ 8435f1dde1
2022-08-12 09:15:01 -04:00
Amine Khaldi
2c7e06672d
Merge commit '8435f1dde1aad6fb4e947aad28c7ce9ba9c13bdb' into checkpoint/long_lived_atari_from_main_8435f1dde1aad6fb4e947aad28c7ce9ba9c13bdb
2022-08-12 14:14:11 +01:00
Kyle Altendorf and GitHub
2d9e669987
Merge pull request #12930 from Chia-Network/checkpoint/long_lived_atari_from_main_ad5d8bbb294aa01185f4330e115fc711ea3d35e6
...
checkpoint: into long_lived/atari from main @ ad5d8bbb29
2022-08-12 09:13:12 -04:00
Amine Khaldi
cbb4910610
Merge commit 'ad5d8bbb294aa01185f4330e115fc711ea3d35e6' into checkpoint/long_lived_atari_from_main_ad5d8bbb294aa01185f4330e115fc711ea3d35e6
2022-08-12 14:08:07 +01:00
Kyle Altendorf and GitHub
9757c4198a
Merge pull request #12912 from AmineKhaldi/increase_some_test_timeouts
...
Increase some timeouts in an attempt to address flakiness in several tests
2022-08-12 09:06:58 -04:00
Amine Khaldi
36e62a0568
Merge commit 'e311bf4bd4679f97f41f407fecfe0cc0ca94497b' into checkpoint/main_from_release_1.5.1_e311bf4bd4679f97f41f407fecfe0cc0ca94497b
2022-08-12 14:04:45 +01:00
Amine Khaldi
Kyle AltendorfandGitHub
Jack Nelson
JeffandGitHub
William AllenandGitHub
Arvid NorbergandGitHub
Matt Hauff
Florin ChiricaandGitHub