account+rpcserver: bump account key index on recovery #373
Conversation
This file contains hidden or 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
positiveblue
approved these changes
Jun 15, 2022
account/recovery.go
Outdated
|
|
||
| log.Debugf("Account %s already has %d external keys (want "+ | ||
| "minimum index %d), not deriving any keys", | ||
| poolAccountsPath, poolAccountsAccount.ExternalKeyCount, |
There was a problem hiding this comment.
I guess wallet.ListAccounts returns them in increasing order so we have the last one here?
There was a problem hiding this comment.
Yes, it returns them in order, but there are more than 255 and we want one towards the back (key family 220).
| } | ||
|
|
||
| log.Debugf("Derived next account key with index %d", key.Index) | ||
| if key.Index >= minimumIndex { |
There was a problem hiding this comment.
Q: Do we want to end up with the last key being minimumIndex or the next one? Before we were comparing with poolAccountsAccount.ExternalKeyCount > minimumIndex
There was a problem hiding this comment.
Above it's the key count while here it's the derived index. So the count is always one higher than the index. Added a comment above to make it a bit more clear.
Fixes #372. This commit fixes the issue that if the lnd node the trader client is connected to was also restored from seed, it is starting at account key derivation index 0. So when recovering accounts we need to make sure we re-derive the right number of keys from the wallet in order to allow properly creating new accounts with the recovered node.
94de789 to
1ba717c
Compare
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.
Fixes #372.
This commit fixes the issue that if the lnd node the trader client is
connected to was also restored from seed, it is starting at account key
derivation index 0. So when recovering accounts we need to make sure we
re-derive the right number of keys from the wallet in order to allow
properly creating new accounts with the recovered node.
Pull Request Checklist
used.