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
Kyle AltendorfandGitHub c31a973b6d Merge pull request #13114 from AmineKhaldi/update_test_reorg_protocol 
Update test to reflect the recent change in ReorgProtocol
 2022-08-23 08:46:01 -04:00
Amine Khaldi 2db8ad4f0c Update test to reflect the recent change in ReorgProtocol. 2022-08-23 11:38:47 +01:00
dustinfaceandGitHub b020c03b15 tests: Simplify test_daemon.py (#12772) 
* Drop `TestDaemon` class

* Refactor response checks in `test_daemon.py`

* Make `test_mnemonic` and `test_fingerprint` global

I want to use them in some other tests in the parameterization.

* Create the daemon connection in the fixture, yield it with the keychain

* Use `KeyData` for the global key data
 2022-08-22 22:22:21 -05:00
Arvid NorbergandGitHub 49ad81b5a0 instrumentation of asyncio tasks (#13046) 
* Add support for instrumentation of asyncio tasks, to measure wall-clock time (as opposed to CPU time)

* fine tune output
 2022-08-22 22:20:55 -05:00
Arvid NorbergandGitHub 4959331cd1 Disable some tests (#13089) 
* disable the merkle_root regression test. It's expensive and we're already convinced there are no discrepancies between the old and the new implementation

* disable the exhaustive full block parser test
 2022-08-22 22:19:57 -05:00
Kyle AltendorfandGitHub f3bd07981c Merge pull request #13111 from Chia-Network/checkpoint/long_lived_atari_from_main_8ec6fe9b92dba860d369c1c6ef2c935837b6fa1b 
checkpoint: into long_lived/atari from main  @ 8ec6fe9b92
 2022-08-22 18:07:53 -04:00
Amine Khaldi 6ee7162f8c Merge commit '8ec6fe9b92dba860d369c1c6ef2c935837b6fa1b' into checkpoint/long_lived_atari_from_main_8ec6fe9b92dba860d369c1c6ef2c935837b6fa1b 2022-08-22 23:01:15 +01:00
Chris MarslenderandGitHub 8f7a610fb0 Only try and install aws cli if its not already present, since this is really slow on 10.14 (#13098) 2022-08-22 17:00:12 -05:00
Kyle AltendorfandGitHub 8f71ce59f5 Merge pull request #13110 from Chia-Network/checkpoint/long_lived_atari_from_main_2fa9f768ea998952a57011bee6d1143b51c2276d 
checkpoint: into long_lived/atari from main  @ 2fa9f768ea
 2022-08-22 17:59:02 -04:00
Amine Khaldi 0921fa2d10 Merge commit '2fa9f768ea998952a57011bee6d1143b51c2276d' into checkpoint/long_lived_atari_from_main_2fa9f768ea998952a57011bee6d1143b51c2276d 2022-08-22 22:56:37 +01:00
Kyle AltendorfandGitHub 2b42cc3f25 Merge pull request #13109 from Chia-Network/checkpoint/long_lived_atari_from_main_48a8347c833e9e84e0ef72fb50a5ac3853512e16 
checkpoint: into long_lived/atari from main  @ 48a8347c83
 2022-08-22 17:48:31 -04:00
Amine Khaldi e279272c78 Merge commit '48a8347c833e9e84e0ef72fb50a5ac3853512e16' into checkpoint/long_lived_atari_from_main_48a8347c833e9e84e0ef72fb50a5ac3853512e16 2022-08-22 22:46:31 +01:00
William AllenandGitHub 6be5185d2d Merge pull request #13108 from Chia-Network/checkpoint/long_lived_atari_from_main_f1651e5df14745a6abcd44567500abad296cf834 
checkpoint: into long_lived/atari from main  @ f1651e5df1
 2022-08-22 16:45:33 -05:00
Amine Khaldi 1a58bc0d61 Merge commit 'f1651e5df14745a6abcd44567500abad296cf834' into checkpoint/long_lived_atari_from_main_f1651e5df14745a6abcd44567500abad296cf834 2022-08-22 22:44:00 +01:00
Kyle AltendorfandGitHub 9ecab39a6a Merge pull request #13105 from Chia-Network/checkpoint/long_lived_atari_from_main_4611d0aa4372a441617fe1322be9c6b8867adbd0 
checkpoint: into long_lived/atari from main  @ 4611d0aa43
 2022-08-22 17:16:13 -04:00
Amine Khaldi 4baf1c42f7 Address linting. 2022-08-22 22:11:05 +01:00
Amine Khaldi 2b80e03011 Merge commit '4611d0aa4372a441617fe1322be9c6b8867adbd0' into checkpoint/long_lived_atari_from_main_4611d0aa4372a441617fe1322be9c6b8867adbd0 2022-08-22 21:50:56 +01:00
Kyle Altendorf 4e5bd52d04 renames 2022-08-22 16:32:07 -04:00
Kyle Altendorf 1a2a60f16f some rpc reference data output code (commented out) 2022-08-22 16:31:46 -04:00
Kyle AltendorfandGitHub 3d096a1f38 Merge pull request #13104 from Chia-Network/checkpoint/long_lived_atari_from_main_0dd5391f40df3414180d2df716fe1d9c2d02767f 
checkpoint: into long_lived/atari from main  @ 0dd5391f40
 2022-08-22 15:07:58 -04:00
Amine Khaldi 8e65ceebc2 Merge commit '0dd5391f40df3414180d2df716fe1d9c2d02767f' into checkpoint/long_lived_atari_from_main_0dd5391f40df3414180d2df716fe1d9c2d02767f 2022-08-22 19:50:04 +01:00
Kyle AltendorfandGitHub 5f66646244 Merge pull request #13103 from Chia-Network/checkpoint/long_lived_atari_from_main_f562d965353c4af2b067fda8a8c975f61b1a0c83 
checkpoint: into long_lived/atari from main  @ f562d96535
 2022-08-22 14:40:56 -04:00
Amine Khaldi a118cc367c Merge commit 'f562d965353c4af2b067fda8a8c975f61b1a0c83' into checkpoint/long_lived_atari_from_main_f562d965353c4af2b067fda8a8c975f61b1a0c83 2022-08-22 19:38:42 +01:00
Kyle AltendorfandGitHub 9fb7ba70f7 Merge pull request #13102 from Chia-Network/checkpoint/long_lived_atari_from_main_39ef58ef612b46b9c4c0d4f9d01bb46b4bd28518 
checkpoint: into long_lived/atari from main  @ 39ef58ef61
 2022-08-22 14:37:36 -04:00
Amine Khaldi c42340f14f Merge commit '39ef58ef612b46b9c4c0d4f9d01bb46b4bd28518' into checkpoint/long_lived_atari_from_main_39ef58ef612b46b9c4c0d4f9d01bb46b4bd28518 2022-08-22 19:33:04 +01:00
Kyle AltendorfandGitHub a0218d903e Merge pull request #13101 from Chia-Network/checkpoint/long_lived_atari_from_main_44b2568cd64556009d679d25523041220729324b 
checkpoint: into long_lived/atari from main  @ 44b2568cd6
 2022-08-22 14:26:57 -04:00
Amine Khaldi 0807df5b04 Merge commit '44b2568cd64556009d679d25523041220729324b' into checkpoint/long_lived_atari_from_main_44b2568cd64556009d679d25523041220729324b 2022-08-22 19:20:09 +01:00
Kyle AltendorfandGitHub c9d9ce066f Merge pull request #13099 from Chia-Network/checkpoint/long_lived_atari_from_main_ff8ecb35a0bd251b66e1b5102a8113d115c93604 
checkpoint: into long_lived/atari from main  @ ff8ecb35a0
 2022-08-22 14:11:35 -04:00
Amine Khaldi 4b39c4e241 Merge commit 'ff8ecb35a0bd251b66e1b5102a8113d115c93604' into checkpoint/long_lived_atari_from_main_ff8ecb35a0bd251b66e1b5102a8113d115c93604 2022-08-22 19:04:09 +01:00
William AllenandGitHub 1368b483ca Merge pull request #13092 from Chia-Network/checkpoint/main_from_release_1.5.1_e3d7122d80f1df147213d8536ba96c72e7bb0bfd 
checkpoint: into main from release/1.5.1  @ e3d7122d80
 2022-08-22 12:55:17 -05:00
Kyle AltendorfandGitHub 783233349a Merge pull request #13095 from Chia-Network/fc.fix-duplicate-subscriptions 
Fix duplicate subscriptions.
 2022-08-22 13:31:22 -04:00
JeffandGitHub 0c35f9ee50 Bump chia-blockchain-gui to 55e776c875f27d2e80fed0105691ff8183040e18 (#13090) 
Fixes an exception in local storage when non-existent items are accessed.
 2022-08-22 11:32:15 -05:00
dustinfaceandGitHub 9d5d76d611 util: Introduce KeyData and _get_pk_and_entropy -> _get_key_data (#12752) 
* util: Introduce `KeyData` and `_get_pk_and_entropy` -> `_get_key_data`

* Fix typos

* `include_secrets=False` in `delete_key_by_fingerprint`

* Use a variable for the mnemonic string in `KeyDataSecrets.__post_init__`
 2022-08-22 11:24:31 -05:00
dustinfaceandGitHub 9b71c857b4 util: Fix force_legacy in KeyringWrapper.__init__ (#13054) 2022-08-22 11:24:20 -05:00
Kyle Altendorf 4bbcbc3439 Merge branch 'long_lived/atari' into atari-cancel_offer_rpc 2022-08-22 12:21:36 -04:00
Kyle AltendorfandGitHub 0178f345b1 Merge pull request #13081 from Chia-Network/atari-transactions_for_offers 
atari - transactions for offers
 2022-08-22 12:18:19 -04:00
Kyle Altendorf 8b2e712c74 fixup 2022-08-22 12:13:06 -04:00
Kyle Altendorf 2fbfe49605 Merge branch 'long_lived/atari' into atari-cancel_offer_rpc 2022-08-22 12:11:45 -04:00
Kyle AltendorfandGitHub 7d8faeb61d Merge pull request #13096 from Chia-Network/checkpoint/long_lived_atari_from_main_9588949cfa22f180f62dc18962b5c71635e00ebc 
checkpoint: into long_lived/atari from main  @ 9588949cfa
 2022-08-22 11:40:55 -04:00
Amine Khaldi 965c692961 Merge commit '9588949cfa22f180f62dc18962b5c71635e00ebc' into checkpoint/long_lived_atari_from_main_9588949cfa22f180f62dc18962b5c71635e00ebc 2022-08-22 16:34:34 +01:00
Kyle AltendorfandGitHub a6fd85b675 Merge pull request #13093 from Chia-Network/checkpoint/long_lived_atari_from_main_f648f7e52bc4b9ea65b29ed11c0927b5a33f660e 
checkpoint: into long_lived/atari from main  @ f648f7e52b
 2022-08-22 11:32:34 -04:00
Florin Chirica 1941f20f49 Fix duplicate subscriptions. 2022-08-22 18:17:39 +03:00
Amine Khaldi 4869bc2694 Merge commit 'f648f7e52bc4b9ea65b29ed11c0927b5a33f660e' into checkpoint/long_lived_atari_from_main_f648f7e52bc4b9ea65b29ed11c0927b5a33f660e 2022-08-22 16:07:56 +01:00
Kyle AltendorfandGitHub d257a51272 Merge pull request #13091 from Chia-Network/checkpoint/long_lived_atari_from_main_fba150627c912bb2f0eb2526011ccf85d51f1afc 
checkpoint: into long_lived/atari from main  @ fba150627c
 2022-08-22 11:06:55 -04:00
Amine Khaldi e6375b3514 Merge commit 'e3d7122d80f1df147213d8536ba96c72e7bb0bfd' into checkpoint/main_from_release_1.5.1_e3d7122d80f1df147213d8536ba96c72e7bb0bfd 2022-08-22 15:46:19 +01:00
Amine Khaldi cd666a1117 Merge commit 'fba150627c912bb2f0eb2526011ccf85d51f1afc' into checkpoint/long_lived_atari_from_main_fba150627c912bb2f0eb2526011ccf85d51f1afc 2022-08-22 15:37:13 +01:00
JeffandGitHub ce47d6dcb3 Bump chia-blockchain-gui to cf0a83ce389a192e6cb5067a21373a2cb9eece6b (#13086) 
Includes fixes for:
Flakey behavior when adding CAT wallets from the manage tokens drawer.
Incorrect NFT wallet being labelled as "Unassigned" in some cases.
 2022-08-22 09:26:09 -05:00
Kyle Altendorf 0b6d108ae9 wait for an actual thing 2022-08-22 10:18:35 -04:00
Kyle Altendorf e8a4f5d9a1 move wallet actions outside the lock 2022-08-22 10:11:24 -04:00
Kyle Altendorf c6ff398346 less flaky, still hacky 2022-08-22 10:07:55 -04:00