starred/chia-blockchain
1
0
Fork 0
mirror of https://github.com/Chia-Network/chia-blockchain.git synced 2026-09-04 18:14:23 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,659 Commits 442 Branches 260 Tags
use-structured-RPC-errors
Commit Graph
14659 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mariano SorgenteandGitHub dc5c44accd Fix several bugs with untrusted sync, and correct sync status (#13133) 
* Hopefully fix bug with untrusted sync

* Try removing the cache

* Add cache back, and don't rollback

* Compare to finished_sync_up_to

* Fix plotnfts, and tests

* Async function

* fix wallet blockchain tests

* Fix test, and improve detection of synced

* Correct sync status

* Fix more tests

* Fix more tests

* Fix NFT tests
 2022-08-24 15:29:51 -05:00
William AllenandGitHub 7e73b14eeb Merge pull request #13143 from Chia-Network/checkpoint/main_from_release_1.5.1_6ec6bd799b43c040fe0097d27729348272e42e21 
checkpoint: into main from release/1.5.1  @ 6ec6bd799b
 2022-08-24 14:58:52 -05:00
Kyle AltendorfandGitHub d9ee8b9363 Merge pull request #13079 from Chia-Network/atari-cancel_offer_rpc 
atari - cancel offer rpc
 2022-08-24 15:42:40 -04:00
Kyle AltendorfandGitHub 0c16f32c7f Merge pull request #13152 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_c1a9d6c031c206cb5b9792a30fd737f0327560dd 
checkpoint: into long_lived/atari from release/1.5.1  @ c1a9d6c031
 2022-08-24 14:53:36 -04:00
Amine Khaldi bced7008f9 Merge commit 'c1a9d6c031c206cb5b9792a30fd737f0327560dd' into checkpoint/long_lived_atari_from_release_1.5.1_c1a9d6c031c206cb5b9792a30fd737f0327560dd 2022-08-24 19:35:12 +01:00
Kyle AltendorfandGitHub c0b1692f18 Merge pull request #13150 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_a041576c12c23b03d665c9ade775ee3f2bfc32a5 
checkpoint: into long_lived/atari from release/1.5.1  @ a041576c12
 2022-08-24 14:08:07 -04:00
Amine Khaldi 4306815d23 Merge commit 'a041576c12c23b03d665c9ade775ee3f2bfc32a5' into checkpoint/long_lived_atari_from_release_1.5.1_a041576c12c23b03d665c9ade775ee3f2bfc32a5 2022-08-24 19:06:48 +01:00
Kyle AltendorfandGitHub 3472faffdc Merge pull request #13149 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_50af8dfe3915192857a39cb3e82567c87216a430 
checkpoint: into long_lived/atari from release/1.5.1  @ 50af8dfe39
 2022-08-24 13:57:52 -04:00
Amine Khaldi e0a89ad3ab Merge commit '50af8dfe3915192857a39cb3e82567c87216a430' into checkpoint/long_lived_atari_from_release_1.5.1_50af8dfe3915192857a39cb3e82567c87216a430 2022-08-24 18:52:35 +01:00
Kyle AltendorfandGitHub 5c1d5383b0 Merge pull request #13148 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_5e36274be213033852ff38b306352238a9ff94c7 
checkpoint: into long_lived/atari from release/1.5.1  @ 5e36274be2
 2022-08-24 13:27:40 -04:00
Amine Khaldi f550aa97a8 Merge commit '5e36274be213033852ff38b306352238a9ff94c7' into checkpoint/long_lived_atari_from_release_1.5.1_5e36274be213033852ff38b306352238a9ff94c7 2022-08-24 17:34:44 +01:00
Kyle AltendorfandGitHub e0c0a27e23 Merge pull request #13147 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_bcec9e232b9a121418e6dc3aeaf4704f9f23ecb3 
checkpoint: into long_lived/atari from release/1.5.1  @ bcec9e232b
 2022-08-24 12:34:03 -04:00
Amine Khaldi 9fb39a1114 Merge commit 'bcec9e232b9a121418e6dc3aeaf4704f9f23ecb3' into checkpoint/long_lived_atari_from_release_1.5.1_bcec9e232b9a121418e6dc3aeaf4704f9f23ecb3 2022-08-24 17:30:29 +01:00
Kyle AltendorfandGitHub 08148be537 Merge pull request #13120 from Chia-Network/atari-include_wallet_make_offer_in_transaction_rollback_region 
atari - include wallet maker offer rpc call in transaction rollback region
 2022-08-24 08:51:15 -04:00
Amine Khaldi 83f2a3b8b6 Merge commit '6ec6bd799b43c040fe0097d27729348272e42e21' into checkpoint/main_from_release_1.5.1_6ec6bd799b43c040fe0097d27729348272e42e21 2022-08-24 12:34:51 +01:00
Kyle AltendorfandGitHub 0550b248f7 Merge pull request #13141 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_e311bf4bd4679f97f41f407fecfe0cc0ca94497b 
checkpoint: into long_lived/atari from release/1.5.1  @ e311bf4bd4
 2022-08-24 07:18:51 -04:00
Amine Khaldi 2e1505469e Merge commit 'e311bf4bd4679f97f41f407fecfe0cc0ca94497b' into checkpoint/long_lived_atari_from_release_1.5.1_e311bf4bd4679f97f41f407fecfe0cc0ca94497b 2022-08-24 12:12:40 +01:00
Kyle AltendorfandGitHub 6a64044ef2 Merge pull request #13140 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_922523694a30fc6e39fd686ee820d0ea96f55272 
checkpoint: into long_lived/atari from release/1.5.1  @ 922523694a
 2022-08-24 07:09:08 -04:00
Amine Khaldi 8ec9bda5c7 Merge commit '922523694a30fc6e39fd686ee820d0ea96f55272' into checkpoint/long_lived_atari_from_release_1.5.1_922523694a30fc6e39fd686ee820d0ea96f55272 2022-08-24 11:59:19 +01:00
Kyle AltendorfandGitHub e5bde0019b Merge pull request #13139 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_51e8c8b60efbcd0d0a6d3d4f1494ca0fdd673c87 
checkpoint: into long_lived/atari from release/1.5.1  @ 51e8c8b60e
 2022-08-24 06:57:54 -04:00
Amine Khaldi ca7523d904 Merge commit '51e8c8b60efbcd0d0a6d3d4f1494ca0fdd673c87' into checkpoint/long_lived_atari_from_release_1.5.1_51e8c8b60efbcd0d0a6d3d4f1494ca0fdd673c87 2022-08-24 11:37:30 +01:00
William AllenandGitHub 30be830ff3 Adding changelog (#13121) (#13135) 
* Adding changelog

* Fixing changelog indentation
 2022-08-24 02:04:46 -05:00
Arvid NorbergandGitHub 2276284c8e now that all uses of DBWrapper have been updated to DBWrapper2, remove the old one (#13116) 2022-08-24 01:36:25 -05:00
Arvid NorbergandGitHub 691528e5ef avoid locking up the main thread by using an asyncio.Future to wait for the worker processes in weight proof validation (#13118) 2022-08-24 01:19:22 -05:00
Matt HauffandGitHub 5a967e5166 Generalize NFT offers (#12945) 
* Generalize NFT offers

* Write tests for complex NFT1 offers

* Combine two loops

* isort

* Save one block farmed

* Increase timeouts

* black

* merge related fix
 2022-08-24 01:18:56 -05:00
dustinfaceandGitHub 62642b3b15 util: Introduce get_key/get_keys in Keychain + KeychainServer (#12830) 2022-08-24 01:18:34 -05:00
William AllenandGitHub a9a3240414 Merge pull request #13134 from Chia-Network/checkpoint/main_from_release_1.5.1_0c35f9ee50263941e260afd6dbb578dfd12a842f 
checkpoint: into main from release/1.5.1  @ 0c35f9ee50
 2022-08-24 01:11:39 -05:00
wallentx f382fd395a Merge commit '0c35f9ee50263941e260afd6dbb578dfd12a842f' into checkpoint/main_from_release_1.5.1_0c35f9ee50263941e260afd6dbb578dfd12a842f 2022-08-24 00:02:37 -05:00
Kyle AltendorfandGitHub 35715fba67 Merge pull request #13128 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_c39d7ac64f94ed55c98025b3dcfca2cd39e90d86 
checkpoint: into long_lived/atari from release/1.5.1  @ c39d7ac64f
 2022-08-23 22:13:55 -04:00
William AllenandGitHub 58b44cc2c1 Merge pull request #13130 from Chia-Network/checkpoint/main_from_release_1.5.1_ce47d6dcb3de5280230f99afb8175c31aea185d6 
checkpoint: into main from release/1.5.1  @ ce47d6dcb3
 2022-08-23 19:45:03 -05:00
Kyle Altendorf ef389b2b37 bump data layer test timeout to 55 2022-08-23 18:49:10 -04:00
Kyle Altendorf 754cfeef00 (fixed up) 2022-08-23 17:31:52 -04:00
Amine Khaldi 0380692464 Merge commit 'ce47d6dcb3de5280230f99afb8175c31aea185d6' into checkpoint/main_from_release_1.5.1_ce47d6dcb3de5280230f99afb8175c31aea185d6 2022-08-23 22:23:56 +01:00
William AllenandGitHub 8956436f89 Merge pull request #13125 from Chia-Network/checkpoint/main_from_release_1.5.1_bac862f6382c0f946604014426a29381919a9766 
checkpoint: into main from release/1.5.1  @ bac862f638
 2022-08-23 16:22:09 -05:00
Amine Khaldi 732d7e261e Merge commit 'c39d7ac64f94ed55c98025b3dcfca2cd39e90d86' into checkpoint/long_lived_atari_from_release_1.5.1_c39d7ac64f94ed55c98025b3dcfca2cd39e90d86 2022-08-23 21:22:31 +01:00
Kyle AltendorfandGitHub b09b5cd110 Merge pull request #13127 from Chia-Network/checkpoint/long_lived_atari_from_release_1.5.1_76b173e36bd9cd9835b5d126015c5594dacfe45c 
checkpoint: into long_lived/atari from release/1.5.1  @ 76b173e36b
 2022-08-23 16:16:56 -04:00
Amine Khaldi 39f6669c80 Merge commit '76b173e36bd9cd9835b5d126015c5594dacfe45c' into checkpoint/long_lived_atari_from_release_1.5.1_76b173e36bd9cd9835b5d126015c5594dacfe45c 2022-08-23 20:57:08 +01:00
Kyle AltendorfandGitHub 1c0b202b42 Merge pull request #13126 from Chia-Network/checkpoint/long_lived_atari_from_main_2ab0fa8b0a14bb16da17a2e74e19ce1404562ff9 
checkpoint: into long_lived/atari from main  @ 2ab0fa8b0a
 2022-08-23 15:45:25 -04:00
Amine Khaldi d0bb476555 Merge commit '2ab0fa8b0a14bb16da17a2e74e19ce1404562ff9' into checkpoint/long_lived_atari_from_main_2ab0fa8b0a14bb16da17a2e74e19ce1404562ff9 2022-08-23 20:43:24 +01:00
Kyle AltendorfandGitHub 9b65685f9d Merge pull request #13124 from Chia-Network/checkpoint/long_lived_atari_from_main_e314040d8d1034668f2563f0c2aeea6a39fd553c 
checkpoint: into long_lived/atari from main  @ e314040d8d
 2022-08-23 15:42:34 -04:00
Amine Khaldi 8cb9310075 Merge commit 'bac862f6382c0f946604014426a29381919a9766' into checkpoint/main_from_release_1.5.1_bac862f6382c0f946604014426a29381919a9766 2022-08-23 20:38:17 +01:00
Amine Khaldi b63aa1c87f Merge commit 'e314040d8d1034668f2563f0c2aeea6a39fd553c' into checkpoint/long_lived_atari_from_main_e314040d8d1034668f2563f0c2aeea6a39fd553c 2022-08-23 20:38:03 +01:00
William AllenandGitHub 43f538e85c Merge pull request #13123 from Chia-Network/checkpoint/main_from_release_1.5.1_a2f97534fdb440672e807689fc4dd177a0f3ddd4 
checkpoint: into main from release/1.5.1  @ a2f97534fd
 2022-08-23 14:35:40 -05:00
Amine Khaldi 3898f81ae5 Merge commit 'a2f97534fdb440672e807689fc4dd177a0f3ddd4' into checkpoint/main_from_release_1.5.1_a2f97534fdb440672e807689fc4dd177a0f3ddd4 2022-08-23 20:22:42 +01:00
Kyle Altendorf f2d6a158fa roll back pending roots on cancellation (but broken) 2022-08-23 15:09:17 -04:00
William AllenandGitHub 6ec6bd799b Adding changelog (#13121) 
* Adding changelog

* Fixing changelog indentation
1.5.1 		2022-08-23 12:20:27 -05:00
Kyle AltendorfandGitHub 704575e09e Update data_layer.py 2022-08-23 12:43:35 -04:00
Kyle Altendorf 7844b6eee1 include wallet maker offer rpc call in transaction rollback region 2022-08-23 12:11:17 -04:00
Kyle AltendorfandGitHub e3db1b877c Merge pull request #13117 from Chia-Network/checkpoint/long_lived_atari_from_main_105f02993f943f758b8f3276b94c9d0781006877 
checkpoint: into long_lived/atari from main  @ 105f02993f
 2022-08-23 09:08:38 -04:00
Amine Khaldi 5440cc61bb Merge commit '105f02993f943f758b8f3276b94c9d0781006877' into checkpoint/long_lived_atari_from_main_105f02993f943f758b8f3276b94c9d0781006877 2022-08-23 13:59:19 +01:00