From 69a11e293b38f5c947c78c7f85a5f8cd8ec22137 Mon Sep 17 00:00:00 2001 From: Prathyusha Lakkireddy Date: Wed, 12 May 2021 20:49:27 +0530 Subject: [PATCH 1/2] Fixed parse key issue (#9299) * Fixed parse key issue * Added getconfig in root command * uncommented changes in parse.go (cherry picked from commit d7dd1d7affc02a819845802da540bc2742d82074) # Conflicts: # simapp/simd/cmd/root.go --- simapp/simd/cmd/root.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index 4b20b73167e2..b5a87bba6a86 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -74,7 +74,12 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { } func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { +<<<<<<< HEAD authclient.Codec = encodingConfig.Marshaler +======= + cfg := sdk.GetConfig() + cfg.Seal() +>>>>>>> d7dd1d7af (Fixed parse key issue (#9299)) rootCmd.AddCommand( genutilcli.InitCmd(simapp.ModuleBasics, simapp.DefaultNodeHome), From 7ea9209a6c357c01b2cf60e04f1f2b2ffb190852 Mon Sep 17 00:00:00 2001 From: Amaury M <1293565+amaurym@users.noreply.github.com> Date: Tue, 22 Jun 2021 12:53:30 +0200 Subject: [PATCH 2/2] Add changelog --- CHANGELOG.md | 4 ++++ simapp/simd/cmd/root.go | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 230d696915e7..c21b5d5c8530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,10 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## Unreleased + +* [\#9299](https://github.com/cosmos/cosmos-sdk/pull/9299) Fix `[appd] keys parse cosmos1...` freezing. + ## [v0.42.6](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.42.6) - 2021-06-18 ### Improvements diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index b5a87bba6a86..5b1cd1ca5eb7 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -74,12 +74,9 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { } func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { -<<<<<<< HEAD authclient.Codec = encodingConfig.Marshaler -======= cfg := sdk.GetConfig() cfg.Seal() ->>>>>>> d7dd1d7af (Fixed parse key issue (#9299)) rootCmd.AddCommand( genutilcli.InitCmd(simapp.ModuleBasics, simapp.DefaultNodeHome),