Fix keys migrate command
#8703
Merged
Fix keys migrate command
#8703
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
amaury1093
requested review from
aaronc,
alessio and
alexanderbez
as code owners
amaury1093
commented
Feb 25, 2021
| @@ -111,6 +111,10 @@ type Importer interface { | |||
|
|
|||
| // ImportPubKey imports ASCII armored public keys. | |||
| ImportPubKey(uid string, armor string, keyType KeyType) error | |||
There was a problem hiding this comment.
ImportPubKeyis only used in tests now. I propose to remove it in a subsequent PR (to not introduce breaking change). For reasons, see #8703 (comment).
| @@ -327,6 +331,15 @@ func (ks keystore) ImportPubKey(uid string, armor string, keyType KeyType) error | |||
| return nil | |||
| } | |||
|
|
|||
| // MigrateInfo implements Importer.MigrateInfo. | |||
| func (ks keystore) MigrateInfo(oldInfo Info) error { | |||
There was a problem hiding this comment.
This is only for Type{Multi,Ledger,Offline}.
Before
The old migration logic was inside ImportPubKey: we read data from the old Info, decode it (depending on the type), extract pubkey, and create and write a new Info in the new keyring.
In the process, we completely lose the Info: we were migrating old TypeMulti and old TypeLedger into new TypeOffline. #8639 (comment)
After
We don't decode Info anymore (to extract pubkey etc). Since the infos didn't change, we just copy/paste the old Info into the new keyring. It's imo much simpler.
9 tasks
|
Let me try |
|
It works now! Thanks @AmauryM, shall we merge back to original? |
|
Thank you so very much @AmauryM ! |
alessio
pushed a commit
that referenced
this pull request
Mar 1, 2021
Fix `keys migrate` command (#8703) crypto/keyring: reinstate the InfoImporter interface InfoImporter is implemented by those Keyring implementations that support import of Info objects. Co-authored-by: Alessio Treglia <[email protected]> Co-authored-by: Jonathan Gimeno <[email protected]> Co-authored-by: Amaury <[email protected]>
alessio
pushed a commit
that referenced
this pull request
Mar 1, 2021
Fix `keys migrate` command (#8703) crypto/keyring: reinstate the InfoImporter interface InfoImporter is implemented by those Keyring implementations that support import of Info objects. Co-authored-by: Alessio Treglia <[email protected]> Co-authored-by: Jonathan Gimeno <[email protected]> Co-authored-by: Amaury <[email protected]>
9 tasks
alessio
pushed a commit
that referenced
this pull request
Mar 2, 2021
* crypto/keyring: fix offline keys migration (#8639) Fix `keys migrate` command (#8703) crypto/keyring: reinstate the InfoImporter interface InfoImporter is implemented by those Keyring implementations that support import of Info objects. Co-authored-by: Alessio Treglia <[email protected]> Co-authored-by: Jonathan Gimeno <[email protected]> Co-authored-by: Amaury <[email protected]> * refresh golangci-lint * Rename InfoImporter -> LegacyInfoImporter (#8739) Avoid namespace clash with the InfoImporter interface that already exists in the v0.41 release series. * Revert "refresh golangci-lint" This reverts commit 38e1349. Co-authored-by: SaReN <[email protected]> Co-authored-by: Jonathan Gimeno <[email protected]> Co-authored-by: Amaury <[email protected]>
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.
Description
ref: #8639
I have no idea what the
keys migratewas doing, but imo it was bugged for multiple reasons:--homeflags: one for the location of the old keyring, and one for the location of the new keyring. I added a--old-homeflag to it.--old-home ~/.gaiacli --home ~/.gaiadTypeLocalto aTypeLocal(that's correct), aTypeOfflineto aTypeOffline(correct too), but migratedType{Ledger,Multi}both toTypeOffline(why???). Anyways, now the migration migrates to the correct keyring type.Tests
I followed Sahith's test steps with a ledger key, and could migrate & sign with a tx with the new keyring
We should test:
Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.
docs/) or specification (x/<module>/spec/)godoccomments.Unreleasedsection inCHANGELOG.mdFiles changedin the Github PR explorerCodecov Reportin the comment section below once CI passes