fix(client/v2/autocli): prevent duplicate addition of customCommands (#…

…22576) Co-authored-by: Julien Robert <[email protected]> (cherry picked from commit 685218e) # Conflicts: # client/v2/CHANGELOG.md
cosmos · Nov 21, 2024 · 3dad36d · 3dad36d
1 parent 56c2c7d
commit 3dad36d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/client/v2/CHANGELOG.md b/client/v2/CHANGELOG.md
@@ -43,7 +43,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Bug Fixes
 
+<<<<<<< HEAD
 * [#21809](https://github.com/cosmos/cosmos-sdk/pull/21809) Correctly handle enhanced sub commands.
+=======
+* [#21853](https://github.com/cosmos/cosmos-sdk/pull/21853) Fix `*big.Int` unmarshalling in txs.
+* [#22576](https://github.com/cosmos/cosmos-sdk/pull/22576) Fix duplicate command addition in `autocli` when custom enhanced command has a different name than module name
+>>>>>>> 685218e53 (fix(client/v2/autocli): prevent duplicate addition of customCommands (#22576))
 
 ## [v2.0.0-beta.5] - 2024-09-18
 

diff --git a/client/v2/autocli/common.go b/client/v2/autocli/common.go
@@ -140,7 +140,16 @@ func (b *Builder) enhanceCommandCommon(
 
 		// if we have a custom command use that instead of generating one
 		if custom, ok := customCmds[moduleName]; ok {
-			if hasModuleOptions { // check if we need to enhance the existing command
+			// Custom may not be called the same as its module, so we need to have a separate check here
+			if subCmd := findSubCommand(cmd, custom.Name()); subCmd != nil {
+				if hasModuleOptions { // check if we need to enhance the existing command
+					if err := enhanceCustomCmd(b, subCmd, cmdType, modOpts); err != nil {
+						return err
+					}
+				}
+				continue
+			}
+			if hasModuleOptions { // check if we need to enhance the new command
 				if err := enhanceCustomCmd(b, custom, cmdType, modOpts); err != nil {
 					return err
 				}