fix(client/v2): improve message parsing by replacing proto.Merge with cloneMessage (backport cosmos#24722) (cosmos#24818)

Co-authored-by: julienrbrt <[email protected]>
Co-authored-by: Alex | Interchain Labs <[email protected]>
Co-authored-by: Aaron <[email protected]>

Author: 4 people

client/v2/CHANGELOG.md

@@ -34,6 +34,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
+## [v2.0.0-beta.11](https://github.com/cosmos/cosmos-sdk/tree/client/v2.0.0-beta.11) - 2025-05-30
+
+### Bug Fixes
+
+* [#24722](https://github.com/cosmos/cosmos-sdk/pull/24722) Fix msg parsing in when no pulsar file is present.
+
 ## [v2.0.0-beta.9](https://github.com/cosmos/cosmos-sdk/tree/client/v2.0.0-beta.9) - 2025-04-24
 
 ### Features
@@ -42,7 +48,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
-* [#22890](https://github.com/cosmos/cosmos-sdk/pull/22890)  Added support for flattening inner message fields in autocli as positional arguments.
+* [#22890](https://github.com/cosmos/cosmos-sdk/pull/22890) Added support for flattening inner message fields in autocli as positional arguments.
 
 ### Bug Fixes
 

client/v2/Makefile

@@ -1,2 +1,6 @@
 codegen:
-	@(cd internal; buf generate)
+	@(cd internal; buf generate --template testpbpulsar/buf.gen.yaml)
+	@(cd internal; buf generate --template testpbgogo/buf.gen.yaml)
+	@(cd internal/testpbgogo; rm *_grpc.pb.go; rm *.pulsar.go)
+	@(cd internal; mv github.com/cosmos/cosmos-sdk/client/v2/internal/testpbgogo/* testpbgogo)
+	@(cd internal; rm -r github.com)

client/v2/autocli/common_test.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"testing"
 
+	"github.com/cosmos/gogoproto/proto"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -15,14 +16,16 @@ import (
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	reflectionv2alpha1 "cosmossdk.io/api/cosmos/base/reflection/v2alpha1"
 	"cosmossdk.io/client/v2/autocli/flag"
-	"cosmossdk.io/client/v2/internal/testpb"
+	"cosmossdk.io/client/v2/internal/testpbgogo"
+	testpb "cosmossdk.io/client/v2/internal/testpbpulsar"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	addresscodec "github.com/cosmos/cosmos-sdk/codec/address"
 	sdkkeyring "github.com/cosmos/cosmos-sdk/crypto/keyring"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
+	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 )
@@ -57,6 +60,7 @@ func initFixture(t *testing.T) *fixture {
 
 	interfaceRegistry := encodingConfig.Codec.InterfaceRegistry()
 	banktypes.RegisterInterfaces(interfaceRegistry)
+	msgservice.RegisterMsgServiceDesc(interfaceRegistry, &testpbgogo.MsgGogoOnly_serviceDesc)
 
 	clientCtx := client.Context{}.
 		WithKeyring(kr).
@@ -69,10 +73,15 @@ func initFixture(t *testing.T) *fixture {
 		WithChainID("autocli-test")
 
 	conn := &testClientConn{ClientConn: clientConn}
+
+	// using merged registry to get pulsar + gogo files
+	mergedFiles, err := proto.MergedRegistry()
+	assert.NilError(t, err)
+
 	b := &Builder{
 		Builder: flag.Builder{
 			TypeResolver:          protoregistry.GlobalTypes,
-			FileResolver:          protoregistry.GlobalFiles,
+			FileResolver:          mergedFiles,
 			AddressCodec:          addresscodec.NewBech32Codec("cosmos"),
 			ValidatorAddressCodec: addresscodec.NewBech32Codec("cosmosvaloper"),
 			ConsensusAddressCodec: addresscodec.NewBech32Codec("cosmosvalcons"),

client/v2/autocli/msg.go

@@ -161,7 +161,9 @@ func (b *Builder) BuildMsgMethodCommand(descriptor protoreflect.MethodDescriptor
 		// Here we use dynamicpb, to create a proto v1 compatible message.
 		// The SDK codec will handle protov2 -> protov1 (marshal)
 		msg := dynamicpb.NewMessage(input.Descriptor())
-		proto.Merge(msg, input.Interface())
+		if err := cloneMessage(msg, input); err != nil {
+			return fmt.Errorf("failed to clone message: %w", err)
+		}
 
 		return clienttx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 	}
@@ -217,11 +219,23 @@ func (b *Builder) handleGovProposal(
 	// Here we use dynamicpb, to create a proto v1 compatible message.
 	// The SDK codec will handle protov2 -> protov1 (marshal)
 	msg := dynamicpb.NewMessage(input.Descriptor())
-	proto.Merge(msg, input.Interface())
+	if err := cloneMessage(msg, input); err != nil {
+		return fmt.Errorf("failed to clone message: %w", err)
+	}
 
 	if err := proposal.SetMsgs([]gogoproto.Message{msg}); err != nil {
 		return fmt.Errorf("failed to set msg in proposal %w", err)
 	}
 
 	return clienttx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), proposal)
 }
+
+// cloneMessage safely copies fields from src message to dst message.
+// this avoids the proto.Merge issue with field descriptors from different repositories.
+func cloneMessage(dst, src protoreflect.Message) error {
+	bz, err := proto.Marshal(src.Interface())
+	if err != nil {
+		return err
+	}
+	return proto.Unmarshal(bz, dst.Interface())
+}

client/v2/autocli/msg_test.go

@@ -15,7 +15,8 @@ import (
 
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
-	"cosmossdk.io/client/v2/internal/testpb"
+	"cosmossdk.io/client/v2/internal/testpbgogo"
+	testpb "cosmossdk.io/client/v2/internal/testpbpulsar"
 
 	"github.com/cosmos/cosmos-sdk/client"
 )
@@ -124,6 +125,31 @@ func TestMsg(t *testing.T) {
 	assertNormalizedJSONEqual(t, out.Bytes(), goldenLoad(t, "msg-output.golden"))
 }
 
+// TestMsgGogo set same as previous, but the message are only gogoproto generated.
+// There are no protov2 files registered in the global registry for those types.
+func TestMsgGogo(t *testing.T) {
+	fixture := initFixture(t)
+	out, err := runCmd(fixture, buildCustomModuleMsgCommand(&autocliv1.ServiceCommandDescriptor{
+		Service: testpbgogo.MsgGogoOnly_serviceDesc.ServiceName, // using gogoproto only test msg
+		RpcCommandOptions: []*autocliv1.RpcCommandOptions{
+			{
+				RpcMethod:      "Send",
+				Use:            "send [a_coin] [str] [flags]",
+				Short:          "Send coins from one account to another",
+				PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "a_coin"}, {ProtoField: "str"}},
+				// an_address should be automatically added
+			},
+		},
+	}), "send",
+		"1foo", "henlo",
+		"--from", "cosmos1y74p8wyy4enfhfn342njve6cjmj5c8dtl6emdk",
+		"--generate-only",
+		"--output", "json",
+	)
+	assert.NilError(t, err)
+	golden.Assert(t, out.String(), "msg-gogo-output.golden")
+}
+
 func TestMsgWithFlattenFields(t *testing.T) {
 	fixture := initFixture(t)
 

client/v2/autocli/query_test.go

@@ -18,7 +18,7 @@ import (
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 	queryv1beta1 "cosmossdk.io/api/cosmos/base/query/v1beta1"
 	basev1beta1 "cosmossdk.io/api/cosmos/base/v1beta1"
-	"cosmossdk.io/client/v2/internal/testpb"
+	testpb "cosmossdk.io/client/v2/internal/testpbpulsar"
 
 	"github.com/cosmos/cosmos-sdk/client"
 )

client/v2/autocli/testdata/help-deprecated.golden

@@ -8,7 +8,7 @@ Flags:
       --a-bool                                                               
       --a-coin cosmos.base.v1beta1.Coin                                      
       --a-consensus-address account address or key name                      
-      --a-message testpb.AMessage (json)                                     
+      --a-message testpbpulsar.AMessage (json)                               
       --a-validator-address account address or key name                      
       --an-address account address or key name                               
       --an-enum Enum (unspecified | one | two | five | neg-three)             (default unspecified)
@@ -41,7 +41,7 @@ Flags:
       --positional2 string                                                   
       --positional3-varargs cosmos.base.v1beta1.Coin (repeated)              
       --shorthand-deprecated-field string                                    
-      --some-messages testpb.AMessage (json) (repeated)                      
+      --some-messages testpbpulsar.AMessage (json) (repeated)                
       --str string                                                           
       --strings strings                                                      
       --timestamp timestamp (RFC 3339)                                       

client/v2/autocli/testdata/help-echo.golden

@@ -13,7 +13,7 @@ Flags:
       --a-bool                                                               
       --a-coin cosmos.base.v1beta1.Coin                                      some random coin
       --a-consensus-address account address or key name                      
-      --a-message testpb.AMessage (json)                                     
+      --a-message testpbpulsar.AMessage (json)                               
       --a-validator-address account address or key name                      
       --an-address account address or key name                               
       --an-enum Enum (unspecified | one | two | five | neg-three)             (default unspecified)
@@ -42,7 +42,7 @@ Flags:
       --page-offset uint                                                     
       --page-reverse                                                         
   -s, --shorthand-deprecated-field string                                     (DEPRECATED: bad idea)
-      --some-messages testpb.AMessage (json) (repeated)                      
+      --some-messages testpbpulsar.AMessage (json) (repeated)                
       --str string                                                           
       --strings strings                                                      
       --timestamp timestamp (RFC 3339)                                       

client/v2/autocli/testdata/help-skip.golden

@@ -1,4 +1,4 @@
-Querying commands for the testpb.Query service
+Querying commands for the testpbpulsar.Query service
 
 Usage:
   test skipecho [flags]

client/v2/autocli/testdata/help-toplevel.golden

@@ -6,10 +6,10 @@ Usage:
 
 Available Commands:
   completion     Generate the autocompletion script for the specified shell
-  deprecatedecho Querying commands for the testpb.Query service
+  deprecatedecho Querying commands for the testpbpulsar.Query service
   echo           echo echos the value provided by the user
   help           Help about any command
-  skipecho       Querying commands for the testpb.Query service
+  skipecho       Querying commands for the testpbpulsar.Query service
 
 Flags:
   -h, --help   help for test