From 096f1afeb7cf12e1ce67b52cbd4be38cc0377e9c Mon Sep 17 00:00:00 2001 From: NevermoreRandom <92708920+NevermoreRandom@users.noreply.github.com> Date: Wed, 27 Oct 2021 17:47:50 +0800 Subject: [PATCH] fix: use sdk.config hdpath (#10414) ## Description Other cosmos-sdk based chains cannot reset hdpath on running `app testnet` command. --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable) (cherry picked from commit 33737f4d8a7c8d75939308281102091ffc18d0e3) # Conflicts: # CHANGELOG.md # server/init.go --- CHANGELOG.md | 7 +++++++ server/init.go | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e0e05649231..df04c674b273 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,7 +68,14 @@ Security Release. No breaking changes related to 0.44.x. ### Bug Fixes +<<<<<<< HEAD * [\#9969](https://github.com/cosmos/cosmos-sdk/pull/9969) fix: use keyring in config for add-genesis-account cmd. +======= +* [\#10414](https://github.com/cosmos/cosmos-sdk/pull/10414) Use `sdk.GetConfig().GetFullBIP44Path()` instead `sdk.FullFundraiserPath` to generate key +* (rosetta) [\#10340](https://github.com/cosmos/cosmos-sdk/pull/10340) Use `GenesisChunked(ctx)` instead `Genesis(ctx)` to get genesis block height +* (client) [#10226](https://github.com/cosmos/cosmos-sdk/pull/10226) Fix --home flag parsing. +* [#10180](https://github.com/cosmos/cosmos-sdk/issues/10180) Documentation: make references to Cosmos SDK consistent +>>>>>>> 33737f4d8 (fix: use sdk.config hdpath (#10414)) * (x/genutil) [#10104](https://github.com/cosmos/cosmos-sdk/pull/10104) Ensure the `init` command reads the `--home` flag value correctly. * (x/feegrant) [\#10049](https://github.com/cosmos/cosmos-sdk/issues/10049) Fixed the error message when `period` or `period-limit` flag is not set on a feegrant grant transaction. diff --git a/server/init.go b/server/init.go index 389b231e9975..e66a823d9d8b 100644 --- a/server/init.go +++ b/server/init.go @@ -12,7 +12,11 @@ import ( // phrase to recover the private key. func GenerateCoinKey(algo keyring.SignatureAlgo) (sdk.AccAddress, string, error) { // generate a private key, with recovery phrase +<<<<<<< HEAD info, secret, err := keyring.NewInMemory().NewMnemonic("name", keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, algo) +======= + k, secret, err := keyring.NewInMemory(cdc).NewMnemonic("name", keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo) +>>>>>>> 33737f4d8 (fix: use sdk.config hdpath (#10414)) if err != nil { return sdk.AccAddress([]byte{}), "", err } @@ -43,7 +47,11 @@ func GenerateSaveCoinKey(keybase keyring.Keyring, keyName string, overwrite bool } } +<<<<<<< HEAD info, secret, err := keybase.NewMnemonic(keyName, keyring.English, sdk.FullFundraiserPath, keyring.DefaultBIP39Passphrase, algo) +======= + k, secret, err := keybase.NewMnemonic(keyName, keyring.English, sdk.GetConfig().GetFullBIP44Path(), keyring.DefaultBIP39Passphrase, algo) +>>>>>>> 33737f4d8 (fix: use sdk.config hdpath (#10414)) if err != nil { return sdk.AccAddress([]byte{}), "", err }