From 41d30398d95cdd8584308546baa562eddc54fbb3 Mon Sep 17 00:00:00 2001
From: ryanchrypto <12519942+ryanchrypto@users.noreply.github.com>
Date: Fri, 23 Jul 2021 17:39:58 -0700
Subject: [PATCH] fix: init with config chain-id

---
 CHANGELOG.md                      |  1 +
 x/genutil/client/cli/init.go      |  6 +++-
 x/genutil/client/cli/init_test.go | 49 ++++++++++++++++++++++++++++++-
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8350a6fb8ad4..b618605a2a7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -85,6 +85,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (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
 * (server) [#9704](https://github.com/cosmos/cosmos-sdk/pull/9704) Start GRPCWebServer in goroutine, avoid blocking other services from starting.
+* [\#9762](https://github.com/cosmos/cosmos-sdk/pull/9762) The init command uses the chain-id from the client config if --chain-id is not provided
 
 ## [v0.43.0-rc0](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-rc0) - 2021-06-25
 
diff --git a/x/genutil/client/cli/init.go b/x/genutil/client/cli/init.go
index a51d4b90757b..df83ea29a0f1 100644
--- a/x/genutil/client/cli/init.go
+++ b/x/genutil/client/cli/init.go
@@ -81,7 +81,11 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
 
 			chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
 			if chainID == "" {
-				chainID = fmt.Sprintf("test-chain-%v", tmrand.Str(6))
+				if clientCtx.ChainID == "" {
+					chainID = fmt.Sprintf("test-chain-%v", tmrand.Str(6))
+				} else {
+					chainID = clientCtx.ChainID
+				}
 			}
 
 			// Get bip39 mnemonic
diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go
index 64ec01c4adf1..b64d792c29fc 100644
--- a/x/genutil/client/cli/init_test.go
+++ b/x/genutil/client/cli/init_test.go
@@ -199,13 +199,60 @@ func TestStartStandAlone(t *testing.T) {
 func TestInitNodeValidatorFiles(t *testing.T) {
 	home := t.TempDir()
 	cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
+	require.NoError(t, err)
+
 	nodeID, valPubKey, err := genutil.InitializeNodeValidatorFiles(cfg)
+	require.NoError(t, err)
 
-	require.Nil(t, err)
 	require.NotEqual(t, "", nodeID)
 	require.NotEqual(t, 0, len(valPubKey.Bytes()))
 }
 
+func TestInitConfig(t *testing.T) {
+	home := t.TempDir()
+	logger := log.NewNopLogger()
+	cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
+	require.NoError(t, err)
+
+	serverCtx := server.NewContext(viper.New(), cfg, logger)
+	interfaceRegistry := types.NewInterfaceRegistry()
+	marshaler := codec.NewProtoCodec(interfaceRegistry)
+	clientCtx := client.Context{}.
+		WithCodec(marshaler).
+		WithLegacyAmino(makeCodec()).
+		WithChainID("foo"). // add chain-id to clientCtx
+		WithHomeDir(home)
+
+	ctx := context.Background()
+	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
+	ctx = context.WithValue(ctx, server.ServerContextKey, serverCtx)
+
+	cmd := genutilcli.InitCmd(testMbm, home)
+	cmd.SetArgs([]string{"testnode"})
+
+	require.NoError(t, cmd.ExecuteContext(ctx))
+
+	old := os.Stdout
+	r, w, _ := os.Pipe()
+	os.Stdout = w
+
+	cmd = server.ExportCmd(nil, home)
+	require.NoError(t, cmd.ExecuteContext(ctx))
+
+	outC := make(chan string)
+	go func() {
+		var buf bytes.Buffer
+		io.Copy(&buf, r)
+		outC <- buf.String()
+	}()
+
+	w.Close()
+	os.Stdout = old
+	out := <-outC
+
+	require.Contains(t, out, "\"chain_id\": \"foo\"")
+}
+
 // custom tx codec
 func makeCodec() *codec.LegacyAmino {
 	var cdc = codec.NewLegacyAmino()