From e73a02b74fd38d9bdca01016a21574d421561914 Mon Sep 17 00:00:00 2001 From: dreamer Date: Thu, 18 Apr 2024 09:01:42 +0800 Subject: [PATCH] standardized parameter naming --- api/irismod/token/v1/tx.pulsar.go | 411 +++++++++++----------- modules/token/client/cli/tx.go | 16 +- modules/token/keeper/legacy_msg_server.go | 2 +- modules/token/keeper/msg_server.go | 12 +- modules/token/simulation/operations.go | 2 +- modules/token/types/v1/msgs.go | 8 +- modules/token/types/v1/msgs_test.go | 6 +- modules/token/types/v1/tx.pb.go | 171 +++++---- proto/irismod/token/v1/tx.proto | 4 +- 9 files changed, 316 insertions(+), 316 deletions(-) diff --git a/api/irismod/token/v1/tx.pulsar.go b/api/irismod/token/v1/tx.pulsar.go index 4b42f7ba..bec8f041 100644 --- a/api/irismod/token/v1/tx.pulsar.go +++ b/api/irismod/token/v1/tx.pulsar.go @@ -3103,17 +3103,17 @@ func (x *fastReflection_MsgEditTokenResponse) ProtoMethods() *protoiface.Methods } var ( - md_MsgMintToken protoreflect.MessageDescriptor - fd_MsgMintToken_coin protoreflect.FieldDescriptor - fd_MsgMintToken_to protoreflect.FieldDescriptor - fd_MsgMintToken_owner protoreflect.FieldDescriptor + md_MsgMintToken protoreflect.MessageDescriptor + fd_MsgMintToken_coin protoreflect.FieldDescriptor + fd_MsgMintToken_receiver protoreflect.FieldDescriptor + fd_MsgMintToken_owner protoreflect.FieldDescriptor ) func init() { file_irismod_token_v1_tx_proto_init() md_MsgMintToken = File_irismod_token_v1_tx_proto.Messages().ByName("MsgMintToken") fd_MsgMintToken_coin = md_MsgMintToken.Fields().ByName("coin") - fd_MsgMintToken_to = md_MsgMintToken.Fields().ByName("to") + fd_MsgMintToken_receiver = md_MsgMintToken.Fields().ByName("receiver") fd_MsgMintToken_owner = md_MsgMintToken.Fields().ByName("owner") } @@ -3188,9 +3188,9 @@ func (x *fastReflection_MsgMintToken) Range(f func(protoreflect.FieldDescriptor, return } } - if x.To != "" { - value := protoreflect.ValueOfString(x.To) - if !f(fd_MsgMintToken_to, value) { + if x.Receiver != "" { + value := protoreflect.ValueOfString(x.Receiver) + if !f(fd_MsgMintToken_receiver, value) { return } } @@ -3217,8 +3217,8 @@ func (x *fastReflection_MsgMintToken) Has(fd protoreflect.FieldDescriptor) bool switch fd.FullName() { case "irismod.token.v1.MsgMintToken.coin": return x.Coin != nil - case "irismod.token.v1.MsgMintToken.to": - return x.To != "" + case "irismod.token.v1.MsgMintToken.receiver": + return x.Receiver != "" case "irismod.token.v1.MsgMintToken.owner": return x.Owner != "" default: @@ -3239,8 +3239,8 @@ func (x *fastReflection_MsgMintToken) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { case "irismod.token.v1.MsgMintToken.coin": x.Coin = nil - case "irismod.token.v1.MsgMintToken.to": - x.To = "" + case "irismod.token.v1.MsgMintToken.receiver": + x.Receiver = "" case "irismod.token.v1.MsgMintToken.owner": x.Owner = "" default: @@ -3262,8 +3262,8 @@ func (x *fastReflection_MsgMintToken) Get(descriptor protoreflect.FieldDescripto case "irismod.token.v1.MsgMintToken.coin": value := x.Coin return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "irismod.token.v1.MsgMintToken.to": - value := x.To + case "irismod.token.v1.MsgMintToken.receiver": + value := x.Receiver return protoreflect.ValueOfString(value) case "irismod.token.v1.MsgMintToken.owner": value := x.Owner @@ -3290,8 +3290,8 @@ func (x *fastReflection_MsgMintToken) Set(fd protoreflect.FieldDescriptor, value switch fd.FullName() { case "irismod.token.v1.MsgMintToken.coin": x.Coin = value.Message().Interface().(*v1beta1.Coin) - case "irismod.token.v1.MsgMintToken.to": - x.To = value.Interface().(string) + case "irismod.token.v1.MsgMintToken.receiver": + x.Receiver = value.Interface().(string) case "irismod.token.v1.MsgMintToken.owner": x.Owner = value.Interface().(string) default: @@ -3319,8 +3319,8 @@ func (x *fastReflection_MsgMintToken) Mutable(fd protoreflect.FieldDescriptor) p x.Coin = new(v1beta1.Coin) } return protoreflect.ValueOfMessage(x.Coin.ProtoReflect()) - case "irismod.token.v1.MsgMintToken.to": - panic(fmt.Errorf("field to of message irismod.token.v1.MsgMintToken is not mutable")) + case "irismod.token.v1.MsgMintToken.receiver": + panic(fmt.Errorf("field receiver of message irismod.token.v1.MsgMintToken is not mutable")) case "irismod.token.v1.MsgMintToken.owner": panic(fmt.Errorf("field owner of message irismod.token.v1.MsgMintToken is not mutable")) default: @@ -3339,7 +3339,7 @@ func (x *fastReflection_MsgMintToken) NewField(fd protoreflect.FieldDescriptor) case "irismod.token.v1.MsgMintToken.coin": m := new(v1beta1.Coin) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "irismod.token.v1.MsgMintToken.to": + case "irismod.token.v1.MsgMintToken.receiver": return protoreflect.ValueOfString("") case "irismod.token.v1.MsgMintToken.owner": return protoreflect.ValueOfString("") @@ -3416,7 +3416,7 @@ func (x *fastReflection_MsgMintToken) ProtoMethods() *protoiface.Methods { l = options.Size(x.Coin) n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.To) + l = len(x.Receiver) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -3460,10 +3460,10 @@ func (x *fastReflection_MsgMintToken) ProtoMethods() *protoiface.Methods { i-- dAtA[i] = 0x1a } - if len(x.To) > 0 { - i -= len(x.To) - copy(dAtA[i:], x.To) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.To))) + if len(x.Receiver) > 0 { + i -= len(x.Receiver) + copy(dAtA[i:], x.Receiver) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Receiver))) i-- dAtA[i] = 0x12 } @@ -3568,7 +3568,7 @@ func (x *fastReflection_MsgMintToken) ProtoMethods() *protoiface.Methods { iNdEx = postIndex case 2: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field To", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3596,7 +3596,7 @@ func (x *fastReflection_MsgMintToken) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.To = string(dAtA[iNdEx:postIndex]) + x.Receiver = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { @@ -4877,17 +4877,17 @@ func (x *fastReflection_MsgBurnTokenResponse) ProtoMethods() *protoiface.Methods } var ( - md_MsgSwapFeeToken protoreflect.MessageDescriptor - fd_MsgSwapFeeToken_fee_paid protoreflect.FieldDescriptor - fd_MsgSwapFeeToken_recipient protoreflect.FieldDescriptor - fd_MsgSwapFeeToken_sender protoreflect.FieldDescriptor + md_MsgSwapFeeToken protoreflect.MessageDescriptor + fd_MsgSwapFeeToken_fee_paid protoreflect.FieldDescriptor + fd_MsgSwapFeeToken_receiver protoreflect.FieldDescriptor + fd_MsgSwapFeeToken_sender protoreflect.FieldDescriptor ) func init() { file_irismod_token_v1_tx_proto_init() md_MsgSwapFeeToken = File_irismod_token_v1_tx_proto.Messages().ByName("MsgSwapFeeToken") fd_MsgSwapFeeToken_fee_paid = md_MsgSwapFeeToken.Fields().ByName("fee_paid") - fd_MsgSwapFeeToken_recipient = md_MsgSwapFeeToken.Fields().ByName("recipient") + fd_MsgSwapFeeToken_receiver = md_MsgSwapFeeToken.Fields().ByName("receiver") fd_MsgSwapFeeToken_sender = md_MsgSwapFeeToken.Fields().ByName("sender") } @@ -4962,9 +4962,9 @@ func (x *fastReflection_MsgSwapFeeToken) Range(f func(protoreflect.FieldDescript return } } - if x.Recipient != "" { - value := protoreflect.ValueOfString(x.Recipient) - if !f(fd_MsgSwapFeeToken_recipient, value) { + if x.Receiver != "" { + value := protoreflect.ValueOfString(x.Receiver) + if !f(fd_MsgSwapFeeToken_receiver, value) { return } } @@ -4991,8 +4991,8 @@ func (x *fastReflection_MsgSwapFeeToken) Has(fd protoreflect.FieldDescriptor) bo switch fd.FullName() { case "irismod.token.v1.MsgSwapFeeToken.fee_paid": return x.FeePaid != nil - case "irismod.token.v1.MsgSwapFeeToken.recipient": - return x.Recipient != "" + case "irismod.token.v1.MsgSwapFeeToken.receiver": + return x.Receiver != "" case "irismod.token.v1.MsgSwapFeeToken.sender": return x.Sender != "" default: @@ -5013,8 +5013,8 @@ func (x *fastReflection_MsgSwapFeeToken) Clear(fd protoreflect.FieldDescriptor) switch fd.FullName() { case "irismod.token.v1.MsgSwapFeeToken.fee_paid": x.FeePaid = nil - case "irismod.token.v1.MsgSwapFeeToken.recipient": - x.Recipient = "" + case "irismod.token.v1.MsgSwapFeeToken.receiver": + x.Receiver = "" case "irismod.token.v1.MsgSwapFeeToken.sender": x.Sender = "" default: @@ -5036,8 +5036,8 @@ func (x *fastReflection_MsgSwapFeeToken) Get(descriptor protoreflect.FieldDescri case "irismod.token.v1.MsgSwapFeeToken.fee_paid": value := x.FeePaid return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "irismod.token.v1.MsgSwapFeeToken.recipient": - value := x.Recipient + case "irismod.token.v1.MsgSwapFeeToken.receiver": + value := x.Receiver return protoreflect.ValueOfString(value) case "irismod.token.v1.MsgSwapFeeToken.sender": value := x.Sender @@ -5064,8 +5064,8 @@ func (x *fastReflection_MsgSwapFeeToken) Set(fd protoreflect.FieldDescriptor, va switch fd.FullName() { case "irismod.token.v1.MsgSwapFeeToken.fee_paid": x.FeePaid = value.Message().Interface().(*v1beta1.Coin) - case "irismod.token.v1.MsgSwapFeeToken.recipient": - x.Recipient = value.Interface().(string) + case "irismod.token.v1.MsgSwapFeeToken.receiver": + x.Receiver = value.Interface().(string) case "irismod.token.v1.MsgSwapFeeToken.sender": x.Sender = value.Interface().(string) default: @@ -5093,8 +5093,8 @@ func (x *fastReflection_MsgSwapFeeToken) Mutable(fd protoreflect.FieldDescriptor x.FeePaid = new(v1beta1.Coin) } return protoreflect.ValueOfMessage(x.FeePaid.ProtoReflect()) - case "irismod.token.v1.MsgSwapFeeToken.recipient": - panic(fmt.Errorf("field recipient of message irismod.token.v1.MsgSwapFeeToken is not mutable")) + case "irismod.token.v1.MsgSwapFeeToken.receiver": + panic(fmt.Errorf("field receiver of message irismod.token.v1.MsgSwapFeeToken is not mutable")) case "irismod.token.v1.MsgSwapFeeToken.sender": panic(fmt.Errorf("field sender of message irismod.token.v1.MsgSwapFeeToken is not mutable")) default: @@ -5113,7 +5113,7 @@ func (x *fastReflection_MsgSwapFeeToken) NewField(fd protoreflect.FieldDescripto case "irismod.token.v1.MsgSwapFeeToken.fee_paid": m := new(v1beta1.Coin) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "irismod.token.v1.MsgSwapFeeToken.recipient": + case "irismod.token.v1.MsgSwapFeeToken.receiver": return protoreflect.ValueOfString("") case "irismod.token.v1.MsgSwapFeeToken.sender": return protoreflect.ValueOfString("") @@ -5190,7 +5190,7 @@ func (x *fastReflection_MsgSwapFeeToken) ProtoMethods() *protoiface.Methods { l = options.Size(x.FeePaid) n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.Recipient) + l = len(x.Receiver) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -5234,10 +5234,10 @@ func (x *fastReflection_MsgSwapFeeToken) ProtoMethods() *protoiface.Methods { i-- dAtA[i] = 0x1a } - if len(x.Recipient) > 0 { - i -= len(x.Recipient) - copy(dAtA[i:], x.Recipient) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Recipient))) + if len(x.Receiver) > 0 { + i -= len(x.Receiver) + copy(dAtA[i:], x.Receiver) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Receiver))) i-- dAtA[i] = 0x12 } @@ -5342,7 +5342,7 @@ func (x *fastReflection_MsgSwapFeeToken) ProtoMethods() *protoiface.Methods { iNdEx = postIndex case 2: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Recipient", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5370,7 +5370,7 @@ func (x *fastReflection_MsgSwapFeeToken) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Recipient = string(dAtA[iNdEx:postIndex]) + x.Receiver = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { @@ -9896,9 +9896,9 @@ type MsgMintToken struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Coin *v1beta1.Coin `protobuf:"bytes,1,opt,name=coin,proto3" json:"coin,omitempty"` - To string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"` - Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` + Coin *v1beta1.Coin `protobuf:"bytes,1,opt,name=coin,proto3" json:"coin,omitempty"` + Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` + Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` } func (x *MsgMintToken) Reset() { @@ -9928,9 +9928,9 @@ func (x *MsgMintToken) GetCoin() *v1beta1.Coin { return nil } -func (x *MsgMintToken) GetTo() string { +func (x *MsgMintToken) GetReceiver() string { if x != nil { - return x.To + return x.Receiver } return "" } @@ -10046,9 +10046,9 @@ type MsgSwapFeeToken struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FeePaid *v1beta1.Coin `protobuf:"bytes,1,opt,name=fee_paid,json=feePaid,proto3" json:"fee_paid,omitempty"` - Recipient string `protobuf:"bytes,2,opt,name=recipient,proto3" json:"recipient,omitempty"` - Sender string `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` + FeePaid *v1beta1.Coin `protobuf:"bytes,1,opt,name=fee_paid,json=feePaid,proto3" json:"fee_paid,omitempty"` + Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` + Sender string `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` } func (x *MsgSwapFeeToken) Reset() { @@ -10078,9 +10078,9 @@ func (x *MsgSwapFeeToken) GetFeePaid() *v1beta1.Coin { return nil } -func (x *MsgSwapFeeToken) GetRecipient() string { +func (x *MsgSwapFeeToken) GetReceiver() string { if x != nil { - return x.Recipient + return x.Receiver } return "" } @@ -10522,164 +10522,165 @@ var file_irismod_token_v1_tx_proto_rawDesc = []byte{ 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x3a, 0x0a, 0x82, 0xe7, 0xb0, 0x2a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x45, 0x64, 0x69, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x8f, 0x01, 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x4d, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9b, 0x01, 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x33, 0x0a, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 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, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x0e, 0x0a, - 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x2e, 0x0a, - 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, - 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x3a, 0x0a, 0x82, - 0xe7, 0xb0, 0x2a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x4d, 0x73, 0x67, - 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x82, 0x01, 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, 0x6e, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x12, 0x33, 0x0a, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x1a, 0x0a, + 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x05, 0x6f, 0x77, 0x6e, + 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, + 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, + 0x6e, 0x67, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x3a, 0x0a, 0x82, 0xe7, 0xb0, 0x2a, 0x05, + 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x4d, 0x69, 0x6e, 0x74, + 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x82, 0x01, + 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x33, + 0x0a, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 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, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x04, 0x63, + 0x6f, 0x69, 0x6e, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, + 0x65, 0x6e, 0x64, 0x65, 0x72, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, + 0x65, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, 0x6e, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa8, 0x01, 0x0a, 0x0f, 0x4d, + 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x3a, + 0x0a, 0x08, 0x66, 0x65, 0x65, 0x5f, 0x70, 0x61, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 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, 0x04, 0xc8, 0xde, 0x1f, - 0x00, 0x52, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, - 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, - 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x16, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, - 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xaa, - 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x12, 0x3a, 0x0a, 0x08, 0x66, 0x65, 0x65, 0x5f, 0x70, 0x61, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 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, - 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x07, 0x66, 0x65, 0x65, 0x50, 0x61, 0x69, 0x64, 0x12, 0x1c, - 0x0a, 0x09, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x06, - 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, + 0x00, 0x52, 0x07, 0x66, 0x65, 0x65, 0x50, 0x61, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, + 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, + 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x53, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, + 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x38, 0x0a, 0x07, 0x66, 0x65, 0x65, 0x5f, 0x67, 0x6f, 0x74, 0x18, 0x01, 0x20, 0x01, 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, 0x04, 0xc8, 0xde, + 0x1f, 0x00, 0x52, 0x06, 0x66, 0x65, 0x65, 0x47, 0x6f, 0x74, 0x22, 0x91, 0x01, 0x0a, 0x0f, 0x4d, + 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, + 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x61, 0x75, 0x74, + 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x36, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, + 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, + 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x3a, 0x0e, + 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x19, + 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa5, 0x01, 0x0a, 0x0e, 0x4d, 0x73, + 0x67, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x16, 0x0a, 0x06, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79, + 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x61, 0x6c, + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x19, + 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x5f, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x6d, 0x69, 0x6e, 0x55, 0x6e, 0x69, 0x74, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, + 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x3a, 0x0b, - 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x53, 0x0a, 0x17, 0x4d, - 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x07, 0x66, 0x65, 0x65, 0x5f, 0x67, 0x6f, - 0x74, 0x18, 0x01, 0x20, 0x01, 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, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x66, 0x65, 0x65, 0x47, 0x6f, 0x74, - 0x22, 0x91, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, - 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, - 0x67, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x36, 0x0a, 0x06, - 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x69, - 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, - 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x3a, 0x0e, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, - 0x72, 0x69, 0x74, 0x79, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0xa5, 0x01, 0x0a, 0x0e, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x45, 0x52, 0x43, - 0x32, 0x30, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, - 0x0a, 0x05, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x73, - 0x63, 0x61, 0x6c, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x5f, 0x75, 0x6e, 0x69, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x69, 0x6e, 0x55, 0x6e, 0x69, 0x74, 0x12, - 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x61, 0x75, - 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x73, 0x67, 0x44, 0x65, - 0x70, 0x6c, 0x6f, 0x79, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x0e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, - 0x52, 0x43, 0x32, 0x30, 0x12, 0x37, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, - 0x20, 0x01, 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, - 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x30, 0x0a, - 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, - 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, - 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, - 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x73, 0x67, 0x53, - 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0xcd, 0x01, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, - 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x44, 0x0a, 0x0d, 0x77, 0x61, 0x6e, 0x74, 0x65, - 0x64, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, + 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, + 0x79, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x45, 0x52, + 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x0e, + 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x37, + 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 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, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, - 0x0c, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x30, 0x0a, - 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, - 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, - 0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x08, 0x72, 0x65, 0x63, + 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, + 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, + 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x3a, 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, - 0x65, 0x72, 0x22, 0x1a, 0x0a, 0x18, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, - 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xa6, - 0x07, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x56, 0x0a, 0x0a, 0x49, 0x73, 0x73, 0x75, 0x65, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, - 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x49, 0x73, 0x73, 0x75, 0x65, - 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x27, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, - 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x49, 0x73, 0x73, 0x75, - 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, - 0x0a, 0x09, 0x45, 0x64, 0x69, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1e, 0x2e, 0x69, 0x72, - 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x45, 0x64, 0x69, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x26, 0x2e, 0x69, 0x72, - 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x45, 0x64, 0x69, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x09, 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x12, 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x1a, 0x26, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x09, 0x42, 0x75, 0x72, 0x6e, + 0x65, 0x72, 0x22, 0x18, 0x0a, 0x16, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, + 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xcd, 0x01, 0x0a, + 0x10, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, + 0x30, 0x12, 0x44, 0x0a, 0x0d, 0x77, 0x61, 0x6e, 0x74, 0x65, 0x64, 0x5f, 0x61, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 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, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0c, 0x77, 0x61, 0x6e, 0x74, 0x65, + 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, + 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, + 0x67, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x34, 0x0a, 0x08, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, + 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, + 0x74, 0x72, 0x69, 0x6e, 0x67, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x3a, + 0x0b, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x1a, 0x0a, 0x18, + 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xa6, 0x07, 0x0a, 0x03, 0x4d, 0x73, 0x67, + 0x12, 0x56, 0x0a, 0x0a, 0x49, 0x73, 0x73, 0x75, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1f, + 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, + 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x49, 0x73, 0x73, 0x75, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, + 0x27, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x49, 0x73, 0x73, 0x75, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x09, 0x45, 0x64, 0x69, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, - 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, 0x6e, + 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x64, 0x69, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x26, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, - 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, 0x6e, - 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6e, 0x0a, - 0x12, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4f, 0x77, - 0x6e, 0x65, 0x72, 0x12, 0x27, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, - 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, - 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x1a, 0x2f, 0x2e, 0x69, - 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5c, 0x0a, - 0x0c, 0x53, 0x77, 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x21, 0x2e, - 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, - 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, - 0x1a, 0x29, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, - 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x59, 0x0a, 0x0b, 0x53, - 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x20, 0x2e, 0x69, 0x72, 0x69, + 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x45, 0x64, 0x69, 0x74, + 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, + 0x09, 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, - 0x67, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x1a, 0x28, 0x2e, 0x69, - 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5f, 0x0a, 0x0d, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, - 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x22, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, + 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x26, 0x2e, 0x69, 0x72, 0x69, + 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x53, 0x0a, 0x09, 0x42, 0x75, 0x72, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, + 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, + 0x26, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x72, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6e, 0x0a, 0x12, 0x54, 0x72, 0x61, 0x6e, 0x73, + 0x66, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x27, 0x2e, + 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, + 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, + 0x6e, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x1a, 0x2f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, + 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x72, 0x61, + 0x6e, 0x73, 0x66, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5c, 0x0a, 0x0c, 0x53, 0x77, 0x61, 0x70, 0x46, + 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x21, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, - 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, 0x1a, 0x2a, 0x2e, 0x69, 0x72, - 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5c, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x21, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, - 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x29, 0x2e, 0x69, 0x72, 0x69, + 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x29, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, - 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x59, 0x0a, 0x0b, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x45, + 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x59, 0x0a, 0x0b, 0x53, 0x77, 0x61, 0x70, 0x54, 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, - 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x70, 0x6c, 0x6f, - 0x79, 0x45, 0x52, 0x43, 0x32, 0x30, 0x1a, 0x28, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, - 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x70, - 0x6c, 0x6f, 0x79, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0xbe, 0x01, 0xc8, 0xe1, 0x1e, 0x00, 0x0a, 0x14, - 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, - 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, - 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, - 0x6e, 0x65, 0x74, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x76, 0x31, - 0x3b, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x49, 0x54, 0x58, 0xaa, 0x02, - 0x10, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x56, - 0x31, 0xca, 0x02, 0x10, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, 0x6f, 0x6b, 0x65, - 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x3a, 0x3a, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x54, + 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x1a, 0x28, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, + 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, + 0x70, 0x54, 0x6f, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x5f, 0x0a, 0x0d, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, + 0x30, 0x12, 0x22, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x46, 0x72, 0x6f, 0x6d, + 0x45, 0x52, 0x43, 0x32, 0x30, 0x1a, 0x2a, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, + 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, + 0x46, 0x72, 0x6f, 0x6d, 0x45, 0x52, 0x43, 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x5c, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x73, 0x12, 0x21, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x29, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, + 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x59, 0x0a, 0x0b, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x45, 0x52, 0x43, 0x32, 0x30, 0x12, 0x20, + 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, + 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x45, 0x52, 0x43, 0x32, 0x30, + 0x1a, 0x28, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x45, 0x52, 0x43, + 0x32, 0x30, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, + 0x01, 0x42, 0xbe, 0x01, 0xc8, 0xe1, 0x1e, 0x00, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x72, + 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x07, + 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6e, 0x65, 0x74, 0x2f, 0x69, 0x72, + 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, + 0x64, 0x2f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x74, 0x6f, 0x6b, 0x65, 0x6e, + 0x76, 0x31, 0xa2, 0x02, 0x03, 0x49, 0x54, 0x58, 0xaa, 0x02, 0x10, 0x49, 0x72, 0x69, 0x73, 0x6d, + 0x6f, 0x64, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x49, 0x72, + 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, + 0x1c, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x5c, 0x56, + 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, + 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x3a, 0x3a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/modules/token/client/cli/tx.go b/modules/token/client/cli/tx.go index 74d8f038..476d0df2 100644 --- a/modules/token/client/cli/tx.go +++ b/modules/token/client/cli/tx.go @@ -108,7 +108,7 @@ func GetCmdIssueToken() *cobra.Command { return err } - var prompt = "The token issuance transaction will consume extra fee" + prompt := "The token issuance transaction will consume extra fee" generateOnly, err := cmd.Flags().GetBool(flags.FlagGenerateOnly) if err != nil { @@ -235,16 +235,16 @@ func GetCmdMintToken() *cobra.Command { } msg := &v1.MsgMintToken{ - Coin: coin, - To: addr, - Owner: owner, + Coin: coin, + Receiver: addr, + Owner: owner, } if err := msg.ValidateBasic(); err != nil { return err } - var prompt = "The token minting transaction will consume extra fee" + prompt := "The token minting transaction will consume extra fee" generateOnly, err := cmd.Flags().GetBool(flags.FlagGenerateOnly) if err != nil { @@ -398,9 +398,9 @@ func GetCmdSwapFeeToken() *cobra.Command { } msg := &v1.MsgSwapFeeToken{ - FeePaid: coin, - Recipient: toAddr, - Sender: sender, + FeePaid: coin, + Receiver: toAddr, + Sender: sender, } if err := msg.ValidateBasic(); err != nil { diff --git a/modules/token/keeper/legacy_msg_server.go b/modules/token/keeper/legacy_msg_server.go index 5a1eb7d4..c53b0a17 100644 --- a/modules/token/keeper/legacy_msg_server.go +++ b/modules/token/keeper/legacy_msg_server.go @@ -64,7 +64,7 @@ func (m legacyMsgServer) MintToken(goCtx context.Context, msg *v1beta1.MsgMintTo } _, err = m.server.MintToken(goCtx, &v1.MsgMintToken{ Coin: coin, - To: msg.To, + Receiver: msg.To, Owner: msg.Owner, }) return &v1beta1.MsgMintTokenResponse{}, err diff --git a/modules/token/keeper/msg_server.go b/modules/token/keeper/msg_server.go index 150874f0..59db1ca1 100644 --- a/modules/token/keeper/msg_server.go +++ b/modules/token/keeper/msg_server.go @@ -103,8 +103,8 @@ func (m msgServer) MintToken( var recipient sdk.AccAddress - if len(msg.To) != 0 { - recipient, err = sdk.AccAddressFromBech32(msg.To) + if len(msg.Receiver) != 0 { + recipient, err = sdk.AccAddressFromBech32(msg.Receiver) if err != nil { return nil, err } @@ -216,13 +216,13 @@ func (m msgServer) SwapFeeToken( } var recipient sdk.AccAddress - if len(msg.Recipient) > 0 { - recipient, err = sdk.AccAddressFromBech32(msg.Recipient) + if len(msg.Receiver) > 0 { + recipient, err = sdk.AccAddressFromBech32(msg.Receiver) if err != nil { return nil, err } - if m.k.blockedAddrs[msg.Recipient] { + if m.k.blockedAddrs[msg.Receiver] { return nil, errorsmod.Wrapf( sdkerrors.ErrUnauthorized, "%s is a module account", @@ -241,7 +241,7 @@ func (m msgServer) SwapFeeToken( sdk.NewEvent( types.EventTypeSwapFeeToken, sdk.NewAttribute(types.AttributeKeySender, msg.Sender), - sdk.NewAttribute(types.AttributeKeyRecipient, msg.Recipient), + sdk.NewAttribute(types.AttributeKeyRecipient, msg.Receiver), sdk.NewAttribute(types.AttributeKeyFeePaid, feePaid.String()), sdk.NewAttribute(types.AttributeKeyFeeGot, feeGot.String()), ), diff --git a/modules/token/simulation/operations.go b/modules/token/simulation/operations.go index 27af3fa4..8712ca61 100644 --- a/modules/token/simulation/operations.go +++ b/modules/token/simulation/operations.go @@ -281,7 +281,7 @@ func SimulateMintToken( Denom: token.GetMinUnit(), Amount: sdkmath.NewIntWithDecimal(100, int(token.GetScale())), }, - To: simToAccount.Address.String(), + Receiver: simToAccount.Address.String(), Owner: token.GetOwner().String(), } diff --git a/modules/token/types/v1/msgs.go b/modules/token/types/v1/msgs.go index 0153ae7c..46471994 100644 --- a/modules/token/types/v1/msgs.go +++ b/modules/token/types/v1/msgs.go @@ -256,8 +256,8 @@ func (msg MsgMintToken) ValidateBasic() error { } // check the reception - if len(msg.To) > 0 { - if _, err := sdk.AccAddressFromBech32(msg.To); err != nil { + if len(msg.Receiver) > 0 { + if _, err := sdk.AccAddressFromBech32(msg.Receiver); err != nil { return errorsmod.Wrapf( sdkerrors.ErrInvalidAddress, "invalid mint reception address (%s)", @@ -328,8 +328,8 @@ func (msg MsgSwapFeeToken) ValidateBasic() error { return errorsmod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) } - if len(msg.Recipient) != 0 { - if _, err := sdk.AccAddressFromBech32(msg.Recipient); err != nil { + if len(msg.Receiver) != 0 { + if _, err := sdk.AccAddressFromBech32(msg.Receiver); err != nil { return errorsmod.Wrapf( sdkerrors.ErrInvalidAddress, "invalid recipient address (%s)", diff --git a/modules/token/types/v1/msgs_test.go b/modules/token/types/v1/msgs_test.go index 96c0ff7f..994d29f2 100644 --- a/modules/token/types/v1/msgs_test.go +++ b/modules/token/types/v1/msgs_test.go @@ -155,7 +155,7 @@ func TestMsgEditTokenRoute(t *testing.T) { func TestMsgEditTokenGetSignBytes(t *testing.T) { mintable := tokentypes.False - var msg = MsgEditToken{ + msg := MsgEditToken{ Name: "BTC TOKEN", Owner: sdk.AccAddress(tmhash.SumTruncated([]byte("owner"))).String(), Symbol: "btc", @@ -193,8 +193,8 @@ func TestMsgMintTokenValidateBasic(t *testing.T) { Denom: td.minUnit, Amount: sdkmath.NewIntFromUint64(td.amount), }, - To: td.to, - Owner: td.owner, + Receiver: td.to, + Owner: td.owner, } if td.expectPass { require.Nil(t, msg.ValidateBasic(), "test: %v", td.msg) diff --git a/modules/token/types/v1/tx.pb.go b/modules/token/types/v1/tx.pb.go index 64cf093e..45a69c17 100644 --- a/modules/token/types/v1/tx.pb.go +++ b/modules/token/types/v1/tx.pb.go @@ -273,9 +273,9 @@ var xxx_messageInfo_MsgEditTokenResponse proto.InternalMessageInfo // MsgMintToken defines an SDK message for minting a new token type MsgMintToken struct { - Coin types.Coin `protobuf:"bytes,1,opt,name=coin,proto3" json:"coin"` - To string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"` - Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` + Coin types.Coin `protobuf:"bytes,1,opt,name=coin,proto3" json:"coin"` + Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` + Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` } func (m *MsgMintToken) Reset() { *m = MsgMintToken{} } @@ -426,9 +426,9 @@ var xxx_messageInfo_MsgBurnTokenResponse proto.InternalMessageInfo // MsgSwapFeeToken defines an SDK message for swap fee token type MsgSwapFeeToken struct { - FeePaid types.Coin `protobuf:"bytes,1,opt,name=fee_paid,json=feePaid,proto3" json:"fee_paid"` - Recipient string `protobuf:"bytes,2,opt,name=recipient,proto3" json:"recipient,omitempty"` - Sender string `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` + FeePaid types.Coin `protobuf:"bytes,1,opt,name=fee_paid,json=feePaid,proto3" json:"fee_paid"` + Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty"` + Sender string `protobuf:"bytes,3,opt,name=sender,proto3" json:"sender,omitempty"` } func (m *MsgSwapFeeToken) Reset() { *m = MsgSwapFeeToken{} } @@ -847,73 +847,72 @@ func init() { func init() { proto.RegisterFile("irismod/token/v1/tx.proto", fileDescriptor_f5fa171367154e01) } var fileDescriptor_f5fa171367154e01 = []byte{ - // 1048 bytes of a gzipped FileDescriptorProto + // 1032 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0xc6, 0x3f, 0x62, 0x4f, 0xea, 0x50, 0xad, 0x42, 0xb2, 0x5e, 0x5a, 0xc7, 0x58, 0x02, - 0x4c, 0x24, 0x76, 0xeb, 0x04, 0xb5, 0x28, 0xb7, 0xba, 0x2d, 0x88, 0x83, 0xd5, 0xca, 0x4e, 0x91, - 0x40, 0x48, 0xd6, 0xda, 0x3b, 0xd9, 0x8e, 0xf0, 0xce, 0xac, 0x76, 0xc6, 0x49, 0x7c, 0x43, 0x3d, - 0x72, 0x01, 0xc4, 0xbf, 0x00, 0x1c, 0x38, 0xf5, 0xc0, 0x1f, 0x91, 0x0b, 0x52, 0xc5, 0x89, 0x53, - 0x05, 0xc9, 0xa1, 0x12, 0x7f, 0x02, 0x27, 0xb4, 0x33, 0xe3, 0xf1, 0xda, 0x5e, 0xc7, 0x76, 0x10, - 0x37, 0xcf, 0x7e, 0xdf, 0xbe, 0xf9, 0xde, 0xf7, 0xde, 0xbc, 0x59, 0x83, 0x12, 0x0a, 0x11, 0xf5, - 0x89, 0x6b, 0x33, 0xf2, 0x15, 0xc4, 0xf6, 0x49, 0xdd, 0x66, 0x67, 0x56, 0x10, 0x12, 0x46, 0xf4, - 0x9b, 0x12, 0xb2, 0x38, 0x64, 0x9d, 0xd4, 0xcd, 0x2d, 0x8f, 0x78, 0x84, 0x83, 0x76, 0xf4, 0x4b, - 0xf0, 0xcc, 0x72, 0x8f, 0x50, 0x9f, 0x50, 0xbb, 0xeb, 0x50, 0x68, 0x9f, 0xd4, 0xbb, 0x90, 0x39, - 0x75, 0xbb, 0x47, 0x10, 0x96, 0xf8, 0x8e, 0xc4, 0x7d, 0xea, 0x45, 0xf1, 0x7d, 0xea, 0x49, 0xa0, - 0x24, 0x80, 0x8e, 0x88, 0x28, 0x16, 0x12, 0xba, 0x35, 0x2b, 0x8b, 0x8b, 0xe0, 0x68, 0xf5, 0x9b, - 0x35, 0x50, 0x6c, 0x52, 0xef, 0x53, 0x4a, 0x07, 0xf0, 0x28, 0x7a, 0xae, 0x6f, 0x83, 0x1c, 0x1d, - 0xfa, 0x5d, 0xd2, 0x37, 0xb4, 0x8a, 0x56, 0x2b, 0xb4, 0xe4, 0x4a, 0xd7, 0x41, 0x06, 0x3b, 0x3e, - 0x34, 0xd6, 0xf8, 0x53, 0xfe, 0x5b, 0xdf, 0x02, 0x59, 0xda, 0x73, 0xfa, 0xd0, 0x48, 0x57, 0xb4, - 0x5a, 0xb1, 0x25, 0x16, 0x7a, 0x09, 0xe4, 0x7d, 0x84, 0x3b, 0x03, 0x8c, 0x98, 0x91, 0xe1, 0xec, - 0x75, 0x1f, 0xe1, 0xa7, 0x18, 0x31, 0xfd, 0x1d, 0xb0, 0x89, 0x30, 0x62, 0xc8, 0xe9, 0x77, 0xe8, - 0x20, 0x08, 0xfa, 0x43, 0x23, 0x5b, 0xd1, 0x6a, 0x99, 0x56, 0x51, 0x3e, 0x6d, 0xf3, 0x87, 0xfa, - 0x6d, 0x00, 0x7c, 0xe7, 0x6c, 0x44, 0xc9, 0x71, 0x4a, 0xc1, 0x77, 0xce, 0x24, 0x6c, 0xf2, 0x0d, - 0x98, 0xd3, 0xed, 0x43, 0x63, 0xbd, 0xa2, 0xd5, 0xf2, 0x2d, 0xb5, 0xd6, 0x2d, 0x90, 0x25, 0xa7, - 0x18, 0x86, 0x46, 0x3e, 0xda, 0xb9, 0x61, 0xfc, 0xfe, 0xeb, 0x07, 0x5b, 0xd2, 0x8f, 0xfb, 0xae, - 0x1b, 0x42, 0x4a, 0xdb, 0x2c, 0x44, 0xd8, 0x6b, 0x09, 0xda, 0x21, 0x78, 0xfe, 0xfa, 0xc5, 0x9e, - 0xf8, 0x5d, 0xdd, 0x01, 0x6f, 0x4e, 0x78, 0xd1, 0x82, 0x34, 0x20, 0x98, 0xc2, 0xea, 0x0f, 0x1a, - 0x47, 0x8e, 0x42, 0x07, 0xd3, 0x63, 0x18, 0x72, 0xf0, 0x71, 0xf4, 0x8a, 0xfe, 0x16, 0x28, 0xd0, - 0xb0, 0xd7, 0x11, 0x5b, 0x0a, 0xc3, 0xf2, 0x34, 0xec, 0x29, 0xd0, 0xa5, 0x4c, 0x82, 0xc2, 0xb7, - 0xbc, 0x4b, 0x99, 0x00, 0xef, 0x28, 0x9f, 0xd3, 0x0b, 0x94, 0x4a, 0xde, 0xe1, 0x66, 0x24, 0x75, - 0xbc, 0x5d, 0x75, 0x17, 0xdc, 0x4e, 0x14, 0xa5, 0x64, 0xff, 0xad, 0x81, 0x1b, 0x4d, 0xea, 0x3d, - 0x72, 0x11, 0x5b, 0xbd, 0xb6, 0x93, 0x35, 0x48, 0x4f, 0xd7, 0xa0, 0x1d, 0xab, 0x01, 0x2f, 0x72, - 0xe3, 0xde, 0x3f, 0xaf, 0x76, 0x0f, 0x3c, 0xc4, 0x9e, 0x0d, 0xba, 0x56, 0x8f, 0xf8, 0x76, 0xd4, - 0x77, 0x18, 0x32, 0x7b, 0xd4, 0x7f, 0x3e, 0x71, 0x07, 0x7d, 0x48, 0x65, 0x1f, 0xb2, 0x61, 0x00, - 0xa9, 0xd5, 0x20, 0xa4, 0x9f, 0x54, 0xbc, 0xec, 0xea, 0xc5, 0xdb, 0x06, 0x5b, 0xf1, 0x5c, 0x95, - 0x09, 0xdf, 0x0a, 0x13, 0x9a, 0x08, 0x4b, 0x13, 0x0e, 0x40, 0x26, 0x3a, 0x52, 0xdc, 0x82, 0x8d, - 0xfd, 0x92, 0x25, 0x37, 0x88, 0xce, 0x9c, 0x25, 0xcf, 0x9c, 0xf5, 0x80, 0x20, 0xdc, 0xc8, 0x9c, - 0xbf, 0xda, 0x4d, 0xb5, 0x38, 0x59, 0xdf, 0x04, 0x6b, 0x8c, 0x48, 0x7f, 0xd6, 0x18, 0x19, 0x2b, - 0x4d, 0x5f, 0x57, 0xa9, 0x12, 0xa4, 0x94, 0x3e, 0x17, 0x4a, 0x1b, 0x83, 0x10, 0xff, 0x07, 0xa5, - 0x51, 0x5f, 0x41, 0xec, 0x8e, 0x3a, 0xee, 0xca, 0xbe, 0xe2, 0xbc, 0xc3, 0x8d, 0x48, 0x9b, 0x5c, - 0x48, 0x71, 0x4a, 0x83, 0x12, 0xf7, 0x8b, 0x06, 0xde, 0x68, 0x52, 0xaf, 0x7d, 0xea, 0x04, 0x1f, - 0x43, 0x39, 0x2a, 0x0e, 0x41, 0xfe, 0x18, 0xc2, 0x4e, 0xe0, 0x20, 0x77, 0x59, 0x8d, 0xeb, 0xc7, - 0x10, 0x3e, 0x71, 0x90, 0xab, 0xdf, 0x02, 0x85, 0x10, 0xf6, 0x50, 0x80, 0x20, 0x66, 0xd2, 0xd7, - 0xf1, 0x83, 0x58, 0x12, 0xe9, 0xeb, 0x24, 0xd1, 0x06, 0x3b, 0x53, 0x5a, 0x47, 0x79, 0xe8, 0x1f, - 0x81, 0x48, 0x42, 0xc7, 0x23, 0x6c, 0x59, 0xc9, 0xb9, 0x63, 0x08, 0x3f, 0x21, 0xac, 0xfa, 0xbd, - 0x70, 0xe0, 0x69, 0xe0, 0x3a, 0x0c, 0x3e, 0x71, 0x42, 0xc7, 0xa7, 0xfa, 0x5d, 0x50, 0x70, 0x06, - 0xec, 0x19, 0x09, 0x11, 0x1b, 0x8a, 0x33, 0x75, 0x85, 0xd4, 0x31, 0x55, 0xbf, 0x0b, 0x72, 0x01, - 0x8f, 0xc0, 0x53, 0xdf, 0xd8, 0x37, 0xac, 0xe9, 0x1b, 0xc2, 0x12, 0x3b, 0x8c, 0x34, 0x08, 0xb6, - 0x1c, 0x01, 0x2a, 0x4e, 0xb5, 0xc4, 0x13, 0x8d, 0x4b, 0x52, 0x05, 0xfb, 0x49, 0x03, 0x9b, 0x4d, - 0xea, 0x3d, 0x84, 0x41, 0x9f, 0x0c, 0x1f, 0xb5, 0x1e, 0xec, 0xdf, 0xf9, 0x7f, 0x47, 0xfb, 0x84, - 0x15, 0xd9, 0xa5, 0xad, 0xa8, 0x1a, 0x60, 0x7b, 0x52, 0xa6, 0xca, 0xe0, 0x47, 0x91, 0x41, 0x54, - 0xc6, 0x23, 0x22, 0x32, 0xb8, 0x07, 0x72, 0x8e, 0x4f, 0x06, 0x78, 0xf9, 0xe2, 0x09, 0xfa, 0xea, - 0xa7, 0x22, 0xba, 0x64, 0x42, 0xd8, 0x83, 0xe8, 0x64, 0xd4, 0x84, 0x2d, 0xb5, 0x9e, 0x6c, 0x36, - 0x91, 0x40, 0x4c, 0xa5, 0x4a, 0xe0, 0x37, 0x0d, 0xdc, 0x1c, 0xf5, 0x61, 0x48, 0x7c, 0x91, 0xc2, - 0x43, 0x50, 0x3c, 0x75, 0x30, 0x83, 0x6e, 0x67, 0xb5, 0x4c, 0x6e, 0x88, 0xb7, 0xee, 0x5f, 0x37, - 0x9f, 0x0f, 0xa7, 0xf3, 0xb9, 0xe2, 0x9d, 0x39, 0x99, 0x9a, 0xc0, 0x98, 0x4e, 0x67, 0x94, 0xeb, - 0xfe, 0xcf, 0xeb, 0x20, 0xdd, 0xa4, 0x9e, 0xfe, 0x19, 0x00, 0xb1, 0x8f, 0x89, 0xdd, 0xd9, 0xbe, - 0x9e, 0xb8, 0x61, 0xcd, 0xf7, 0x16, 0x10, 0xd4, 0xb9, 0x6d, 0x83, 0xc2, 0xf8, 0x1e, 0x2b, 0x27, - 0xbe, 0xa5, 0x70, 0xf3, 0xdd, 0xab, 0xf1, 0x78, 0xd0, 0xf1, 0xbd, 0x90, 0x1c, 0x54, 0xe1, 0x73, - 0x82, 0xce, 0x8c, 0xf1, 0x28, 0xe8, 0x78, 0x84, 0x27, 0x07, 0x55, 0xf8, 0x9c, 0xa0, 0x33, 0xe3, - 0x57, 0xc7, 0x40, 0x4f, 0xf8, 0xfa, 0x48, 0x76, 0x6f, 0x96, 0x68, 0xda, 0x4b, 0x12, 0xd5, 0x7e, - 0x5f, 0x82, 0x1b, 0x13, 0xa3, 0xfe, 0xed, 0xc4, 0x00, 0x71, 0x8a, 0xf9, 0xfe, 0x42, 0x8a, 0x8a, - 0xfe, 0x39, 0xd8, 0x88, 0x9f, 0xea, 0xca, 0xdc, 0x37, 0x25, 0xc3, 0xac, 0x2d, 0x62, 0xa8, 0xd0, - 0x1d, 0x50, 0x9c, 0x3c, 0x6f, 0xd5, 0xf9, 0xb2, 0x46, 0x1c, 0x73, 0x6f, 0x31, 0x27, 0xee, 0xcc, - 0xc4, 0x15, 0x90, 0xec, 0x4c, 0x9c, 0x32, 0xc7, 0x99, 0xa4, 0xa9, 0x1d, 0x39, 0x13, 0x9f, 0xd8, - 0xc9, 0xce, 0xc4, 0x18, 0x73, 0x9c, 0x49, 0x18, 0xa7, 0x66, 0xf6, 0xeb, 0xd7, 0x2f, 0xf6, 0xb4, - 0xc6, 0xe3, 0xf3, 0xbf, 0xca, 0xa9, 0xf3, 0x8b, 0xb2, 0xf6, 0xf2, 0xa2, 0xac, 0xfd, 0x79, 0x51, - 0xd6, 0xbe, 0xbb, 0x2c, 0xa7, 0x5e, 0x5e, 0x96, 0x53, 0x7f, 0x5c, 0x96, 0x53, 0x5f, 0xd4, 0x57, - 0xfb, 0x80, 0x8b, 0xfe, 0xa4, 0xe4, 0xf8, 0x3f, 0x89, 0x83, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, - 0x3e, 0xac, 0xed, 0x43, 0x00, 0x0d, 0x00, 0x00, + 0x14, 0xce, 0xd6, 0xb1, 0xe3, 0x4c, 0xe2, 0x50, 0xad, 0x42, 0xb2, 0x5e, 0xa8, 0x63, 0x2c, 0x01, + 0x26, 0x12, 0xbb, 0x75, 0x82, 0x5a, 0x94, 0x5b, 0xdd, 0x16, 0xc4, 0xc1, 0x6a, 0x65, 0xa7, 0x48, + 0x20, 0x24, 0x6b, 0xed, 0x9d, 0x6c, 0x47, 0x78, 0x67, 0x56, 0x3b, 0xe3, 0x24, 0xbe, 0xa1, 0x1e, + 0x39, 0x81, 0x38, 0x72, 0x05, 0xc4, 0xb1, 0x07, 0xfe, 0x88, 0x5c, 0x90, 0x2a, 0x4e, 0x9c, 0x2a, + 0x48, 0x0e, 0x95, 0xf8, 0x13, 0x38, 0xa1, 0x9d, 0x19, 0x8f, 0x77, 0xed, 0xf5, 0xaf, 0xa0, 0xde, + 0x3c, 0xfb, 0xbe, 0x7d, 0xf3, 0x7d, 0xdf, 0x7b, 0xf3, 0x66, 0x0d, 0x8a, 0x28, 0x44, 0xd4, 0x27, + 0xae, 0xcd, 0xc8, 0xd7, 0x10, 0xdb, 0xa7, 0x35, 0x9b, 0x9d, 0x5b, 0x41, 0x48, 0x18, 0xd1, 0x6f, + 0xca, 0x90, 0xc5, 0x43, 0xd6, 0x69, 0xcd, 0xdc, 0xf6, 0x88, 0x47, 0x78, 0xd0, 0x8e, 0x7e, 0x09, + 0x9c, 0x59, 0xea, 0x12, 0xea, 0x13, 0x6a, 0x77, 0x1c, 0x0a, 0xed, 0xd3, 0x5a, 0x07, 0x32, 0xa7, + 0x66, 0x77, 0x09, 0xc2, 0x32, 0xbe, 0x2b, 0xe3, 0x3e, 0xf5, 0xa2, 0xfc, 0x3e, 0xf5, 0x64, 0xa0, + 0x28, 0x02, 0x6d, 0x91, 0x51, 0x2c, 0x64, 0xe8, 0xed, 0x49, 0x5a, 0x9c, 0x04, 0x8f, 0x56, 0xbe, + 0xbd, 0x01, 0x0a, 0x0d, 0xea, 0x7d, 0x46, 0x69, 0x1f, 0x1e, 0x47, 0xcf, 0xf5, 0x1d, 0x90, 0xa3, + 0x03, 0xbf, 0x43, 0x7a, 0x86, 0x56, 0xd6, 0xaa, 0xeb, 0x4d, 0xb9, 0xd2, 0x75, 0xb0, 0x8a, 0x1d, + 0x1f, 0x1a, 0x37, 0xf8, 0x53, 0xfe, 0x5b, 0xdf, 0x06, 0x59, 0xda, 0x75, 0x7a, 0xd0, 0xc8, 0x94, + 0xb5, 0x6a, 0xa1, 0x29, 0x16, 0x7a, 0x11, 0xe4, 0x7d, 0x84, 0xdb, 0x7d, 0x8c, 0x98, 0xb1, 0xca, + 0xd1, 0x6b, 0x3e, 0xc2, 0x4f, 0x30, 0x62, 0xfa, 0xbb, 0x60, 0x0b, 0x61, 0xc4, 0x90, 0xd3, 0x6b, + 0xd3, 0x7e, 0x10, 0xf4, 0x06, 0x46, 0xb6, 0xac, 0x55, 0x57, 0x9b, 0x05, 0xf9, 0xb4, 0xc5, 0x1f, + 0xea, 0xb7, 0x00, 0xf0, 0x9d, 0xf3, 0x21, 0x24, 0xc7, 0x21, 0xeb, 0xbe, 0x73, 0x2e, 0xc3, 0x26, + 0xdf, 0x80, 0x39, 0x9d, 0x1e, 0x34, 0xd6, 0xca, 0x5a, 0x35, 0xdf, 0x54, 0x6b, 0xdd, 0x02, 0x59, + 0x72, 0x86, 0x61, 0x68, 0xe4, 0xa3, 0x9d, 0xeb, 0xc6, 0x1f, 0xbf, 0x7d, 0xb8, 0x2d, 0xfd, 0xb8, + 0xe7, 0xba, 0x21, 0xa4, 0xb4, 0xc5, 0x42, 0x84, 0xbd, 0xa6, 0x80, 0x1d, 0x81, 0x67, 0xaf, 0x9e, + 0xef, 0x8b, 0xdf, 0x95, 0x5d, 0xf0, 0x66, 0xc2, 0x8b, 0x26, 0xa4, 0x01, 0xc1, 0x14, 0x56, 0x7e, + 0xd0, 0x78, 0xe4, 0x38, 0x74, 0x30, 0x3d, 0x81, 0x21, 0x0f, 0x3e, 0x8a, 0x5e, 0xd1, 0xdf, 0x02, + 0xeb, 0x34, 0xec, 0xb6, 0xc5, 0x96, 0xc2, 0xb0, 0x3c, 0x0d, 0xbb, 0x2a, 0xe8, 0x52, 0x26, 0x83, + 0xc2, 0xb7, 0xbc, 0x4b, 0x99, 0x08, 0xde, 0x56, 0x3e, 0x67, 0xe6, 0x30, 0x95, 0xb8, 0xa3, 0xad, + 0x88, 0xea, 0x68, 0xbb, 0xca, 0x1e, 0xb8, 0x95, 0x4a, 0x4a, 0xd1, 0xfe, 0x47, 0x03, 0x9b, 0x0d, + 0xea, 0x3d, 0x74, 0x11, 0x5b, 0xbe, 0xb6, 0xc9, 0x1a, 0x64, 0xc6, 0x6b, 0xd0, 0x8a, 0xd5, 0x80, + 0x17, 0xb9, 0x7e, 0xf7, 0xdf, 0x97, 0x7b, 0x87, 0x1e, 0x62, 0x4f, 0xfb, 0x1d, 0xab, 0x4b, 0x7c, + 0x3b, 0xea, 0x3b, 0x0c, 0x99, 0x3d, 0xec, 0x3f, 0x9f, 0xb8, 0xfd, 0x1e, 0xa4, 0xb2, 0x0f, 0xd9, + 0x20, 0x80, 0xd4, 0xaa, 0x13, 0xd2, 0x4b, 0x2b, 0x5e, 0x76, 0xf9, 0xe2, 0xed, 0x80, 0xed, 0xb8, + 0x56, 0x65, 0xc2, 0x8f, 0xc2, 0x84, 0x06, 0xc2, 0xd2, 0x84, 0x43, 0xb0, 0x1a, 0x1d, 0x29, 0x6e, + 0xc1, 0xc6, 0x41, 0xd1, 0x92, 0x1b, 0x44, 0x67, 0xce, 0x92, 0x67, 0xce, 0xba, 0x4f, 0x10, 0xae, + 0xaf, 0x5e, 0xbc, 0xdc, 0x5b, 0x69, 0x72, 0x70, 0xd4, 0x72, 0x21, 0xec, 0x42, 0x74, 0x3a, 0xaa, + 0xe4, 0x70, 0x3d, 0x62, 0x9d, 0xb9, 0x2e, 0x6b, 0x45, 0x4e, 0xb1, 0x7e, 0x26, 0x58, 0xd7, 0xfb, + 0x21, 0xfe, 0x1f, 0xac, 0xa3, 0x1e, 0x83, 0xd8, 0x1d, 0x72, 0x9e, 0xd9, 0x63, 0x1c, 0x77, 0xb4, + 0x11, 0x71, 0x93, 0x0b, 0x49, 0x4e, 0x71, 0x50, 0xe4, 0x7e, 0xd5, 0xc0, 0x1b, 0x0d, 0xea, 0xb5, + 0xce, 0x9c, 0xe0, 0x13, 0x28, 0xc7, 0xc6, 0x11, 0xc8, 0x9f, 0x40, 0xd8, 0x0e, 0x1c, 0xe4, 0x2e, + 0xca, 0x71, 0xed, 0x04, 0xc2, 0xc7, 0x0e, 0x72, 0x67, 0x9a, 0x3b, 0x92, 0x90, 0xb9, 0x8e, 0x84, + 0x16, 0xd8, 0x1d, 0x63, 0x3a, 0x54, 0xa1, 0x7f, 0x0c, 0x22, 0x02, 0x6d, 0x8f, 0xb0, 0x45, 0x09, + 0xe7, 0x4e, 0x20, 0xfc, 0x94, 0xb0, 0xca, 0xf7, 0x42, 0xff, 0x93, 0xc0, 0x75, 0x18, 0x7c, 0xec, + 0x84, 0x8e, 0x4f, 0xf5, 0x3b, 0x60, 0xdd, 0xe9, 0xb3, 0xa7, 0x24, 0x44, 0x6c, 0x20, 0x4e, 0xd7, + 0x0c, 0xaa, 0x23, 0xa8, 0x7e, 0x07, 0xe4, 0x02, 0x9e, 0x81, 0x2b, 0xdf, 0x38, 0x30, 0xac, 0xf1, + 0xbb, 0xc2, 0x12, 0x3b, 0x0c, 0x39, 0x08, 0xb4, 0x1c, 0x06, 0x2a, 0x4f, 0xa5, 0xc8, 0x85, 0xc6, + 0x29, 0xa9, 0x72, 0xfd, 0xac, 0x81, 0xad, 0x06, 0xf5, 0x1e, 0xc0, 0xa0, 0x47, 0x06, 0x0f, 0x9b, + 0xf7, 0x0f, 0x6e, 0xbf, 0xde, 0x21, 0x9f, 0xb0, 0x22, 0xbb, 0xb0, 0x15, 0x15, 0x03, 0xec, 0x24, + 0x69, 0x2a, 0x05, 0x3f, 0x09, 0x05, 0x51, 0x19, 0x8f, 0x89, 0x50, 0x70, 0x17, 0xe4, 0x1c, 0x9f, + 0xf4, 0xf1, 0xe2, 0xc5, 0x13, 0xf0, 0xe5, 0xcf, 0x44, 0xa2, 0x3d, 0x33, 0xc9, 0xf6, 0x4c, 0x36, + 0x9b, 0x10, 0x10, 0x63, 0xa9, 0x04, 0xfc, 0xae, 0x81, 0x9b, 0xc3, 0x3e, 0x0c, 0x89, 0x2f, 0x24, + 0x3c, 0x00, 0x85, 0x33, 0x07, 0x33, 0xe8, 0xb6, 0x97, 0x53, 0xb2, 0x29, 0xde, 0xba, 0x77, 0x5d, + 0x3d, 0x1f, 0x8d, 0xeb, 0x99, 0xf1, 0xce, 0x14, 0xa5, 0x26, 0x30, 0xc6, 0xe5, 0x0c, 0xb5, 0x1e, + 0xfc, 0xb2, 0x06, 0x32, 0x0d, 0xea, 0xe9, 0x9f, 0x03, 0x10, 0xfb, 0xac, 0xd8, 0x9b, 0xec, 0xeb, + 0xc4, 0x5d, 0x6b, 0xbe, 0x3f, 0x07, 0xa0, 0xce, 0x6d, 0x0b, 0xac, 0x8f, 0x6e, 0xb4, 0x52, 0xea, + 0x5b, 0x2a, 0x6e, 0xbe, 0x37, 0x3b, 0x1e, 0x4f, 0x3a, 0xba, 0x21, 0xd2, 0x93, 0xaa, 0xf8, 0x94, + 0xa4, 0x13, 0x43, 0x3c, 0x4a, 0x3a, 0x1a, 0xe0, 0xe9, 0x49, 0x55, 0x7c, 0x4a, 0xd2, 0x89, 0xe1, + 0xab, 0x63, 0xa0, 0xa7, 0x7c, 0x87, 0xa4, 0xbb, 0x37, 0x09, 0x34, 0xed, 0x05, 0x81, 0x6a, 0xbf, + 0xaf, 0xc0, 0x66, 0x62, 0xd0, 0xbf, 0x93, 0x9a, 0x20, 0x0e, 0x31, 0x3f, 0x98, 0x0b, 0x51, 0xd9, + 0xbf, 0x00, 0x1b, 0xf1, 0x53, 0x5d, 0x9e, 0xfa, 0xa6, 0x44, 0x98, 0xd5, 0x79, 0x08, 0x95, 0xba, + 0x0d, 0x0a, 0xc9, 0xf3, 0x56, 0x99, 0x4e, 0x6b, 0x88, 0x31, 0xf7, 0xe7, 0x63, 0xe2, 0xce, 0x24, + 0xae, 0x80, 0x74, 0x67, 0xe2, 0x90, 0x29, 0xce, 0xa4, 0x4d, 0xed, 0xc8, 0x99, 0xf8, 0xc4, 0x4e, + 0x77, 0x26, 0x86, 0x98, 0xe2, 0x4c, 0xca, 0x38, 0x35, 0xb3, 0xdf, 0xbc, 0x7a, 0xbe, 0xaf, 0xd5, + 0x1f, 0x5d, 0xfc, 0x5d, 0x5a, 0xb9, 0xb8, 0x2c, 0x69, 0x2f, 0x2e, 0x4b, 0xda, 0x5f, 0x97, 0x25, + 0xed, 0xbb, 0xab, 0xd2, 0xca, 0x8b, 0xab, 0xd2, 0xca, 0x9f, 0x57, 0xa5, 0x95, 0x2f, 0x6b, 0xcb, + 0x7d, 0xca, 0x45, 0x7f, 0x57, 0x72, 0xfc, 0x3f, 0xc5, 0xe1, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, + 0xef, 0x46, 0x21, 0x04, 0x0a, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1618,10 +1617,10 @@ func (m *MsgMintToken) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - if len(m.To) > 0 { - i -= len(m.To) - copy(dAtA[i:], m.To) - i = encodeVarintTx(dAtA, i, uint64(len(m.To))) + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintTx(dAtA, i, uint64(len(m.Receiver))) i-- dAtA[i] = 0x12 } @@ -1751,10 +1750,10 @@ func (m *MsgSwapFeeToken) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - if len(m.Recipient) > 0 { - i -= len(m.Recipient) - copy(dAtA[i:], m.Recipient) - i = encodeVarintTx(dAtA, i, uint64(len(m.Recipient))) + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintTx(dAtA, i, uint64(len(m.Receiver))) i-- dAtA[i] = 0x12 } @@ -2218,7 +2217,7 @@ func (m *MsgMintToken) Size() (n int) { _ = l l = m.Coin.Size() n += 1 + l + sovTx(uint64(l)) - l = len(m.To) + l = len(m.Receiver) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -2270,7 +2269,7 @@ func (m *MsgSwapFeeToken) Size() (n int) { _ = l l = m.FeePaid.Size() n += 1 + l + sovTx(uint64(l)) - l = len(m.Recipient) + l = len(m.Receiver) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -3227,7 +3226,7 @@ func (m *MsgMintToken) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field To", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3255,7 +3254,7 @@ func (m *MsgMintToken) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.To = string(dAtA[iNdEx:postIndex]) + m.Receiver = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { @@ -3589,7 +3588,7 @@ func (m *MsgSwapFeeToken) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Recipient", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3617,7 +3616,7 @@ func (m *MsgSwapFeeToken) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Recipient = string(dAtA[iNdEx:postIndex]) + m.Receiver = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { diff --git a/proto/irismod/token/v1/tx.proto b/proto/irismod/token/v1/tx.proto index 291afd75..6a554e09 100644 --- a/proto/irismod/token/v1/tx.proto +++ b/proto/irismod/token/v1/tx.proto @@ -100,7 +100,7 @@ message MsgMintToken { option (cosmos.msg.v1.signer) = "owner"; cosmos.base.v1beta1.Coin coin = 1 [ (gogoproto.nullable) = false ]; - string to = 2; + string receiver = 2; string owner = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } @@ -123,7 +123,7 @@ message MsgSwapFeeToken { option (cosmos.msg.v1.signer) = "sender"; cosmos.base.v1beta1.Coin fee_paid = 1 [ (gogoproto.nullable) = false ]; - string recipient = 2; + string receiver = 2; string sender = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; }