From ae403f213247d1871d61fb5b58efd0956d6c0f5f Mon Sep 17 00:00:00 2001
From: technicallyty <48813565+tytech3@users.noreply.github.com>
Date: Thu, 16 Sep 2021 12:10:50 -0700
Subject: [PATCH 1/2] fix: remove chainid as a strictly required flag

---
 client/flags/flags.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/client/flags/flags.go b/client/flags/flags.go
index c4faad1b035a..49b805534efd 100644
--- a/client/flags/flags.go
+++ b/client/flags/flags.go
@@ -116,8 +116,6 @@ func AddTxFlagsToCmd(cmd *cobra.Command) {
 
 	// --gas can accept integers and "auto"
 	cmd.Flags().String(FlagGas, "", fmt.Sprintf("gas limit to set per-transaction; set to %q to calculate sufficient gas automatically (default %d)", GasFlagAuto, DefaultGasLimit))
-
-	cmd.MarkFlagRequired(FlagChainID)
 }
 
 // AddPaginationFlagsToCmd adds common pagination flags to cmd

From 1fe2ef76b03f01b55ffda235f5e039f414808dd6 Mon Sep 17 00:00:00 2001
From: technicallyty <48813565+tytech3@users.noreply.github.com>
Date: Tue, 21 Sep 2021 08:32:56 -0700
Subject: [PATCH 2/2] changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 071922a343ee..bee78d1cdb11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -133,6 +133,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 + [\#10061](https://github.com/cosmos/cosmos-sdk/pull/10061) Ensure that `LegacyAminoPubKey` struct correctly unmarshals from JSON
 * (server) [#10016](https://github.com/cosmos/cosmos-sdk/issues/10016) Fix marshaling of index-events into server config file.
 * (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.
+* [\#10184](https://github.com/cosmos/cosmos-sdk/pull/10184) Fixed CLI tx commands to no longer explicitly require the chain-id flag as this value can come from a user config.
 
 
 ### State Machine Breaking