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

Fix farmer rewards checks and add observer tests #11147

Closed
wants to merge 59 commits into from

Conversation

emlowe
Copy link
Contributor

@emlowe emlowe commented Apr 13, 2022

The GUI farmer rewards check was not checking for observer keys and the code was duplicated from farmer and wallet, which is one reason this was missed.

Consolidated some code into new function called by both the wallet and farmer and added tests for observer keys.

Also added the ability to pass in the number of derivations to the RPC call - primarily this was so the tests can pass in much smaller numbers than the default (500) and so the tests can run much faster. However, this flexibility seems worth while regardless

@emlowe emlowe requested review from paninaro and xdustinface April 13, 2022 01:14
Copy link
Contributor

@xdustinface xdustinface left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will review tomorrow but one thing i noticed as i skimmed it: I think you should drop all those unrelated isort changes.. imo we shouldn't just mix those into other PRs to have clear scopes why things have changed.

chia/farmer/farmer.py Outdated Show resolved Hide resolved
paninaro
paninaro previously approved these changes Apr 13, 2022
Copy link
Contributor

@paninaro paninaro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

wjblanke and others added 11 commits April 21, 2022 10:56
* Mark the github workspace as safe

* Move the git config step after git is installed in the test containers
…ex, but caching puzzle_hash -> secret key (which is the lookup we're actually interested in). This avoids duplicating the actual derivation (#11154)
…re-releases that could be returned by listReleases (#11165)
* Build cli only version of debs

* Export the vars needed by j2

* Fix paths

* Add symlink to chia in /usr/local/bin/

* Upload the cli only debs to s3

* Add init.py

* Ensure SHA is on the dev build for amd64
altendky and others added 25 commits April 21, 2022 10:56
* Correct wallet CLI sent/received indication

* extract dict to reusable global scope, plus a function
Retry to load the pool info with a 2 minutes interval if it failed.
* Optimize test_wallet_sync

* Update tests/wallet/sync/test_wallet_sync.py

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

* Fix test

Co-authored-by: Kyle Altendorf <sda@fstab.net>
Recent runs are mostly low 30s but some are close to 40 and one just timed out.
* Remove logging tweak for no-longer-used websockets library

Follow up after #10611.

* Update pylintrc

* Update test_daemon.py
* Bump actions/upload-artifact from 2 to 3

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v2...v3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Also update runner_templates

* Mark the github workspace as safe (#11159)

* Mark the github workspace as safe

* Move the git config step after git is installed in the test containers

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Gene Hoffman <hoffmang@hoffmang.com>
Co-authored-by: Chris Marslender <chrismarslender@gmail.com>
* Set `in_transaction` for `set_finished_sync_up_to`

* Call `clean_block_records` based on `in_transaction`

* Don't pop wallets in `reorg_rollback`, do it after it was commited
* optimize Program.curry()

* Add a comment for this curry implementation

* optimize Program.curry()

* Add comment

Co-authored-by: arty <art.yerkes@gmail.com>
* avoid serialisation in logging

* avoid serialisation in logging

* Revert "avoid serialisation in logging"

This reverts commit 4a2b447.
* Add cli only rpm

* Ensure rvm (fpm) is loaded before running fpm

* Use full path to fpm, since GHA seems to mess up the PATH in the container

* Add back source and add use ruby-3

* Call rpm script with bash, to see if the rvm script works

* Add --depends for libcrypt.so.1
@emlowe emlowe marked this pull request as draft April 21, 2022 18:10
@emlowe emlowe closed this Apr 21, 2022
@emlowe emlowe deleted the EL.fix_farmer_reward_check branch April 21, 2022 21:36
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.