Commit Graph
14659 Commits
Author SHA1 Message Date
Kyle AltendorfandGitHub c36713eab3 Merge pull request #12408 from Chia-Network/checkpoint/long_lived_atari_from_main_9b3bed885e2f39e88f0953ac6a94c8fcdb07b6a6 2022-07-15 14:16:10 -04:00
Amine Khaldi b8454428e1 Merge commit '9b3bed885e2f39e88f0953ac6a94c8fcdb07b6a6' into checkpoint/long_lived_atari_from_main_9b3bed885e2f39e88f0953ac6a94c8fcdb07b6a6 2022-07-15 19:15:19 +01:00
Richard KissandGitHub a7462f66e9 Add Program.replace. (#12362) 2022-07-15 13:11:56 -05:00
Kyle AltendorfandGitHub 7b0b07e26c Merge pull request #12407 from Chia-Network/checkpoint/long_lived_atari_from_main_d3baa4c236be9ee8059953fa1e4da76f10a4cf69 2022-07-15 14:09:46 -04:00
Amine Khaldi 7aaa7006d9 Merge commit 'd3baa4c236be9ee8059953fa1e4da76f10a4cf69' into checkpoint/long_lived_atari_from_main_d3baa4c236be9ee8059953fa1e4da76f10a4cf69 2022-07-15 18:53:41 +01:00
Kyle AltendorfandGitHub 9f8df29d35 Merge pull request #12406 from Chia-Network/checkpoint/long_lived_atari_from_main_3c203e335c8bb8f32cbc39fa46e8a6ad42bdd9fa 2022-07-15 13:52:37 -04:00
Amine Khaldi 0fbc05afc2 Merge commit '3c203e335c8bb8f32cbc39fa46e8a6ad42bdd9fa' into checkpoint/long_lived_atari_from_main_3c203e335c8bb8f32cbc39fa46e8a6ad42bdd9fa 2022-07-15 18:44:38 +01:00
Kyle AltendorfandGitHub 4ad7b42930 Merge pull request #12405 from Chia-Network/checkpoint/long_lived_atari_from_main_5c5ab111ad9900fec4e4f6c2de50b8036dbb19ad 2022-07-15 13:42:45 -04:00
Amine Khaldi fa685d0186 Merge commit '5c5ab111ad9900fec4e4f6c2de50b8036dbb19ad' into checkpoint/long_lived_atari_from_main_5c5ab111ad9900fec4e4f6c2de50b8036dbb19ad 2022-07-15 18:39:08 +01:00
Kyle AltendorfandGitHub df3abad0ae Merge pull request #12404 from Chia-Network/checkpoint/long_lived_atari_from_main_1dccb682aeba080321e2b6f2516cf76165ca5957 2022-07-15 13:34:47 -04:00
Amine Khaldi 1b5efdf3ac Merge commit '1dccb682aeba080321e2b6f2516cf76165ca5957' into checkpoint/long_lived_atari_from_main_1dccb682aeba080321e2b6f2516cf76165ca5957 2022-07-15 17:39:36 +01:00
Kyle AltendorfandGitHub d51f1152df Merge pull request #12402 from Chia-Network/checkpoint/long_lived_atari_from_main_db1cc4d32acdfc7089e3d88235b6c838e99cc36e 2022-07-15 12:38:21 -04:00
Richard KissandMatt Hauff 3d5fed439d Add Program.replace. 2022-07-15 11:32:47 -05:00
Amine Khaldi 28c76fbd96 Merge commit 'db1cc4d32acdfc7089e3d88235b6c838e99cc36e' into checkpoint/long_lived_atari_from_main_db1cc4d32acdfc7089e3d88235b6c838e99cc36e 2022-07-15 16:53:05 +01:00
Kyle AltendorfandGitHub 8b51376202 Merge pull request #12401 from Chia-Network/checkpoint/long_lived_atari_from_main_d08d1b0a11d795d763fbf7bf359eca696f3a4c4e 2022-07-15 11:52:05 -04:00
Amine Khaldi 67675686e9 Merge commit 'd08d1b0a11d795d763fbf7bf359eca696f3a4c4e' into checkpoint/long_lived_atari_from_main_d08d1b0a11d795d763fbf7bf359eca696f3a4c4e 2022-07-15 16:51:01 +01:00
Kyle AltendorfandGitHub bcc2621fcc Merge pull request #12400 from Chia-Network/checkpoint/long_lived_atari_from_main_2495e8dfd3bef7b2842ac4127497b477b786e933 2022-07-15 11:43:58 -04:00
Amine Khaldi 9033520351 Merge commit '2495e8dfd3bef7b2842ac4127497b477b786e933' into checkpoint/long_lived_atari_from_main_2495e8dfd3bef7b2842ac4127497b477b786e933 2022-07-15 16:38:08 +01:00
Kyle AltendorfandGitHub f620c3b66e Merge pull request #12399 from Chia-Network/checkpoint/long_lived_atari_from_main_46c4ab3891361e7d95ae106a541fa206813bb957 2022-07-15 11:37:26 -04:00
Amine Khaldi c19d156cc0 Merge commit '46c4ab3891361e7d95ae106a541fa206813bb957' into checkpoint/long_lived_atari_from_main_46c4ab3891361e7d95ae106a541fa206813bb957 2022-07-15 16:22:17 +01:00
Kyle AltendorfandGitHub 9b0458f484 Merge pull request #12396 from Chia-Network/checkpoint/long_lived_atari_from_main_7cafb2a51309849995280f1dff9553687f5d8644 2022-07-15 10:31:56 -04:00
Amine Khaldi 95bcc4d0f5 Merge commit '7cafb2a51309849995280f1dff9553687f5d8644' into checkpoint/long_lived_atari_from_main_7cafb2a51309849995280f1dff9553687f5d8644 2022-07-15 14:02:30 +01:00
Kyle AltendorfandGitHub 4ef406a52b Merge pull request #12395 from Chia-Network/checkpoint/long_lived_atari_from_main_fcb9829f2bc31629daec4de7ffae21c2f45303f9 2022-07-15 09:01:15 -04:00
Amine Khaldi 17dbf37b30 Merge commit 'fcb9829f2bc31629daec4de7ffae21c2f45303f9' into checkpoint/long_lived_atari_from_main_fcb9829f2bc31629daec4de7ffae21c2f45303f9 2022-07-15 13:56:56 +01:00
Kyle AltendorfandGitHub 5ce4152014 Merge pull request #12394 from Chia-Network/checkpoint/long_lived_atari_from_main_865d3b84bb5f1b0113e1ae94e8b8ad99455a879f 2022-07-15 08:55:32 -04:00
Amine Khaldi 04463de146 Merge commit '865d3b84bb5f1b0113e1ae94e8b8ad99455a879f' into checkpoint/long_lived_atari_from_main_865d3b84bb5f1b0113e1ae94e8b8ad99455a879f 2022-07-15 13:51:42 +01:00
Kyle AltendorfandGitHub d57e84a8cc Merge pull request #12393 from Chia-Network/checkpoint/long_lived_atari_from_main_5f0b921788b50011a8484068f10e03ba191f2c1e 2022-07-15 08:44:17 -04:00
Amine Khaldi 822c06c12c Merge commit '5f0b921788b50011a8484068f10e03ba191f2c1e' into checkpoint/long_lived_atari_from_main_5f0b921788b50011a8484068f10e03ba191f2c1e 2022-07-15 10:48:35 +01:00
dustinfaceandGitHub a801260a5e util: Improve prompt_yes_no (#12366)
Move the `(y/n)` addition into the function and drop it as default parameter.
2022-07-15 03:15:26 -05:00
Arvid NorbergandGitHub f49777885d use execute_fetchall() instead of execute(), fetchall(), close() in wallet DB queries (#12335) 2022-07-15 03:14:22 -05:00
William AllenandGitHub a0102b3814 Merge pull request #38 from Chia-Network/paninaro.cli_nft_take_offer_fix
Fix for NFT0 and NFT+Royalty detection suggested by quex
2022-07-14 19:55:44 -05:00
Kyle AltendorfandGitHub 9c4df49149 Merge pull request #12390 from Chia-Network/checkpoint/long_lived_atari_from_main_718b830e613d7207386f939f506e42d862b81b43 2022-07-14 20:05:11 -04:00
Amine Khaldi 0e9b635dca Merge commit '718b830e613d7207386f939f506e42d862b81b43' into checkpoint/long_lived_atari_from_main_718b830e613d7207386f939f506e42d862b81b43 2022-07-14 21:14:52 +01:00
Kyle AltendorfandGitHub b318535225 Merge pull request #12387 from Chia-Network/checkpoint/long_lived_atari_from_main_0d2b39c87dab0f80d1c7fd664c1f8b0e71b9dda5 2022-07-14 16:13:36 -04:00
Amine Khaldi c870418001 Merge commit '0d2b39c87dab0f80d1c7fd664c1f8b0e71b9dda5' into checkpoint/long_lived_atari_from_main_0d2b39c87dab0f80d1c7fd664c1f8b0e71b9dda5 2022-07-14 20:57:40 +01:00
Kyle AltendorfandGitHub d6b40e7015 Merge pull request #12386 from Chia-Network/checkpoint/long_lived_atari_from_main_ef88a71404b64998ec163b3c190d9be42a52ef27 2022-07-14 15:55:01 -04:00
Amine Khaldi 14a8bc75ef Merge commit 'ef88a71404b64998ec163b3c190d9be42a52ef27' into checkpoint/long_lived_atari_from_main_ef88a71404b64998ec163b3c190d9be42a52ef27 2022-07-14 20:48:19 +01:00
Kyle AltendorfandGitHub ae97499e97 Merge pull request #12385 from Chia-Network/checkpoint/long_lived_atari_from_main_3c2fc1947df311aa80130a0f60288547cf09250d 2022-07-14 15:43:28 -04:00
Amine Khaldi 9d4a66287c Merge commit '3c2fc1947df311aa80130a0f60288547cf09250d' into checkpoint/long_lived_atari_from_main_3c2fc1947df311aa80130a0f60288547cf09250d 2022-07-14 20:36:30 +01:00
Kyle AltendorfandGitHub 4147bc3813 Merge pull request #12384 from Chia-Network/checkpoint/long_lived_atari_from_main_969c2586f1ca71151530547a6d1145470e3fc15f 2022-07-14 15:34:17 -04:00
Amine Khaldi e5acd68720 Merge commit '969c2586f1ca71151530547a6d1145470e3fc15f' into checkpoint/long_lived_atari_from_main_969c2586f1ca71151530547a6d1145470e3fc15f 2022-07-14 19:31:40 +01:00
Kyle AltendorfandGitHub 4a5dfc8368 Merge pull request #12383 from Chia-Network/checkpoint/long_lived_atari_from_main_898fcbb08b9585b0022b51d3ff4e8fd66cf222f8 2022-07-14 14:30:23 -04:00
Amine Khaldi 96766795f2 Merge commit '898fcbb08b9585b0022b51d3ff4e8fd66cf222f8' into checkpoint/long_lived_atari_from_main_898fcbb08b9585b0022b51d3ff4e8fd66cf222f8 2022-07-14 19:25:45 +01:00
Kyle AltendorfandGitHub 58b5af36ce Merge pull request #12380 from Chia-Network/checkpoint/long_lived_atari_from_main_5a6827168d9f88385c3f316e14d4880318d0c8a2 2022-07-14 14:24:38 -04:00
Kyle AltendorfandGitHub 04cc9cbbe8 Merge pull request #12381 from AmineKhaldi/fix_test_subscriptions 2022-07-14 13:48:44 -04:00
Jeff Cruikshank 8cbbeb3bf2 Linter fix and formatting change 2022-07-14 10:43:22 -07:00
Jeff Cruikshank 369a190b45 Fix for NFT0 and NFT+Royalty detection suggested by quex 2022-07-14 10:31:52 -07:00
William AllenandGitHub fc0cbc71cb Merge pull request #37 from Chia-Network/paninaro.cli_nft_offer_royalties
Update `chia wallet take_offer` to show NFT royalties
2022-07-14 11:56:16 -05:00
Amine Khaldi c798ab19a2 Fix test_subscriptions(). 2022-07-14 17:41:04 +01:00
Amine Khaldi ff30d9ba15 Merge commit '5a6827168d9f88385c3f316e14d4880318d0c8a2' into checkpoint/long_lived_atari_from_main_5a6827168d9f88385c3f316e14d4880318d0c8a2 2022-07-14 17:28:06 +01:00