fix(client/v2): correctly handle enhanced sub commands (backport #21809…

…) (#21930) Co-authored-by: John Letey <[email protected]> Co-authored-by: Julien Robert <[email protected]>
cosmos · Sep 26, 2024 · 412f4e7 · 412f4e7
1 parent bcd31a1
commit 412f4e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/client/v2/CHANGELOG.md b/client/v2/CHANGELOG.md
@@ -36,6 +36,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+### Bug Fixes
+
+* [#21809](https://github.com/cosmos/cosmos-sdk/pull/21809) Correctly handle enhanced sub commands.
+
 ## [v2.0.0-beta.5] - 2024-09-18
 
 ### Improvements

diff --git a/client/v2/autocli/msg.go b/client/v2/autocli/msg.go
@@ -49,7 +49,9 @@ func (b *Builder) AddMsgServiceCommands(cmd *cobra.Command, cmdDescriptor *autoc
 			return err
 		}
 
-		cmd.AddCommand(subCmd)
+		if !subCmdDescriptor.EnhanceCustomCommand {
+			cmd.AddCommand(subCmd)
+		}
 	}
 
 	if cmdDescriptor.Service == "" {

diff --git a/client/v2/autocli/query.go b/client/v2/autocli/query.go
@@ -52,7 +52,9 @@ func (b *Builder) AddQueryServiceCommands(cmd *cobra.Command, cmdDescriptor *aut
 			return err
 		}
 
-		cmd.AddCommand(subCmd)
+		if !subCmdDesc.EnhanceCustomCommand {
+			cmd.AddCommand(subCmd)
+		}
 	}
 
 	// skip empty command descriptors