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

mergify[bot] · johnletey · julienrbrt · web-flow · commit 412f4e719ea3 · 2024-09-26T15:28:07.000+02:00
Co-authored-by: John Letey &lt;john@noble.xyz&gt;
Co-authored-by: Julien Robert &lt;julien@rbrt.fr&gt;
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

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,9 @@ func (b Builder) AddMsgServiceCommands(cmd cobra.Command, cmdDescriptor *autoc`
`49`	`49`	`return err`
`50`	`50`	`}`
`51`	`51`
`52`		`- cmd.AddCommand(subCmd)`
	`52`	`+ if !subCmdDescriptor.EnhanceCustomCommand {`
	`53`	`+ cmd.AddCommand(subCmd)`
	`54`	`+ }`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`if cmdDescriptor.Service == "" {`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,9 @@ func (b Builder) AddQueryServiceCommands(cmd cobra.Command, cmdDescriptor *aut`
`52`	`52`	`return err`
`53`	`53`	`}`
`54`	`54`
`55`		`- cmd.AddCommand(subCmd)`
	`55`	`+ if !subCmdDesc.EnhanceCustomCommand {`
	`56`	`+ cmd.AddCommand(subCmd)`
	`57`	`+ }`
`56`	`58`	`}`
`57`	`59`
`58`	`60`	`// skip empty command descriptors`