From 3a202cae718da40509a707639f77402fdbe55b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CDongLieu=E2=80=9D?= Date: Mon, 2 Dec 2024 17:05:45 +0700 Subject: [PATCH] proto MsgExecute --- api/cosmos/accounts/v1/tx.pulsar.go | 391 +++++++++++-------- x/accounts/msg_server.go | 2 +- x/accounts/proto/cosmos/accounts/v1/tx.proto | 6 +- x/accounts/v1/tx.pb.go | 186 +++++---- 4 files changed, 345 insertions(+), 240 deletions(-) diff --git a/api/cosmos/accounts/v1/tx.pulsar.go b/api/cosmos/accounts/v1/tx.pulsar.go index a2cc85087871..da72e6041b7b 100644 --- a/api/cosmos/accounts/v1/tx.pulsar.go +++ b/api/cosmos/accounts/v1/tx.pulsar.go @@ -1202,63 +1202,64 @@ func (x *fastReflection_MsgInitResponse) ProtoMethods() *protoiface.Methods { } } -var _ protoreflect.List = (*_MsgExecute_4_list)(nil) +var _ protoreflect.List = (*_MsgExecute_5_list)(nil) -type _MsgExecute_4_list struct { +type _MsgExecute_5_list struct { list *[]*v1beta1.Coin } -func (x *_MsgExecute_4_list) Len() int { +func (x *_MsgExecute_5_list) Len() int { if x.list == nil { return 0 } return len(*x.list) } -func (x *_MsgExecute_4_list) Get(i int) protoreflect.Value { +func (x *_MsgExecute_5_list) Get(i int) protoreflect.Value { return protoreflect.ValueOfMessage((*x.list)[i].ProtoReflect()) } -func (x *_MsgExecute_4_list) Set(i int, value protoreflect.Value) { +func (x *_MsgExecute_5_list) Set(i int, value protoreflect.Value) { valueUnwrapped := value.Message() concreteValue := valueUnwrapped.Interface().(*v1beta1.Coin) (*x.list)[i] = concreteValue } -func (x *_MsgExecute_4_list) Append(value protoreflect.Value) { +func (x *_MsgExecute_5_list) Append(value protoreflect.Value) { valueUnwrapped := value.Message() concreteValue := valueUnwrapped.Interface().(*v1beta1.Coin) *x.list = append(*x.list, concreteValue) } -func (x *_MsgExecute_4_list) AppendMutable() protoreflect.Value { +func (x *_MsgExecute_5_list) AppendMutable() protoreflect.Value { v := new(v1beta1.Coin) *x.list = append(*x.list, v) return protoreflect.ValueOfMessage(v.ProtoReflect()) } -func (x *_MsgExecute_4_list) Truncate(n int) { +func (x *_MsgExecute_5_list) Truncate(n int) { for i := n; i < len(*x.list); i++ { (*x.list)[i] = nil } *x.list = (*x.list)[:n] } -func (x *_MsgExecute_4_list) NewElement() protoreflect.Value { +func (x *_MsgExecute_5_list) NewElement() protoreflect.Value { v := new(v1beta1.Coin) return protoreflect.ValueOfMessage(v.ProtoReflect()) } -func (x *_MsgExecute_4_list) IsValid() bool { +func (x *_MsgExecute_5_list) IsValid() bool { return x.list != nil } var ( - md_MsgExecute protoreflect.MessageDescriptor - fd_MsgExecute_sender protoreflect.FieldDescriptor - fd_MsgExecute_target protoreflect.FieldDescriptor - fd_MsgExecute_message protoreflect.FieldDescriptor - fd_MsgExecute_funds protoreflect.FieldDescriptor + md_MsgExecute protoreflect.MessageDescriptor + fd_MsgExecute_sender protoreflect.FieldDescriptor + fd_MsgExecute_target protoreflect.FieldDescriptor + fd_MsgExecute_json_message protoreflect.FieldDescriptor + fd_MsgExecute_execute_msg_type_url protoreflect.FieldDescriptor + fd_MsgExecute_funds protoreflect.FieldDescriptor ) func init() { @@ -1266,7 +1267,8 @@ func init() { md_MsgExecute = File_cosmos_accounts_v1_tx_proto.Messages().ByName("MsgExecute") fd_MsgExecute_sender = md_MsgExecute.Fields().ByName("sender") fd_MsgExecute_target = md_MsgExecute.Fields().ByName("target") - fd_MsgExecute_message = md_MsgExecute.Fields().ByName("message") + fd_MsgExecute_json_message = md_MsgExecute.Fields().ByName("json_message") + fd_MsgExecute_execute_msg_type_url = md_MsgExecute.Fields().ByName("execute_msg_type_url") fd_MsgExecute_funds = md_MsgExecute.Fields().ByName("funds") } @@ -1347,14 +1349,20 @@ func (x *fastReflection_MsgExecute) Range(f func(protoreflect.FieldDescriptor, p return } } - if x.Message != nil { - value := protoreflect.ValueOfMessage(x.Message.ProtoReflect()) - if !f(fd_MsgExecute_message, value) { + if x.JsonMessage != "" { + value := protoreflect.ValueOfString(x.JsonMessage) + if !f(fd_MsgExecute_json_message, value) { + return + } + } + if x.ExecuteMsgTypeUrl != "" { + value := protoreflect.ValueOfString(x.ExecuteMsgTypeUrl) + if !f(fd_MsgExecute_execute_msg_type_url, value) { return } } if len(x.Funds) != 0 { - value := protoreflect.ValueOfList(&_MsgExecute_4_list{list: &x.Funds}) + value := protoreflect.ValueOfList(&_MsgExecute_5_list{list: &x.Funds}) if !f(fd_MsgExecute_funds, value) { return } @@ -1378,8 +1386,10 @@ func (x *fastReflection_MsgExecute) Has(fd protoreflect.FieldDescriptor) bool { return x.Sender != "" case "cosmos.accounts.v1.MsgExecute.target": return x.Target != "" - case "cosmos.accounts.v1.MsgExecute.message": - return x.Message != nil + case "cosmos.accounts.v1.MsgExecute.json_message": + return x.JsonMessage != "" + case "cosmos.accounts.v1.MsgExecute.execute_msg_type_url": + return x.ExecuteMsgTypeUrl != "" case "cosmos.accounts.v1.MsgExecute.funds": return len(x.Funds) != 0 default: @@ -1402,8 +1412,10 @@ func (x *fastReflection_MsgExecute) Clear(fd protoreflect.FieldDescriptor) { x.Sender = "" case "cosmos.accounts.v1.MsgExecute.target": x.Target = "" - case "cosmos.accounts.v1.MsgExecute.message": - x.Message = nil + case "cosmos.accounts.v1.MsgExecute.json_message": + x.JsonMessage = "" + case "cosmos.accounts.v1.MsgExecute.execute_msg_type_url": + x.ExecuteMsgTypeUrl = "" case "cosmos.accounts.v1.MsgExecute.funds": x.Funds = nil default: @@ -1428,14 +1440,17 @@ func (x *fastReflection_MsgExecute) Get(descriptor protoreflect.FieldDescriptor) case "cosmos.accounts.v1.MsgExecute.target": value := x.Target return protoreflect.ValueOfString(value) - case "cosmos.accounts.v1.MsgExecute.message": - value := x.Message - return protoreflect.ValueOfMessage(value.ProtoReflect()) + case "cosmos.accounts.v1.MsgExecute.json_message": + value := x.JsonMessage + return protoreflect.ValueOfString(value) + case "cosmos.accounts.v1.MsgExecute.execute_msg_type_url": + value := x.ExecuteMsgTypeUrl + return protoreflect.ValueOfString(value) case "cosmos.accounts.v1.MsgExecute.funds": if len(x.Funds) == 0 { - return protoreflect.ValueOfList(&_MsgExecute_4_list{}) + return protoreflect.ValueOfList(&_MsgExecute_5_list{}) } - listValue := &_MsgExecute_4_list{list: &x.Funds} + listValue := &_MsgExecute_5_list{list: &x.Funds} return protoreflect.ValueOfList(listValue) default: if descriptor.IsExtension() { @@ -1461,11 +1476,13 @@ func (x *fastReflection_MsgExecute) Set(fd protoreflect.FieldDescriptor, value p x.Sender = value.Interface().(string) case "cosmos.accounts.v1.MsgExecute.target": x.Target = value.Interface().(string) - case "cosmos.accounts.v1.MsgExecute.message": - x.Message = value.Message().Interface().(*anypb.Any) + case "cosmos.accounts.v1.MsgExecute.json_message": + x.JsonMessage = value.Interface().(string) + case "cosmos.accounts.v1.MsgExecute.execute_msg_type_url": + x.ExecuteMsgTypeUrl = value.Interface().(string) case "cosmos.accounts.v1.MsgExecute.funds": lv := value.List() - clv := lv.(*_MsgExecute_4_list) + clv := lv.(*_MsgExecute_5_list) x.Funds = *clv.list default: if fd.IsExtension() { @@ -1487,21 +1504,20 @@ func (x *fastReflection_MsgExecute) Set(fd protoreflect.FieldDescriptor, value p // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgExecute) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "cosmos.accounts.v1.MsgExecute.message": - if x.Message == nil { - x.Message = new(anypb.Any) - } - return protoreflect.ValueOfMessage(x.Message.ProtoReflect()) case "cosmos.accounts.v1.MsgExecute.funds": if x.Funds == nil { x.Funds = []*v1beta1.Coin{} } - value := &_MsgExecute_4_list{list: &x.Funds} + value := &_MsgExecute_5_list{list: &x.Funds} return protoreflect.ValueOfList(value) case "cosmos.accounts.v1.MsgExecute.sender": panic(fmt.Errorf("field sender of message cosmos.accounts.v1.MsgExecute is not mutable")) case "cosmos.accounts.v1.MsgExecute.target": panic(fmt.Errorf("field target of message cosmos.accounts.v1.MsgExecute is not mutable")) + case "cosmos.accounts.v1.MsgExecute.json_message": + panic(fmt.Errorf("field json_message of message cosmos.accounts.v1.MsgExecute is not mutable")) + case "cosmos.accounts.v1.MsgExecute.execute_msg_type_url": + panic(fmt.Errorf("field execute_msg_type_url of message cosmos.accounts.v1.MsgExecute is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.v1.MsgExecute")) @@ -1519,12 +1535,13 @@ func (x *fastReflection_MsgExecute) NewField(fd protoreflect.FieldDescriptor) pr return protoreflect.ValueOfString("") case "cosmos.accounts.v1.MsgExecute.target": return protoreflect.ValueOfString("") - case "cosmos.accounts.v1.MsgExecute.message": - m := new(anypb.Any) - return protoreflect.ValueOfMessage(m.ProtoReflect()) + case "cosmos.accounts.v1.MsgExecute.json_message": + return protoreflect.ValueOfString("") + case "cosmos.accounts.v1.MsgExecute.execute_msg_type_url": + return protoreflect.ValueOfString("") case "cosmos.accounts.v1.MsgExecute.funds": list := []*v1beta1.Coin{} - return protoreflect.ValueOfList(&_MsgExecute_4_list{list: &list}) + return protoreflect.ValueOfList(&_MsgExecute_5_list{list: &list}) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.accounts.v1.MsgExecute")) @@ -1602,8 +1619,12 @@ func (x *fastReflection_MsgExecute) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - if x.Message != nil { - l = options.Size(x.Message) + l = len(x.JsonMessage) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } + l = len(x.ExecuteMsgTypeUrl) + if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } if len(x.Funds) > 0 { @@ -1654,20 +1675,20 @@ func (x *fastReflection_MsgExecute) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } } - if x.Message != nil { - encoded, err := options.Marshal(x.Message) - if err != nil { - return protoiface.MarshalOutput{ - NoUnkeyedLiterals: input.NoUnkeyedLiterals, - Buf: input.Buf, - }, err - } - i -= len(encoded) - copy(dAtA[i:], encoded) - i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) + if len(x.ExecuteMsgTypeUrl) > 0 { + i -= len(x.ExecuteMsgTypeUrl) + copy(dAtA[i:], x.ExecuteMsgTypeUrl) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.ExecuteMsgTypeUrl))) + i-- + dAtA[i] = 0x22 + } + if len(x.JsonMessage) > 0 { + i -= len(x.JsonMessage) + copy(dAtA[i:], x.JsonMessage) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.JsonMessage))) i-- dAtA[i] = 0x1a } @@ -1800,9 +1821,9 @@ func (x *fastReflection_MsgExecute) ProtoMethods() *protoiface.Methods { iNdEx = postIndex case 3: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Message", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field JsonMessage", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow @@ -1812,29 +1833,57 @@ func (x *fastReflection_MsgExecute) ProtoMethods() *protoiface.Methods { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength } if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - if x.Message == nil { - x.Message = &anypb.Any{} + x.JsonMessage = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field ExecuteMsgTypeUrl", wireType) } - if err := options.Unmarshal(dAtA[iNdEx:postIndex], x.Message); err != nil { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.ExecuteMsgTypeUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Funds", wireType) } @@ -4351,10 +4400,11 @@ type MsgExecute struct { // target is the address of the account to be executed. Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"` // message is the message to be sent to the account. - Message *anypb.Any `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` + JsonMessage string `protobuf:"bytes,3,opt,name=json_message,json=jsonMessage,proto3" json:"json_message,omitempty"` + ExecuteMsgTypeUrl string `protobuf:"bytes,4,opt,name=execute_msg_type_url,json=executeMsgTypeUrl,proto3" json:"execute_msg_type_url,omitempty"` // funds contains the coins that the account wants to // send alongside the request. - Funds []*v1beta1.Coin `protobuf:"bytes,4,rep,name=funds,proto3" json:"funds,omitempty"` + Funds []*v1beta1.Coin `protobuf:"bytes,5,rep,name=funds,proto3" json:"funds,omitempty"` } func (x *MsgExecute) Reset() { @@ -4391,11 +4441,18 @@ func (x *MsgExecute) GetTarget() string { return "" } -func (x *MsgExecute) GetMessage() *anypb.Any { +func (x *MsgExecute) GetJsonMessage() string { if x != nil { - return x.Message + return x.JsonMessage } - return nil + return "" +} + +func (x *MsgExecute) GetExecuteMsgTypeUrl() string { + if x != nil { + return x.ExecuteMsgTypeUrl + } + return "" } func (x *MsgExecute) GetFunds() []*v1beta1.Coin { @@ -4651,87 +4708,90 @@ var file_cosmos_accounts_v1_tx_proto_rawDesc = []byte{ 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0xdc, 0x01, 0x0a, 0x0a, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x12, 0x16, + 0x80, 0x02, 0x0a, 0x0a, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x2e, - 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x61, - 0x0a, 0x05, 0x66, 0x75, 0x6e, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, - 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, - 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x05, 0x66, 0x75, 0x6e, 0x64, - 0x73, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x46, - 0x0a, 0x12, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x08, 0x72, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4c, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, - 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, - 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x75, 0x6e, - 0x64, 0x6c, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x3a, 0x0c, 0x82, 0xe7, 0xb0, 0x2a, 0x07, 0x62, 0x75, 0x6e, - 0x64, 0x6c, 0x65, 0x72, 0x22, 0xe1, 0x02, 0x0a, 0x11, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x64, - 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, 0x0a, 0x17, 0x61, 0x75, - 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x67, 0x61, 0x73, - 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x15, 0x61, 0x75, 0x74, - 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x61, 0x73, 0x55, 0x73, - 0x65, 0x64, 0x12, 0x37, 0x0a, 0x18, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x5f, 0x70, 0x61, - 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x15, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x50, 0x61, 0x79, - 0x6d, 0x65, 0x6e, 0x74, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, 0x50, 0x0a, 0x19, 0x62, - 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x5f, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x72, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x17, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x50, 0x61, 0x79, - 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x12, 0x2c, 0x0a, - 0x12, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, - 0x73, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x65, 0x78, 0x65, 0x63, 0x75, - 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, 0x45, 0x0a, 0x13, 0x65, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x12, - 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x5f, 0x0a, 0x18, 0x4d, 0x73, 0x67, 0x45, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x75, 0x6e, - 0x64, 0x6c, 0x65, 0x64, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x09, - 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x32, 0x8e, 0x02, 0x0a, 0x03, 0x4d, 0x73, - 0x67, 0x12, 0x48, 0x0a, 0x04, 0x49, 0x6e, 0x69, 0x74, 0x12, 0x1b, 0x2e, 0x63, 0x6f, 0x73, 0x6d, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x21, + 0x0a, 0x0c, 0x6a, 0x73, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6a, 0x73, 0x6f, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, + 0x65, 0x12, 0x2f, 0x0a, 0x14, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x5f, 0x6d, 0x73, 0x67, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x11, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x4d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x55, + 0x72, 0x6c, 0x12, 0x61, 0x0a, 0x05, 0x66, 0x75, 0x6e, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, + 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, + 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, + 0x64, 0x6b, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x05, + 0x66, 0x75, 0x6e, 0x64, 0x73, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x22, 0x46, 0x0a, 0x12, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x30, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, + 0x52, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4c, 0x0a, 0x10, 0x4d, 0x73, + 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, 0x18, + 0x0a, 0x07, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x07, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x78, 0x73, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x03, 0x74, 0x78, 0x73, 0x3a, 0x0c, 0x82, 0xe7, 0xb0, 0x2a, + 0x07, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x22, 0xe1, 0x02, 0x0a, 0x11, 0x42, 0x75, 0x6e, + 0x64, 0x6c, 0x65, 0x64, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x36, + 0x0a, 0x17, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, + 0x15, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x47, + 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, 0x37, 0x0a, 0x18, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, + 0x72, 0x5f, 0x70, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x75, 0x73, + 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x15, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, + 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, + 0x50, 0x0a, 0x19, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x5f, 0x70, 0x61, 0x79, 0x6d, 0x65, + 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x17, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, + 0x72, 0x50, 0x61, 0x79, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x67, + 0x61, 0x73, 0x5f, 0x75, 0x73, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x65, + 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x47, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x12, + 0x45, 0x0a, 0x13, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x72, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, + 0x6e, 0x79, 0x52, 0x12, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x5f, 0x0a, 0x18, + 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x6f, + 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, + 0x2e, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x64, 0x54, 0x78, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x73, 0x32, 0x8e, 0x02, + 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x48, 0x0a, 0x04, 0x49, 0x6e, 0x69, 0x74, 0x12, 0x1b, 0x2e, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, + 0x4d, 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x51, 0x0a, 0x07, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, + 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x1a, 0x26, 0x2e, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, + 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x63, 0x0a, 0x0d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, + 0x64, 0x6c, 0x65, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, + 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, + 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x1a, 0x2c, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x49, 0x6e, 0x69, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x49, - 0x6e, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x07, 0x45, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x12, 0x1e, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x1a, 0x26, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, - 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x63, - 0x0a, 0x0d, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x12, - 0x24, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, - 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x1a, 0x2c, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0xbb, 0x01, 0x0a, 0x16, 0x63, - 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, - 0x5a, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x76, 0x31, - 0xa2, 0x02, 0x03, 0x43, 0x41, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, - 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x43, 0x6f, - 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x56, 0x31, - 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x67, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x42, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0xbb, + 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, + 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2f, 0x76, 0x31, 0x3b, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x73, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x41, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x2e, 0x56, 0x31, 0xca, + 0x02, 0x12, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x73, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x41, 0x63, + 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, + 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -4761,23 +4821,22 @@ var file_cosmos_accounts_v1_tx_proto_goTypes = []interface{}{ var file_cosmos_accounts_v1_tx_proto_depIdxs = []int32{ 7, // 0: cosmos.accounts.v1.MsgInit.funds:type_name -> cosmos.base.v1beta1.Coin 8, // 1: cosmos.accounts.v1.MsgInitResponse.response:type_name -> google.protobuf.Any - 8, // 2: cosmos.accounts.v1.MsgExecute.message:type_name -> google.protobuf.Any - 7, // 3: cosmos.accounts.v1.MsgExecute.funds:type_name -> cosmos.base.v1beta1.Coin - 8, // 4: cosmos.accounts.v1.MsgExecuteResponse.response:type_name -> google.protobuf.Any - 8, // 5: cosmos.accounts.v1.BundledTxResponse.bundler_payment_responses:type_name -> google.protobuf.Any - 8, // 6: cosmos.accounts.v1.BundledTxResponse.execution_responses:type_name -> google.protobuf.Any - 5, // 7: cosmos.accounts.v1.MsgExecuteBundleResponse.responses:type_name -> cosmos.accounts.v1.BundledTxResponse - 0, // 8: cosmos.accounts.v1.Msg.Init:input_type -> cosmos.accounts.v1.MsgInit - 2, // 9: cosmos.accounts.v1.Msg.Execute:input_type -> cosmos.accounts.v1.MsgExecute - 4, // 10: cosmos.accounts.v1.Msg.ExecuteBundle:input_type -> cosmos.accounts.v1.MsgExecuteBundle - 1, // 11: cosmos.accounts.v1.Msg.Init:output_type -> cosmos.accounts.v1.MsgInitResponse - 3, // 12: cosmos.accounts.v1.Msg.Execute:output_type -> cosmos.accounts.v1.MsgExecuteResponse - 6, // 13: cosmos.accounts.v1.Msg.ExecuteBundle:output_type -> cosmos.accounts.v1.MsgExecuteBundleResponse - 11, // [11:14] is the sub-list for method output_type - 8, // [8:11] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 7, // 2: cosmos.accounts.v1.MsgExecute.funds:type_name -> cosmos.base.v1beta1.Coin + 8, // 3: cosmos.accounts.v1.MsgExecuteResponse.response:type_name -> google.protobuf.Any + 8, // 4: cosmos.accounts.v1.BundledTxResponse.bundler_payment_responses:type_name -> google.protobuf.Any + 8, // 5: cosmos.accounts.v1.BundledTxResponse.execution_responses:type_name -> google.protobuf.Any + 5, // 6: cosmos.accounts.v1.MsgExecuteBundleResponse.responses:type_name -> cosmos.accounts.v1.BundledTxResponse + 0, // 7: cosmos.accounts.v1.Msg.Init:input_type -> cosmos.accounts.v1.MsgInit + 2, // 8: cosmos.accounts.v1.Msg.Execute:input_type -> cosmos.accounts.v1.MsgExecute + 4, // 9: cosmos.accounts.v1.Msg.ExecuteBundle:input_type -> cosmos.accounts.v1.MsgExecuteBundle + 1, // 10: cosmos.accounts.v1.Msg.Init:output_type -> cosmos.accounts.v1.MsgInitResponse + 3, // 11: cosmos.accounts.v1.Msg.Execute:output_type -> cosmos.accounts.v1.MsgExecuteResponse + 6, // 12: cosmos.accounts.v1.Msg.ExecuteBundle:output_type -> cosmos.accounts.v1.MsgExecuteBundleResponse + 10, // [10:13] is the sub-list for method output_type + 7, // [7:10] is the sub-list for method input_type + 7, // [7:7] is the sub-list for extension type_name + 7, // [7:7] is the sub-list for extension extendee + 0, // [0:7] is the sub-list for field type_name } func init() { file_cosmos_accounts_v1_tx_proto_init() } diff --git a/x/accounts/msg_server.go b/x/accounts/msg_server.go index 2ee9a9334a95..678cef2a0f51 100644 --- a/x/accounts/msg_server.go +++ b/x/accounts/msg_server.go @@ -66,7 +66,7 @@ func (m msgServer) Execute(ctx context.Context, execute *v1.MsgExecute) (*v1.Msg } // decode message bytes into the concrete boxed message type - req, err := implementation.UnpackAnyRaw(execute.Message) + req, err := implementation.EncodeMsgJSONToProto(execute.JsonMessage) if err != nil { return nil, err } diff --git a/x/accounts/proto/cosmos/accounts/v1/tx.proto b/x/accounts/proto/cosmos/accounts/v1/tx.proto index fdc989bd1a45..437a20ffcb26 100644 --- a/x/accounts/proto/cosmos/accounts/v1/tx.proto +++ b/x/accounts/proto/cosmos/accounts/v1/tx.proto @@ -57,10 +57,12 @@ message MsgExecute { // target is the address of the account to be executed. string target = 2; // message is the message to be sent to the account. - google.protobuf.Any message = 3; + string json_message = 3; + + string execute_msg_type_url = 4; // funds contains the coins that the account wants to // send alongside the request. - repeated cosmos.base.v1beta1.Coin funds = 4 + repeated cosmos.base.v1beta1.Coin funds = 5 [(gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", (gogoproto.nullable) = false]; } diff --git a/x/accounts/v1/tx.pb.go b/x/accounts/v1/tx.pb.go index d888346e344a..66b7bbacb554 100644 --- a/x/accounts/v1/tx.pb.go +++ b/x/accounts/v1/tx.pb.go @@ -169,10 +169,11 @@ type MsgExecute struct { // target is the address of the account to be executed. Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"` // message is the message to be sent to the account. - Message *any.Any `protobuf:"bytes,3,opt,name=message,proto3" json:"message,omitempty"` + JsonMessage string `protobuf:"bytes,3,opt,name=json_message,json=jsonMessage,proto3" json:"json_message,omitempty"` + ExecuteMsgTypeUrl string `protobuf:"bytes,4,opt,name=execute_msg_type_url,json=executeMsgTypeUrl,proto3" json:"execute_msg_type_url,omitempty"` // funds contains the coins that the account wants to // send alongside the request. - Funds github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=funds,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"funds"` + Funds github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,5,rep,name=funds,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"funds"` } func (m *MsgExecute) Reset() { *m = MsgExecute{} } @@ -222,11 +223,18 @@ func (m *MsgExecute) GetTarget() string { return "" } -func (m *MsgExecute) GetMessage() *any.Any { +func (m *MsgExecute) GetJsonMessage() string { if m != nil { - return m.Message + return m.JsonMessage } - return nil + return "" +} + +func (m *MsgExecute) GetExecuteMsgTypeUrl() string { + if m != nil { + return m.ExecuteMsgTypeUrl + } + return "" } func (m *MsgExecute) GetFunds() github_com_cosmos_cosmos_sdk_types.Coins { @@ -496,51 +504,53 @@ func init() { func init() { proto.RegisterFile("cosmos/accounts/v1/tx.proto", fileDescriptor_29c2b6d8a13d4189) } var fileDescriptor_29c2b6d8a13d4189 = []byte{ - // 703 bytes of a gzipped FileDescriptorProto + // 723 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcb, 0x4e, 0xdb, 0x4c, - 0x14, 0x8e, 0x73, 0xfd, 0x39, 0xe1, 0xff, 0xe1, 0x9f, 0x52, 0x30, 0x46, 0x32, 0x34, 0xbd, 0x45, - 0x88, 0xda, 0x84, 0x56, 0xad, 0xc4, 0x0e, 0x10, 0xbd, 0x48, 0x8d, 0x44, 0x23, 0xba, 0xe9, 0x26, - 0x72, 0xec, 0xc1, 0xb8, 0x10, 0x4f, 0xe4, 0x33, 0x46, 0xc9, 0xae, 0xea, 0x03, 0x54, 0x7d, 0x8e, - 0xae, 0x78, 0x0c, 0x96, 0xec, 0xda, 0x45, 0xd5, 0x0b, 0x2c, 0x78, 0x8d, 0xca, 0xf6, 0x8c, 0x4d, - 0xb8, 0x44, 0xac, 0xba, 0x62, 0xe6, 0x7c, 0xe7, 0x7c, 0xe7, 0x3b, 0xdf, 0xc1, 0x13, 0x98, 0xb3, - 0x19, 0x76, 0x19, 0x9a, 0x96, 0x6d, 0xb3, 0xd0, 0xe7, 0x68, 0x1e, 0x34, 0x4c, 0xde, 0x37, 0x7a, - 0x01, 0xe3, 0x8c, 0x90, 0x04, 0x34, 0x24, 0x68, 0x1c, 0x34, 0xb4, 0x59, 0x97, 0x31, 0x77, 0x9f, - 0x9a, 0x71, 0x46, 0x27, 0xdc, 0x31, 0x2d, 0x7f, 0x90, 0xa4, 0x6b, 0x33, 0x82, 0xab, 0x8b, 0x6e, - 0x44, 0xd3, 0x45, 0x57, 0x00, 0xba, 0x00, 0x3a, 0x16, 0x52, 0xf3, 0xa0, 0xd1, 0xa1, 0xdc, 0x6a, - 0x98, 0x36, 0xf3, 0x7c, 0x81, 0x6b, 0x02, 0xe7, 0xfd, 0x14, 0x95, 0x1a, 0xb4, 0x29, 0x97, 0xb9, - 0x2c, 0x3e, 0x9a, 0xd1, 0x29, 0x89, 0xd6, 0xbe, 0x2a, 0x50, 0x69, 0xa2, 0xfb, 0xca, 0xf7, 0x38, - 0x99, 0x86, 0x32, 0x52, 0xdf, 0xa1, 0x81, 0xaa, 0x2c, 0x28, 0xf5, 0xb1, 0x96, 0xb8, 0x91, 0x3b, - 0x30, 0x2e, 0x84, 0xb7, 0xf9, 0xa0, 0x47, 0xd5, 0x7c, 0x8c, 0x56, 0x45, 0x6c, 0x7b, 0xd0, 0xa3, - 0x51, 0xca, 0x7b, 0x64, 0x7e, 0xbb, 0x4b, 0x11, 0x2d, 0x97, 0xaa, 0x85, 0x24, 0x25, 0x8a, 0x35, - 0x93, 0x10, 0xb1, 0xa0, 0xb4, 0x13, 0xfa, 0x0e, 0xaa, 0xc5, 0x85, 0x42, 0xbd, 0xba, 0x32, 0x6b, - 0x08, 0x4f, 0xa2, 0x59, 0x0c, 0xa1, 0xd6, 0xd8, 0x60, 0x9e, 0xbf, 0xbe, 0x7c, 0xf4, 0x63, 0x3e, - 0xf7, 0xe5, 0xe7, 0x7c, 0xdd, 0xf5, 0xf8, 0x6e, 0xd8, 0x31, 0x6c, 0xd6, 0x35, 0xc5, 0x60, 0xc9, - 0x9f, 0x47, 0xe8, 0xec, 0x99, 0x91, 0x14, 0x8c, 0x0b, 0xb0, 0x95, 0x30, 0xaf, 0x56, 0x3f, 0x9e, - 0x1d, 0x2e, 0x0a, 0xd5, 0xb5, 0x7d, 0x98, 0x10, 0x83, 0xb5, 0x28, 0xf6, 0x98, 0x8f, 0x94, 0x3c, - 0x84, 0x09, 0x39, 0x88, 0xe5, 0x38, 0x01, 0x45, 0x14, 0x93, 0xfe, 0x27, 0xc2, 0x6b, 0x49, 0x94, - 0x2c, 0xc3, 0x3f, 0x81, 0x28, 0x8a, 0xa7, 0xad, 0xae, 0x4c, 0x19, 0xc9, 0xba, 0x0c, 0xb9, 0x2e, - 0x63, 0xcd, 0x1f, 0xb4, 0xd2, 0xac, 0xda, 0x77, 0x05, 0xa0, 0x89, 0xee, 0x66, 0x9f, 0xda, 0x21, - 0xa7, 0xd7, 0x5a, 0x39, 0x0d, 0x65, 0x6e, 0x05, 0x2e, 0xe5, 0xc2, 0x44, 0x71, 0x23, 0x06, 0x54, - 0xce, 0x5b, 0x77, 0x5d, 0x3f, 0x99, 0xf4, 0xd7, 0xcd, 0x7c, 0x0e, 0x24, 0x9b, 0x2e, 0xf5, 0xf3, - 0xbc, 0x4d, 0xca, 0x8d, 0x6c, 0x7a, 0x0d, 0x93, 0x19, 0xcf, 0x7a, 0xe8, 0x3b, 0xfb, 0x94, 0xa8, - 0x50, 0xe9, 0xc4, 0x27, 0x69, 0x96, 0xbc, 0x92, 0x49, 0x28, 0xf0, 0x3e, 0xaa, 0xf9, 0x85, 0x42, - 0x7d, 0xbc, 0x15, 0x1d, 0x57, 0xc7, 0x23, 0x51, 0x12, 0xaf, 0xfd, 0xce, 0xc3, 0xff, 0x09, 0x89, - 0xb3, 0xdd, 0x4f, 0x55, 0x3d, 0x85, 0x19, 0x2b, 0xe4, 0xbb, 0xd4, 0xe7, 0x9e, 0x6d, 0x71, 0x8f, - 0xf9, 0x6d, 0xd7, 0xc2, 0x76, 0x88, 0xd4, 0x89, 0xf9, 0x8b, 0xad, 0xdb, 0xc3, 0xf0, 0x0b, 0x0b, - 0xdf, 0x22, 0x75, 0xc8, 0x33, 0x50, 0x05, 0x71, 0xbb, 0x67, 0x0d, 0xba, 0xd4, 0xe7, 0x59, 0x61, - 0x3e, 0x29, 0x14, 0xf8, 0x56, 0x02, 0xcb, 0xc2, 0x2d, 0x98, 0xbd, 0x58, 0x28, 0x07, 0x46, 0xb5, - 0x10, 0x2f, 0xe8, 0x6a, 0x5f, 0x66, 0x86, 0xf9, 0xe4, 0x04, 0x48, 0x96, 0x80, 0xd0, 0xd8, 0xa3, - 0x21, 0xf5, 0xc5, 0x58, 0xc4, 0x64, 0x8a, 0xc8, 0xfe, 0x9b, 0x70, 0x2b, 0xcb, 0xce, 0x3a, 0x97, - 0x46, 0x74, 0xce, 0xe8, 0xb3, 0xa6, 0x53, 0x50, 0xa2, 0x41, 0xc0, 0x02, 0xb5, 0x1c, 0x6f, 0x21, - 0xb9, 0xd4, 0xda, 0xa0, 0x5e, 0xdc, 0x58, 0xea, 0xf4, 0x06, 0x8c, 0x65, 0xed, 0x94, 0xb8, 0xdd, - 0x7d, 0xe3, 0xf2, 0x53, 0x67, 0x5c, 0xda, 0x51, 0x2b, 0xab, 0x5b, 0xf9, 0x94, 0x87, 0x42, 0x13, - 0x5d, 0xf2, 0x12, 0x8a, 0xf1, 0x2b, 0x34, 0x77, 0x15, 0x83, 0xf8, 0x92, 0xb5, 0xbb, 0x23, 0xc0, - 0x54, 0xd6, 0x1b, 0xa8, 0xc8, 0xef, 0x50, 0xbf, 0x26, 0x5f, 0xe0, 0xda, 0x83, 0xd1, 0x78, 0x4a, - 0x69, 0xc3, 0xbf, 0xc3, 0xff, 0xb4, 0xf7, 0x46, 0x17, 0x26, 0x59, 0xda, 0xd2, 0x4d, 0xb2, 0x64, - 0x13, 0xad, 0xf4, 0xe1, 0xec, 0x70, 0x51, 0x59, 0x7f, 0x72, 0x74, 0xa2, 0x2b, 0xc7, 0x27, 0xba, - 0xf2, 0xeb, 0x44, 0x57, 0x3e, 0x9f, 0xea, 0xb9, 0xe3, 0x53, 0x3d, 0xf7, 0xed, 0x54, 0xcf, 0xbd, - 0x13, 0xcf, 0x3b, 0x3a, 0x7b, 0x86, 0xc7, 0xcc, 0xfe, 0xf9, 0xdf, 0x9a, 0x4e, 0x39, 0xde, 0xef, - 0xe3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xbe, 0xf4, 0xa1, 0x88, 0x06, 0x00, 0x00, + 0x14, 0x8e, 0x73, 0xe3, 0x67, 0xc2, 0xff, 0x03, 0xfe, 0x53, 0x30, 0x46, 0x32, 0x34, 0xbd, 0x45, + 0x88, 0xda, 0x84, 0x56, 0xad, 0xc4, 0x0e, 0x10, 0xbd, 0x48, 0x8d, 0x44, 0x23, 0xd8, 0x74, 0x63, + 0x39, 0xf6, 0x30, 0xa4, 0xc4, 0x9e, 0xc8, 0x67, 0x8c, 0x92, 0x1d, 0xea, 0x03, 0x54, 0x7d, 0x8e, + 0xae, 0x78, 0x0c, 0x96, 0xec, 0xda, 0x55, 0x2f, 0xb0, 0xe0, 0x35, 0x2a, 0xcf, 0x8c, 0x6d, 0xc2, + 0x25, 0x62, 0xd5, 0x55, 0x66, 0xce, 0x77, 0xce, 0x77, 0xce, 0xf9, 0xbe, 0xd8, 0x46, 0xf3, 0x2e, + 0x05, 0x9f, 0x82, 0xe5, 0xb8, 0x2e, 0x8d, 0x02, 0x06, 0xd6, 0x61, 0xc3, 0x62, 0x7d, 0xb3, 0x17, + 0x52, 0x46, 0x55, 0x55, 0x80, 0x66, 0x02, 0x9a, 0x87, 0x0d, 0x7d, 0x8e, 0x50, 0x4a, 0xba, 0xd8, + 0xe2, 0x19, 0xed, 0x68, 0xcf, 0x72, 0x82, 0x81, 0x48, 0xd7, 0x67, 0x25, 0x97, 0x0f, 0x24, 0xa6, + 0xf1, 0x81, 0x48, 0xc0, 0x90, 0x40, 0xdb, 0x01, 0x6c, 0x1d, 0x36, 0xda, 0x98, 0x39, 0x0d, 0xcb, + 0xa5, 0x9d, 0x40, 0xe2, 0xba, 0xc4, 0x59, 0x3f, 0x45, 0x93, 0x19, 0xf4, 0x2a, 0xa1, 0x84, 0xf2, + 0xa3, 0x15, 0x9f, 0x44, 0xb4, 0xf6, 0x4d, 0x41, 0x63, 0x4d, 0x20, 0x6f, 0x83, 0x0e, 0x53, 0x67, + 0x50, 0x19, 0x70, 0xe0, 0xe1, 0x50, 0x53, 0x16, 0x95, 0xfa, 0x78, 0x4b, 0xde, 0xd4, 0xfb, 0x68, + 0x42, 0x0e, 0x6e, 0xb3, 0x41, 0x0f, 0x6b, 0x79, 0x8e, 0x56, 0x64, 0x6c, 0x67, 0xd0, 0xc3, 0x71, + 0xca, 0x47, 0xa0, 0x81, 0xed, 0x63, 0x00, 0x87, 0x60, 0xad, 0x20, 0x52, 0xe2, 0x58, 0x53, 0x84, + 0x54, 0x07, 0x95, 0xf6, 0xa2, 0xc0, 0x03, 0xad, 0xb8, 0x58, 0xa8, 0x57, 0x56, 0xe7, 0x4c, 0xa9, + 0x49, 0xbc, 0x8b, 0x29, 0xa7, 0x35, 0x37, 0x69, 0x27, 0xd8, 0x58, 0x39, 0xf9, 0xb1, 0x90, 0xfb, + 0xfa, 0x73, 0xa1, 0x4e, 0x3a, 0x6c, 0x3f, 0x6a, 0x9b, 0x2e, 0xf5, 0x2d, 0xb9, 0x98, 0xf8, 0x79, + 0x0a, 0xde, 0x81, 0x15, 0x8f, 0x02, 0xbc, 0x00, 0x5a, 0x82, 0x79, 0xad, 0xf2, 0xe9, 0xe2, 0x78, + 0x49, 0x4e, 0x5d, 0xeb, 0xa2, 0x49, 0xb9, 0x58, 0x0b, 0x43, 0x8f, 0x06, 0x80, 0xd5, 0x27, 0x68, + 0x32, 0x59, 0xc4, 0xf1, 0xbc, 0x10, 0x03, 0xc8, 0x4d, 0xff, 0x93, 0xe1, 0x75, 0x11, 0x55, 0x57, + 0xd0, 0x3f, 0xa1, 0x2c, 0xe2, 0xdb, 0x56, 0x56, 0xab, 0xa6, 0xb0, 0xcb, 0x4c, 0xec, 0x32, 0xd7, + 0x83, 0x41, 0x2b, 0xcd, 0xaa, 0x1d, 0xe5, 0x11, 0x6a, 0x02, 0xd9, 0xea, 0x63, 0x37, 0x62, 0xf8, + 0x56, 0x29, 0x67, 0x50, 0x99, 0x39, 0x21, 0xc1, 0x4c, 0x8a, 0x28, 0x6f, 0x77, 0xd1, 0xcf, 0x42, + 0x55, 0x2c, 0xd8, 0x6d, 0x1f, 0x08, 0x77, 0xc2, 0x8e, 0xc2, 0xae, 0x56, 0xe4, 0xa9, 0xd3, 0x12, + 0x6b, 0x02, 0x89, 0x0d, 0xd9, 0x0d, 0xbb, 0x99, 0xe0, 0xa5, 0xbf, 0x23, 0xf8, 0x2b, 0xa4, 0x66, + 0x0a, 0xa4, 0x9a, 0x5f, 0x96, 0x52, 0xb9, 0x93, 0x94, 0xef, 0xd0, 0x54, 0xc6, 0xb3, 0x11, 0x05, + 0x5e, 0x17, 0xab, 0x1a, 0x1a, 0x6b, 0xf3, 0x53, 0x22, 0x68, 0x72, 0x55, 0xa7, 0x50, 0x81, 0xf5, + 0x41, 0xcb, 0x2f, 0x16, 0xea, 0x13, 0xad, 0xf8, 0xb8, 0x36, 0x11, 0x0f, 0x95, 0xe0, 0xb5, 0xdf, + 0x79, 0x34, 0x2d, 0x48, 0xbc, 0x9d, 0x7e, 0x3a, 0xd5, 0x0b, 0x34, 0xeb, 0x44, 0x6c, 0x1f, 0x07, + 0xac, 0xe3, 0x3a, 0xac, 0x43, 0x03, 0x9b, 0x38, 0x60, 0x47, 0x80, 0x3d, 0xce, 0x5f, 0x6c, 0xdd, + 0x1b, 0x86, 0x5f, 0x3b, 0xb0, 0x0b, 0xd8, 0x53, 0x5f, 0x22, 0x4d, 0x12, 0xdb, 0x3d, 0x67, 0xe0, + 0xe3, 0x80, 0x65, 0x85, 0x79, 0x51, 0x28, 0xf1, 0x6d, 0x01, 0x27, 0x85, 0xdb, 0x68, 0xee, 0x6a, + 0x61, 0xb2, 0x30, 0x68, 0x05, 0x6e, 0xd0, 0xcd, 0xba, 0xcc, 0x0e, 0xf3, 0x25, 0x1b, 0x80, 0xba, + 0x8c, 0x54, 0xe1, 0xf9, 0xd0, 0xf4, 0x45, 0x3e, 0xc4, 0x54, 0x8a, 0x24, 0xfd, 0xb7, 0xd0, 0xff, + 0x59, 0x76, 0xd6, 0xb9, 0x34, 0xa2, 0x73, 0x46, 0x9f, 0x35, 0xad, 0xa2, 0x12, 0x0e, 0x43, 0x1a, + 0x6a, 0x65, 0xee, 0x82, 0xb8, 0xd4, 0x6c, 0xa4, 0x5d, 0x75, 0x2c, 0x55, 0x7a, 0x13, 0x8d, 0x67, + 0xed, 0x14, 0xde, 0xee, 0x91, 0x79, 0xfd, 0x75, 0x68, 0x5e, 0xf3, 0xa8, 0x95, 0xd5, 0xad, 0x7e, + 0xce, 0xa3, 0x42, 0x13, 0x88, 0xfa, 0x06, 0x15, 0xf9, 0x9b, 0x6a, 0xfe, 0x26, 0x06, 0xf9, 0xb4, + 0xeb, 0x0f, 0x46, 0x80, 0xe9, 0x58, 0xef, 0xd1, 0x58, 0xf2, 0xac, 0x1a, 0xb7, 0xe4, 0x4b, 0x5c, + 0x7f, 0x3c, 0x1a, 0x4f, 0x29, 0x5d, 0xf4, 0xef, 0xf0, 0x9f, 0xf6, 0xe1, 0xe8, 0x42, 0x91, 0xa5, + 0x2f, 0xdf, 0x25, 0x2b, 0x69, 0xa2, 0x97, 0x8e, 0x2e, 0x8e, 0x97, 0x94, 0x8d, 0xe7, 0x27, 0x67, + 0x86, 0x72, 0x7a, 0x66, 0x28, 0xbf, 0xce, 0x0c, 0xe5, 0xcb, 0xb9, 0x91, 0x3b, 0x3d, 0x37, 0x72, + 0xdf, 0xcf, 0x8d, 0xdc, 0x07, 0xf9, 0x09, 0x00, 0xef, 0xc0, 0xec, 0x50, 0xab, 0x7f, 0xf9, 0x7b, + 0xd4, 0x2e, 0x73, 0x7f, 0x9f, 0xfd, 0x09, 0x00, 0x00, 0xff, 0xff, 0x82, 0x7f, 0xe3, 0xfd, 0xac, + 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -835,18 +845,20 @@ func (m *MsgExecute) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTx(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } } - if m.Message != nil { - { - size, err := m.Message.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } + if len(m.ExecuteMsgTypeUrl) > 0 { + i -= len(m.ExecuteMsgTypeUrl) + copy(dAtA[i:], m.ExecuteMsgTypeUrl) + i = encodeVarintTx(dAtA, i, uint64(len(m.ExecuteMsgTypeUrl))) + i-- + dAtA[i] = 0x22 + } + if len(m.JsonMessage) > 0 { + i -= len(m.JsonMessage) + copy(dAtA[i:], m.JsonMessage) + i = encodeVarintTx(dAtA, i, uint64(len(m.JsonMessage))) i-- dAtA[i] = 0x1a } @@ -1120,8 +1132,12 @@ func (m *MsgExecute) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - if m.Message != nil { - l = m.Message.Size() + l = len(m.JsonMessage) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = len(m.ExecuteMsgTypeUrl) + if l > 0 { n += 1 + l + sovTx(uint64(l)) } if len(m.Funds) > 0 { @@ -1613,9 +1629,9 @@ func (m *MsgExecute) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Message", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field JsonMessage", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -1625,29 +1641,57 @@ func (m *MsgExecute) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Message == nil { - m.Message = &any.Any{} + m.JsonMessage = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExecuteMsgTypeUrl", wireType) } - if err := m.Message.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + 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 ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ExecuteMsgTypeUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Funds", wireType) }