From 2979f83cae46e9e3a8e5920b24b812f098637f59 Mon Sep 17 00:00:00 2001 From: Bax995 Date: Tue, 6 Jul 2021 10:03:47 +0200 Subject: [PATCH 1/4] added missing private-key save inside x/genutil/utils.go --- x/genutil/utils.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/genutil/utils.go b/x/genutil/utils.go index 4c46bdb6f121..2df84994ac12 100644 --- a/x/genutil/utils.go +++ b/x/genutil/utils.go @@ -84,6 +84,7 @@ func InitializeNodeValidatorFilesFromMnemonic(config *cfg.Config, mnemonic strin } else { privKey := tmed25519.GenPrivKeyFromSecret([]byte(mnemonic)) filePV = privval.NewFilePV(privKey, pvKeyFile, pvStateFile) + filePV.Save() } tmValPubKey, err := filePV.GetPubKey() From 04a49db8f495c908ab1ee4b54476ad3bafc6a4ff Mon Sep 17 00:00:00 2001 From: Bax995 Date: Tue, 6 Jul 2021 15:11:28 +0200 Subject: [PATCH 2/4] fixed docs function name added test to be sure the generated key is save in a file and it's correct added CHANGELOG.md entry --- CHANGELOG.md | 2 +- x/genutil/utils.go | 2 +- x/genutil/utils_test.go | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d11c6ed9996..190615fb26fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,7 +76,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (types) [\#9627](https://github.com/cosmos/cosmos-sdk/pull/9627) Fix nil pointer panic on `NewBigIntFromInt` * (x/genutil) [\#9574](https://github.com/cosmos/cosmos-sdk/pull/9575) Actually use the `gentx` client tx flags (like `--keyring-dir`) * (x/distribution) [\#9599](https://github.com/cosmos/cosmos-sdk/pull/9599) Withdraw rewards event now includes a value attribute even if there are 0 rewards (due to situations like 100% commission). - +* (x/genutil) [\#9638](https://github.com/cosmos/cosmos-sdk/pull/9638) Added missing validator key save when recovering from mnemonic ## [v0.43.0-rc0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc0) - 2021-06-25 diff --git a/x/genutil/utils.go b/x/genutil/utils.go index 2df84994ac12..4851a4081d7b 100644 --- a/x/genutil/utils.go +++ b/x/genutil/utils.go @@ -54,7 +54,7 @@ func InitializeNodeValidatorFiles(config *cfg.Config) (nodeID string, valPubKey return InitializeNodeValidatorFilesFromMnemonic(config, "") } -// InitializeNodeValidatorFiles creates private validator and p2p configuration files using the given mnemonic. +// InitializeNodeValidatorFilesFromMnemonic creates private validator and p2p configuration files using the given mnemonic. // If no valid mnemonic is given, a random one will be used instead. func InitializeNodeValidatorFilesFromMnemonic(config *cfg.Config, mnemonic string) (nodeID string, valPubKey cryptotypes.PubKey, err error) { if len(mnemonic) > 0 && !bip39.IsMnemonicValid(mnemonic) { diff --git a/x/genutil/utils_test.go b/x/genutil/utils_test.go index a845cc68cd96..06d84cf62ae4 100644 --- a/x/genutil/utils_test.go +++ b/x/genutil/utils_test.go @@ -2,6 +2,9 @@ package genutil import ( "encoding/json" + "fmt" + tmed25519 "github.com/tendermint/tendermint/crypto/ed25519" + "github.com/tendermint/tendermint/privval" "os" "path/filepath" "testing" @@ -57,6 +60,19 @@ func TestInitializeNodeValidatorFilesFromMnemonic(t *testing.T) { require.Error(t, err) } else { require.NoError(t, err) + + require.NoError(t, err) + + if tt.mnemonic != "" { + keyFilePath := fmt.Sprintf("%s/config/priv_validator_key.json", cfg.RootDir) + stateFilePath := fmt.Sprintf("%s/data/priv_validator_state.json", cfg.RootDir) + actualPVFile := privval.LoadFilePV(keyFilePath, stateFilePath) + + expectedPrivateKey := tmed25519.GenPrivKeyFromSecret([]byte(tt.mnemonic)) + expectedFile := privval.NewFilePV(expectedPrivateKey, cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile()) + + require.Equal(t, expectedFile, actualPVFile) + } } }) } From 37e72e11257665cf82b2ada9f179a69d650d30cd Mon Sep 17 00:00:00 2001 From: Bax995 Date: Tue, 6 Jul 2021 15:16:50 +0200 Subject: [PATCH 3/4] improve test --- x/genutil/utils_test.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/x/genutil/utils_test.go b/x/genutil/utils_test.go index 06d84cf62ae4..f2a1a846528c 100644 --- a/x/genutil/utils_test.go +++ b/x/genutil/utils_test.go @@ -2,7 +2,6 @@ package genutil import ( "encoding/json" - "fmt" tmed25519 "github.com/tendermint/tendermint/crypto/ed25519" "github.com/tendermint/tendermint/privval" "os" @@ -64,13 +63,9 @@ func TestInitializeNodeValidatorFilesFromMnemonic(t *testing.T) { require.NoError(t, err) if tt.mnemonic != "" { - keyFilePath := fmt.Sprintf("%s/config/priv_validator_key.json", cfg.RootDir) - stateFilePath := fmt.Sprintf("%s/data/priv_validator_state.json", cfg.RootDir) - actualPVFile := privval.LoadFilePV(keyFilePath, stateFilePath) - + actualPVFile := privval.LoadFilePV(cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile()) expectedPrivateKey := tmed25519.GenPrivKeyFromSecret([]byte(tt.mnemonic)) expectedFile := privval.NewFilePV(expectedPrivateKey, cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile()) - require.Equal(t, expectedFile, actualPVFile) } } From 321d78306d06a788e139942c238c54a0454ae26e Mon Sep 17 00:00:00 2001 From: Amaury <1293565+amaurym@users.noreply.github.com> Date: Tue, 6 Jul 2021 15:37:22 +0200 Subject: [PATCH 4/4] Update x/genutil/utils_test.go --- x/genutil/utils_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/x/genutil/utils_test.go b/x/genutil/utils_test.go index f2a1a846528c..df0984a4a150 100644 --- a/x/genutil/utils_test.go +++ b/x/genutil/utils_test.go @@ -60,8 +60,6 @@ func TestInitializeNodeValidatorFilesFromMnemonic(t *testing.T) { } else { require.NoError(t, err) - require.NoError(t, err) - if tt.mnemonic != "" { actualPVFile := privval.LoadFilePV(cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile()) expectedPrivateKey := tmed25519.GenPrivKeyFromSecret([]byte(tt.mnemonic))