Cleanup remains of ServiceMsg (#9236)

* Remove ServiceMsgClientConn from CLI

* Cleanup Operations

* Remove some legacytx.LegacyMsg

* Update CL

* Remove mentions of ServiceMsg

* Simply reflection MsgDescriptor

* Simplify more

* Add code comment

Co-authored-by: technicallyty <48813565+technicallyty@users.noreply.github.com>

CHANGELOG.md

@@ -53,7 +53,6 @@ if input key is empty, or input data contains empty key.
 ### Client Breaking Changes
 
 * [\#8363](https://github.com/cosmos/cosmos-sdk/pull/8363) Addresses no longer have a fixed 20-byte length. From the SDK modules' point of view, any 1-255 bytes-long byte array is a valid address.
-* [\#8346](https://github.com/cosmos/cosmos-sdk/pull/8346) All CLI `tx` commands generate ServiceMsgs by default. Graceful Amino support has been added to ServiceMsgs to support signing legacy Msgs.
 * (crypto/ed25519) [\#8690] Adopt zip1215 ed2559 verification rules.
 * [\#8849](https://github.com/cosmos/cosmos-sdk/pull/8849) Upgrade module no longer supports time based upgrades.
 * [\#8880](https://github.com/cosmos/cosmos-sdk/pull/8880) The CLI `simd migrate v0.40 ...` command has been renamed to `simd migrate v0.42`.

client/tx/legacy_test.go

@@ -103,7 +103,7 @@ func (s *TestSuite) TestCopyTx() {
 	s.Require().Equal(sigsV2_1, sigsV2_2)
 	s.Require().Equal(aminoBuilder.GetTx().GetSigners(), aminoBuilder2.GetTx().GetSigners())
 	s.Require().Equal(aminoBuilder.GetTx().GetMsgs()[0], aminoBuilder2.GetTx().GetMsgs()[0])
-	s.Require().Equal(aminoBuilder.GetTx().GetMsgs()[1], aminoBuilder2.GetTx().GetMsgs()[1]) // We lose the "ServiceMsg" information
+	s.Require().Equal(aminoBuilder.GetTx().GetMsgs()[1], aminoBuilder2.GetTx().GetMsgs()[1])
 }
 
 func (s *TestSuite) TestConvertTxToStdTx() {

client/tx/tx.go

@@ -34,6 +34,16 @@ func GenerateOrBroadcastTxCLI(clientCtx client.Context, flagSet *pflag.FlagSet,
 // GenerateOrBroadcastTxWithFactory will either generate and print and unsigned transaction
 // or sign it and broadcast it returning an error upon failure.
 func GenerateOrBroadcastTxWithFactory(clientCtx client.Context, txf Factory, msgs ...sdk.Msg) error {
+	// Validate all msgs before generating or broadcasting the tx.
+	// We were calling ValidateBasic separately in each CLI handler before.
+	// Right now, we're factorizing that call inside this function.
+	// ref: https://github.com/cosmos/cosmos-sdk/pull/9236#discussion_r623803504
+	for _, msg := range msgs {
+		if err := msg.ValidateBasic(); err != nil {
+			return err
+		}
+	}
+
 	if clientCtx.GenerateOnly {
 		return GenerateTx(clientCtx, txf, msgs...)
 	}

docs/core/proto-docs.md

@@ -151,7 +151,6 @@
     - [QueryMethodDescriptor](#cosmos.base.reflection.v2alpha1.QueryMethodDescriptor)
     - [QueryServiceDescriptor](#cosmos.base.reflection.v2alpha1.QueryServiceDescriptor)
     - [QueryServicesDescriptor](#cosmos.base.reflection.v2alpha1.QueryServicesDescriptor)
-    - [ServiceMsgDescriptor](#cosmos.base.reflection.v2alpha1.ServiceMsgDescriptor)
     - [SigningModeDescriptor](#cosmos.base.reflection.v2alpha1.SigningModeDescriptor)
     - [TxDescriptor](#cosmos.base.reflection.v2alpha1.TxDescriptor)
   
@@ -2449,7 +2448,7 @@ MsgDescriptor describes a cosmos-sdk message that can be delivered with a transa
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `service_msg` | [ServiceMsgDescriptor](#cosmos.base.reflection.v2alpha1.ServiceMsgDescriptor) |  | service_msg is used when the message is an sdk.ServiceMsg type |
+| `msg_type_url` | [string](#string) |  | msg_type_url contains the TypeURL of a sdk.Msg. |
 
 
 
@@ -2506,24 +2505,6 @@ QueryServicesDescriptor contains the list of cosmos-sdk queriable services
 
 
 
-<a name="cosmos.base.reflection.v2alpha1.ServiceMsgDescriptor"></a>
-
-### ServiceMsgDescriptor
-ServiceMsgDescriptor describes an sdk.ServiceMsg type
-
-
-| Field | Type | Label | Description |
-| ----- | ---- | ----- | ----------- |
-| `request_fullname` | [string](#string) |  | request_fullname is the protobuf fullname of the given sdk.ServiceMsg request this is the protobuf message type which should be used as google.protobuf.Any.value when delivering the msg to the DeliverTx endpoint |
-| `request_route` | [string](#string) |  | request_route is the sdk.ServiceMsg route, it is equal to type_url |
-| `request_type_url` | [string](#string) |  | request_type_url is the identifier that should be used as google.protobuf.Any.type_url when delivering the msg to the DeliverTx endpoint |
-| `response_fullname` | [string](#string) |  | response_fullname is the protobuf fullname of the given sdk.ServiceMsg response |
-
-
-
-
-
-
 <a name="cosmos.base.reflection.v2alpha1.SigningModeDescriptor"></a>
 
 ### SigningModeDescriptor
@@ -2553,7 +2534,7 @@ TxDescriptor describes the accepted transaction type
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
 | `fullname` | [string](#string) |  | fullname is the protobuf fullname of the raw transaction type (for instance the tx.Tx type) it is not meant to support polymorphism of transaction types, it is supposed to be used by reflection clients to understand if they can handle a specific transaction type in an application. |
-| `msgs` | [MsgDescriptor](#cosmos.base.reflection.v2alpha1.MsgDescriptor) | repeated | msgs lists the accepted application messages (sdk.ServiceMsg, sdk.Msg) NOTE: not to be confused with proto.Message types |
+| `msgs` | [MsgDescriptor](#cosmos.base.reflection.v2alpha1.MsgDescriptor) | repeated | msgs lists the accepted application messages (sdk.Msg) |
 
 
 

proto/cosmos/base/reflection/v2alpha1/reflection.proto

@@ -28,8 +28,7 @@ message TxDescriptor {
   // it is not meant to support polymorphism of transaction types, it is supposed to be used by
   // reflection clients to understand if they can handle a specific transaction type in an application.
   string fullname = 1;
-  // msgs lists the accepted application messages (sdk.ServiceMsg, sdk.Msg)
+  // msgs lists the accepted application messages (sdk.Msg)
-  // NOTE: not to be confused with proto.Message types
   repeated MsgDescriptor msgs = 2;
 }
 
@@ -106,28 +105,8 @@ message ConfigurationDescriptor {
 
 // MsgDescriptor describes a cosmos-sdk message that can be delivered with a transaction
 message MsgDescriptor {
-  // msg contains a descriptor of sdk.ServiceMsg, note: sdk.Msg is not supported
+  // msg_type_url contains the TypeURL of a sdk.Msg.
-  // as every sdk.Msg is already an sdk.ServiceMsg. It is defined as a oneof in case
+  string msg_type_url = 1;
-  // different representation of a msg will be implemented.
-  oneof msg {
-    // service_msg is used when the message is an sdk.ServiceMsg type
-    ServiceMsgDescriptor service_msg = 1;
-  }
-}
-
-// ServiceMsgDescriptor describes an sdk.ServiceMsg type
-message ServiceMsgDescriptor {
-  // request_fullname is the protobuf fullname of the given sdk.ServiceMsg request
-  // this is the protobuf message type which should be used as google.protobuf.Any.value
-  // when delivering the msg to the DeliverTx endpoint
-  string request_fullname = 1;
-  // request_route is the sdk.ServiceMsg route, it is equal to type_url
-  string request_route = 2;
-  // request_type_url is the identifier that should be used as google.protobuf.Any.type_url
-  // when delivering the msg to the DeliverTx endpoint
-  string request_type_url = 3;
-  // response_fullname is the protobuf fullname of the given sdk.ServiceMsg response
-  string response_fullname = 4;
 }
 
 // ReflectionService defines a service for application reflection.

server/grpc/reflection/v2alpha1/reflection.go

@@ -173,29 +173,13 @@ func newTxDescriptor(ir codectypes.InterfaceRegistry) (*TxDescriptor, error) {
 
 	msgsDesc := make([]*MsgDescriptor, 0, len(sdkMsgImplementers))
 
-	// process sdk.ServiceMsg
+	// process sdk.Msg
-	for _, svcMsg := range sdkMsgImplementers {
+	for _, msgTypeURL := range sdkMsgImplementers {
-		resolved, err := ir.Resolve(svcMsg)
+		msgsDesc = append(msgsDesc, &MsgDescriptor{
-		if err != nil {
+			MsgTypeUrl: msgTypeURL,
-			return nil, fmt.Errorf("unable to resolve sdk.ServiceMsg %s: %w", svcMsg, err)
+		})
-		}
-		pbName := proto.MessageName(resolved)
-		if pbName == "" {
-			return nil, fmt.Errorf("unable to get proto name for sdk.ServiceMsg %s", svcMsg)
 	}
 
-		msgsDesc = append(msgsDesc, &MsgDescriptor{Msg: &MsgDescriptor_ServiceMsg{
-			ServiceMsg: &ServiceMsgDescriptor{
-				RequestFullname: pbName,
-				RequestRoute:    svcMsg,
-				RequestTypeUrl:  svcMsg,
-				// NOTE(fdymylja): this cannot be filled as of now, the Configurator is not held inside the *BaseApp type
-				// but is local to specific applications, hence we have no way of getting the MsgServer's descriptors
-				// which contain response information.
-				ResponseFullname: "",
-			},
-		}})
-	}
 	return &TxDescriptor{
 		Fullname: txPbName,
 		Msgs:     msgsDesc,

server/grpc/reflection/v2alpha1/reflection.pb.go

@@ -126,8 +126,7 @@ type TxDescriptor struct {
 	// it is not meant to support polymorphism of transaction types, it is supposed to be used by
 	// reflection clients to understand if they can handle a specific transaction type in an application.
 	Fullname string `protobuf:"bytes,1,opt,name=fullname,proto3" json:"fullname,omitempty"`
-	// msgs lists the accepted application messages (sdk.ServiceMsg, sdk.Msg)
+	// msgs lists the accepted application messages (sdk.Msg)
-	// NOTE: not to be confused with proto.Message types
 	Msgs []*MsgDescriptor `protobuf:"bytes,2,rep,name=msgs,proto3" json:"msgs,omitempty"`
 }
 
@@ -613,13 +612,8 @@ func (m *ConfigurationDescriptor) GetBech32AccountAddressPrefix() string {
 
 // MsgDescriptor describes a cosmos-sdk message that can be delivered with a transaction
 type MsgDescriptor struct {
-	// msg contains a descriptor of sdk.ServiceMsg, note: sdk.Msg is not supported
+	// msg_type_url contains the TypeURL of a sdk.Msg.
-	// as every sdk.Msg is already an sdk.ServiceMsg. It is defined as a oneof in case
+	MsgTypeUrl string `protobuf:"bytes,1,opt,name=msg_type_url,json=msgTypeUrl,proto3" json:"msg_type_url,omitempty"`
-	// different representation of a msg will be implemented.
-	//
-	// Types that are valid to be assigned to Msg:
-	//	*MsgDescriptor_ServiceMsg
-	Msg isMsgDescriptor_Msg `protobuf_oneof:"msg"`
 }
 
 func (m *MsgDescriptor) Reset()         { *m = MsgDescriptor{} }
@@ -655,111 +649,9 @@ func (m *MsgDescriptor) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_MsgDescriptor proto.InternalMessageInfo
 
-type isMsgDescriptor_Msg interface {
+func (m *MsgDescriptor) GetMsgTypeUrl() string {
-	isMsgDescriptor_Msg()
-	MarshalTo([]byte) (int, error)
-	Size() int
-}
-
-type MsgDescriptor_ServiceMsg struct {
-	ServiceMsg *ServiceMsgDescriptor `protobuf:"bytes,1,opt,name=service_msg,json=serviceMsg,proto3,oneof" json:"service_msg,omitempty"`
-}
-
-func (*MsgDescriptor_ServiceMsg) isMsgDescriptor_Msg() {}
-
-func (m *MsgDescriptor) GetMsg() isMsgDescriptor_Msg {
 	if m != nil {
-		return m.Msg
+		return m.MsgTypeUrl
-	}
-	return nil
-}
-
-func (m *MsgDescriptor) GetServiceMsg() *ServiceMsgDescriptor {
-	if x, ok := m.GetMsg().(*MsgDescriptor_ServiceMsg); ok {
-		return x.ServiceMsg
-	}
-	return nil
-}
-
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*MsgDescriptor) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*MsgDescriptor_ServiceMsg)(nil),
-	}
-}
-
-// ServiceMsgDescriptor describes an sdk.ServiceMsg type
-type ServiceMsgDescriptor struct {
-	// request_fullname is the protobuf fullname of the given sdk.ServiceMsg request
-	// this is the protobuf message type which should be used as google.protobuf.Any.value
-	// when delivering the msg to the DeliverTx endpoint
-	RequestFullname string `protobuf:"bytes,1,opt,name=request_fullname,json=requestFullname,proto3" json:"request_fullname,omitempty"`
-	// request_route is the sdk.ServiceMsg route, it is equal to type_url
-	RequestRoute string `protobuf:"bytes,2,opt,name=request_route,json=requestRoute,proto3" json:"request_route,omitempty"`
-	// request_type_url is the identifier that should be used as google.protobuf.Any.type_url
-	// when delivering the msg to the DeliverTx endpoint
-	RequestTypeUrl string `protobuf:"bytes,3,opt,name=request_type_url,json=requestTypeUrl,proto3" json:"request_type_url,omitempty"`
-	// response_fullname is the protobuf fullname of the given sdk.ServiceMsg response
-	ResponseFullname string `protobuf:"bytes,4,opt,name=response_fullname,json=responseFullname,proto3" json:"response_fullname,omitempty"`
-}
-
-func (m *ServiceMsgDescriptor) Reset()         { *m = ServiceMsgDescriptor{} }
-func (m *ServiceMsgDescriptor) String() string { return proto.CompactTextString(m) }
-func (*ServiceMsgDescriptor) ProtoMessage()    {}
-func (*ServiceMsgDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{11}
-}
-func (m *ServiceMsgDescriptor) XXX_Unmarshal(b []byte) error {
-	return m.Unmarshal(b)
-}
-func (m *ServiceMsgDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	if deterministic {
-		return xxx_messageInfo_ServiceMsgDescriptor.Marshal(b, m, deterministic)
-	} else {
-		b = b[:cap(b)]
-		n, err := m.MarshalToSizedBuffer(b)
-		if err != nil {
-			return nil, err
-		}
-		return b[:n], nil
-	}
-}
-func (m *ServiceMsgDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceMsgDescriptor.Merge(m, src)
-}
-func (m *ServiceMsgDescriptor) XXX_Size() int {
-	return m.Size()
-}
-func (m *ServiceMsgDescriptor) XXX_DiscardUnknown() {
-	xxx_messageInfo_ServiceMsgDescriptor.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ServiceMsgDescriptor proto.InternalMessageInfo
-
-func (m *ServiceMsgDescriptor) GetRequestFullname() string {
-	if m != nil {
-		return m.RequestFullname
-	}
-	return ""
-}
-
-func (m *ServiceMsgDescriptor) GetRequestRoute() string {
-	if m != nil {
-		return m.RequestRoute
-	}
-	return ""
-}
-
-func (m *ServiceMsgDescriptor) GetRequestTypeUrl() string {
-	if m != nil {
-		return m.RequestTypeUrl
-	}
-	return ""
-}
-
-func (m *ServiceMsgDescriptor) GetResponseFullname() string {
-	if m != nil {
-		return m.ResponseFullname
 	}
 	return ""
 }
@@ -772,7 +664,7 @@ func (m *GetAuthnDescriptorRequest) Reset()         { *m = GetAuthnDescriptorReq
 func (m *GetAuthnDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetAuthnDescriptorRequest) ProtoMessage()    {}
 func (*GetAuthnDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{12}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{11}
 }
 func (m *GetAuthnDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -811,7 +703,7 @@ func (m *GetAuthnDescriptorResponse) Reset()         { *m = GetAuthnDescriptorRe
 func (m *GetAuthnDescriptorResponse) String() string { return proto.CompactTextString(m) }
 func (*GetAuthnDescriptorResponse) ProtoMessage()    {}
 func (*GetAuthnDescriptorResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{13}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{12}
 }
 func (m *GetAuthnDescriptorResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -855,7 +747,7 @@ func (m *GetChainDescriptorRequest) Reset()         { *m = GetChainDescriptorReq
 func (m *GetChainDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetChainDescriptorRequest) ProtoMessage()    {}
 func (*GetChainDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{14}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{13}
 }
 func (m *GetChainDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -894,7 +786,7 @@ func (m *GetChainDescriptorResponse) Reset()         { *m = GetChainDescriptorRe
 func (m *GetChainDescriptorResponse) String() string { return proto.CompactTextString(m) }
 func (*GetChainDescriptorResponse) ProtoMessage()    {}
 func (*GetChainDescriptorResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{15}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{14}
 }
 func (m *GetChainDescriptorResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -938,7 +830,7 @@ func (m *GetCodecDescriptorRequest) Reset()         { *m = GetCodecDescriptorReq
 func (m *GetCodecDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetCodecDescriptorRequest) ProtoMessage()    {}
 func (*GetCodecDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{16}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{15}
 }
 func (m *GetCodecDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -977,7 +869,7 @@ func (m *GetCodecDescriptorResponse) Reset()         { *m = GetCodecDescriptorRe
 func (m *GetCodecDescriptorResponse) String() string { return proto.CompactTextString(m) }
 func (*GetCodecDescriptorResponse) ProtoMessage()    {}
 func (*GetCodecDescriptorResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{17}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{16}
 }
 func (m *GetCodecDescriptorResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1021,7 +913,7 @@ func (m *GetConfigurationDescriptorRequest) Reset()         { *m = GetConfigurat
 func (m *GetConfigurationDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetConfigurationDescriptorRequest) ProtoMessage()    {}
 func (*GetConfigurationDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{18}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{17}
 }
 func (m *GetConfigurationDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1060,7 +952,7 @@ func (m *GetConfigurationDescriptorResponse) Reset()         { *m = GetConfigura
 func (m *GetConfigurationDescriptorResponse) String() string { return proto.CompactTextString(m) }
 func (*GetConfigurationDescriptorResponse) ProtoMessage()    {}
 func (*GetConfigurationDescriptorResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{19}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{18}
 }
 func (m *GetConfigurationDescriptorResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1104,7 +996,7 @@ func (m *GetQueryServicesDescriptorRequest) Reset()         { *m = GetQueryServi
 func (m *GetQueryServicesDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetQueryServicesDescriptorRequest) ProtoMessage()    {}
 func (*GetQueryServicesDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{20}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{19}
 }
 func (m *GetQueryServicesDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1143,7 +1035,7 @@ func (m *GetQueryServicesDescriptorResponse) Reset()         { *m = GetQueryServ
 func (m *GetQueryServicesDescriptorResponse) String() string { return proto.CompactTextString(m) }
 func (*GetQueryServicesDescriptorResponse) ProtoMessage()    {}
 func (*GetQueryServicesDescriptorResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{21}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{20}
 }
 func (m *GetQueryServicesDescriptorResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1187,7 +1079,7 @@ func (m *GetTxDescriptorRequest) Reset()         { *m = GetTxDescriptorRequest{}
 func (m *GetTxDescriptorRequest) String() string { return proto.CompactTextString(m) }
 func (*GetTxDescriptorRequest) ProtoMessage()    {}
 func (*GetTxDescriptorRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{22}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{21}
 }
 func (m *GetTxDescriptorRequest) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1227,7 +1119,7 @@ func (m *GetTxDescriptorResponse) Reset()         { *m = GetTxDescriptorResponse
 func (m *GetTxDescriptorResponse) String() string { return proto.CompactTextString(m) }
 func (*GetTxDescriptorResponse) ProtoMessage()    {}
 func (*GetTxDescriptorResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{23}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{22}
 }
 func (m *GetTxDescriptorResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1273,7 +1165,7 @@ func (m *QueryServicesDescriptor) Reset()         { *m = QueryServicesDescriptor
 func (m *QueryServicesDescriptor) String() string { return proto.CompactTextString(m) }
 func (*QueryServicesDescriptor) ProtoMessage()    {}
 func (*QueryServicesDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{24}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{23}
 }
 func (m *QueryServicesDescriptor) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1323,7 +1215,7 @@ func (m *QueryServiceDescriptor) Reset()         { *m = QueryServiceDescriptor{}
 func (m *QueryServiceDescriptor) String() string { return proto.CompactTextString(m) }
 func (*QueryServiceDescriptor) ProtoMessage()    {}
 func (*QueryServiceDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{25}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{24}
 }
 func (m *QueryServiceDescriptor) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1388,7 +1280,7 @@ func (m *QueryMethodDescriptor) Reset()         { *m = QueryMethodDescriptor{} }
 func (m *QueryMethodDescriptor) String() string { return proto.CompactTextString(m) }
 func (*QueryMethodDescriptor) ProtoMessage()    {}
 func (*QueryMethodDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_15c91f0b8d6bf3d0, []int{26}
+	return fileDescriptor_15c91f0b8d6bf3d0, []int{25}
 }
 func (m *QueryMethodDescriptor) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1443,7 +1335,6 @@ func init() {
 	proto.RegisterType((*InterfaceAcceptingMessageDescriptor)(nil), "cosmos.base.reflection.v2alpha1.InterfaceAcceptingMessageDescriptor")
 	proto.RegisterType((*ConfigurationDescriptor)(nil), "cosmos.base.reflection.v2alpha1.ConfigurationDescriptor")
 	proto.RegisterType((*MsgDescriptor)(nil), "cosmos.base.reflection.v2alpha1.MsgDescriptor")
-	proto.RegisterType((*ServiceMsgDescriptor)(nil), "cosmos.base.reflection.v2alpha1.ServiceMsgDescriptor")
 	proto.RegisterType((*GetAuthnDescriptorRequest)(nil), "cosmos.base.reflection.v2alpha1.GetAuthnDescriptorRequest")
 	proto.RegisterType((*GetAuthnDescriptorResponse)(nil), "cosmos.base.reflection.v2alpha1.GetAuthnDescriptorResponse")
 	proto.RegisterType((*GetChainDescriptorRequest)(nil), "cosmos.base.reflection.v2alpha1.GetChainDescriptorRequest")
@@ -1466,85 +1357,80 @@ func init() {
 }
 
 var fileDescriptor_15c91f0b8d6bf3d0 = []byte{
-	// 1243 bytes of a gzipped FileDescriptorProto
+	// 1155 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0xc5,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x58, 0xcf, 0x6f, 0x1b, 0x45,
-	0x17, 0xcf, 0xda, 0xf9, 0xf9, 0xd2, 0xc4, 0xed, 0x7c, 0x9b, 0xc4, 0x75, 0xfb, 0x75, 0xdb, 0x8d,
+	0x14, 0xce, 0x3a, 0xbf, 0x5f, 0x9b, 0x46, 0x0c, 0x24, 0x71, 0xdd, 0xe2, 0xa6, 0x1b, 0x09, 0xf5,
-	0x84, 0x82, 0x50, 0xed, 0x26, 0x0d, 0x69, 0x05, 0x29, 0x95, 0xd3, 0xd0, 0x12, 0x89, 0xa0, 0xe0,
+	0x52, 0xbb, 0x49, 0xa3, 0xb4, 0x82, 0x94, 0xca, 0x69, 0x68, 0x15, 0x89, 0xa0, 0xe0, 0xa4, 0x80,
-	0xa4, 0x50, 0x21, 0xd4, 0xd5, 0x7a, 0x77, 0xbc, 0x1e, 0xe1, 0xfd, 0x91, 0x9d, 0xdd, 0xe0, 0x5c,
+	0x10, 0xea, 0x6a, 0xbd, 0x3b, 0x5e, 0x8f, 0xf0, 0xee, 0x6c, 0x76, 0xc6, 0xc1, 0xb9, 0x72, 0xe0,
-	0x39, 0x70, 0x06, 0xf1, 0x27, 0x70, 0xe0, 0xce, 0x9d, 0x3b, 0x82, 0x4b, 0x25, 0x2e, 0x1c, 0x51,
+	0x0c, 0xe2, 0x4f, 0xe0, 0xc0, 0x9d, 0xbf, 0x02, 0xc1, 0xa5, 0x12, 0x17, 0x8e, 0x28, 0x41, 0xe2,
-	0x82, 0xc4, 0x01, 0xfe, 0x08, 0xb4, 0x33, 0xb3, 0xf6, 0x78, 0xb3, 0xb6, 0x37, 0x09, 0xa7, 0x64,
+	0x00, 0x7f, 0x04, 0x9a, 0x1f, 0x76, 0xc6, 0xce, 0xda, 0xde, 0x24, 0x3d, 0x25, 0xb3, 0xef, 0xbd,
-	0xe6, 0x7d, 0xde, 0x67, 0x3e, 0x6f, 0x66, 0xfc, 0xde, 0x9b, 0x85, 0xfb, 0x86, 0x4b, 0x6d, 0x97,
+	0x6f, 0xbe, 0xef, 0xed, 0xe8, 0x7d, 0xb3, 0x86, 0x07, 0x1e, 0x65, 0x21, 0x65, 0xe5, 0x9a, 0xcb,
-	0x56, 0x1b, 0x3a, 0xc5, 0x55, 0x1f, 0x37, 0xdb, 0xd8, 0x08, 0x88, 0xeb, 0x54, 0x8f, 0xd6, 0xf4,
+	0x70, 0x39, 0xc1, 0xf5, 0x26, 0xf6, 0x38, 0xa1, 0x51, 0xf9, 0x68, 0xcd, 0x6d, 0xc6, 0x0d, 0x77,
-	0xb6, 0xd7, 0xd2, 0x57, 0xa5, 0xb9, 0x8a, 0xe7, 0xbb, 0x81, 0x8b, 0x6e, 0x73, 0x8f, 0x4a, 0xe4,
+	0xd5, 0x78, 0x56, 0x8a, 0x13, 0xca, 0x29, 0xba, 0xa3, 0x2a, 0x4a, 0xa2, 0xa2, 0x64, 0x44, 0x3b,
-	0x51, 0x91, 0xac, 0xb1, 0x47, 0xe9, 0x96, 0xe5, 0xba, 0x56, 0x1b, 0x57, 0x75, 0x8f, 0x54, 0x75,
+	0x15, 0x85, 0xdb, 0x01, 0xa5, 0x41, 0x13, 0x97, 0xdd, 0x98, 0x94, 0xdd, 0x28, 0xa2, 0xdc, 0x15,
-	0xc7, 0x71, 0x03, 0x3d, 0xb2, 0x53, 0xee, 0xae, 0xfe, 0x95, 0x87, 0xb9, 0x9a, 0xe7, 0x6d, 0x63,
+	0x71, 0xa6, 0xca, 0xed, 0x7f, 0xc6, 0x61, 0xae, 0x12, 0xc7, 0xdb, 0x98, 0x79, 0x09, 0x89, 0x39,
-	0x6a, 0xf8, 0xc4, 0x0b, 0x5c, 0x1f, 0x3d, 0x83, 0x09, 0x3d, 0x0c, 0x5a, 0x4e, 0x51, 0xb9, 0xa3,
+	0x4d, 0xd0, 0x73, 0x98, 0x74, 0x5b, 0xbc, 0x11, 0xe5, 0xad, 0x65, 0xeb, 0xde, 0xb5, 0xb5, 0x07,
-	0xac, 0xcc, 0xae, 0xdd, 0xaf, 0x8c, 0x58, 0xa0, 0x52, 0x8b, 0xd0, 0x3d, 0x82, 0x3a, 0x77, 0x8f,
+	0xa5, 0x11, 0x1b, 0x94, 0x2a, 0x22, 0xfb, 0x0c, 0xa0, 0xaa, 0xca, 0x05, 0x8e, 0xd7, 0x70, 0x49,
-	0x78, 0x8c, 0x96, 0x4e, 0x9c, 0x62, 0x2e, 0x23, 0xcf, 0xd3, 0x08, 0x2d, 0xf3, 0x30, 0x77, 0xc6,
+	0x94, 0xcf, 0x65, 0xc4, 0x79, 0x26, 0xb2, 0x4d, 0x1c, 0x59, 0x2e, 0x71, 0xa8, 0x8f, 0xbd, 0xfc,
-	0xe3, 0x9a, 0xd8, 0x28, 0xe6, 0xb3, 0xf2, 0x44, 0xe8, 0x3e, 0x9e, 0x68, 0x02, 0xbd, 0x82, 0x39,
+	0x78, 0x56, 0x1c, 0x91, 0xdd, 0x83, 0x23, 0x1e, 0xa0, 0x57, 0x30, 0xe7, 0xd1, 0xa8, 0x4e, 0x82,
-	0xc3, 0x75, 0x9a, 0xc4, 0x0a, 0x7d, 0xb6, 0x03, 0xc5, 0x71, 0xc6, 0xf7, 0x28, 0x03, 0x9f, 0xe4,
+	0x56, 0x22, 0x3b, 0x90, 0x9f, 0x90, 0x78, 0x8f, 0x33, 0xe0, 0x19, 0x55, 0x06, 0x6e, 0x2f, 0x1c,
-	0x25, 0xf1, 0xf6, 0xd3, 0x21, 0x0d, 0xe6, 0x0f, 0x43, 0xec, 0x1f, 0x6b, 0x14, 0xfb, 0x47, 0xc4,
+	0x72, 0xe0, 0xc6, 0x61, 0x0b, 0x27, 0xc7, 0x0e, 0xc3, 0xc9, 0x11, 0xf1, 0x30, 0xcb, 0x4f, 0x66,
-	0xc0, 0xb4, 0x38, 0x91, 0x71, 0x81, 0x8f, 0x23, 0xb7, 0x7d, 0xe1, 0x25, 0x2f, 0x70, 0x28, 0x1b,
+	0xdc, 0xe0, 0x53, 0x51, 0xb6, 0xaf, 0xab, 0xcc, 0x0d, 0x0e, 0xcd, 0x00, 0x7a, 0x02, 0x39, 0xde,
-	0xd0, 0x63, 0xc8, 0x05, 0x9d, 0xe2, 0x24, 0x23, 0xbd, 0x37, 0x92, 0xf4, 0xa0, 0x23, 0x31, 0xe5,
+	0xce, 0x4f, 0x49, 0xd0, 0xfb, 0x23, 0x41, 0x0f, 0xda, 0x06, 0x52, 0x8e, 0xb7, 0xed, 0x08, 0xae,
-	0x82, 0x8e, 0xea, 0xc0, 0x15, 0x79, 0x0e, 0x95, 0x60, 0xba, 0x19, 0xb6, 0xdb, 0x8e, 0x6e, 0x63,
+	0x9b, 0xcf, 0x50, 0x01, 0x66, 0xea, 0xad, 0x66, 0x33, 0x72, 0x43, 0x2c, 0x5f, 0xf5, 0x6c, 0xb5,
-	0x76, 0xd4, 0x33, 0xf5, 0xee, 0x18, 0x6d, 0xc1, 0xb8, 0x4d, 0x2d, 0x5a, 0xcc, 0xdd, 0xc9, 0xaf,
+	0xbb, 0x46, 0x5b, 0x30, 0x11, 0xb2, 0x80, 0xe5, 0x73, 0xcb, 0xe3, 0xf7, 0xae, 0xad, 0x95, 0x46,
-	0xcc, 0xae, 0x55, 0x46, 0x2e, 0xb6, 0x4b, 0x2d, 0x69, 0x35, 0xe6, 0xab, 0xb6, 0xa0, 0x90, 0xb8,
+	0x6e, 0xb6, 0xcb, 0x02, 0x63, 0x37, 0x59, 0x6b, 0x37, 0x60, 0xbe, 0xef, 0x64, 0xa0, 0x97, 0x00,
-	0x19, 0xe8, 0x05, 0x00, 0x25, 0x96, 0xa3, 0xd9, 0xae, 0x89, 0x69, 0x51, 0x61, 0xe4, 0x1b, 0x23,
+	0x8c, 0x04, 0x91, 0x13, 0x52, 0x1f, 0xb3, 0xbc, 0x25, 0xc1, 0x37, 0x46, 0x82, 0xef, 0x93, 0x20,
-	0xc9, 0xf7, 0x89, 0xe5, 0x10, 0xc7, 0xda, 0x75, 0x4d, 0x2c, 0x2d, 0x32, 0x13, 0x31, 0x45, 0x73,
+	0x22, 0x51, 0xb0, 0x4b, 0x7d, 0x6c, 0x6c, 0x32, 0x2b, 0x90, 0xc4, 0x33, 0x66, 0xff, 0x60, 0xc1,
-	0x54, 0xfd, 0x56, 0x81, 0x85, 0x54, 0x10, 0x42, 0x30, 0x2e, 0xc5, 0xc7, 0xfe, 0x47, 0x8b, 0x30,
+	0x42, 0x6a, 0x12, 0x42, 0x30, 0x61, 0xe8, 0x93, 0xff, 0xa3, 0x45, 0x98, 0x8a, 0x5a, 0x61, 0x0d,
-	0xe9, 0x84, 0x76, 0x03, 0xfb, 0xec, 0x62, 0x4e, 0xd4, 0xc5, 0x08, 0x7d, 0x08, 0xcb, 0xec, 0xe2,
+	0x27, 0xf2, 0x60, 0x4e, 0x56, 0xf5, 0x0a, 0x7d, 0x0c, 0x2b, 0xf2, 0xe0, 0x3a, 0x24, 0xaa, 0x53,
-	0x6a, 0xc4, 0x69, 0xba, 0x9a, 0xe7, 0xbb, 0x47, 0xc4, 0xc4, 0xbe, 0x66, 0xe3, 0xa0, 0xe5, 0x9a,
+	0x27, 0x4e, 0xe8, 0x11, 0xf1, 0x71, 0xe2, 0x84, 0x98, 0x37, 0xa8, 0xef, 0x74, 0x5b, 0x35, 0x2e,
-	0x5a, 0x77, 0xab, 0xf2, 0x8c, 0xea, 0x36, 0x83, 0xee, 0x38, 0x4d, 0x77, 0x4f, 0x00, 0x77, 0x19,
+	0xa1, 0xee, 0xc8, 0xd4, 0x9d, 0xa8, 0x4e, 0xf7, 0x74, 0xe2, 0xae, 0xcc, 0x7b, 0xae, 0xd3, 0xec,
-	0xee, 0x99, 0x80, 0xa9, 0x77, 0xa1, 0x90, 0xb8, 0xcf, 0x68, 0x1e, 0x72, 0xc4, 0x14, 0x52, 0x72,
+	0xbb, 0x30, 0xdf, 0x77, 0x9e, 0xd1, 0x0d, 0xc8, 0x11, 0x5f, 0x53, 0xc9, 0x11, 0xdf, 0x0e, 0x60,
-	0xc4, 0x54, 0x2d, 0x28, 0x24, 0xae, 0x2a, 0x3a, 0x00, 0x20, 0x4e, 0x80, 0xfd, 0xa6, 0x6e, 0x74,
+	0xbe, 0xef, 0xa8, 0xa2, 0x03, 0x00, 0x12, 0x71, 0x9c, 0xd4, 0x5d, 0xaf, 0xdb, 0xa0, 0xf5, 0x91,
-	0x37, 0x68, 0x7d, 0xe4, 0x06, 0xed, 0xc4, 0x2e, 0xd2, 0xf6, 0x48, 0x3c, 0xea, 0x8f, 0x39, 0xf8,
+	0x0d, 0xda, 0xe9, 0x94, 0x18, 0xed, 0x31, 0x70, 0xec, 0x5f, 0x72, 0xf0, 0x76, 0x4a, 0xce, 0xd0,
-	0x5f, 0x0a, 0x66, 0xe8, 0x0d, 0xf8, 0x5a, 0x81, 0x5b, 0x5d, 0x0a, 0x4d, 0x37, 0x0c, 0xec, 0x05,
+	0x13, 0xf0, 0x9d, 0x05, 0xb7, 0xbb, 0x10, 0x8e, 0xeb, 0x79, 0x38, 0xe6, 0x24, 0x0a, 0x9c, 0x10,
-	0xc4, 0xb1, 0x34, 0x1b, 0x53, 0xaa, 0x5b, 0x38, 0xbe, 0x1a, 0xdb, 0xd9, 0xc5, 0xd5, 0x62, 0x8e,
+	0x33, 0xe6, 0x06, 0xb8, 0x73, 0x34, 0xb6, 0xb3, 0x93, 0xab, 0x74, 0x30, 0x76, 0x15, 0x84, 0x41,
-	0x5d, 0x4e, 0x21, 0x89, 0x2d, 0x91, 0x41, 0x20, 0x8a, 0x8e, 0x60, 0xb1, 0xa7, 0x83, 0xd8, 0x5e,
+	0xb6, 0x40, 0x06, 0x25, 0x31, 0x74, 0x04, 0x8b, 0x67, 0x3c, 0x48, 0x18, 0x37, 0x71, 0x88, 0xc5,
-	0x1b, 0xdb, 0x38, 0x1a, 0xd3, 0x62, 0x9e, 0x29, 0x78, 0x92, 0x5d, 0xc1, 0x4e, 0xcf, 0x5b, 0x5a,
+	0x9a, 0xe5, 0xc7, 0x25, 0x83, 0xa7, 0xd9, 0x19, 0xec, 0x9c, 0x55, 0x1b, 0x9b, 0x2f, 0x90, 0x94,
-	0x7c, 0x81, 0xa4, 0xd8, 0xa9, 0xfa, 0x29, 0x94, 0x87, 0x3b, 0x0e, 0xdd, 0xbe, 0x1b, 0x30, 0x1d,
+	0x38, 0xb3, 0x3f, 0x87, 0xe2, 0xf0, 0xc2, 0xa1, 0xed, 0xbb, 0x09, 0x33, 0xfc, 0x38, 0xc6, 0x4e,
-	0x1c, 0x7b, 0x58, 0x0b, 0xfd, 0x36, 0xbb, 0x66, 0x33, 0xf5, 0xa9, 0x68, 0xfc, 0xc2, 0x6f, 0xab,
+	0x2b, 0x69, 0xca, 0x63, 0x36, 0x5b, 0x9d, 0x16, 0xeb, 0x97, 0x49, 0xd3, 0xfe, 0x06, 0x56, 0x32,
-	0x5f, 0xc2, 0x72, 0x86, 0x3d, 0x19, 0xca, 0xbe, 0x0e, 0x8b, 0x4d, 0x82, 0xdb, 0xa6, 0x66, 0x76,
+	0xf4, 0x64, 0x28, 0xfa, 0x3a, 0x2c, 0xd6, 0x09, 0x6e, 0xfa, 0x8e, 0xdf, 0xcd, 0x77, 0x44, 0x40,
-	0xf1, 0x5a, 0x64, 0xe0, 0xa7, 0x32, 0x53, 0xbf, 0xce, 0xac, 0x3d, 0xb2, 0x8f, 0x22, 0x9b, 0xfa,
+	0xbd, 0x95, 0xd9, 0xea, 0x3b, 0x32, 0x7a, 0x06, 0xf6, 0x89, 0x88, 0xd9, 0x5f, 0xc1, 0xd2, 0x80,
-	0x39, 0x2c, 0x0d, 0x48, 0x65, 0xa8, 0x06, 0xff, 0x6f, 0x60, 0xa3, 0xf5, 0x60, 0x2d, 0x3a, 0x69,
+	0x51, 0x86, 0x2a, 0xf0, 0x6e, 0x0d, 0x7b, 0x8d, 0x87, 0x6b, 0xe2, 0x4d, 0xd3, 0x56, 0xc4, 0x1d,
-	0x37, 0x74, 0x02, 0x4d, 0x37, 0x4d, 0x1f, 0x53, 0xaa, 0x79, 0x3e, 0x6e, 0x92, 0x8e, 0x50, 0x50,
+	0xd7, 0xf7, 0x13, 0xcc, 0x98, 0x13, 0x27, 0xb8, 0x4e, 0xda, 0x9a, 0x41, 0x41, 0x25, 0x55, 0x54,
-	0xe2, 0xa0, 0x1a, 0xc7, 0xd4, 0x38, 0x64, 0x8f, 0x21, 0x54, 0x0f, 0xe6, 0xfa, 0xb2, 0x00, 0x7a,
+	0x4e, 0x45, 0xa5, 0xec, 0xc9, 0x0c, 0x7b, 0x15, 0xe6, 0x7a, 0xa6, 0x00, 0x5a, 0x86, 0xeb, 0x21,
-	0x09, 0xb3, 0x22, 0x13, 0x6a, 0x36, 0xb5, 0x44, 0x35, 0x79, 0x7b, 0xf4, 0xaf, 0x9d, 0xfb, 0xf4,
+	0x0b, 0x9c, 0x6e, 0x1b, 0x14, 0x04, 0x84, 0x2c, 0x38, 0xd0, 0x9d, 0xb8, 0x05, 0x37, 0x5f, 0x60,
-	0x71, 0x7d, 0x30, 0x56, 0x07, 0xda, 0x9d, 0xdf, 0x9a, 0x80, 0xbc, 0x4d, 0x2d, 0xf5, 0x27, 0x05,
+	0xde, 0x6f, 0x1f, 0xf8, 0xb0, 0x85, 0x19, 0xb7, 0x7d, 0x28, 0xa4, 0x05, 0x59, 0x4c, 0x23, 0x86,
-	0xae, 0xa7, 0xa1, 0xd1, 0x9b, 0x70, 0xd5, 0xc7, 0x87, 0x21, 0xa6, 0x81, 0x96, 0xd8, 0xc2, 0x82,
+	0xdf, 0x94, 0x49, 0x69, 0x0a, 0xfd, 0xce, 0xd3, 0x43, 0xe1, 0x5c, 0xf0, 0x8c, 0x82, 0xf2, 0x37,
-	0x98, 0x8f, 0x7f, 0xa6, 0x68, 0x19, 0xe6, 0x62, 0xa8, 0xef, 0x86, 0x01, 0x16, 0x87, 0x75, 0x45,
+	0xeb, 0x4a, 0xfe, 0xd6, 0xa1, 0xd0, 0x67, 0x5a, 0xbd, 0x14, 0xfa, 0x83, 0x06, 0x05, 0x69, 0x8d,
-	0x4c, 0xd6, 0xa3, 0x39, 0xb4, 0xd2, 0xe3, 0xeb, 0x1e, 0x2a, 0x4f, 0x03, 0xf3, 0x62, 0xfe, 0x80,
+	0xd6, 0x95, 0xac, 0xd1, 0x5e, 0x81, 0xbb, 0x72, 0x97, 0x74, 0x9f, 0xd3, 0x54, 0x8e, 0xc0, 0x1e,
-	0x9f, 0x2d, 0x7a, 0x0b, 0xae, 0xf9, 0x98, 0x7a, 0xae, 0x43, 0x71, 0x6f, 0xe9, 0x71, 0x06, 0xbd,
+	0x96, 0xa4, 0x29, 0xed, 0xc1, 0x94, 0xb2, 0x45, 0xcd, 0xe9, 0xf2, 0xf6, 0xaa, 0x71, 0x34, 0xb9,
-	0x1a, 0x1b, 0xba, 0x29, 0xe2, 0x26, 0xdc, 0x78, 0x8e, 0x83, 0x64, 0xf5, 0xe4, 0x84, 0xaa, 0x09,
+	0x41, 0x1e, 0xa9, 0xc9, 0xb5, 0x25, 0xb9, 0x81, 0x49, 0x9a, 0x5c, 0x15, 0xa6, 0x85, 0xa5, 0x12,
-	0xa5, 0x34, 0x23, 0xa7, 0xf8, 0xaf, 0x6a, 0xb4, 0x90, 0x90, 0x2c, 0xbc, 0x7d, 0x12, 0xce, 0x18,
+	0x39, 0x5b, 0xaf, 0xe6, 0xcd, 0x1d, 0x20, 0x3b, 0x0f, 0x8b, 0x2f, 0x30, 0xef, 0x71, 0x5b, 0xcd,
-	0x7b, 0x12, 0x78, 0x79, 0x57, 0x2e, 0x55, 0xde, 0x63, 0x09, 0x89, 0x9a, 0xdd, 0x2f, 0x21, 0x69,
+	0xe9, 0x0b, 0x58, 0x3a, 0x17, 0xd1, 0x44, 0x94, 0x95, 0x5b, 0x97, 0xb5, 0xf2, 0x63, 0x58, 0x1a,
-	0x94, 0x24, 0xb0, 0xce, 0x40, 0xb9, 0x54, 0x67, 0xa0, 0x2e, 0xc3, 0x5d, 0xb6, 0x4a, 0x7a, 0x99,
+	0xc0, 0x0b, 0xbd, 0x3a, 0x77, 0x0b, 0x51, 0x2e, 0xf2, 0xe8, 0x42, 0x4a, 0x07, 0x5e, 0x42, 0xec,
-	0x17, 0x52, 0x8e, 0x40, 0x1d, 0x06, 0x12, 0x92, 0xf6, 0x60, 0x92, 0x77, 0x05, 0x42, 0xd3, 0xc5,
+	0x9f, 0x2c, 0x58, 0x4c, 0xcf, 0x1c, 0x3a, 0xb1, 0x6e, 0xc1, 0x2c, 0x61, 0xc2, 0xf7, 0x5b, 0x4d,
-	0xbb, 0x0b, 0xc1, 0x23, 0xc4, 0x0d, 0x6a, 0x11, 0x84, 0xb8, 0x0e, 0x13, 0x37, 0x10, 0x24, 0xc4,
+	0x2c, 0x07, 0xe2, 0x4c, 0x75, 0x86, 0xb0, 0x5d, 0xb9, 0x46, 0x7b, 0x30, 0xad, 0x5c, 0xb6, 0x33,
-	0xd5, 0x61, 0x2a, 0xea, 0x28, 0x08, 0x2b, 0x2d, 0x97, 0x6b, 0x4d, 0x62, 0x22, 0xb5, 0x08, 0x8b,
+	0xd3, 0x37, 0xb2, 0x91, 0x55, 0x96, 0x6b, 0xbe, 0x14, 0x0d, 0x63, 0xef, 0xc3, 0x42, 0x6a, 0x46,
-	0xcf, 0x71, 0xd0, 0xd7, 0x6c, 0x08, 0x4d, 0x2f, 0x61, 0xe9, 0x8c, 0x45, 0x08, 0xe1, 0x9d, 0x8c,
+	0xea, 0x85, 0xe0, 0x3d, 0x98, 0x17, 0x3c, 0x1d, 0xd5, 0xb7, 0xd8, 0xe5, 0x0d, 0x3d, 0xb2, 0xe7,
-	0x72, 0xd1, 0x4e, 0xe6, 0x18, 0x96, 0x06, 0xe8, 0x42, 0xaf, 0xce, 0x34, 0x61, 0xbc, 0x88, 0x3e,
+	0xc4, 0x63, 0x89, 0xb3, 0xe7, 0xf2, 0xc6, 0xda, 0xcf, 0x00, 0x6f, 0x55, 0xbb, 0x5c, 0xb4, 0x7e,
-	0x3c, 0x57, 0xa4, 0x03, 0x7b, 0x30, 0xf5, 0x7b, 0x05, 0x16, 0xd3, 0x91, 0x43, 0x13, 0xf6, 0x4d,
+	0xf4, 0xbb, 0x05, 0xe8, 0xfc, 0xa0, 0x42, 0xef, 0x8f, 0x94, 0x30, 0x70, 0xf4, 0x15, 0x3e, 0xb8,
-	0x98, 0x21, 0x34, 0x6a, 0x7b, 0xc2, 0x36, 0x4f, 0x31, 0xd3, 0xf5, 0x69, 0x42, 0x77, 0xd9, 0x18,
+	0x54, 0xad, 0x3a, 0x5a, 0xf6, 0xe6, 0xb7, 0x7f, 0xfc, 0xfd, 0x63, 0x6e, 0x03, 0xad, 0x97, 0x07,
-	0xed, 0xc1, 0x14, 0x6f, 0x32, 0xe2, 0x92, 0xb6, 0x91, 0x4d, 0x2c, 0xef, 0x38, 0xe4, 0x43, 0x11,
+	0x7d, 0x4a, 0xac, 0xd6, 0x30, 0x77, 0x57, 0xcb, 0x6e, 0x1c, 0x1b, 0xfe, 0x51, 0x56, 0x97, 0x76,
-	0x34, 0xea, 0x3e, 0x2c, 0xa4, 0x22, 0x52, 0xfb, 0xa1, 0x37, 0xa0, 0x10, 0xe9, 0xd4, 0xf8, 0xbe,
+	0xad, 0xa6, 0xff, 0xea, 0x92, 0x49, 0x4d, 0xfa, 0x14, 0xcd, 0xa6, 0x66, 0xc0, 0x90, 0xbd, 0xb4,
-	0x79, 0x7a, 0xd0, 0x12, 0x49, 0x70, 0x2e, 0x9a, 0x66, 0x3c, 0x7b, 0x7a, 0xd0, 0x5a, 0xfb, 0x01,
+	0x1a, 0xf5, 0xe9, 0xd0, 0x51, 0xd3, 0x77, 0xcb, 0xca, 0xa6, 0x26, 0x75, 0x20, 0x67, 0x54, 0x93,
-	0xe0, 0x5a, 0xbd, 0xab, 0x45, 0xc4, 0x8f, 0x7e, 0x55, 0x00, 0x9d, 0x4d, 0x54, 0xe8, 0x9d, 0x91,
+	0x3e, 0xaf, 0x2f, 0xaf, 0x46, 0x7e, 0xc0, 0xfc, 0x6b, 0x69, 0x33, 0x48, 0xf7, 0xf0, 0xad, 0x6c,
-	0x21, 0x0c, 0x4c, 0x7d, 0xa5, 0x77, 0x2f, 0xe4, 0xcb, 0xaf, 0x96, 0xba, 0xf9, 0xd5, 0x6f, 0x7f,
+	0xcc, 0x86, 0xcd, 0xf8, 0xc2, 0xb3, 0x2b, 0x61, 0x68, 0x95, 0xdb, 0x52, 0xe5, 0x87, 0x68, 0xf3,
-	0x7e, 0x97, 0xdb, 0x40, 0xeb, 0xd5, 0x41, 0x2f, 0xa9, 0xd5, 0x06, 0x0e, 0xf4, 0xd5, 0xaa, 0xee,
+	0xc2, 0x2a, 0xcd, 0xcf, 0xa9, 0xff, 0x94, 0xda, 0x41, 0x73, 0x2e, 0x93, 0xda, 0xe1, 0xa6, 0x91,
-	0x79, 0x52, 0xf9, 0xac, 0xf2, 0x37, 0x8b, 0x88, 0x26, 0xd9, 0xb9, 0x65, 0x8a, 0x26, 0x3d, 0x8b,
+	0x4d, 0xed, 0x08, 0x4f, 0xb1, 0x3f, 0x92, 0x6a, 0x9f, 0xa2, 0x27, 0x17, 0x54, 0xdb, 0x3b, 0xa5,
-	0x66, 0x8b, 0x66, 0x40, 0x92, 0xbd, 0x70, 0x34, 0xfc, 0xe5, 0x14, 0x47, 0x93, 0x68, 0x32, 0xb3,
+	0xd1, 0x6f, 0x16, 0xcc, 0xf7, 0xb9, 0x05, 0x7a, 0x94, 0x85, 0x5f, 0x8a, 0xf3, 0x14, 0x1e, 0x5f,
-	0x45, 0x93, 0x9a, 0x90, 0x33, 0x46, 0x93, 0x9e, 0xaf, 0x2f, 0x1e, 0x0d, 0x7b, 0xbf, 0xfd, 0xad,
+	0xbc, 0xf0, 0x8a, 0xef, 0x8e, 0xb7, 0x8d, 0xd5, 0xd6, 0x67, 0xbf, 0x9e, 0x14, 0xad, 0xd7, 0x27,
-	0x88, 0x62, 0x90, 0xde, 0xc2, 0x6c, 0x65, 0x53, 0x36, 0x2c, 0xc7, 0x97, 0x9e, 0x5e, 0x8a, 0x43,
+	0x45, 0xeb, 0xaf, 0x93, 0xa2, 0xf5, 0xfd, 0x69, 0x71, 0xec, 0xf5, 0x69, 0x71, 0xec, 0xcf, 0xd3,
-	0x44, 0xb9, 0xcd, 0xa2, 0x7c, 0x0f, 0x6d, 0x9e, 0x3b, 0x4a, 0xf9, 0x35, 0xf9, 0x0f, 0x8f, 0x76,
+	0xe2, 0xd8, 0x97, 0x9b, 0x01, 0xe1, 0x8d, 0x56, 0xad, 0xe4, 0xd1, 0xb0, 0xb3, 0x83, 0xfa, 0x73,
-	0x50, 0x9e, 0xcb, 0x14, 0xed, 0xf0, 0xa2, 0x91, 0x2d, 0xda, 0x11, 0x35, 0x45, 0x7d, 0x9f, 0x45,
+	0x9f, 0xf9, 0x5f, 0x97, 0x45, 0x37, 0x70, 0x52, 0x0e, 0x92, 0xd8, 0x4b, 0xfb, 0xf1, 0xa3, 0x36,
-	0xfb, 0x04, 0x3d, 0x3e, 0x67, 0xb4, 0xfd, 0x59, 0x1a, 0xfd, 0xa2, 0x40, 0x21, 0x51, 0x2d, 0xd0,
+	0x25, 0x7f, 0xb3, 0x78, 0xf8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xdb, 0xec, 0xac, 0x26,
-	0xc3, 0x2c, 0xfa, 0x52, 0x2a, 0x4f, 0xe9, 0xd1, 0xf9, 0x1d, 0x2f, 0x79, 0x76, 0x41, 0x47, 0x1a,
+	0x11, 0x00, 0x00,
-	0x6d, 0x7d, 0xf2, 0xf3, 0x49, 0x59, 0x79, 0x7d, 0x52, 0x56, 0xfe, 0x38, 0x29, 0x2b, 0xdf, 0x9c,
-	0x96, 0xc7, 0x5e, 0x9f, 0x96, 0xc7, 0x7e, 0x3f, 0x2d, 0x8f, 0x7d, 0xb6, 0x69, 0x91, 0xa0, 0x15,
-	0x36, 0x2a, 0x86, 0x6b, 0xc7, 0x2b, 0xf0, 0x3f, 0xf7, 0xa8, 0xf9, 0x45, 0x35, 0xda, 0x0d, 0xec,
-	0x57, 0x2d, 0xdf, 0x33, 0xd2, 0xbe, 0xfd, 0x34, 0x26, 0xd9, 0x27, 0x9b, 0x07, 0xff, 0x06, 0x00,
-	0x00, 0xff, 0xff, 0x52, 0x36, 0x45, 0xcc, 0x25, 0x12, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -2292,84 +2178,10 @@ func (m *MsgDescriptor) MarshalToSizedBuffer(dAtA []byte) (int, error) {
 	_ = i
 	var l int
 	_ = l
-	if m.Msg != nil {
+	if len(m.MsgTypeUrl) > 0 {
-		{
+		i -= len(m.MsgTypeUrl)
-			size := m.Msg.Size()
+		copy(dAtA[i:], m.MsgTypeUrl)
-			i -= size
+		i = encodeVarintReflection(dAtA, i, uint64(len(m.MsgTypeUrl)))
-			if _, err := m.Msg.MarshalTo(dAtA[i:]); err != nil {
-				return 0, err
-			}
-		}
-	}
-	return len(dAtA) - i, nil
-}
-
-func (m *MsgDescriptor_ServiceMsg) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *MsgDescriptor_ServiceMsg) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	if m.ServiceMsg != nil {
-		{
-			size, err := m.ServiceMsg.MarshalToSizedBuffer(dAtA[:i])
-			if err != nil {
-				return 0, err
-			}
-			i -= size
-			i = encodeVarintReflection(dAtA, i, uint64(size))
-		}
-		i--
-		dAtA[i] = 0xa
-	}
-	return len(dAtA) - i, nil
-}
-func (m *ServiceMsgDescriptor) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalToSizedBuffer(dAtA[:size])
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *ServiceMsgDescriptor) MarshalTo(dAtA []byte) (int, error) {
-	size := m.Size()
-	return m.MarshalToSizedBuffer(dAtA[:size])
-}
-
-func (m *ServiceMsgDescriptor) MarshalToSizedBuffer(dAtA []byte) (int, error) {
-	i := len(dAtA)
-	_ = i
-	var l int
-	_ = l
-	if len(m.ResponseFullname) > 0 {
-		i -= len(m.ResponseFullname)
-		copy(dAtA[i:], m.ResponseFullname)
-		i = encodeVarintReflection(dAtA, i, uint64(len(m.ResponseFullname)))
-		i--
-		dAtA[i] = 0x22
-	}
-	if len(m.RequestTypeUrl) > 0 {
-		i -= len(m.RequestTypeUrl)
-		copy(dAtA[i:], m.RequestTypeUrl)
-		i = encodeVarintReflection(dAtA, i, uint64(len(m.RequestTypeUrl)))
-		i--
-		dAtA[i] = 0x1a
-	}
-	if len(m.RequestRoute) > 0 {
-		i -= len(m.RequestRoute)
-		copy(dAtA[i:], m.RequestRoute)
-		i = encodeVarintReflection(dAtA, i, uint64(len(m.RequestRoute)))
-		i--
-		dAtA[i] = 0x12
-	}
-	if len(m.RequestFullname) > 0 {
-		i -= len(m.RequestFullname)
-		copy(dAtA[i:], m.RequestFullname)
-		i = encodeVarintReflection(dAtA, i, uint64(len(m.RequestFullname)))
 		i--
 		dAtA[i] = 0xa
 	}
@@ -3058,43 +2870,7 @@ func (m *MsgDescriptor) Size() (n int) {
 	}
 	var l int
 	_ = l
-	if m.Msg != nil {
+	l = len(m.MsgTypeUrl)
-		n += m.Msg.Size()
-	}
-	return n
-}
-
-func (m *MsgDescriptor_ServiceMsg) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	if m.ServiceMsg != nil {
-		l = m.ServiceMsg.Size()
-		n += 1 + l + sovReflection(uint64(l))
-	}
-	return n
-}
-func (m *ServiceMsgDescriptor) Size() (n int) {
-	if m == nil {
-		return 0
-	}
-	var l int
-	_ = l
-	l = len(m.RequestFullname)
-	if l > 0 {
-		n += 1 + l + sovReflection(uint64(l))
-	}
-	l = len(m.RequestRoute)
-	if l > 0 {
-		n += 1 + l + sovReflection(uint64(l))
-	}
-	l = len(m.RequestTypeUrl)
-	if l > 0 {
-		n += 1 + l + sovReflection(uint64(l))
-	}
-	l = len(m.ResponseFullname)
 	if l > 0 {
 		n += 1 + l + sovReflection(uint64(l))
 	}
@@ -4549,92 +4325,7 @@ func (m *MsgDescriptor) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ServiceMsg", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field MsgTypeUrl", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowReflection
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= int(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthReflection
-			}
-			postIndex := iNdEx + msglen
-			if postIndex < 0 {
-				return ErrInvalidLengthReflection
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			v := &ServiceMsgDescriptor{}
-			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			m.Msg = &MsgDescriptor_ServiceMsg{v}
-			iNdEx = postIndex
-		default:
-			iNdEx = preIndex
-			skippy, err := skipReflection(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if (skippy < 0) || (iNdEx+skippy) < 0 {
-				return ErrInvalidLengthReflection
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *ServiceMsgDescriptor) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowReflection
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= uint64(b&0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: ServiceMsgDescriptor: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: ServiceMsgDescriptor: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field RequestFullname", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -4662,103 +4353,7 @@ func (m *ServiceMsgDescriptor) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.RequestFullname = string(dAtA[iNdEx:postIndex])
+			m.MsgTypeUrl = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field RequestRoute", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowReflection
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthReflection
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthReflection
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.RequestRoute = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field RequestTypeUrl", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowReflection
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthReflection
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthReflection
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.RequestTypeUrl = string(dAtA[iNdEx:postIndex])
-			iNdEx = postIndex
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ResponseFullname", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowReflection
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= uint64(b&0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthReflection
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex < 0 {
-				return ErrInvalidLengthReflection
-			}
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.ResponseFullname = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex

types/msgservice/service_msg_client.go

@@ -1,47 +0,0 @@
-package msgservice
-
-import (
-	"context"
-	"fmt"
-
-	gogogrpc "github.com/gogo/protobuf/grpc"
-	grpc "google.golang.org/grpc"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-var _ gogogrpc.ClientConn = &ServiceMsgClientConn{}
-
-// ServiceMsgClientConn is an instance of grpc.ClientConn that is used to test building
-// transactions with MsgClient's. It is intended to be replaced by the work in
-// https://github.com/cosmos/cosmos-sdk/issues/7541 when that is ready.
-type ServiceMsgClientConn struct {
-	msgs []sdk.Msg
-}
-
-// Invoke implements the grpc ClientConn.Invoke method
-func (t *ServiceMsgClientConn) Invoke(_ context.Context, _ string, args, _ interface{}, _ ...grpc.CallOption) error {
-	req, ok := args.(sdk.Msg)
-	if !ok {
-		return fmt.Errorf("%T should implement %T", args, (*sdk.Msg)(nil))
-	}
-
-	err := req.ValidateBasic()
-	if err != nil {
-		return err
-	}
-
-	t.msgs = append(t.msgs, req)
-
-	return nil
-}
-
-// NewStream implements the grpc ClientConn.NewStream method
-func (t *ServiceMsgClientConn) NewStream(context.Context, *grpc.StreamDesc, string, ...grpc.CallOption) (grpc.ClientStream, error) {
-	return nil, fmt.Errorf("not supported")
-}
-
-// GetMsgs returns ServiceMsgClientConn.msgs
-func (t *ServiceMsgClientConn) GetMsgs() []sdk.Msg {
-	return t.msgs
-}

x/auth/client/rest/rest_test.go

@@ -226,7 +226,7 @@ func (s *IntegrationTestSuite) testQueryTx(txHeight int64, txHash, txRecipient s
 	}
 }
 
-func (s *IntegrationTestSuite) TestQueryTxWithStdTx() {
+func (s *IntegrationTestSuite) TestQueryLegacyStdTx() {
 	val0 := s.network.Validators[0]
 
 	// We broadcasted a StdTx in SetupSuite.
@@ -236,7 +236,7 @@ func (s *IntegrationTestSuite) TestQueryTxWithStdTx() {
 	s.testQueryTx(s.stdTxRes.Height, s.stdTxRes.TxHash, val0.Address.String())
 }
 
-func (s *IntegrationTestSuite) TestQueryTxWithServiceMsg() {
+func (s *IntegrationTestSuite) TestQueryTx() {
 	val := s.network.Validators[0]
 
 	sendTokens := sdk.NewInt64Coin(s.cfg.BondDenom, 10)

x/auth/legacy/legacytx/stdsign.go

@@ -53,10 +53,12 @@ type StdSignDoc struct {
 func StdSignBytes(chainID string, accnum, sequence, timeout uint64, fee StdFee, msgs []sdk.Msg, memo string) []byte {
 	msgsBytes := make([]json.RawMessage, 0, len(msgs))
 	for _, msg := range msgs {
-		// If msg is a legacy Msg, then GetSignBytes is implemented.
+		legacyMsg, ok := msg.(LegacyMsg)
-		// If msg is a ServiceMsg, then GetSignBytes has graceful support of
+		if !ok {
-		// calling GetSignBytes from its underlying Msg.
+			panic(fmt.Errorf("expected %T when using amino JSON", (*LegacyMsg)(nil)))
-		msgsBytes = append(msgsBytes, json.RawMessage(msg.(LegacyMsg).GetSignBytes()))
+		}
+
+		msgsBytes = append(msgsBytes, json.RawMessage(legacyMsg.GetSignBytes()))
 	}
 
 	bz, err := legacy.Cdc.MarshalJSON(StdSignDoc{

x/auth/vesting/client/cli/tx.go

@@ -9,7 +9,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 )
 
@@ -70,14 +69,8 @@ timestamp.`,
 			delayed, _ := cmd.Flags().GetBool(FlagDelayed)
 
 			msg := types.NewMsgCreateVestingAccount(clientCtx.GetFromAddress(), toAddr, amount, endTime, delayed)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.CreateVestingAccount(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 

x/authz/client/cli/tx.go

@@ -12,7 +12,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/version"
 	authclient "github.com/cosmos/cosmos-sdk/x/auth/client"
 	"github.com/cosmos/cosmos-sdk/x/authz"
@@ -166,14 +165,7 @@ Examples:
 				return err
 			}
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-			msgClient := authz.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Grant(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
 		},
 	}
 	flags.AddTxFlagsToCmd(cmd)
@@ -211,14 +203,7 @@ Example:
 			msgAuthorized := args[1]
 			msg := authz.NewMsgRevoke(granter, grantee, msgAuthorized)
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
-			msgClient := authz.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Revoke(cmd.Context(), &msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
 		},
 	}
 	flags.AddTxFlagsToCmd(cmd)
@@ -254,14 +239,8 @@ Example:
 				return err
 			}
 			msg := authz.NewMsgExec(grantee, theTx.GetMsgs())
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := authz.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Exec(cmd.Context(), &msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
 		},
 	}
 

x/authz/simulation/operations.go

@@ -1,7 +1,6 @@
 package simulation
 
 import (
-	"context"
 	"math/rand"
 	"strings"
 
@@ -11,7 +10,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	"github.com/cosmos/cosmos-sdk/x/authz/keeper"
@@ -107,15 +105,9 @@ func SimulateMsgGrantAuthorization(ak authz.AccountKeeper, bk authz.BankKeeper,
 			return simtypes.NoOpMsg(authz.ModuleName, TypeMsgGrantAuthorization, err.Error()), nil, err
 		}
 		txGen := simappparams.MakeTestEncodingConfig().TxConfig
-		svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-		authzMsgClient := authz.NewMsgClient(svcMsgClientConn)
-		_, err = authzMsgClient.Grant(context.Background(), msg)
-		if err != nil {
-			return simtypes.NoOpMsg(authz.ModuleName, TypeMsgGrantAuthorization, err.Error()), nil, err
-		}
 		tx, err := helpers.GenTx(
 			txGen,
-			svcMsgClientConn.GetMsgs(),
+			[]sdk.Msg{msg},
 			fees,
 			helpers.DefaultGenTxGas,
 			chainID,
@@ -130,9 +122,9 @@ func SimulateMsgGrantAuthorization(ak authz.AccountKeeper, bk authz.BankKeeper,
 
 		_, _, err = app.Deliver(txGen.TxEncoder(), tx)
 		if err != nil {
-			return simtypes.NoOpMsg(authz.ModuleName, sdk.MsgTypeURL(svcMsgClientConn.GetMsgs()[0]), "unable to deliver tx"), nil, err
+			return simtypes.NoOpMsg(authz.ModuleName, sdk.MsgTypeURL(msg), "unable to deliver tx"), nil, err
 		}
-		return simtypes.NewOperationMsg(svcMsgClientConn.GetMsgs()[0], true, "", protoCdc), nil, err
+		return simtypes.NewOperationMsg(msg, true, "", protoCdc), nil, err
 	}
 }
 
@@ -173,15 +165,9 @@ func SimulateMsgRevokeAuthorization(ak authz.AccountKeeper, bk authz.BankKeeper,
 		auth := targetGrant.GetAuthorization()
 		msg := authz.NewMsgRevoke(granterAddr, granteeAddr, auth.MsgTypeURL())
 		txGen := simappparams.MakeTestEncodingConfig().TxConfig
-		svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-		authzMsgClient := authz.NewMsgClient(svcMsgClientConn)
-		_, err = authzMsgClient.Revoke(context.Background(), &msg)
-		if err != nil {
-			return simtypes.NoOpMsg(authz.ModuleName, TypeMsgRevokeAuthorization, err.Error()), nil, err
-		}
 		tx, err := helpers.GenTx(
 			txGen,
-			svcMsgClientConn.GetMsgs(),
+			[]sdk.Msg{&msg},
 			fees,
 			helpers.DefaultGenTxGas,
 			chainID,
@@ -195,7 +181,7 @@ func SimulateMsgRevokeAuthorization(ak authz.AccountKeeper, bk authz.BankKeeper,
 		}
 
 		_, _, err = app.Deliver(txGen.TxEncoder(), tx)
-		return simtypes.NewOperationMsg(svcMsgClientConn.GetMsgs()[0], true, "", protoCdc), nil, err
+		return simtypes.NewOperationMsg(&msg, true, "", protoCdc), nil, err
 	}
 }
 
@@ -256,15 +242,9 @@ func SimulateMsgExecuteAuthorized(ak authz.AccountKeeper, bk authz.BankKeeper, k
 		}
 
 		txGen := simappparams.MakeTestEncodingConfig().TxConfig
-		svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-		authzMsgClient := authz.NewMsgClient(svcMsgClientConn)
-		_, err = authzMsgClient.Exec(context.Background(), &msg)
-		if err != nil {
-			return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExecDelegated, err.Error()), nil, err
-		}
 		tx, err := helpers.GenTx(
 			txGen,
-			svcMsgClientConn.GetMsgs(),
+			[]sdk.Msg{&msg},
 			fees,
 			helpers.DefaultGenTxGas,
 			chainID,
@@ -287,6 +267,6 @@ func SimulateMsgExecuteAuthorized(ak authz.AccountKeeper, bk authz.BankKeeper, k
 		if err != nil {
 			return simtypes.NoOpMsg(authz.ModuleName, TypeMsgExecDelegated, "unmarshal error"), nil, err
 		}
-		return simtypes.NewOperationMsg(svcMsgClientConn.GetMsgs()[0], true, "success", protoCdc), nil, nil
+		return simtypes.NewOperationMsg(&msg, true, "success", protoCdc), nil, nil
 	}
 }

x/bank/client/cli/tx.go

@@ -7,7 +7,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/x/bank/types"
 )
 
@@ -50,14 +49,8 @@ ignored as it is implied from [from_key_or_address].`,
 			}
 
 			msg := types.NewMsgSend(clientCtx.GetFromAddress(), toAddr, coins)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Send(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 

x/crisis/client/cli/tx.go

@@ -8,7 +8,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/x/crisis/types"
 )
 
@@ -50,14 +49,8 @@ func NewMsgVerifyInvariantTxCmd() *cobra.Command {
 			senderAddr := clientCtx.GetFromAddress()
 
 			msg := types.NewMsgVerifyInvariant(senderAddr, moduleName, route)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.VerifyInvariant(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 

x/distribution/client/cli/tx.go

@@ -11,7 +11,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/distribution/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -215,14 +214,8 @@ $ %s tx distribution set-withdraw-addr %s1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p
 			}
 
 			msg := types.NewMsgSetWithdrawAddress(delAddr, withdrawAddr)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.SetWithdrawAddress(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
@@ -257,14 +250,8 @@ $ %s tx distribution fund-community-pool 100uatom --from mykey
 			}
 
 			msg := types.NewMsgFundCommunityPool(amount, depositorAddr)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.FundCommunityPool(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
@@ -333,14 +320,7 @@ Where proposal.json contains:
 				return err
 			}
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-			msgClient := govtypes.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.SubmitProposal(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
 		},
 	}
 

x/evidence/types/msgs_test.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
 	"github.com/cosmos/cosmos-sdk/x/evidence/exported"
 	"github.com/cosmos/cosmos-sdk/x/evidence/types"
 )
@@ -51,8 +50,7 @@ func TestMsgSubmitEvidence(t *testing.T) {
 	}
 
 	for i, tc := range testCases {
-		require.Equal(t, tc.msg.(legacytx.LegacyMsg).Route(), types.RouterKey, "unexpected result for tc #%d", i)
+		require.Equal(t, sdk.MsgTypeURL(&types.MsgSubmitEvidence{}), sdk.MsgTypeURL(tc.msg), "unexpected result for tc #%d", i)
-		require.Equal(t, tc.msg.(legacytx.LegacyMsg).Type(), types.TypeMsgSubmitEvidence, "unexpected result for tc #%d", i)
 		require.Equal(t, tc.expectErr, tc.msg.ValidateBasic() != nil, "unexpected result for tc #%d", i)
 
 		if !tc.expectErr {

x/feegrant/client/cli/tx.go

@@ -11,7 +11,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/feegrant"
 )
@@ -168,14 +167,7 @@ Examples:
 				return err
 			}
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-			msgClient := feegrant.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.GrantAllowance(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
 		},
 	}
 
@@ -216,14 +208,8 @@ Example:
 			}
 
 			msg := feegrant.NewMsgRevokeAllowance(clientCtx.GetFromAddress(), grantee)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := feegrant.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.RevokeAllowance(cmd.Context(), &msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), &msg)
 		},
 	}
 

x/feegrant/simulation/operations.go

@@ -1,7 +1,6 @@
 package simulation
 
 import (
-	"context"
 	"math/rand"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
@@ -9,7 +8,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	simappparams "github.com/cosmos/cosmos-sdk/simapp/params"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/feegrant"
 	"github.com/cosmos/cosmos-sdk/x/feegrant/keeper"
@@ -100,15 +98,9 @@ func SimulateMsgGrantAllowance(ak feegrant.AccountKeeper, bk feegrant.BankKeeper
 			return simtypes.NoOpMsg(feegrant.ModuleName, TypeMsgGrantAllowance, err.Error()), nil, err
 		}
 		txGen := simappparams.MakeTestEncodingConfig().TxConfig
-		svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-		feegrantMsgClient := feegrant.NewMsgClient(svcMsgClientConn)
-		_, err = feegrantMsgClient.GrantAllowance(context.Background(), msg)
-		if err != nil {
-			return simtypes.NoOpMsg(feegrant.ModuleName, TypeMsgGrantAllowance, err.Error()), nil, err
-		}
 		tx, err := helpers.GenTx(
 			txGen,
-			svcMsgClientConn.GetMsgs(),
+			[]sdk.Msg{msg},
 			fees,
 			helpers.DefaultGenTxGas,
 			chainID,
@@ -124,9 +116,9 @@ func SimulateMsgGrantAllowance(ak feegrant.AccountKeeper, bk feegrant.BankKeeper
 		_, _, err = app.Deliver(txGen.TxEncoder(), tx)
 
 		if err != nil {
-			return simtypes.NoOpMsg(feegrant.ModuleName, sdk.MsgTypeURL(svcMsgClientConn.GetMsgs()[0]), "unable to deliver tx"), nil, err
+			return simtypes.NoOpMsg(feegrant.ModuleName, sdk.MsgTypeURL(msg), "unable to deliver tx"), nil, err
 		}
-		return simtypes.NewOperationMsg(svcMsgClientConn.GetMsgs()[0], true, "", protoCdc), nil, err
+		return simtypes.NewOperationMsg(msg, true, "", protoCdc), nil, err
 	}
 }
 
@@ -174,16 +166,9 @@ func SimulateMsgRevokeAllowance(ak feegrant.AccountKeeper, bk feegrant.BankKeepe
 		msg := feegrant.NewMsgRevokeAllowance(granterAddr, granteeAddr)
 
 		txGen := simappparams.MakeTestEncodingConfig().TxConfig
-		svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-		feegrantMsgClient := feegrant.NewMsgClient(svcMsgClientConn)
-		_, err = feegrantMsgClient.RevokeAllowance(context.Background(), &msg)
-		if err != nil {
-			return simtypes.NoOpMsg(feegrant.ModuleName, TypeMsgGrantAllowance, err.Error()), nil, err
-		}
-
 		tx, err := helpers.GenTx(
 			txGen,
-			svcMsgClientConn.GetMsgs(),
+			[]sdk.Msg{&msg},
 			fees,
 			helpers.DefaultGenTxGas,
 			chainID,
@@ -197,6 +182,6 @@ func SimulateMsgRevokeAllowance(ak feegrant.AccountKeeper, bk feegrant.BankKeepe
 		}
 
 		_, _, err = app.Deliver(txGen.TxEncoder(), tx)
-		return simtypes.NewOperationMsg(svcMsgClientConn.GetMsgs()[0], true, "", protoCdc), nil, err
+		return simtypes.NewOperationMsg(&msg, true, "", protoCdc), nil, err
 	}
 }

x/genutil/client/testutil/suite.go

@@ -15,7 +15,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/testutil/network"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -85,7 +84,7 @@ func (s *IntegrationTestSuite) TestGenTxCmd() {
 	msgs := tx.GetMsgs()
 	s.Require().Len(msgs, 1)
 
-	s.Require().Equal(types.TypeMsgCreateValidator, msgs[0].(legacytx.LegacyMsg).Type())
+	s.Require().Equal(sdk.MsgTypeURL(&types.MsgCreateValidator{}), sdk.MsgTypeURL(msgs[0]))
 	s.Require().Equal([]sdk.AccAddress{val.Address}, msgs[0].GetSigners())
 	s.Require().Equal(amount, msgs[0].(*types.MsgCreateValidator).Value)
 	err = tx.ValidateBasic()

x/gov/client/cli/tx.go

@@ -11,7 +11,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/version"
 	govutils "github.com/cosmos/cosmos-sdk/x/gov/client/utils"
 	"github.com/cosmos/cosmos-sdk/x/gov/types"
@@ -127,14 +126,7 @@ $ %s tx gov submit-proposal --title="Test Proposal" --description="My awesome pr
 				return fmt.Errorf("invalid message: %w", err)
 			}
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.SubmitProposal(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
 		},
 	}
 
@@ -186,14 +178,8 @@ $ %s tx gov deposit 1 10stake --from mykey
 			}
 
 			msg := types.NewMsgDeposit(from, proposalID, amount)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Deposit(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
@@ -240,14 +226,8 @@ $ %s tx gov vote 1 yes --from mykey
 
 			// Build vote message and run basic validation
 			msg := types.NewMsgVote(from, proposalID, byteVoteOption)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Vote(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 

x/params/client/cli/tx.go

@@ -9,7 +9,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/version"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	paramscutils "github.com/cosmos/cosmos-sdk/x/params/client/utils"
@@ -81,14 +80,8 @@ Where proposal.json contains:
 			if err != nil {
 				return err
 			}
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := govtypes.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.SubmitProposal(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 }

x/slashing/client/cli/tx.go

@@ -7,7 +7,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/x/slashing/types"
 )
 
@@ -42,14 +41,8 @@ $ <appd> tx slashing unjail --from mykey
 			valAddr := clientCtx.GetFromAddress()
 
 			msg := types.NewMsgUnjail(sdk.ValAddress(valAddr))
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Unjail(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 

x/staking/client/cli/tx.go

@@ -13,7 +13,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/version"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 )
@@ -66,14 +65,7 @@ func NewCreateValidatorCmd() *cobra.Command {
 				return err
 			}
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, msg)
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.CreateValidator(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxWithFactory(clientCtx, txf, svcMsgClientConn.GetMsgs()...)
 		},
 	}
 
@@ -137,14 +129,8 @@ func NewEditValidatorCmd() *cobra.Command {
 			}
 
 			msg := types.NewMsgEditValidator(sdk.ValAddress(valAddr), description, newRate, newMinSelfDelegation)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.EditValidator(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
@@ -189,14 +175,8 @@ $ %s tx staking delegate %s1l2rsakp388kuv9k8qzq6lrm9taddae7fpx59wm 1000stake --f
 			}
 
 			msg := types.NewMsgDelegate(delAddr, valAddr, amount)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Delegate(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
@@ -243,14 +223,8 @@ $ %s tx staking redelegate %s1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj %s1l2rsakp3
 			}
 
 			msg := types.NewMsgBeginRedelegate(delAddr, valSrcAddr, valDstAddr, amount)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.BeginRedelegate(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 
@@ -292,14 +266,8 @@ $ %s tx staking unbond %s1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhffj 100stake --from
 			}
 
 			msg := types.NewMsgUndelegate(delAddr, valAddr, amount)
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
-			msgClient := types.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.Undelegate(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
 
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
 		},
 	}
 

x/upgrade/client/cli/tx.go

@@ -6,7 +6,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/msgservice"
 	"github.com/cosmos/cosmos-sdk/x/gov/client/cli"
 	gov "github.com/cosmos/cosmos-sdk/x/gov/types"
 	"github.com/cosmos/cosmos-sdk/x/upgrade/types"
@@ -63,14 +62,7 @@ func NewCmdSubmitUpgradeProposal() *cobra.Command {
 				return err
 			}
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-			msgClient := gov.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.SubmitProposal(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
 		},
 	}
 
@@ -124,14 +116,7 @@ func NewCmdSubmitCancelUpgradeProposal() *cobra.Command {
 				return err
 			}
 
-			svcMsgClientConn := &msgservice.ServiceMsgClientConn{}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-			msgClient := gov.NewMsgClient(svcMsgClientConn)
-			_, err = msgClient.SubmitProposal(cmd.Context(), msg)
-			if err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), svcMsgClientConn.GetMsgs()...)
 		},
 	}