From 6555c98d09713c2e10685de32ab135f9033b66b5 Mon Sep 17 00:00:00 2001 From: Danilo Pantani Date: Tue, 1 Apr 2025 17:36:40 -0300 Subject: [PATCH] fix: use the gogoproto merge registry as a file resolver instead of the interface registry (#24330) Co-authored-by: Alex | Interchain Labs --- client/v2/CHANGELOG.md | 4 ++++ client/v2/autocli/app.go | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/client/v2/CHANGELOG.md b/client/v2/CHANGELOG.md index a4ecc941ec..300214f02b 100644 --- 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 + +* (cli) [#24330](https://github.com/cosmos/cosmos-sdk/pull/24330) Use the gogoproto merge registry as a file resolver instead of the interface registry. + ## [v2.0.0-beta.8] - 2025-01-29 * [#23544](https://github.com/cosmos/cosmos-sdk/pull/23544) Support map in queries for autocli. diff --git a/client/v2/autocli/app.go b/client/v2/autocli/app.go index 607f9052d2..6fbb5952ea 100644 --- a/client/v2/autocli/app.go +++ b/client/v2/autocli/app.go @@ -1,6 +1,7 @@ package autocli import ( + "github.com/cosmos/gogoproto/proto" "github.com/spf13/cobra" "google.golang.org/grpc" "google.golang.org/protobuf/reflect/protoregistry" @@ -61,10 +62,14 @@ type AppOptions struct { // rootCmd := initRootCmd() // err = autoCliOpts.EnhanceRootCommand(rootCmd) func (appOptions AppOptions) EnhanceRootCommand(rootCmd *cobra.Command) error { + mergedFiles, err := proto.MergedRegistry() + if err != nil { + return err + } builder := &Builder{ Builder: flag.Builder{ TypeResolver: protoregistry.GlobalTypes, - FileResolver: appOptions.ClientCtx.InterfaceRegistry, + FileResolver: mergedFiles, AddressCodec: appOptions.AddressCodec, ValidatorAddressCodec: appOptions.ValidatorAddressCodec, ConsensusAddressCodec: appOptions.ConsensusAddressCodec,