Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main's e0df18f into main_dids #11479

Merged
merged 39 commits into from
May 11, 2022

Conversation

AmineKhaldi
Copy link
Contributor

No description provided.

cmmarslender and others added 30 commits April 28, 2022 07:31
Co-authored-by: wjblanke <wjb98672@gmail.com>
* Use Install.ps1 in build_windows.ps1

* -d

* stop moving madmax and bladebit down into site-packages
…work#11346)

* Remove warning about CHIA_ROOT being set when running init

* Update to still output the CHIA_ROOT if set, but not instruct the user to remove it

* Store chia_root in a var
* cmds: Adjust stop daemon output

Stopping the daemon without this patch prints:

```
daemon: {'ack': True, 'command': 'exit', 'data': {'success': True}, 
'destination': 'client', 'origin': 'daemon', 'request_id': 'some 
request_id hash here'}
```

Stopping the daemon with this patch prints: 

```
Daemon stopped
```

and if it fails:

```
Stop daemon failed {'ack': True, 'command': 'exit', 'data': {'success': 
True}, 
'destination': 'client', 'origin': 'daemon', 'request_id': 'some 
request_id hash here'}
```

* Simplify check

Co-authored-by: Kyle Altendorf <sda@fstab.net>

Co-authored-by: Kyle Altendorf <sda@fstab.net>
* lookup coins in large batches, rather than one at a time, in block_body_validation

* make get_coin_records use the cache. and make the blockchain change tracking also use the new batch lookup

* make building the sql query a bit more elegant

* fix assert

* fix test_blockchain assert tests

* add type annotation

* await aiosqlite.Cursor.execute() immediately
* plot_sync: Introduce `receiver.Sync`

* Use `dataclasses.replace`

Co-authored-by: Kyle Altendorf <sda@fstab.net>

Co-authored-by: Kyle Altendorf <sda@fstab.net>
* adding workflow for checking for conflicts

* proper version number

* proper version number syntax?

* not sure tbh

* trying 2.x

* using newly created labels

* adding static 2.0.0 version

* update based on feedback

* removing label removal

* merge_conflict
…hia-Network#11342)

* farmer|rpc: Always add `last_sync_time` in `Receiver.to_dict`

This changes the resonse of `get_harvesters` and
`get_harvesters_summary` to always include that field with value
`None`/`null` if the receiver is not yet synced.

* plot_sync: Add sync state to dict in `Receiver.to_dict`

* Add `total_plot_size` to `Receiver.to_dict`

* Refactor sync object assertions

* Access `_current_sync` directly

* Generate `syncing` data outside
* tidy installer building

* -d

* fix rpm build

* try for windows

* Install.ps1 -d

* move the install.ps1 call out to the workflow

* Update build_windows.ps1

* Update build_windows.ps1

* debug non-editable install on windows

* platlib and purelib in pyinstaller pathex

* Revert "debug non-editable install on windows"

This reverts commit 7c04168.

* Revert "platlib and purelib in pyinstaller pathex"

This reverts commit c5c5cdc.

* debug

* debug not-editable

* Revert "debug not-editable"

This reverts commit d4373d8.

* a bit more similar

* git -C

* find dlls in site-packages?

* oops

* Revert "debug"

This reverts commit 88090f6.

* consistently name installer github actions artifact zips

* leave SCM_VERSION here

* Update build-windows-installer.yml
…ges (Chia-Network#11247)

* util: Implement `Paginator` class as interface to access a list by pages

* Be less restrictive about page sizes and refactor tests

* Make the pages based of 0 instead of 1 and some more test refactoring

* More tests

* Adjust workflows after rebase

* Introduce `Paginator.create`

* `<=` instead of `- 1`
…etwork#11364)

* farmer|rpc: Add `plot_count` to `get_pool_state` RPC endpoint

* Test `plot_count` of `get_pool_state` farmer RPC endpoint
Chia-Network#11389)

* make sure we set the syncto height correctly when we roll back instead of noop

* don't error out if height is -1 on rollback
…hia-Network#11408)

* test: Give `setup_farmer` and `setup_harvester` a separate chia root

* test: Wait for `last_sync_time` in `get_harvesters_{summary}`

To make sure the first sync from the harvester to the farmer is done 
before we check plot counts.
* _make_middle doesn't need to be a member function

* add some unit tests
…Network#11365)

* farmer|rpc|tests: Implement paginated harvester plot endpoints

* Simplify filtering

Co-authored-by: Kyle Altendorf <sda@fstab.net>

* Let the API handle the exceptions

* Simplify the other filtering too

Co-authored-by: Kyle Altendorf <sda@fstab.net>

* Simplify count assertions

Co-authored-by: Kyle Altendorf <sda@fstab.net>

* Refactor `is_filter_match` to `plot_matches_filter`

And just convert to `Plot` in tests.

* Move `chia.util.misc.KeyValue` to `chia.rpc.farmer_rpc_api.FilterItem`

* Rename `peer_id` to `node_id` to be match `get_harvesters_{summary}`

Co-authored-by: Kyle Altendorf <sda@fstab.net>
* readd ping_task as keepalive for daemon

* raised and lowered logging levels

* flake
Chia-Network#11367)

* farmer: Adjust notifications from the farmer to the UI

- Only send the data for the harvester which actually sent an update
- Notify for each loaded batch during initial loading

* Enable improved farmer/harvester GUI
… that need to compute its name multiple times during sorting, and also by sorting the actual binary coin names, not hexadecimal strings (Chia-Network#11421)
xdustinface and others added 9 commits May 5, 2022 08:16
* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

Co-authored-by: Kyle Altendorf <sda@fstab.net>

Co-authored-by: Kyle Altendorf <sda@fstab.net>
* Some work on hints

* More cleanup and test_generator_tools

* Change relevant calls

* More refactor and cleanup

* More refactor

* Small fix

* Create wrapper object PeakPostProcessingResult

* Lint and small fix

* Fix a hint bug

* Fix hint update_wallets

* Fix test_full_sync

* pre-commit

* Start with PR review comments

* More efficient iteration

* Remove tx_removals_additions_and_hints

* Revert mozilla ca

* Fix issue with startup
@lgtm-com
Copy link

lgtm-com bot commented May 10, 2022

This pull request introduces 1 alert when merging e21108b into 867a204 - view on LGTM.com

new alerts:

  • 1 for Unused local variable

@AmineKhaldi AmineKhaldi marked this pull request as ready for review May 10, 2022 19:26
@trepca trepca merged commit 932c389 into Chia-Network:main_dids May 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants