Kyle Altendorf
2fb706efd6
add a test
2022-08-21 15:14:02 -04:00
Kyle Altendorf
8a5fe871ba
more lock=False
2022-08-21 11:33:31 -04:00
dustinface and GitHub
c47bdb35b3
daemon: Recover sys.stdout.close() call ( #13052 )
...
Fixing the following output on macOS when starting/stopping the daemon on CLI:
```
Exception ignored in: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='utf-8'>
BrokenPipeError: [Errno 32] Broken pipe
```
2022-08-20 13:42:06 -05:00
dustinface and GitHub
97a5921ede
util: Some cleanups in file_keyring.py ( #12669 )
...
* Move `CHECKBYTES_VALUE` related stuff into encryption/decription
* Simplify `FileKeyring._inner_set_password`
* Simplify `FileKeyring._inner_delete_password`
* Drop some redundant assignments
* Simplify `FileKeyring.check_if_keyring_file_modified`
Just try since it anyway fails if the file doesn't exist.
* Drop incorrect comment, it writes the cached payload to disk
* Rename `payload_cache` -> `cached_data_dict` and some related variables
* Ensure the `keys` dict exists by default
* Convert the passphrase from the legacy keyring if it is `bytes` type
* Merge `loads_keyring` into `FileKeyring.lockfile`
And rename it into `FileKeyring.lock_and_reload_if_required`
2022-08-20 13:41:42 -05:00
Kyle Altendorf
a64ee459b7
Merge branch 'long_lived/atari' into atari-transactions_for_offers
2022-08-20 12:36:43 -04:00
Kyle Altendorf and GitHub
3ea3c02280
Merge pull request #13083 from Chia-Network/atari-more_update
...
atari - call DataLayer._update_confirmation_status() more
2022-08-20 12:33:19 -04:00
Kyle Altendorf
2e6c1baa35
atari - call DataLayer._update_confirmation_status() more
2022-08-20 10:42:17 -04:00
Kyle Altendorf
90e0ca235b
Merge branch 'long_lived/atari' into atari-transactions_for_offers
2022-08-20 09:50:49 -04:00
Kyle Altendorf and GitHub
782f7cc41c
Merge pull request #13080 from Chia-Network/atari-fixup_fee_optionality
...
atari - fixup fee optionality
2022-08-20 09:20:27 -04:00
Kyle Altendorf and GitHub
42cd7b5cc1
Merge pull request #13078 from Chia-Network/atari-trade_id_not_offer_id
...
atari - trade_id not offer_id
2022-08-19 21:33:28 -04:00
Kyle Altendorf
52f518e26d
atari - transactions for offers
2022-08-19 21:20:42 -04:00
William Allen and GitHub
4f93c0e0d5
Merge pull request #13074 from Chia-Network/checkpoint/main_from_release_1.5.1_a25ba0d673af53f975004cd261e0a7af31ad1645
...
checkpoint: into main from release/1.5.1 @ a25ba0d673
2022-08-19 16:30:04 -05:00
Kyle Altendorf
ebd4dfeaaa
atari - fixup fee optionality
2022-08-19 17:09:15 -04:00
Kyle Altendorf
c95c28eb22
Merge branch 'long_lived/atari' into atari-cancel_offer_rpc
2022-08-19 16:35:59 -04:00
Kyle Altendorf
b548bbe939
atari - trade_id not offer_id
2022-08-19 16:30:17 -04:00
Kyle Altendorf
daac27e336
atari - preliminary /cancel_offer route and test
2022-08-19 16:08:54 -04:00
Kyle Altendorf and GitHub
97ef1ca152
Merge pull request #13071 from Chia-Network/atari-add_actual_route_for_verify_offer
...
atari - add actual route for verify offer
2022-08-19 16:04:02 -04:00
Kyle Altendorf and GitHub
7a79385132
Merge pull request #13077 from Chia-Network/checkpoint/long_lived_atari_from_main_fad414132e6950e79e805629427af76bf9ddcbc5
...
checkpoint: into long_lived/atari from main @ fad414132e
2022-08-19 15:10:58 -04:00
Amine Khaldi
4eec7e5fab
Merge commit 'fad414132e6950e79e805629427af76bf9ddcbc5' into checkpoint/long_lived_atari_from_main_fad414132e6950e79e805629427af76bf9ddcbc5
2022-08-19 20:10:03 +01:00
Kyle Altendorf and GitHub
af8b21903b
Merge pull request #13076 from Chia-Network/checkpoint/long_lived_atari_from_main_777ffb2751a6f11a7ad7bcc131c91d3b86e177b5
...
checkpoint: into long_lived/atari from main @ 777ffb2751
2022-08-19 15:08:19 -04:00
Amine Khaldi
9093328d94
Merge commit '777ffb2751a6f11a7ad7bcc131c91d3b86e177b5' into checkpoint/long_lived_atari_from_main_777ffb2751a6f11a7ad7bcc131c91d3b86e177b5
2022-08-19 20:07:29 +01:00
Kyle Altendorf and GitHub
b404bf6924
Merge pull request #13075 from Chia-Network/checkpoint/long_lived_atari_from_main_e5297f411d716b384e0514fd57aeb8536eda0527
...
checkpoint: into long_lived/atari from main @ e5297f411d
2022-08-19 15:04:29 -04:00
Amine Khaldi
2836dd9574
Merge commit 'e5297f411d716b384e0514fd57aeb8536eda0527' into checkpoint/long_lived_atari_from_main_e5297f411d716b384e0514fd57aeb8536eda0527
2022-08-19 19:51:55 +01:00
Kyle Altendorf and GitHub
aeb070417f
Merge pull request #13073 from Chia-Network/checkpoint/long_lived_atari_from_main_4c87c99d1563d6d118ef6af8cef90b4f19b0d8b4
...
checkpoint: into long_lived/atari from main @ 4c87c99d15
2022-08-19 14:45:30 -04:00
Amine Khaldi
06062b17a6
Merge commit 'a25ba0d673af53f975004cd261e0a7af31ad1645' into checkpoint/main_from_release_1.5.1_a25ba0d673af53f975004cd261e0a7af31ad1645
2022-08-19 19:42:52 +01:00
Amine Khaldi
70575d5ee3
Merge commit '4c87c99d1563d6d118ef6af8cef90b4f19b0d8b4' into checkpoint/long_lived_atari_from_main_4c87c99d1563d6d118ef6af8cef90b4f19b0d8b4
2022-08-19 19:40:40 +01:00
Kyle Altendorf and GitHub
e7cff849b3
Merge pull request #13072 from Chia-Network/checkpoint/long_lived_atari_from_main_67b45c92eaab014c9c77a83b42e14e5f5fa6e28b
...
checkpoint: into long_lived/atari from main @ 67b45c92ea
2022-08-19 14:39:40 -04:00
Amine Khaldi
5609c4e6dd
Merge commit '67b45c92eaab014c9c77a83b42e14e5f5fa6e28b' into checkpoint/long_lived_atari_from_main_67b45c92eaab014c9c77a83b42e14e5f5fa6e28b
2022-08-19 19:38:45 +01:00
Kyle Altendorf and GitHub
fc328fad82
atari - add actual route for verify offer
2022-08-19 14:12:24 -04:00
dustinface and GitHub
e4ecba3219
tests: Wait for the expected Receiver in Farmer.plot_sync_receivers ( #13045 )
...
This attempts to fix flakiness like in: https://github.com/Chia-Network/chia-blockchain/runs/7788054899
```
2022-08-11T13:44:30.2622222Z tests/core/test_farmer_harvester_rpc.py:493: in test_farmer_get_harvester_plots_endpoints
2022-08-11T13:44:30.2622847Z page_result = await endpoint(farmer_rpc_client, request)
2022-08-11T13:44:30.2625859Z chia/rpc/farmer_rpc_client.py:70: in get_harvester_plots_keys_missing
2022-08-11T13:44:30.2626915Z return await self.fetch("get_harvester_plots_keys_missing", dataclass_to_json_dict(request))
2022-08-11T13:44:30.2627361Z chia/rpc/rpc_client.py:49: in fetch
2022-08-11T13:44:30.2627696Z raise ValueError(res_json)
2022-08-11T13:44:30.2629908Z E ValueError: {'error': 'Receiver missing for 294e432c0891aedc586571384789c5897c6f6fd9930696e8d64bd2db69744fa1', 'success': False}
```
Actually this should only happen if the harvester gets disconnected from
the farmer. Not sure why this would happen here in this test but with
this PR it should wait until the farmer is back if this happens before
it fires the RPC request.
2022-08-19 13:08:48 -05:00
Patrick Maslana and GitHub
a132487dff
Update electron-osx-sign version ( #13035 )
2022-08-19 13:08:25 -05:00
William Allen and GitHub
5feee9b098
Merge pull request #13049 from Chia-Network/checkpoint/main_from_release_1.5.1_0d2e9531f8cdc884e73a3e28904bcfb94289438d
...
checkpoint: into main from release/1.5.1 @ 0d2e9531f8
2022-08-19 13:07:03 -05:00
Kyle Altendorf and GitHub
bfa8997e45
Merge pull request #13066 from Chia-Network/atari-relocate_api_classes
...
atari - relocate api classes to reduce cross importing
2022-08-19 14:06:07 -04:00
Kyle Altendorf and GitHub
790f07fd64
Merge pull request #13069 from Chia-Network/checkpoint/long_lived_atari_from_main_c9bebc6c405e6896e9ec3b34cdedc2bb1739c748
...
checkpoint: into long_lived/atari from main @ c9bebc6c40
2022-08-19 10:57:22 -04:00
Amine Khaldi
fc06a196ec
Merge commit 'c9bebc6c405e6896e9ec3b34cdedc2bb1739c748' into checkpoint/long_lived_atari_from_main_c9bebc6c405e6896e9ec3b34cdedc2bb1739c748
2022-08-19 15:55:14 +01:00
Kyle Altendorf and GitHub
8ce64eb7d2
Merge pull request #13068 from Chia-Network/checkpoint/long_lived_atari_from_main_4c7a917905b6b6e06439576b11b93064039fdcd3
...
checkpoint: into long_lived/atari from main @ 4c7a917905
2022-08-19 10:53:50 -04:00
Amine Khaldi
e14a822177
Merge commit '4c7a917905b6b6e06439576b11b93064039fdcd3' into checkpoint/long_lived_atari_from_main_4c7a917905b6b6e06439576b11b93064039fdcd3
2022-08-19 15:52:32 +01:00
Kyle Altendorf and GitHub
3671dffd13
Merge pull request #13067 from Chia-Network/checkpoint/long_lived_atari_from_main_a63b5e8a83d2f826792487dba4eec1a330d6bf64
...
checkpoint: into long_lived/atari from main @ a63b5e8a83
2022-08-19 10:50:21 -04:00
Amine Khaldi
f5be48d309
Merge commit 'a63b5e8a83d2f826792487dba4eec1a330d6bf64' into checkpoint/long_lived_atari_from_main_a63b5e8a83d2f826792487dba4eec1a330d6bf64
2022-08-19 15:47:07 +01:00
Kyle Altendorf
fc08becefb
relocate api classes to reduce cross importing
2022-08-19 10:14:15 -04:00
Kyle Altendorf and GitHub
5cfecc5713
Merge pull request #13059 from Chia-Network/atari-fix_empty_store_offers
...
fix empty store offers (at least the indexing error)
2022-08-19 09:09:57 -04:00
Kyle Altendorf and GitHub
7f9a82b93c
Merge pull request #13060 from Chia-Network/atari-test_just_api_setup
...
atari - bare_data_layer_api fixture
2022-08-19 09:09:45 -04:00
Kyle Altendorf and GitHub
bf92cd2ec6
Merge pull request #13064 from Chia-Network/checkpoint/long_lived_atari_from_main_21e563eb4fa491e29347f577c36ea1c91ab2018e
...
checkpoint: into long_lived/atari from main @ 21e563eb4f
2022-08-19 09:02:33 -04:00
Amine Khaldi
973946b62f
Merge commit '21e563eb4fa491e29347f577c36ea1c91ab2018e' into checkpoint/long_lived_atari_from_main_21e563eb4fa491e29347f577c36ea1c91ab2018e
2022-08-19 13:57:30 +01:00
Kyle Altendorf and GitHub
3f8468d0db
Merge pull request #13063 from Chia-Network/checkpoint/long_lived_atari_from_main_e7c0bcfcb46392dcf66298ddac692c8e168e1619
...
checkpoint: into long_lived/atari from main @ e7c0bcfcb4
2022-08-19 08:56:43 -04:00
Amine Khaldi
7085f1a1b8
Merge commit 'e7c0bcfcb46392dcf66298ddac692c8e168e1619' into checkpoint/long_lived_atari_from_main_e7c0bcfcb46392dcf66298ddac692c8e168e1619
2022-08-19 13:55:16 +01:00
Kyle Altendorf and GitHub
3e660cd65a
Merge pull request #13062 from Chia-Network/checkpoint/long_lived_atari_from_main_339fd05d1295f3fa673469a78f25a400d4d1f664
...
checkpoint: into long_lived/atari from main @ 339fd05d12
2022-08-19 08:54:40 -04:00
Amine Khaldi
cef8bf49f2
Merge commit '339fd05d1295f3fa673469a78f25a400d4d1f664' into checkpoint/long_lived_atari_from_main_339fd05d1295f3fa673469a78f25a400d4d1f664
2022-08-19 13:52:09 +01:00
Kyle Altendorf and GitHub
1f51667186
Merge pull request #13061 from Chia-Network/checkpoint/long_lived_atari_from_main_62fd66cb5b95b98211316321d27ce6d5f27d65ea
...
checkpoint: into long_lived/atari from main @ 62fd66cb5b
2022-08-19 08:47:46 -04:00
Amine Khaldi
8620222fa1
Merge commit '62fd66cb5b95b98211316321d27ce6d5f27d65ea' into checkpoint/long_lived_atari_from_main_62fd66cb5b95b98211316321d27ce6d5f27d65ea
2022-08-19 11:36:13 +01:00