-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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 accounts-v2 deposit and related bugs #7219
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
terencechain
requested changes
Sep 13, 2020
Codecov Report
@@ Coverage Diff @@
## master #7219 +/- ##
==========================================
- Coverage 61.68% 61.68% -0.01%
==========================================
Files 412 411 -1
Lines 32969 32785 -184
==========================================
- Hits 20337 20223 -114
+ Misses 9726 9682 -44
+ Partials 2906 2880 -26 |
terencechain
approved these changes
Sep 14, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
What does this PR do? Why is it needed?
Issue #7164 outlines a bug with depositing using cli:
(from @danielschonfeld )
./prysm.sh validator accounts-v2 deposit --wallet-dir /home/myuser/.eth2validators/whale_prysm --eth1-keystore-utc-path /home/myuser/.ethereum/goerli/keystore --eth1-keystore-password-file /home/myuser/mypasswdfile --deposit-all-accounts --http-web3provider http://localhost:8546
Creating this output
[2020-09-02 11:40:04] FATAL accounts-v2: Could not send validator deposit(s): read /home/myuser/prysm: is a directory
In the path to resolving this bug, its cause and other bugs were discovered and are addressed by this PR:
hasPrivateKey || hasEth1Keystore
but only deals with what should happen if Eth1PrivateKeyFileFlag has been provided (hasPrivateKey). So if a user submits a path to an Eth1Keystore, this part of the logic is hit and soon returns from the function, but that flag and its content is never regarded.Which issues(s) does this PR fix?
Fixes #7164