diff --git a/api/regen/ecocredit/marketplace/v1/query.pulsar.go b/api/regen/ecocredit/marketplace/v1/query.pulsar.go index b2a66b3ff4..9a1bf684ca 100644 --- a/api/regen/ecocredit/marketplace/v1/query.pulsar.go +++ b/api/regen/ecocredit/marketplace/v1/query.pulsar.go @@ -2935,27 +2935,27 @@ func (x *fastReflection_QuerySellOrdersByBatchDenomResponse) ProtoMethods() *pro } var ( - md_QuerySellOrdersByAddressRequest protoreflect.MessageDescriptor - fd_QuerySellOrdersByAddressRequest_address protoreflect.FieldDescriptor - fd_QuerySellOrdersByAddressRequest_pagination protoreflect.FieldDescriptor + md_QuerySellOrdersBySellerRequest protoreflect.MessageDescriptor + fd_QuerySellOrdersBySellerRequest_seller protoreflect.FieldDescriptor + fd_QuerySellOrdersBySellerRequest_pagination protoreflect.FieldDescriptor ) func init() { file_regen_ecocredit_marketplace_v1_query_proto_init() - md_QuerySellOrdersByAddressRequest = File_regen_ecocredit_marketplace_v1_query_proto.Messages().ByName("QuerySellOrdersByAddressRequest") - fd_QuerySellOrdersByAddressRequest_address = md_QuerySellOrdersByAddressRequest.Fields().ByName("address") - fd_QuerySellOrdersByAddressRequest_pagination = md_QuerySellOrdersByAddressRequest.Fields().ByName("pagination") + md_QuerySellOrdersBySellerRequest = File_regen_ecocredit_marketplace_v1_query_proto.Messages().ByName("QuerySellOrdersBySellerRequest") + fd_QuerySellOrdersBySellerRequest_seller = md_QuerySellOrdersBySellerRequest.Fields().ByName("seller") + fd_QuerySellOrdersBySellerRequest_pagination = md_QuerySellOrdersBySellerRequest.Fields().ByName("pagination") } -var _ protoreflect.Message = (*fastReflection_QuerySellOrdersByAddressRequest)(nil) +var _ protoreflect.Message = (*fastReflection_QuerySellOrdersBySellerRequest)(nil) -type fastReflection_QuerySellOrdersByAddressRequest QuerySellOrdersByAddressRequest +type fastReflection_QuerySellOrdersBySellerRequest QuerySellOrdersBySellerRequest -func (x *QuerySellOrdersByAddressRequest) ProtoReflect() protoreflect.Message { - return (*fastReflection_QuerySellOrdersByAddressRequest)(x) +func (x *QuerySellOrdersBySellerRequest) ProtoReflect() protoreflect.Message { + return (*fastReflection_QuerySellOrdersBySellerRequest)(x) } -func (x *QuerySellOrdersByAddressRequest) slowProtoReflect() protoreflect.Message { +func (x *QuerySellOrdersBySellerRequest) slowProtoReflect() protoreflect.Message { mi := &file_regen_ecocredit_marketplace_v1_query_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -2967,43 +2967,43 @@ func (x *QuerySellOrdersByAddressRequest) slowProtoReflect() protoreflect.Messag return mi.MessageOf(x) } -var _fastReflection_QuerySellOrdersByAddressRequest_messageType fastReflection_QuerySellOrdersByAddressRequest_messageType -var _ protoreflect.MessageType = fastReflection_QuerySellOrdersByAddressRequest_messageType{} +var _fastReflection_QuerySellOrdersBySellerRequest_messageType fastReflection_QuerySellOrdersBySellerRequest_messageType +var _ protoreflect.MessageType = fastReflection_QuerySellOrdersBySellerRequest_messageType{} -type fastReflection_QuerySellOrdersByAddressRequest_messageType struct{} +type fastReflection_QuerySellOrdersBySellerRequest_messageType struct{} -func (x fastReflection_QuerySellOrdersByAddressRequest_messageType) Zero() protoreflect.Message { - return (*fastReflection_QuerySellOrdersByAddressRequest)(nil) +func (x fastReflection_QuerySellOrdersBySellerRequest_messageType) Zero() protoreflect.Message { + return (*fastReflection_QuerySellOrdersBySellerRequest)(nil) } -func (x fastReflection_QuerySellOrdersByAddressRequest_messageType) New() protoreflect.Message { - return new(fastReflection_QuerySellOrdersByAddressRequest) +func (x fastReflection_QuerySellOrdersBySellerRequest_messageType) New() protoreflect.Message { + return new(fastReflection_QuerySellOrdersBySellerRequest) } -func (x fastReflection_QuerySellOrdersByAddressRequest_messageType) Descriptor() protoreflect.MessageDescriptor { - return md_QuerySellOrdersByAddressRequest +func (x fastReflection_QuerySellOrdersBySellerRequest_messageType) Descriptor() protoreflect.MessageDescriptor { + return md_QuerySellOrdersBySellerRequest } // Descriptor returns message descriptor, which contains only the protobuf // type information for the message. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Descriptor() protoreflect.MessageDescriptor { - return md_QuerySellOrdersByAddressRequest +func (x *fastReflection_QuerySellOrdersBySellerRequest) Descriptor() protoreflect.MessageDescriptor { + return md_QuerySellOrdersBySellerRequest } // Type returns the message type, which encapsulates both Go and protobuf // type information. If the Go type information is not needed, // it is recommended that the message descriptor be used instead. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Type() protoreflect.MessageType { - return _fastReflection_QuerySellOrdersByAddressRequest_messageType +func (x *fastReflection_QuerySellOrdersBySellerRequest) Type() protoreflect.MessageType { + return _fastReflection_QuerySellOrdersBySellerRequest_messageType } // New returns a newly allocated and mutable empty message. -func (x *fastReflection_QuerySellOrdersByAddressRequest) New() protoreflect.Message { - return new(fastReflection_QuerySellOrdersByAddressRequest) +func (x *fastReflection_QuerySellOrdersBySellerRequest) New() protoreflect.Message { + return new(fastReflection_QuerySellOrdersBySellerRequest) } // Interface unwraps the message reflection interface and // returns the underlying ProtoMessage interface. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Interface() protoreflect.ProtoMessage { - return (*QuerySellOrdersByAddressRequest)(x) +func (x *fastReflection_QuerySellOrdersBySellerRequest) Interface() protoreflect.ProtoMessage { + return (*QuerySellOrdersBySellerRequest)(x) } // Range iterates over every populated field in an undefined order, @@ -3011,16 +3011,16 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) Interface() protoreflec // Range returns immediately if f returns false. // While iterating, mutating operations may only be performed // on the current field descriptor. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.Address != "" { - value := protoreflect.ValueOfString(x.Address) - if !f(fd_QuerySellOrdersByAddressRequest_address, value) { +func (x *fastReflection_QuerySellOrdersBySellerRequest) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { + if x.Seller != "" { + value := protoreflect.ValueOfString(x.Seller) + if !f(fd_QuerySellOrdersBySellerRequest_seller, value) { return } } if x.Pagination != nil { value := protoreflect.ValueOfMessage(x.Pagination.ProtoReflect()) - if !f(fd_QuerySellOrdersByAddressRequest_pagination, value) { + if !f(fd_QuerySellOrdersBySellerRequest_pagination, value) { return } } @@ -3037,17 +3037,17 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) Range(f func(protorefle // In other cases (aside from the nullable cases above), // a proto3 scalar field is populated if it contains a non-zero value, and // a repeated field is populated if it is non-empty. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Has(fd protoreflect.FieldDescriptor) bool { +func (x *fastReflection_QuerySellOrdersBySellerRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.address": - return x.Address != "" - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.seller": + return x.Seller != "" + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.pagination": return x.Pagination != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest does not contain field %s", fd.FullName())) } } @@ -3057,17 +3057,17 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) Has(fd protoreflect.Fie // associated with the given field number. // // Clear is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Clear(fd protoreflect.FieldDescriptor) { +func (x *fastReflection_QuerySellOrdersBySellerRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.address": - x.Address = "" - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.seller": + x.Seller = "" + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.pagination": x.Pagination = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest does not contain field %s", fd.FullName())) } } @@ -3077,19 +3077,19 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) Clear(fd protoreflect.F // the default value of a bytes scalar is guaranteed to be a copy. // For unpopulated composite types, it returns an empty, read-only view // of the value; to obtain a mutable reference, use Mutable. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { +func (x *fastReflection_QuerySellOrdersBySellerRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.address": - value := x.Address + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.seller": + value := x.Seller return protoreflect.ValueOfString(value) - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.pagination": value := x.Pagination return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest does not contain field %s", descriptor.FullName())) } } @@ -3103,17 +3103,17 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) Get(descriptor protoref // empty, read-only value, then it panics. // // Set is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { +func (x *fastReflection_QuerySellOrdersBySellerRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.address": - x.Address = value.Interface().(string) - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.seller": + x.Seller = value.Interface().(string) + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.pagination": x.Pagination = value.Message().Interface().(*v1beta1.PageRequest) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest does not contain field %s", fd.FullName())) } } @@ -3127,48 +3127,48 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) Set(fd protoreflect.Fie // It panics if the field does not contain a composite type. // // Mutable is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { +func (x *fastReflection_QuerySellOrdersBySellerRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.pagination": if x.Pagination == nil { x.Pagination = new(v1beta1.PageRequest) } return protoreflect.ValueOfMessage(x.Pagination.ProtoReflect()) - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.address": - panic(fmt.Errorf("field address of message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest is not mutable")) + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.seller": + panic(fmt.Errorf("field seller of message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest is not mutable")) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest does not contain field %s", fd.FullName())) } } // NewField returns a new value that is assignable to the field // for the given descriptor. For scalars, this returns the default value. // For lists, maps, and messages, this returns a new, empty, mutable value. -func (x *fastReflection_QuerySellOrdersByAddressRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { +func (x *fastReflection_QuerySellOrdersBySellerRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.address": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.seller": return protoreflect.ValueOfString("") - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.pagination": m := new(v1beta1.PageRequest) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest does not contain field %s", fd.FullName())) } } // WhichOneof reports which field within the oneof is populated, // returning nil if none are populated. // It panics if the oneof descriptor does not belong to this message. -func (x *fastReflection_QuerySellOrdersByAddressRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { +func (x *fastReflection_QuerySellOrdersBySellerRequest) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest", d.FullName())) } panic("unreachable") } @@ -3176,7 +3176,7 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) WhichOneof(d protorefle // GetUnknown retrieves the entire list of unknown fields. // The caller may only mutate the contents of the RawFields // if the mutated bytes are stored back into the message with SetUnknown. -func (x *fastReflection_QuerySellOrdersByAddressRequest) GetUnknown() protoreflect.RawFields { +func (x *fastReflection_QuerySellOrdersBySellerRequest) GetUnknown() protoreflect.RawFields { return x.unknownFields } @@ -3187,7 +3187,7 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) GetUnknown() protorefle // An empty RawFields may be passed to clear the fields. // // SetUnknown is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressRequest) SetUnknown(fields protoreflect.RawFields) { +func (x *fastReflection_QuerySellOrdersBySellerRequest) SetUnknown(fields protoreflect.RawFields) { x.unknownFields = fields } @@ -3199,7 +3199,7 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) SetUnknown(fields proto // message type, but the details are implementation dependent. // Validity is not part of the protobuf data model, and may not // be preserved in marshaling or other operations. -func (x *fastReflection_QuerySellOrdersByAddressRequest) IsValid() bool { +func (x *fastReflection_QuerySellOrdersBySellerRequest) IsValid() bool { return x != nil } @@ -3209,9 +3209,9 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) IsValid() bool { // The returned methods type is identical to // "google.golang.org/protobuf/runtime/protoiface".Methods. // Consult the protoiface package documentation for details. -func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoiface.Methods { +func (x *fastReflection_QuerySellOrdersBySellerRequest) ProtoMethods() *protoiface.Methods { size := func(input protoiface.SizeInput) protoiface.SizeOutput { - x := input.Message.Interface().(*QuerySellOrdersByAddressRequest) + x := input.Message.Interface().(*QuerySellOrdersBySellerRequest) if x == nil { return protoiface.SizeOutput{ NoUnkeyedLiterals: input.NoUnkeyedLiterals, @@ -3223,7 +3223,7 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoif var n int var l int _ = l - l = len(x.Address) + l = len(x.Seller) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -3241,7 +3241,7 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoif } marshal := func(input protoiface.MarshalInput) (protoiface.MarshalOutput, error) { - x := input.Message.Interface().(*QuerySellOrdersByAddressRequest) + x := input.Message.Interface().(*QuerySellOrdersBySellerRequest) if x == nil { return protoiface.MarshalOutput{ NoUnkeyedLiterals: input.NoUnkeyedLiterals, @@ -3274,10 +3274,10 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoif i-- dAtA[i] = 0x12 } - if len(x.Address) > 0 { - i -= len(x.Address) - copy(dAtA[i:], x.Address) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Address))) + if len(x.Seller) > 0 { + i -= len(x.Seller) + copy(dAtA[i:], x.Seller) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Seller))) i-- dAtA[i] = 0xa } @@ -3292,7 +3292,7 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoif }, nil } unmarshal := func(input protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) { - x := input.Message.Interface().(*QuerySellOrdersByAddressRequest) + x := input.Message.Interface().(*QuerySellOrdersBySellerRequest) if x == nil { return protoiface.UnmarshalOutput{ NoUnkeyedLiterals: input.NoUnkeyedLiterals, @@ -3324,15 +3324,15 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoif fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersByAddressRequest: wiretype end group for non-group") + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersBySellerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersByAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersBySellerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Seller", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3360,7 +3360,7 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoif if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Address = string(dAtA[iNdEx:postIndex]) + x.Seller = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -3433,79 +3433,79 @@ func (x *fastReflection_QuerySellOrdersByAddressRequest) ProtoMethods() *protoif } } -var _ protoreflect.List = (*_QuerySellOrdersByAddressResponse_1_list)(nil) +var _ protoreflect.List = (*_QuerySellOrdersBySellerResponse_1_list)(nil) -type _QuerySellOrdersByAddressResponse_1_list struct { +type _QuerySellOrdersBySellerResponse_1_list struct { list *[]*SellOrderInfo } -func (x *_QuerySellOrdersByAddressResponse_1_list) Len() int { +func (x *_QuerySellOrdersBySellerResponse_1_list) Len() int { if x.list == nil { return 0 } return len(*x.list) } -func (x *_QuerySellOrdersByAddressResponse_1_list) Get(i int) protoreflect.Value { +func (x *_QuerySellOrdersBySellerResponse_1_list) Get(i int) protoreflect.Value { return protoreflect.ValueOfMessage((*x.list)[i].ProtoReflect()) } -func (x *_QuerySellOrdersByAddressResponse_1_list) Set(i int, value protoreflect.Value) { +func (x *_QuerySellOrdersBySellerResponse_1_list) Set(i int, value protoreflect.Value) { valueUnwrapped := value.Message() concreteValue := valueUnwrapped.Interface().(*SellOrderInfo) (*x.list)[i] = concreteValue } -func (x *_QuerySellOrdersByAddressResponse_1_list) Append(value protoreflect.Value) { +func (x *_QuerySellOrdersBySellerResponse_1_list) Append(value protoreflect.Value) { valueUnwrapped := value.Message() concreteValue := valueUnwrapped.Interface().(*SellOrderInfo) *x.list = append(*x.list, concreteValue) } -func (x *_QuerySellOrdersByAddressResponse_1_list) AppendMutable() protoreflect.Value { +func (x *_QuerySellOrdersBySellerResponse_1_list) AppendMutable() protoreflect.Value { v := new(SellOrderInfo) *x.list = append(*x.list, v) return protoreflect.ValueOfMessage(v.ProtoReflect()) } -func (x *_QuerySellOrdersByAddressResponse_1_list) Truncate(n int) { +func (x *_QuerySellOrdersBySellerResponse_1_list) Truncate(n int) { for i := n; i < len(*x.list); i++ { (*x.list)[i] = nil } *x.list = (*x.list)[:n] } -func (x *_QuerySellOrdersByAddressResponse_1_list) NewElement() protoreflect.Value { +func (x *_QuerySellOrdersBySellerResponse_1_list) NewElement() protoreflect.Value { v := new(SellOrderInfo) return protoreflect.ValueOfMessage(v.ProtoReflect()) } -func (x *_QuerySellOrdersByAddressResponse_1_list) IsValid() bool { +func (x *_QuerySellOrdersBySellerResponse_1_list) IsValid() bool { return x.list != nil } var ( - md_QuerySellOrdersByAddressResponse protoreflect.MessageDescriptor - fd_QuerySellOrdersByAddressResponse_sell_orders protoreflect.FieldDescriptor - fd_QuerySellOrdersByAddressResponse_pagination protoreflect.FieldDescriptor + md_QuerySellOrdersBySellerResponse protoreflect.MessageDescriptor + fd_QuerySellOrdersBySellerResponse_sell_orders protoreflect.FieldDescriptor + fd_QuerySellOrdersBySellerResponse_pagination protoreflect.FieldDescriptor ) func init() { file_regen_ecocredit_marketplace_v1_query_proto_init() - md_QuerySellOrdersByAddressResponse = File_regen_ecocredit_marketplace_v1_query_proto.Messages().ByName("QuerySellOrdersByAddressResponse") - fd_QuerySellOrdersByAddressResponse_sell_orders = md_QuerySellOrdersByAddressResponse.Fields().ByName("sell_orders") - fd_QuerySellOrdersByAddressResponse_pagination = md_QuerySellOrdersByAddressResponse.Fields().ByName("pagination") + md_QuerySellOrdersBySellerResponse = File_regen_ecocredit_marketplace_v1_query_proto.Messages().ByName("QuerySellOrdersBySellerResponse") + fd_QuerySellOrdersBySellerResponse_sell_orders = md_QuerySellOrdersBySellerResponse.Fields().ByName("sell_orders") + fd_QuerySellOrdersBySellerResponse_pagination = md_QuerySellOrdersBySellerResponse.Fields().ByName("pagination") } -var _ protoreflect.Message = (*fastReflection_QuerySellOrdersByAddressResponse)(nil) +var _ protoreflect.Message = (*fastReflection_QuerySellOrdersBySellerResponse)(nil) -type fastReflection_QuerySellOrdersByAddressResponse QuerySellOrdersByAddressResponse +type fastReflection_QuerySellOrdersBySellerResponse QuerySellOrdersBySellerResponse -func (x *QuerySellOrdersByAddressResponse) ProtoReflect() protoreflect.Message { - return (*fastReflection_QuerySellOrdersByAddressResponse)(x) +func (x *QuerySellOrdersBySellerResponse) ProtoReflect() protoreflect.Message { + return (*fastReflection_QuerySellOrdersBySellerResponse)(x) } -func (x *QuerySellOrdersByAddressResponse) slowProtoReflect() protoreflect.Message { +func (x *QuerySellOrdersBySellerResponse) slowProtoReflect() protoreflect.Message { mi := &file_regen_ecocredit_marketplace_v1_query_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -3517,43 +3517,43 @@ func (x *QuerySellOrdersByAddressResponse) slowProtoReflect() protoreflect.Messa return mi.MessageOf(x) } -var _fastReflection_QuerySellOrdersByAddressResponse_messageType fastReflection_QuerySellOrdersByAddressResponse_messageType -var _ protoreflect.MessageType = fastReflection_QuerySellOrdersByAddressResponse_messageType{} +var _fastReflection_QuerySellOrdersBySellerResponse_messageType fastReflection_QuerySellOrdersBySellerResponse_messageType +var _ protoreflect.MessageType = fastReflection_QuerySellOrdersBySellerResponse_messageType{} -type fastReflection_QuerySellOrdersByAddressResponse_messageType struct{} +type fastReflection_QuerySellOrdersBySellerResponse_messageType struct{} -func (x fastReflection_QuerySellOrdersByAddressResponse_messageType) Zero() protoreflect.Message { - return (*fastReflection_QuerySellOrdersByAddressResponse)(nil) +func (x fastReflection_QuerySellOrdersBySellerResponse_messageType) Zero() protoreflect.Message { + return (*fastReflection_QuerySellOrdersBySellerResponse)(nil) } -func (x fastReflection_QuerySellOrdersByAddressResponse_messageType) New() protoreflect.Message { - return new(fastReflection_QuerySellOrdersByAddressResponse) +func (x fastReflection_QuerySellOrdersBySellerResponse_messageType) New() protoreflect.Message { + return new(fastReflection_QuerySellOrdersBySellerResponse) } -func (x fastReflection_QuerySellOrdersByAddressResponse_messageType) Descriptor() protoreflect.MessageDescriptor { - return md_QuerySellOrdersByAddressResponse +func (x fastReflection_QuerySellOrdersBySellerResponse_messageType) Descriptor() protoreflect.MessageDescriptor { + return md_QuerySellOrdersBySellerResponse } // Descriptor returns message descriptor, which contains only the protobuf // type information for the message. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Descriptor() protoreflect.MessageDescriptor { - return md_QuerySellOrdersByAddressResponse +func (x *fastReflection_QuerySellOrdersBySellerResponse) Descriptor() protoreflect.MessageDescriptor { + return md_QuerySellOrdersBySellerResponse } // Type returns the message type, which encapsulates both Go and protobuf // type information. If the Go type information is not needed, // it is recommended that the message descriptor be used instead. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Type() protoreflect.MessageType { - return _fastReflection_QuerySellOrdersByAddressResponse_messageType +func (x *fastReflection_QuerySellOrdersBySellerResponse) Type() protoreflect.MessageType { + return _fastReflection_QuerySellOrdersBySellerResponse_messageType } // New returns a newly allocated and mutable empty message. -func (x *fastReflection_QuerySellOrdersByAddressResponse) New() protoreflect.Message { - return new(fastReflection_QuerySellOrdersByAddressResponse) +func (x *fastReflection_QuerySellOrdersBySellerResponse) New() protoreflect.Message { + return new(fastReflection_QuerySellOrdersBySellerResponse) } // Interface unwraps the message reflection interface and // returns the underlying ProtoMessage interface. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Interface() protoreflect.ProtoMessage { - return (*QuerySellOrdersByAddressResponse)(x) +func (x *fastReflection_QuerySellOrdersBySellerResponse) Interface() protoreflect.ProtoMessage { + return (*QuerySellOrdersBySellerResponse)(x) } // Range iterates over every populated field in an undefined order, @@ -3561,16 +3561,16 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) Interface() protorefle // Range returns immediately if f returns false. // While iterating, mutating operations may only be performed // on the current field descriptor. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { +func (x *fastReflection_QuerySellOrdersBySellerResponse) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { if len(x.SellOrders) != 0 { - value := protoreflect.ValueOfList(&_QuerySellOrdersByAddressResponse_1_list{list: &x.SellOrders}) - if !f(fd_QuerySellOrdersByAddressResponse_sell_orders, value) { + value := protoreflect.ValueOfList(&_QuerySellOrdersBySellerResponse_1_list{list: &x.SellOrders}) + if !f(fd_QuerySellOrdersBySellerResponse_sell_orders, value) { return } } if x.Pagination != nil { value := protoreflect.ValueOfMessage(x.Pagination.ProtoReflect()) - if !f(fd_QuerySellOrdersByAddressResponse_pagination, value) { + if !f(fd_QuerySellOrdersBySellerResponse_pagination, value) { return } } @@ -3587,17 +3587,17 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) Range(f func(protorefl // In other cases (aside from the nullable cases above), // a proto3 scalar field is populated if it contains a non-zero value, and // a repeated field is populated if it is non-empty. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Has(fd protoreflect.FieldDescriptor) bool { +func (x *fastReflection_QuerySellOrdersBySellerResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.sell_orders": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.sell_orders": return len(x.SellOrders) != 0 - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.pagination": return x.Pagination != nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse does not contain field %s", fd.FullName())) } } @@ -3607,17 +3607,17 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) Has(fd protoreflect.Fi // associated with the given field number. // // Clear is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Clear(fd protoreflect.FieldDescriptor) { +func (x *fastReflection_QuerySellOrdersBySellerResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.sell_orders": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.sell_orders": x.SellOrders = nil - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.pagination": x.Pagination = nil default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse does not contain field %s", fd.FullName())) } } @@ -3627,22 +3627,22 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) Clear(fd protoreflect. // the default value of a bytes scalar is guaranteed to be a copy. // For unpopulated composite types, it returns an empty, read-only view // of the value; to obtain a mutable reference, use Mutable. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { +func (x *fastReflection_QuerySellOrdersBySellerResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.sell_orders": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.sell_orders": if len(x.SellOrders) == 0 { - return protoreflect.ValueOfList(&_QuerySellOrdersByAddressResponse_1_list{}) + return protoreflect.ValueOfList(&_QuerySellOrdersBySellerResponse_1_list{}) } - listValue := &_QuerySellOrdersByAddressResponse_1_list{list: &x.SellOrders} + listValue := &_QuerySellOrdersBySellerResponse_1_list{list: &x.SellOrders} return protoreflect.ValueOfList(listValue) - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.pagination": value := x.Pagination return protoreflect.ValueOfMessage(value.ProtoReflect()) default: if descriptor.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse does not contain field %s", descriptor.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse does not contain field %s", descriptor.FullName())) } } @@ -3656,19 +3656,19 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) Get(descriptor protore // empty, read-only value, then it panics. // // Set is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { +func (x *fastReflection_QuerySellOrdersBySellerResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.sell_orders": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.sell_orders": lv := value.List() - clv := lv.(*_QuerySellOrdersByAddressResponse_1_list) + clv := lv.(*_QuerySellOrdersBySellerResponse_1_list) x.SellOrders = *clv.list - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.pagination": x.Pagination = value.Message().Interface().(*v1beta1.PageResponse) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse does not contain field %s", fd.FullName())) } } @@ -3682,53 +3682,53 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) Set(fd protoreflect.Fi // It panics if the field does not contain a composite type. // // Mutable is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { +func (x *fastReflection_QuerySellOrdersBySellerResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.sell_orders": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.sell_orders": if x.SellOrders == nil { x.SellOrders = []*SellOrderInfo{} } - value := &_QuerySellOrdersByAddressResponse_1_list{list: &x.SellOrders} + value := &_QuerySellOrdersBySellerResponse_1_list{list: &x.SellOrders} return protoreflect.ValueOfList(value) - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.pagination": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.pagination": if x.Pagination == nil { x.Pagination = new(v1beta1.PageResponse) } return protoreflect.ValueOfMessage(x.Pagination.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse does not contain field %s", fd.FullName())) } } // NewField returns a new value that is assignable to the field // for the given descriptor. For scalars, this returns the default value. // For lists, maps, and messages, this returns a new, empty, mutable value. -func (x *fastReflection_QuerySellOrdersByAddressResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { +func (x *fastReflection_QuerySellOrdersBySellerResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.sell_orders": + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.sell_orders": list := []*SellOrderInfo{} - return protoreflect.ValueOfList(&_QuerySellOrdersByAddressResponse_1_list{list: &list}) - case "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.pagination": + return protoreflect.ValueOfList(&_QuerySellOrdersBySellerResponse_1_list{list: &list}) + case "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.pagination": m := new(v1beta1.PageResponse) return protoreflect.ValueOfMessage(m.ProtoReflect()) default: if fd.IsExtension() { - panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse")) + panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse")) } - panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse does not contain field %s", fd.FullName())) + panic(fmt.Errorf("message regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse does not contain field %s", fd.FullName())) } } // WhichOneof reports which field within the oneof is populated, // returning nil if none are populated. // It panics if the oneof descriptor does not belong to this message. -func (x *fastReflection_QuerySellOrdersByAddressResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { +func (x *fastReflection_QuerySellOrdersBySellerResponse) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { switch d.FullName() { default: - panic(fmt.Errorf("%s is not a oneof field in regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse", d.FullName())) + panic(fmt.Errorf("%s is not a oneof field in regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse", d.FullName())) } panic("unreachable") } @@ -3736,7 +3736,7 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) WhichOneof(d protorefl // GetUnknown retrieves the entire list of unknown fields. // The caller may only mutate the contents of the RawFields // if the mutated bytes are stored back into the message with SetUnknown. -func (x *fastReflection_QuerySellOrdersByAddressResponse) GetUnknown() protoreflect.RawFields { +func (x *fastReflection_QuerySellOrdersBySellerResponse) GetUnknown() protoreflect.RawFields { return x.unknownFields } @@ -3747,7 +3747,7 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) GetUnknown() protorefl // An empty RawFields may be passed to clear the fields. // // SetUnknown is a mutating operation and unsafe for concurrent use. -func (x *fastReflection_QuerySellOrdersByAddressResponse) SetUnknown(fields protoreflect.RawFields) { +func (x *fastReflection_QuerySellOrdersBySellerResponse) SetUnknown(fields protoreflect.RawFields) { x.unknownFields = fields } @@ -3759,7 +3759,7 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) SetUnknown(fields prot // message type, but the details are implementation dependent. // Validity is not part of the protobuf data model, and may not // be preserved in marshaling or other operations. -func (x *fastReflection_QuerySellOrdersByAddressResponse) IsValid() bool { +func (x *fastReflection_QuerySellOrdersBySellerResponse) IsValid() bool { return x != nil } @@ -3769,9 +3769,9 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) IsValid() bool { // The returned methods type is identical to // "google.golang.org/protobuf/runtime/protoiface".Methods. // Consult the protoiface package documentation for details. -func (x *fastReflection_QuerySellOrdersByAddressResponse) ProtoMethods() *protoiface.Methods { +func (x *fastReflection_QuerySellOrdersBySellerResponse) ProtoMethods() *protoiface.Methods { size := func(input protoiface.SizeInput) protoiface.SizeOutput { - x := input.Message.Interface().(*QuerySellOrdersByAddressResponse) + x := input.Message.Interface().(*QuerySellOrdersBySellerResponse) if x == nil { return protoiface.SizeOutput{ NoUnkeyedLiterals: input.NoUnkeyedLiterals, @@ -3803,7 +3803,7 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) ProtoMethods() *protoi } marshal := func(input protoiface.MarshalInput) (protoiface.MarshalOutput, error) { - x := input.Message.Interface().(*QuerySellOrdersByAddressResponse) + x := input.Message.Interface().(*QuerySellOrdersBySellerResponse) if x == nil { return protoiface.MarshalOutput{ NoUnkeyedLiterals: input.NoUnkeyedLiterals, @@ -3863,7 +3863,7 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) ProtoMethods() *protoi }, nil } unmarshal := func(input protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) { - x := input.Message.Interface().(*QuerySellOrdersByAddressResponse) + x := input.Message.Interface().(*QuerySellOrdersBySellerResponse) if x == nil { return protoiface.UnmarshalOutput{ NoUnkeyedLiterals: input.NoUnkeyedLiterals, @@ -3895,10 +3895,10 @@ func (x *fastReflection_QuerySellOrdersByAddressResponse) ProtoMethods() *protoi fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersByAddressResponse: wiretype end group for non-group") + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersBySellerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersByAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: QuerySellOrdersBySellerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -6041,7 +6041,8 @@ func (x *QuerySellOrdersResponse) GetPagination() *v1beta1.PageResponse { return nil } -// QuerySellOrdersByDenomRequest is the Query/SellOrdersByDenom request type. +// QuerySellOrdersByBatchDenomRequest is the Query/SellOrdersByBatchDenom +// request type. type QuerySellOrdersByBatchDenomRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -6087,7 +6088,8 @@ func (x *QuerySellOrdersByBatchDenomRequest) GetPagination() *v1beta1.PageReques return nil } -// QuerySellOrdersByDenomResponse is the Query/SellOrdersByDenom response type. +// QuerySellOrdersByBatchDenomResponse is the Query/SellOrdersByBatchDenom +// response type. type QuerySellOrdersByBatchDenomResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -6133,21 +6135,21 @@ func (x *QuerySellOrdersByBatchDenomResponse) GetPagination() *v1beta1.PageRespo return nil } -// QuerySellOrdersByAddressRequest is the Query/SellOrdersByAddress request +// QuerySellOrdersBySellerRequest is the Query/SellOrdersBySeller request // type. -type QuerySellOrdersByAddressRequest struct { +type QuerySellOrdersBySellerRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // address is the creator of the sell order - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + // seller is the address of the account that is selling credits. + Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // pagination defines an optional pagination for the request. Pagination *v1beta1.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (x *QuerySellOrdersByAddressRequest) Reset() { - *x = QuerySellOrdersByAddressRequest{} +func (x *QuerySellOrdersBySellerRequest) Reset() { + *x = QuerySellOrdersBySellerRequest{} if protoimpl.UnsafeEnabled { mi := &file_regen_ecocredit_marketplace_v1_query_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -6155,34 +6157,34 @@ func (x *QuerySellOrdersByAddressRequest) Reset() { } } -func (x *QuerySellOrdersByAddressRequest) String() string { +func (x *QuerySellOrdersBySellerRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*QuerySellOrdersByAddressRequest) ProtoMessage() {} +func (*QuerySellOrdersBySellerRequest) ProtoMessage() {} -// Deprecated: Use QuerySellOrdersByAddressRequest.ProtoReflect.Descriptor instead. -func (*QuerySellOrdersByAddressRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use QuerySellOrdersBySellerRequest.ProtoReflect.Descriptor instead. +func (*QuerySellOrdersBySellerRequest) Descriptor() ([]byte, []int) { return file_regen_ecocredit_marketplace_v1_query_proto_rawDescGZIP(), []int{6} } -func (x *QuerySellOrdersByAddressRequest) GetAddress() string { +func (x *QuerySellOrdersBySellerRequest) GetSeller() string { if x != nil { - return x.Address + return x.Seller } return "" } -func (x *QuerySellOrdersByAddressRequest) GetPagination() *v1beta1.PageRequest { +func (x *QuerySellOrdersBySellerRequest) GetPagination() *v1beta1.PageRequest { if x != nil { return x.Pagination } return nil } -// QuerySellOrdersByAddressResponse is the Query/SellOrdersByAddressResponse +// QuerySellOrdersBySellerResponse is the Query/SellOrdersBySellerResponse // response type. -type QuerySellOrdersByAddressResponse struct { +type QuerySellOrdersBySellerResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -6193,8 +6195,8 @@ type QuerySellOrdersByAddressResponse struct { Pagination *v1beta1.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (x *QuerySellOrdersByAddressResponse) Reset() { - *x = QuerySellOrdersByAddressResponse{} +func (x *QuerySellOrdersBySellerResponse) Reset() { + *x = QuerySellOrdersBySellerResponse{} if protoimpl.UnsafeEnabled { mi := &file_regen_ecocredit_marketplace_v1_query_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -6202,25 +6204,25 @@ func (x *QuerySellOrdersByAddressResponse) Reset() { } } -func (x *QuerySellOrdersByAddressResponse) String() string { +func (x *QuerySellOrdersBySellerResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*QuerySellOrdersByAddressResponse) ProtoMessage() {} +func (*QuerySellOrdersBySellerResponse) ProtoMessage() {} -// Deprecated: Use QuerySellOrdersByAddressResponse.ProtoReflect.Descriptor instead. -func (*QuerySellOrdersByAddressResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use QuerySellOrdersBySellerResponse.ProtoReflect.Descriptor instead. +func (*QuerySellOrdersBySellerResponse) Descriptor() ([]byte, []int) { return file_regen_ecocredit_marketplace_v1_query_proto_rawDescGZIP(), []int{7} } -func (x *QuerySellOrdersByAddressResponse) GetSellOrders() []*SellOrderInfo { +func (x *QuerySellOrdersBySellerResponse) GetSellOrders() []*SellOrderInfo { if x != nil { return x.SellOrders } return nil } -func (x *QuerySellOrdersByAddressResponse) GetPagination() *v1beta1.PageResponse { +func (x *QuerySellOrdersBySellerResponse) GetPagination() *v1beta1.PageResponse { if x != nil { return x.Pagination } @@ -6319,7 +6321,7 @@ type SellOrderInfo struct { // id is the unique ID of sell order. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - // seller is the account address of the owner of the credits being sold. + // seller is the address of the account that is selling credits. Seller string `protobuf:"bytes,2,opt,name=seller,proto3" json:"seller,omitempty"` // batch_denom is denom of the credit batch being sold. BatchDenom string `protobuf:"bytes,3,opt,name=batch_denom,json=batchDenom,proto3" json:"batch_denom,omitempty"` @@ -6482,147 +6484,147 @@ var file_regen_ecocredit_marketplace_v1_query_proto_rawDesc = []byte{ 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x83, 0x01, 0x0a, 0x1f, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x46, - 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, - 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, - 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xbb, 0x01, 0x0a, 0x20, 0x51, 0x75, 0x65, 0x72, 0x79, - 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x41, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x0b, 0x73, - 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x2d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, - 0x0a, 0x73, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x70, + 0x22, 0x80, 0x01, 0x0a, 0x1e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x46, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x27, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, + 0x26, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x63, 0x0a, 0x19, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x6c, 0x6c, - 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x46, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, - 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, - 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, - 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xba, 0x01, 0x0a, 0x1a, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, - 0x77, 0x65, 0x64, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, 0x0d, - 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x47, 0x0a, - 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0xba, 0x01, 0x0a, 0x1f, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, + 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x0b, 0x73, 0x65, 0x6c, 0x6c, 0x5f, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x65, + 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x73, 0x65, 0x6c, + 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x6f, + 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, + 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x63, 0x0a, 0x19, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, + 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, + 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, - 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x9c, 0x02, 0x0a, 0x0d, 0x53, 0x65, 0x6c, 0x6c, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6c, 0x6c, - 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, - 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, - 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1b, 0x0a, - 0x09, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x61, 0x73, 0x6b, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x73, - 0x6b, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, - 0x61, 0x73, 0x6b, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, - 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, - 0x75, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x65, 0x78, 0x70, - 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x94, 0x08, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, - 0xbf, 0x01, 0x0a, 0x09, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x35, 0x2e, - 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, - 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, - 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x43, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x3d, 0x12, 0x3b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, - 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x6c, 0x2d, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x73, 0x2f, 0x7b, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, - 0x7d, 0x12, 0xb2, 0x01, 0x0a, 0x0a, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, - 0x12, 0x36, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, + 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xba, 0x01, 0x0a, 0x1a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, + 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x5f, + 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x6c, + 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, 0x0d, 0x61, 0x6c, 0x6c, 0x6f, + 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x47, 0x0a, 0x0a, 0x70, 0x61, 0x67, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x27, 0x2e, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, + 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x67, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x9c, 0x02, 0x0a, 0x0d, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x0b, + 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1a, 0x0a, + 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x61, 0x73, 0x6b, + 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x73, + 0x6b, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x73, 0x6b, 0x5f, 0x61, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x73, 0x6b, 0x41, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, + 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x52, + 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x32, 0x8f, 0x08, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0xbf, 0x01, 0x0a, 0x09, + 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x35, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, + 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, + 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x36, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, - 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, - 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, - 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x12, 0x2b, 0x2f, 0x72, 0x65, 0x67, 0x65, - 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, - 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x6c, 0x2d, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0xf0, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x6c, 0x6c, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, - 0x6d, 0x12, 0x42, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x43, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3d, + 0x12, 0x3b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, + 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x6c, 0x2d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x73, + 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0xb2, 0x01, + 0x0a, 0x0a, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x36, 0x2e, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x33, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x12, 0x2b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, + 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x6c, 0x2d, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x73, 0x12, 0xf0, 0x01, 0x0a, 0x16, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x73, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x42, 0x2e, + 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, + 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, + 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, + 0x42, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x43, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x43, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, - 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, - 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, - 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x42, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, - 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4d, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x47, 0x12, 0x45, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x6c, 0x2d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x2f, - 0x62, 0x61, 0x74, 0x63, 0x68, 0x2d, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x2f, 0x7b, 0x62, 0x61, 0x74, - 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x7d, 0x12, 0xdf, 0x01, 0x0a, 0x13, 0x53, 0x65, - 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x3f, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, - 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x73, 0x42, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, - 0x65, 0x72, 0x73, 0x42, 0x79, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x45, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3f, 0x12, 0x3d, 0x2f, 0x72, - 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, - 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, - 0x6c, 0x6c, 0x2d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, - 0x73, 0x2f, 0x7b, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x7d, 0x12, 0xbe, 0x01, 0x0a, 0x0d, - 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x39, 0x2e, - 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, - 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, - 0x75, 0x65, 0x72, 0x79, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, - 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, - 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, - 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x72, - 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, - 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x6c, - 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x2d, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x42, 0xa3, 0x02, 0x0a, - 0x22, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, - 0x01, 0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x65, - 0x67, 0x65, 0x6e, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x72, 0x65, 0x67, 0x65, - 0x6e, 0x2d, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x67, - 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, - 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x61, 0x72, 0x6b, - 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x45, 0x4d, 0xaa, - 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x56, 0x31, - 0xca, 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x5c, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5c, 0x56, - 0x31, 0xe2, 0x02, 0x2a, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, - 0x64, 0x69, 0x74, 0x5c, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5c, - 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, - 0x21, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x3a, 0x3a, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x3a, 0x3a, - 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x47, 0x12, 0x45, + 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, + 0x73, 0x65, 0x6c, 0x6c, 0x2d, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x2f, 0x62, 0x61, 0x74, 0x63, + 0x68, 0x2d, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x2f, 0x7b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, + 0x65, 0x6e, 0x6f, 0x6d, 0x7d, 0x12, 0xda, 0x01, 0x0a, 0x12, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x3e, 0x2e, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x53, + 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3f, 0x2e, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x42, 0x79, 0x53, + 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x43, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x3d, 0x12, 0x3b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, + 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x65, 0x6c, 0x6c, 0x2d, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x73, 0x2f, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x2f, 0x7b, 0x73, 0x65, 0x6c, 0x6c, 0x65, + 0x72, 0x7d, 0x12, 0xbe, 0x01, 0x0a, 0x0d, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, + 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x39, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x6c, 0x6c, 0x6f, 0x77, + 0x65, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x3a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x44, 0x65, 0x6e, + 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x30, 0x12, 0x2e, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, + 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x2d, 0x64, 0x65, 0x6e, + 0x6f, 0x6d, 0x73, 0x42, 0xa3, 0x02, 0x0a, 0x22, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, + 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, + 0x72, 0x6b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, + 0x76, 0x31, 0x3b, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x76, 0x31, + 0xa2, 0x02, 0x03, 0x52, 0x45, 0x4d, 0xaa, 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, + 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, + 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, + 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x2a, 0x52, 0x65, 0x67, 0x65, 0x6e, + 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x4d, 0x61, 0x72, 0x6b, 0x65, + 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x21, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, + 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x3a, 0x3a, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, + 0x70, 0x6c, 0x61, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -6645,8 +6647,8 @@ var file_regen_ecocredit_marketplace_v1_query_proto_goTypes = []interface{}{ (*QuerySellOrdersResponse)(nil), // 3: regen.ecocredit.marketplace.v1.QuerySellOrdersResponse (*QuerySellOrdersByBatchDenomRequest)(nil), // 4: regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomRequest (*QuerySellOrdersByBatchDenomResponse)(nil), // 5: regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomResponse - (*QuerySellOrdersByAddressRequest)(nil), // 6: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest - (*QuerySellOrdersByAddressResponse)(nil), // 7: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse + (*QuerySellOrdersBySellerRequest)(nil), // 6: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest + (*QuerySellOrdersBySellerResponse)(nil), // 7: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse (*QueryAllowedDenomsRequest)(nil), // 8: regen.ecocredit.marketplace.v1.QueryAllowedDenomsRequest (*QueryAllowedDenomsResponse)(nil), // 9: regen.ecocredit.marketplace.v1.QueryAllowedDenomsResponse (*SellOrderInfo)(nil), // 10: regen.ecocredit.marketplace.v1.SellOrderInfo @@ -6663,9 +6665,9 @@ var file_regen_ecocredit_marketplace_v1_query_proto_depIdxs = []int32{ 11, // 4: regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomRequest.pagination:type_name -> cosmos.base.query.v1beta1.PageRequest 10, // 5: regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomResponse.sell_orders:type_name -> regen.ecocredit.marketplace.v1.SellOrderInfo 12, // 6: regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomResponse.pagination:type_name -> cosmos.base.query.v1beta1.PageResponse - 11, // 7: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest.pagination:type_name -> cosmos.base.query.v1beta1.PageRequest - 10, // 8: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.sell_orders:type_name -> regen.ecocredit.marketplace.v1.SellOrderInfo - 12, // 9: regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse.pagination:type_name -> cosmos.base.query.v1beta1.PageResponse + 11, // 7: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest.pagination:type_name -> cosmos.base.query.v1beta1.PageRequest + 10, // 8: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.sell_orders:type_name -> regen.ecocredit.marketplace.v1.SellOrderInfo + 12, // 9: regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse.pagination:type_name -> cosmos.base.query.v1beta1.PageResponse 11, // 10: regen.ecocredit.marketplace.v1.QueryAllowedDenomsRequest.pagination:type_name -> cosmos.base.query.v1beta1.PageRequest 13, // 11: regen.ecocredit.marketplace.v1.QueryAllowedDenomsResponse.allowed_denoms:type_name -> regen.ecocredit.marketplace.v1.AllowedDenom 12, // 12: regen.ecocredit.marketplace.v1.QueryAllowedDenomsResponse.pagination:type_name -> cosmos.base.query.v1beta1.PageResponse @@ -6673,12 +6675,12 @@ var file_regen_ecocredit_marketplace_v1_query_proto_depIdxs = []int32{ 0, // 14: regen.ecocredit.marketplace.v1.Query.SellOrder:input_type -> regen.ecocredit.marketplace.v1.QuerySellOrderRequest 2, // 15: regen.ecocredit.marketplace.v1.Query.SellOrders:input_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersRequest 4, // 16: regen.ecocredit.marketplace.v1.Query.SellOrdersByBatchDenom:input_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomRequest - 6, // 17: regen.ecocredit.marketplace.v1.Query.SellOrdersByAddress:input_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest + 6, // 17: regen.ecocredit.marketplace.v1.Query.SellOrdersBySeller:input_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest 8, // 18: regen.ecocredit.marketplace.v1.Query.AllowedDenoms:input_type -> regen.ecocredit.marketplace.v1.QueryAllowedDenomsRequest 1, // 19: regen.ecocredit.marketplace.v1.Query.SellOrder:output_type -> regen.ecocredit.marketplace.v1.QuerySellOrderResponse 3, // 20: regen.ecocredit.marketplace.v1.Query.SellOrders:output_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersResponse 5, // 21: regen.ecocredit.marketplace.v1.Query.SellOrdersByBatchDenom:output_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomResponse - 7, // 22: regen.ecocredit.marketplace.v1.Query.SellOrdersByAddress:output_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse + 7, // 22: regen.ecocredit.marketplace.v1.Query.SellOrdersBySeller:output_type -> regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse 9, // 23: regen.ecocredit.marketplace.v1.Query.AllowedDenoms:output_type -> regen.ecocredit.marketplace.v1.QueryAllowedDenomsResponse 19, // [19:24] is the sub-list for method output_type 14, // [14:19] is the sub-list for method input_type @@ -6767,7 +6769,7 @@ func file_regen_ecocredit_marketplace_v1_query_proto_init() { } } file_regen_ecocredit_marketplace_v1_query_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QuerySellOrdersByAddressRequest); i { + switch v := v.(*QuerySellOrdersBySellerRequest); i { case 0: return &v.state case 1: @@ -6779,7 +6781,7 @@ func file_regen_ecocredit_marketplace_v1_query_proto_init() { } } file_regen_ecocredit_marketplace_v1_query_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*QuerySellOrdersByAddressResponse); i { + switch v := v.(*QuerySellOrdersBySellerResponse); i { case 0: return &v.state case 1: diff --git a/api/regen/ecocredit/marketplace/v1/query_grpc.pb.go b/api/regen/ecocredit/marketplace/v1/query_grpc.pb.go index 892cc90934..634471e54a 100644 --- a/api/regen/ecocredit/marketplace/v1/query_grpc.pb.go +++ b/api/regen/ecocredit/marketplace/v1/query_grpc.pb.go @@ -22,18 +22,18 @@ const _ = grpc.SupportPackageIsVersion7 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type QueryClient interface { - // SellOrder queries a sell order by its ID + // SellOrder queries a sell order by its unique identifier. SellOrder(ctx context.Context, in *QuerySellOrderRequest, opts ...grpc.CallOption) (*QuerySellOrderResponse, error) - // SellOrders queries a paginated list of all sell orders + // SellOrders queries a paginated list of all sell orders. SellOrders(ctx context.Context, in *QuerySellOrdersRequest, opts ...grpc.CallOption) (*QuerySellOrdersResponse, error) - // SellOrdersByDenom queries a paginated list of all sell orders of a specific - // ecocredit denom + // SellOrdersByBatchDenom queries a paginated list of all sell orders based on + // the batch denom of the credits being sold. SellOrdersByBatchDenom(ctx context.Context, in *QuerySellOrdersByBatchDenomRequest, opts ...grpc.CallOption) (*QuerySellOrdersByBatchDenomResponse, error) - // SellOrdersByAddress queries a paginated list of all sell orders from a - // specific address - SellOrdersByAddress(ctx context.Context, in *QuerySellOrdersByAddressRequest, opts ...grpc.CallOption) (*QuerySellOrdersByAddressResponse, error) - // AllowedDenoms queries all denoms allowed to be set in the AskPrice of a - // sell order + // SellOrdersBySeller queries a paginated list of all sell orders based on the + // account address of the seller. + SellOrdersBySeller(ctx context.Context, in *QuerySellOrdersBySellerRequest, opts ...grpc.CallOption) (*QuerySellOrdersBySellerResponse, error) + // AllowedDenoms queries a paginated list of all bank denoms allowed to be + // used in the marketplace. AllowedDenoms(ctx context.Context, in *QueryAllowedDenomsRequest, opts ...grpc.CallOption) (*QueryAllowedDenomsResponse, error) } @@ -72,9 +72,9 @@ func (c *queryClient) SellOrdersByBatchDenom(ctx context.Context, in *QuerySellO return out, nil } -func (c *queryClient) SellOrdersByAddress(ctx context.Context, in *QuerySellOrdersByAddressRequest, opts ...grpc.CallOption) (*QuerySellOrdersByAddressResponse, error) { - out := new(QuerySellOrdersByAddressResponse) - err := c.cc.Invoke(ctx, "/regen.ecocredit.marketplace.v1.Query/SellOrdersByAddress", in, out, opts...) +func (c *queryClient) SellOrdersBySeller(ctx context.Context, in *QuerySellOrdersBySellerRequest, opts ...grpc.CallOption) (*QuerySellOrdersBySellerResponse, error) { + out := new(QuerySellOrdersBySellerResponse) + err := c.cc.Invoke(ctx, "/regen.ecocredit.marketplace.v1.Query/SellOrdersBySeller", in, out, opts...) if err != nil { return nil, err } @@ -94,18 +94,18 @@ func (c *queryClient) AllowedDenoms(ctx context.Context, in *QueryAllowedDenomsR // All implementations must embed UnimplementedQueryServer // for forward compatibility type QueryServer interface { - // SellOrder queries a sell order by its ID + // SellOrder queries a sell order by its unique identifier. SellOrder(context.Context, *QuerySellOrderRequest) (*QuerySellOrderResponse, error) - // SellOrders queries a paginated list of all sell orders + // SellOrders queries a paginated list of all sell orders. SellOrders(context.Context, *QuerySellOrdersRequest) (*QuerySellOrdersResponse, error) - // SellOrdersByDenom queries a paginated list of all sell orders of a specific - // ecocredit denom + // SellOrdersByBatchDenom queries a paginated list of all sell orders based on + // the batch denom of the credits being sold. SellOrdersByBatchDenom(context.Context, *QuerySellOrdersByBatchDenomRequest) (*QuerySellOrdersByBatchDenomResponse, error) - // SellOrdersByAddress queries a paginated list of all sell orders from a - // specific address - SellOrdersByAddress(context.Context, *QuerySellOrdersByAddressRequest) (*QuerySellOrdersByAddressResponse, error) - // AllowedDenoms queries all denoms allowed to be set in the AskPrice of a - // sell order + // SellOrdersBySeller queries a paginated list of all sell orders based on the + // account address of the seller. + SellOrdersBySeller(context.Context, *QuerySellOrdersBySellerRequest) (*QuerySellOrdersBySellerResponse, error) + // AllowedDenoms queries a paginated list of all bank denoms allowed to be + // used in the marketplace. AllowedDenoms(context.Context, *QueryAllowedDenomsRequest) (*QueryAllowedDenomsResponse, error) mustEmbedUnimplementedQueryServer() } @@ -123,8 +123,8 @@ func (UnimplementedQueryServer) SellOrders(context.Context, *QuerySellOrdersRequ func (UnimplementedQueryServer) SellOrdersByBatchDenom(context.Context, *QuerySellOrdersByBatchDenomRequest) (*QuerySellOrdersByBatchDenomResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SellOrdersByBatchDenom not implemented") } -func (UnimplementedQueryServer) SellOrdersByAddress(context.Context, *QuerySellOrdersByAddressRequest) (*QuerySellOrdersByAddressResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SellOrdersByAddress not implemented") +func (UnimplementedQueryServer) SellOrdersBySeller(context.Context, *QuerySellOrdersBySellerRequest) (*QuerySellOrdersBySellerResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SellOrdersBySeller not implemented") } func (UnimplementedQueryServer) AllowedDenoms(context.Context, *QueryAllowedDenomsRequest) (*QueryAllowedDenomsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllowedDenoms not implemented") @@ -196,20 +196,20 @@ func _Query_SellOrdersByBatchDenom_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } -func _Query_SellOrdersByAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QuerySellOrdersByAddressRequest) +func _Query_SellOrdersBySeller_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySellOrdersBySellerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).SellOrdersByAddress(ctx, in) + return srv.(QueryServer).SellOrdersBySeller(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/regen.ecocredit.marketplace.v1.Query/SellOrdersByAddress", + FullMethod: "/regen.ecocredit.marketplace.v1.Query/SellOrdersBySeller", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).SellOrdersByAddress(ctx, req.(*QuerySellOrdersByAddressRequest)) + return srv.(QueryServer).SellOrdersBySeller(ctx, req.(*QuerySellOrdersBySellerRequest)) } return interceptor(ctx, in, info, handler) } @@ -252,8 +252,8 @@ var Query_ServiceDesc = grpc.ServiceDesc{ Handler: _Query_SellOrdersByBatchDenom_Handler, }, { - MethodName: "SellOrdersByAddress", - Handler: _Query_SellOrdersByAddress_Handler, + MethodName: "SellOrdersBySeller", + Handler: _Query_SellOrdersBySeller_Handler, }, { MethodName: "AllowedDenoms", diff --git a/api/regen/ecocredit/marketplace/v1/state.pulsar.go b/api/regen/ecocredit/marketplace/v1/state.pulsar.go index 8c5e8509a9..c6078352e6 100644 --- a/api/regen/ecocredit/marketplace/v1/state.pulsar.go +++ b/api/regen/ecocredit/marketplace/v1/state.pulsar.go @@ -2028,7 +2028,7 @@ type SellOrder struct { // id is the unique ID of sell order. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - // seller is the bytes address of the owner of the credits being sold. + // seller is the address of the account that is selling credits. Seller []byte `protobuf:"bytes,2,opt,name=seller,proto3" json:"seller,omitempty"` // batch_key is the table row identifier of the credit batch used internally // for efficient lookups. This links a sell order to a credit batch. diff --git a/api/regen/ecocredit/marketplace/v1/tx.pulsar.go b/api/regen/ecocredit/marketplace/v1/tx.pulsar.go index cb7e0d8b70..6596883ba0 100644 --- a/api/regen/ecocredit/marketplace/v1/tx.pulsar.go +++ b/api/regen/ecocredit/marketplace/v1/tx.pulsar.go @@ -68,14 +68,14 @@ func (x *_MsgSell_2_list) IsValid() bool { var ( md_MsgSell protoreflect.MessageDescriptor - fd_MsgSell_owner protoreflect.FieldDescriptor + fd_MsgSell_seller protoreflect.FieldDescriptor fd_MsgSell_orders protoreflect.FieldDescriptor ) func init() { file_regen_ecocredit_marketplace_v1_tx_proto_init() md_MsgSell = File_regen_ecocredit_marketplace_v1_tx_proto.Messages().ByName("MsgSell") - fd_MsgSell_owner = md_MsgSell.Fields().ByName("owner") + fd_MsgSell_seller = md_MsgSell.Fields().ByName("seller") fd_MsgSell_orders = md_MsgSell.Fields().ByName("orders") } @@ -144,9 +144,9 @@ func (x *fastReflection_MsgSell) Interface() protoreflect.ProtoMessage { // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_MsgSell) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.Owner != "" { - value := protoreflect.ValueOfString(x.Owner) - if !f(fd_MsgSell_owner, value) { + if x.Seller != "" { + value := protoreflect.ValueOfString(x.Seller) + if !f(fd_MsgSell_seller, value) { return } } @@ -171,8 +171,8 @@ func (x *fastReflection_MsgSell) Range(f func(protoreflect.FieldDescriptor, prot // a repeated field is populated if it is non-empty. func (x *fastReflection_MsgSell) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgSell.owner": - return x.Owner != "" + case "regen.ecocredit.marketplace.v1.MsgSell.seller": + return x.Seller != "" case "regen.ecocredit.marketplace.v1.MsgSell.orders": return len(x.Orders) != 0 default: @@ -191,8 +191,8 @@ func (x *fastReflection_MsgSell) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgSell) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgSell.owner": - x.Owner = "" + case "regen.ecocredit.marketplace.v1.MsgSell.seller": + x.Seller = "" case "regen.ecocredit.marketplace.v1.MsgSell.orders": x.Orders = nil default: @@ -211,8 +211,8 @@ func (x *fastReflection_MsgSell) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_MsgSell) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.marketplace.v1.MsgSell.owner": - value := x.Owner + case "regen.ecocredit.marketplace.v1.MsgSell.seller": + value := x.Seller return protoreflect.ValueOfString(value) case "regen.ecocredit.marketplace.v1.MsgSell.orders": if len(x.Orders) == 0 { @@ -240,8 +240,8 @@ func (x *fastReflection_MsgSell) Get(descriptor protoreflect.FieldDescriptor) pr // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgSell) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgSell.owner": - x.Owner = value.Interface().(string) + case "regen.ecocredit.marketplace.v1.MsgSell.seller": + x.Seller = value.Interface().(string) case "regen.ecocredit.marketplace.v1.MsgSell.orders": lv := value.List() clv := lv.(*_MsgSell_2_list) @@ -272,8 +272,8 @@ func (x *fastReflection_MsgSell) Mutable(fd protoreflect.FieldDescriptor) protor } value := &_MsgSell_2_list{list: &x.Orders} return protoreflect.ValueOfList(value) - case "regen.ecocredit.marketplace.v1.MsgSell.owner": - panic(fmt.Errorf("field owner of message regen.ecocredit.marketplace.v1.MsgSell is not mutable")) + case "regen.ecocredit.marketplace.v1.MsgSell.seller": + panic(fmt.Errorf("field seller of message regen.ecocredit.marketplace.v1.MsgSell is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.MsgSell")) @@ -287,7 +287,7 @@ func (x *fastReflection_MsgSell) Mutable(fd protoreflect.FieldDescriptor) protor // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_MsgSell) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgSell.owner": + case "regen.ecocredit.marketplace.v1.MsgSell.seller": return protoreflect.ValueOfString("") case "regen.ecocredit.marketplace.v1.MsgSell.orders": list := []*MsgSell_Order{} @@ -361,7 +361,7 @@ func (x *fastReflection_MsgSell) ProtoMethods() *protoiface.Methods { var n int var l int _ = l - l = len(x.Owner) + l = len(x.Seller) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -416,10 +416,10 @@ func (x *fastReflection_MsgSell) ProtoMethods() *protoiface.Methods { dAtA[i] = 0x12 } } - if len(x.Owner) > 0 { - i -= len(x.Owner) - copy(dAtA[i:], x.Owner) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Owner))) + if len(x.Seller) > 0 { + i -= len(x.Seller) + copy(dAtA[i:], x.Seller) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Seller))) i-- dAtA[i] = 0xa } @@ -474,7 +474,7 @@ func (x *fastReflection_MsgSell) ProtoMethods() *protoiface.Methods { switch fieldNum { case 1: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Seller", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -502,7 +502,7 @@ func (x *fastReflection_MsgSell) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Owner = string(dAtA[iNdEx:postIndex]) + x.Seller = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -1858,14 +1858,14 @@ func (x *_MsgUpdateSellOrders_2_list) IsValid() bool { var ( md_MsgUpdateSellOrders protoreflect.MessageDescriptor - fd_MsgUpdateSellOrders_owner protoreflect.FieldDescriptor + fd_MsgUpdateSellOrders_seller protoreflect.FieldDescriptor fd_MsgUpdateSellOrders_updates protoreflect.FieldDescriptor ) func init() { file_regen_ecocredit_marketplace_v1_tx_proto_init() md_MsgUpdateSellOrders = File_regen_ecocredit_marketplace_v1_tx_proto.Messages().ByName("MsgUpdateSellOrders") - fd_MsgUpdateSellOrders_owner = md_MsgUpdateSellOrders.Fields().ByName("owner") + fd_MsgUpdateSellOrders_seller = md_MsgUpdateSellOrders.Fields().ByName("seller") fd_MsgUpdateSellOrders_updates = md_MsgUpdateSellOrders.Fields().ByName("updates") } @@ -1934,9 +1934,9 @@ func (x *fastReflection_MsgUpdateSellOrders) Interface() protoreflect.ProtoMessa // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_MsgUpdateSellOrders) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.Owner != "" { - value := protoreflect.ValueOfString(x.Owner) - if !f(fd_MsgUpdateSellOrders_owner, value) { + if x.Seller != "" { + value := protoreflect.ValueOfString(x.Seller) + if !f(fd_MsgUpdateSellOrders_seller, value) { return } } @@ -1961,8 +1961,8 @@ func (x *fastReflection_MsgUpdateSellOrders) Range(f func(protoreflect.FieldDesc // a repeated field is populated if it is non-empty. func (x *fastReflection_MsgUpdateSellOrders) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.owner": - return x.Owner != "" + case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.seller": + return x.Seller != "" case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.updates": return len(x.Updates) != 0 default: @@ -1981,8 +1981,8 @@ func (x *fastReflection_MsgUpdateSellOrders) Has(fd protoreflect.FieldDescriptor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgUpdateSellOrders) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.owner": - x.Owner = "" + case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.seller": + x.Seller = "" case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.updates": x.Updates = nil default: @@ -2001,8 +2001,8 @@ func (x *fastReflection_MsgUpdateSellOrders) Clear(fd protoreflect.FieldDescript // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_MsgUpdateSellOrders) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.owner": - value := x.Owner + case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.seller": + value := x.Seller return protoreflect.ValueOfString(value) case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.updates": if len(x.Updates) == 0 { @@ -2030,8 +2030,8 @@ func (x *fastReflection_MsgUpdateSellOrders) Get(descriptor protoreflect.FieldDe // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgUpdateSellOrders) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.owner": - x.Owner = value.Interface().(string) + case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.seller": + x.Seller = value.Interface().(string) case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.updates": lv := value.List() clv := lv.(*_MsgUpdateSellOrders_2_list) @@ -2062,8 +2062,8 @@ func (x *fastReflection_MsgUpdateSellOrders) Mutable(fd protoreflect.FieldDescri } value := &_MsgUpdateSellOrders_2_list{list: &x.Updates} return protoreflect.ValueOfList(value) - case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.owner": - panic(fmt.Errorf("field owner of message regen.ecocredit.marketplace.v1.MsgUpdateSellOrders is not mutable")) + case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.seller": + panic(fmt.Errorf("field seller of message regen.ecocredit.marketplace.v1.MsgUpdateSellOrders is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.marketplace.v1.MsgUpdateSellOrders")) @@ -2077,7 +2077,7 @@ func (x *fastReflection_MsgUpdateSellOrders) Mutable(fd protoreflect.FieldDescri // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_MsgUpdateSellOrders) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.owner": + case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.seller": return protoreflect.ValueOfString("") case "regen.ecocredit.marketplace.v1.MsgUpdateSellOrders.updates": list := []*MsgUpdateSellOrders_Update{} @@ -2151,7 +2151,7 @@ func (x *fastReflection_MsgUpdateSellOrders) ProtoMethods() *protoiface.Methods var n int var l int _ = l - l = len(x.Owner) + l = len(x.Seller) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -2206,10 +2206,10 @@ func (x *fastReflection_MsgUpdateSellOrders) ProtoMethods() *protoiface.Methods dAtA[i] = 0x12 } } - if len(x.Owner) > 0 { - i -= len(x.Owner) - copy(dAtA[i:], x.Owner) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Owner))) + if len(x.Seller) > 0 { + i -= len(x.Seller) + copy(dAtA[i:], x.Seller) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Seller))) i-- dAtA[i] = 0xa } @@ -2264,7 +2264,7 @@ func (x *fastReflection_MsgUpdateSellOrders) ProtoMethods() *protoiface.Methods switch fieldNum { case 1: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Seller", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2292,7 +2292,7 @@ func (x *fastReflection_MsgUpdateSellOrders) ProtoMethods() *protoiface.Methods if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Owner = string(dAtA[iNdEx:postIndex]) + x.Seller = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -5821,8 +5821,8 @@ type MsgSell struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // owner is the address of the owner of the credits being sold. - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` + // seller is the address of the account that is selling credits. + Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // orders are the sell orders being created. Orders []*MsgSell_Order `protobuf:"bytes,2,rep,name=orders,proto3" json:"orders,omitempty"` } @@ -5847,9 +5847,9 @@ func (*MsgSell) Descriptor() ([]byte, []int) { return file_regen_ecocredit_marketplace_v1_tx_proto_rawDescGZIP(), []int{0} } -func (x *MsgSell) GetOwner() string { +func (x *MsgSell) GetSeller() string { if x != nil { - return x.Owner + return x.Seller } return "" } @@ -5904,8 +5904,8 @@ type MsgUpdateSellOrders struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // owner is the owner of the sell orders. - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` + // seller is the address of the account that is selling credits. + Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // updates are updates to existing sell orders. Updates []*MsgUpdateSellOrders_Update `protobuf:"bytes,2,rep,name=updates,proto3" json:"updates,omitempty"` } @@ -5930,9 +5930,9 @@ func (*MsgUpdateSellOrders) Descriptor() ([]byte, []int) { return file_regen_ecocredit_marketplace_v1_tx_proto_rawDescGZIP(), []int{2} } -func (x *MsgUpdateSellOrders) GetOwner() string { +func (x *MsgUpdateSellOrders) GetSeller() string { if x != nil { - return x.Owner + return x.Seller } return "" } @@ -5977,7 +5977,8 @@ type MsgCancelSellOrder struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // seller is the address of the seller. + // seller is the address of the account that created the sell order and is + // therefore authorized to cancel the sell order. Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // sell_order_id is the id of the seller order to cancel. SellOrderId uint64 `protobuf:"varint,2,opt,name=sell_order_id,json=sellOrderId,proto3" json:"sell_order_id,omitempty"` @@ -6050,7 +6051,7 @@ type MsgBuyDirect struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // buyer is the address of the credit buyer. + // buyer is the address of the account that is buying credits. Buyer string `protobuf:"bytes,1,opt,name=buyer,proto3" json:"buyer,omitempty"` // orders is a list of orders for ecocredits. Orders []*MsgBuyDirect_Order `protobuf:"bytes,2,rep,name=orders,proto3" json:"orders,omitempty"` @@ -6367,138 +6368,138 @@ var file_regen_ecocredit_marketplace_v1_tx_proto_rawDesc = []byte{ 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0xd7, 0x02, 0x0a, 0x07, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x12, 0x14, 0x0a, 0x05, - 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, - 0x65, 0x72, 0x12, 0x45, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x2e, 0x4f, 0x72, 0x64, 0x65, - 0x72, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x1a, 0xee, 0x01, 0x0a, 0x05, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, - 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, - 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, - 0x12, 0x36, 0x0a, 0x09, 0x61, 0x73, 0x6b, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x03, 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, 0x52, 0x08, - 0x61, 0x73, 0x6b, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, 0x61, - 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x75, - 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x40, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x69, - 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, - 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0a, - 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x37, 0x0a, 0x0f, 0x4d, 0x73, - 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, - 0x0e, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, 0x0c, 0x73, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x49, 0x64, 0x73, 0x22, 0x8b, 0x03, 0x0a, 0x13, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x6f, - 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, - 0x72, 0x12, 0x54, 0x0a, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x6c, - 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x07, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x1a, 0x87, 0x02, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x12, 0x22, 0x0a, 0x0d, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x73, 0x65, 0x6c, 0x6c, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x6e, 0x65, 0x77, 0x5f, 0x71, 0x75, - 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, 0x65, - 0x77, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x3d, 0x0a, 0x0d, 0x6e, 0x65, 0x77, - 0x5f, 0x61, 0x73, 0x6b, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x03, 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, 0x52, 0x0b, 0x6e, 0x65, 0x77, - 0x41, 0x73, 0x6b, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, 0x61, - 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x75, - 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x47, 0x0a, 0x0e, 0x6e, 0x65, 0x77, 0x5f, - 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0x90, 0xdf, - 0x1f, 0x01, 0x52, 0x0d, 0x6e, 0x65, 0x77, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x1d, 0x0a, 0x1b, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, - 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x50, 0x0a, 0x12, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x65, 0x6c, - 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x22, - 0x0a, 0x0d, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x73, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, - 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0xdb, 0x02, 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, - 0x74, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, - 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, - 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x79, 0x44, - 0x69, 0x72, 0x65, 0x63, 0x74, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x06, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x73, 0x1a, 0xe8, 0x01, 0x0a, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x22, 0x0a, - 0x0d, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x73, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, - 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x36, 0x0a, - 0x09, 0x62, 0x69, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x04, 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, 0x52, 0x08, 0x62, 0x69, 0x64, - 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, - 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x52, - 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x37, 0x0a, 0x17, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x5f, 0x6a, 0x75, 0x72, 0x69, 0x73, 0x64, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, 0x65, - 0x6e, 0x74, 0x4a, 0x75, 0x72, 0x69, 0x73, 0x64, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x16, - 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xe3, 0x03, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x60, - 0x0a, 0x04, 0x53, 0x65, 0x6c, 0x6c, 0x12, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, + 0x22, 0xd9, 0x02, 0x0a, 0x07, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, + 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, + 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x2e, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x52, 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x1a, 0xee, 0x01, 0x0a, 0x05, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, + 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, + 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, + 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, + 0x74, 0x79, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x73, 0x6b, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, + 0x03, 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, + 0x52, 0x08, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, + 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x69, 0x72, + 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, + 0x41, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x40, 0x0a, 0x0a, 0x65, 0x78, + 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x04, 0x90, 0xdf, 0x1f, 0x01, + 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x37, 0x0a, 0x0f, + 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x24, 0x0a, 0x0e, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x04, 0x52, 0x0c, 0x73, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x49, 0x64, 0x73, 0x22, 0x8d, 0x03, 0x0a, 0x13, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x16, 0x0a, + 0x06, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, + 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x54, 0x0a, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, - 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x1a, - 0x2f, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x84, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x33, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, - 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, - 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x3b, 0x2e, 0x72, 0x65, 0x67, - 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, - 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x0f, 0x43, 0x61, 0x6e, 0x63, - 0x65, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x32, 0x2e, 0x72, 0x65, + 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x2e, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x1a, 0x87, 0x02, 0x0a, 0x06, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x22, 0x0a, 0x0d, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x73, + 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x6e, 0x65, + 0x77, 0x5f, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0b, 0x6e, 0x65, 0x77, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x3d, 0x0a, + 0x0d, 0x6e, 0x65, 0x77, 0x5f, 0x61, 0x73, 0x6b, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x03, + 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, 0x52, + 0x0b, 0x6e, 0x65, 0x77, 0x41, 0x73, 0x6b, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x13, + 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, + 0x69, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, + 0x6c, 0x65, 0x41, 0x75, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x47, 0x0a, 0x0e, + 0x6e, 0x65, 0x77, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, + 0x42, 0x04, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0d, 0x6e, 0x65, 0x77, 0x45, 0x78, 0x70, 0x69, 0x72, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x1d, 0x0a, 0x1b, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x50, 0x0a, 0x12, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, + 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x6c, + 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0d, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x73, 0x65, 0x6c, 0x6c, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, + 0x63, 0x65, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xdb, 0x02, 0x0a, 0x0c, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x79, 0x44, + 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x06, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, - 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x1a, - 0x3a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x42, 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, + 0x06, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x1a, 0xe8, 0x01, 0x0a, 0x05, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x12, 0x22, 0x0a, 0x0d, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x73, 0x65, 0x6c, 0x6c, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, + 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, + 0x79, 0x12, 0x36, 0x0a, 0x09, 0x62, 0x69, 0x64, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x04, + 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, 0x52, + 0x08, 0x62, 0x69, 0x64, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x69, 0x73, + 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x41, + 0x75, 0x74, 0x6f, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x37, 0x0a, 0x17, 0x72, 0x65, 0x74, + 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6a, 0x75, 0x72, 0x69, 0x73, 0x64, 0x69, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x72, 0x65, 0x74, 0x69, + 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4a, 0x75, 0x72, 0x69, 0x73, 0x64, 0x69, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x16, 0x0a, 0x14, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, + 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xe3, 0x03, 0x0a, 0x03, 0x4d, + 0x73, 0x67, 0x12, 0x60, 0x0a, 0x04, 0x53, 0x65, 0x6c, 0x6c, 0x12, 0x27, 0x2e, 0x72, 0x65, 0x67, + 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, + 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, + 0x65, 0x6c, 0x6c, 0x1a, 0x2f, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, + 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x84, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, + 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x12, 0x33, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, + 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x1a, 0x3b, + 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, + 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x0f, + 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, + 0x32, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x65, 0x6c, 0x6c, 0x4f, 0x72, - 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6f, 0x0a, 0x09, 0x42, - 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, - 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, - 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x79, - 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x1a, 0x34, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, + 0x64, 0x65, 0x72, 0x1a, 0x3a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, + 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x53, 0x65, + 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x6f, 0x0a, 0x09, 0x42, 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x12, 0x2c, 0x2e, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, + 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x42, 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x1a, 0x34, 0x2e, 0x72, 0x65, 0x67, + 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, + 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, + 0x75, 0x79, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x42, 0xa0, 0x02, 0x0a, 0x22, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, - 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x75, 0x79, 0x44, 0x69, - 0x72, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xa0, 0x02, 0x0a, - 0x22, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x2e, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x56, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, - 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6c, - 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, - 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, - 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, - 0x6c, 0x61, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x45, 0x4d, 0xaa, 0x02, 0x1e, 0x52, - 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x4d, - 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x1e, - 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, - 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, - 0x2a, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x5c, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, - 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x21, 0x52, 0x65, - 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x3a, 0x3a, - 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x56, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x72, 0x65, 0x67, + 0x65, 0x6e, 0x2d, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, + 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x6d, 0x61, + 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x61, 0x72, + 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x45, 0x4d, + 0xaa, 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2e, 0x56, + 0x31, 0xca, 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x5c, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5c, + 0x56, 0x31, 0xe2, 0x02, 0x2a, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, + 0x65, 0x64, 0x69, 0x74, 0x5c, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, + 0x02, 0x21, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x3a, 0x3a, 0x4d, 0x61, 0x72, 0x6b, 0x65, 0x74, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x3a, + 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/regen/ecocredit/v1/events.pulsar.go b/api/regen/ecocredit/v1/events.pulsar.go index b1a6f75dc3..09cbd73deb 100644 --- a/api/regen/ecocredit/v1/events.pulsar.go +++ b/api/regen/ecocredit/v1/events.pulsar.go @@ -8114,11 +8114,11 @@ type EventRetire struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // owner is the account that owns the retired credits. This will be the - // account receiving credits in the case that credits were retired upon - // issuance using Msg/CreateBatch, retired upon transfer using Msg/Send, - // retired upon taking from a basket using basket.Msg/Take, or retired - // upon purchase using marketplace.Msg/BuyDirect. + // owner is the address of the account that owns the retired credits. This + // will be the account receiving credits in the case that credits were retired + // upon issuance using Msg/CreateBatch, retired upon transfer using Msg/Send, + // retired upon taking from a basket using basket.Msg/Take, or retired upon + // purchase using marketplace.Msg/BuyDirect. Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // batch_denom is the unique identifier of the credit batch within which the // credits were retired. @@ -8189,7 +8189,7 @@ type EventCancel struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // owner is the account which has cancelled the credits. + // owner is the address of the account that cancelled the credits. Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // batch_denom is the unique identifier of the credit batch within which the // credits were cancelled. diff --git a/api/regen/ecocredit/v1/query.pulsar.go b/api/regen/ecocredit/v1/query.pulsar.go index 860bdf31ff..236c97b8e0 100644 --- a/api/regen/ecocredit/v1/query.pulsar.go +++ b/api/regen/ecocredit/v1/query.pulsar.go @@ -13160,14 +13160,14 @@ func (x *fastReflection_QueryBatchResponse) ProtoMethods() *protoiface.Methods { var ( md_QueryBalanceRequest protoreflect.MessageDescriptor - fd_QueryBalanceRequest_account protoreflect.FieldDescriptor + fd_QueryBalanceRequest_address protoreflect.FieldDescriptor fd_QueryBalanceRequest_batch_denom protoreflect.FieldDescriptor ) func init() { file_regen_ecocredit_v1_query_proto_init() md_QueryBalanceRequest = File_regen_ecocredit_v1_query_proto.Messages().ByName("QueryBalanceRequest") - fd_QueryBalanceRequest_account = md_QueryBalanceRequest.Fields().ByName("account") + fd_QueryBalanceRequest_address = md_QueryBalanceRequest.Fields().ByName("address") fd_QueryBalanceRequest_batch_denom = md_QueryBalanceRequest.Fields().ByName("batch_denom") } @@ -13236,9 +13236,9 @@ func (x *fastReflection_QueryBalanceRequest) Interface() protoreflect.ProtoMessa // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_QueryBalanceRequest) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.Account != "" { - value := protoreflect.ValueOfString(x.Account) - if !f(fd_QueryBalanceRequest_account, value) { + if x.Address != "" { + value := protoreflect.ValueOfString(x.Address) + if !f(fd_QueryBalanceRequest_address, value) { return } } @@ -13263,8 +13263,8 @@ func (x *fastReflection_QueryBalanceRequest) Range(f func(protoreflect.FieldDesc // a repeated field is populated if it is non-empty. func (x *fastReflection_QueryBalanceRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalanceRequest.account": - return x.Account != "" + case "regen.ecocredit.v1.QueryBalanceRequest.address": + return x.Address != "" case "regen.ecocredit.v1.QueryBalanceRequest.batch_denom": return x.BatchDenom != "" default: @@ -13283,8 +13283,8 @@ func (x *fastReflection_QueryBalanceRequest) Has(fd protoreflect.FieldDescriptor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryBalanceRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalanceRequest.account": - x.Account = "" + case "regen.ecocredit.v1.QueryBalanceRequest.address": + x.Address = "" case "regen.ecocredit.v1.QueryBalanceRequest.batch_denom": x.BatchDenom = "" default: @@ -13303,8 +13303,8 @@ func (x *fastReflection_QueryBalanceRequest) Clear(fd protoreflect.FieldDescript // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_QueryBalanceRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.v1.QueryBalanceRequest.account": - value := x.Account + case "regen.ecocredit.v1.QueryBalanceRequest.address": + value := x.Address return protoreflect.ValueOfString(value) case "regen.ecocredit.v1.QueryBalanceRequest.batch_denom": value := x.BatchDenom @@ -13329,8 +13329,8 @@ func (x *fastReflection_QueryBalanceRequest) Get(descriptor protoreflect.FieldDe // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryBalanceRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalanceRequest.account": - x.Account = value.Interface().(string) + case "regen.ecocredit.v1.QueryBalanceRequest.address": + x.Address = value.Interface().(string) case "regen.ecocredit.v1.QueryBalanceRequest.batch_denom": x.BatchDenom = value.Interface().(string) default: @@ -13353,8 +13353,8 @@ func (x *fastReflection_QueryBalanceRequest) Set(fd protoreflect.FieldDescriptor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryBalanceRequest) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalanceRequest.account": - panic(fmt.Errorf("field account of message regen.ecocredit.v1.QueryBalanceRequest is not mutable")) + case "regen.ecocredit.v1.QueryBalanceRequest.address": + panic(fmt.Errorf("field address of message regen.ecocredit.v1.QueryBalanceRequest is not mutable")) case "regen.ecocredit.v1.QueryBalanceRequest.batch_denom": panic(fmt.Errorf("field batch_denom of message regen.ecocredit.v1.QueryBalanceRequest is not mutable")) default: @@ -13370,7 +13370,7 @@ func (x *fastReflection_QueryBalanceRequest) Mutable(fd protoreflect.FieldDescri // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_QueryBalanceRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalanceRequest.account": + case "regen.ecocredit.v1.QueryBalanceRequest.address": return protoreflect.ValueOfString("") case "regen.ecocredit.v1.QueryBalanceRequest.batch_denom": return protoreflect.ValueOfString("") @@ -13443,7 +13443,7 @@ func (x *fastReflection_QueryBalanceRequest) ProtoMethods() *protoiface.Methods var n int var l int _ = l - l = len(x.Account) + l = len(x.Address) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -13487,10 +13487,10 @@ func (x *fastReflection_QueryBalanceRequest) ProtoMethods() *protoiface.Methods i-- dAtA[i] = 0x12 } - if len(x.Account) > 0 { - i -= len(x.Account) - copy(dAtA[i:], x.Account) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Account))) + if len(x.Address) > 0 { + i -= len(x.Address) + copy(dAtA[i:], x.Address) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Address))) i-- dAtA[i] = 0xa } @@ -13545,7 +13545,7 @@ func (x *fastReflection_QueryBalanceRequest) ProtoMethods() *protoiface.Methods switch fieldNum { case 1: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -13573,7 +13573,7 @@ func (x *fastReflection_QueryBalanceRequest) ProtoMethods() *protoiface.Methods if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Account = string(dAtA[iNdEx:postIndex]) + x.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -14079,14 +14079,14 @@ func (x *fastReflection_QueryBalanceResponse) ProtoMethods() *protoiface.Methods var ( md_QueryBalancesRequest protoreflect.MessageDescriptor - fd_QueryBalancesRequest_account protoreflect.FieldDescriptor + fd_QueryBalancesRequest_address protoreflect.FieldDescriptor fd_QueryBalancesRequest_pagination protoreflect.FieldDescriptor ) func init() { file_regen_ecocredit_v1_query_proto_init() md_QueryBalancesRequest = File_regen_ecocredit_v1_query_proto.Messages().ByName("QueryBalancesRequest") - fd_QueryBalancesRequest_account = md_QueryBalancesRequest.Fields().ByName("account") + fd_QueryBalancesRequest_address = md_QueryBalancesRequest.Fields().ByName("address") fd_QueryBalancesRequest_pagination = md_QueryBalancesRequest.Fields().ByName("pagination") } @@ -14155,9 +14155,9 @@ func (x *fastReflection_QueryBalancesRequest) Interface() protoreflect.ProtoMess // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_QueryBalancesRequest) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.Account != "" { - value := protoreflect.ValueOfString(x.Account) - if !f(fd_QueryBalancesRequest_account, value) { + if x.Address != "" { + value := protoreflect.ValueOfString(x.Address) + if !f(fd_QueryBalancesRequest_address, value) { return } } @@ -14182,8 +14182,8 @@ func (x *fastReflection_QueryBalancesRequest) Range(f func(protoreflect.FieldDes // a repeated field is populated if it is non-empty. func (x *fastReflection_QueryBalancesRequest) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalancesRequest.account": - return x.Account != "" + case "regen.ecocredit.v1.QueryBalancesRequest.address": + return x.Address != "" case "regen.ecocredit.v1.QueryBalancesRequest.pagination": return x.Pagination != nil default: @@ -14202,8 +14202,8 @@ func (x *fastReflection_QueryBalancesRequest) Has(fd protoreflect.FieldDescripto // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryBalancesRequest) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalancesRequest.account": - x.Account = "" + case "regen.ecocredit.v1.QueryBalancesRequest.address": + x.Address = "" case "regen.ecocredit.v1.QueryBalancesRequest.pagination": x.Pagination = nil default: @@ -14222,8 +14222,8 @@ func (x *fastReflection_QueryBalancesRequest) Clear(fd protoreflect.FieldDescrip // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_QueryBalancesRequest) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.v1.QueryBalancesRequest.account": - value := x.Account + case "regen.ecocredit.v1.QueryBalancesRequest.address": + value := x.Address return protoreflect.ValueOfString(value) case "regen.ecocredit.v1.QueryBalancesRequest.pagination": value := x.Pagination @@ -14248,8 +14248,8 @@ func (x *fastReflection_QueryBalancesRequest) Get(descriptor protoreflect.FieldD // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QueryBalancesRequest) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalancesRequest.account": - x.Account = value.Interface().(string) + case "regen.ecocredit.v1.QueryBalancesRequest.address": + x.Address = value.Interface().(string) case "regen.ecocredit.v1.QueryBalancesRequest.pagination": x.Pagination = value.Message().Interface().(*v1beta1.PageRequest) default: @@ -14277,8 +14277,8 @@ func (x *fastReflection_QueryBalancesRequest) Mutable(fd protoreflect.FieldDescr x.Pagination = new(v1beta1.PageRequest) } return protoreflect.ValueOfMessage(x.Pagination.ProtoReflect()) - case "regen.ecocredit.v1.QueryBalancesRequest.account": - panic(fmt.Errorf("field account of message regen.ecocredit.v1.QueryBalancesRequest is not mutable")) + case "regen.ecocredit.v1.QueryBalancesRequest.address": + panic(fmt.Errorf("field address of message regen.ecocredit.v1.QueryBalancesRequest is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.v1.QueryBalancesRequest")) @@ -14292,7 +14292,7 @@ func (x *fastReflection_QueryBalancesRequest) Mutable(fd protoreflect.FieldDescr // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_QueryBalancesRequest) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.v1.QueryBalancesRequest.account": + case "regen.ecocredit.v1.QueryBalancesRequest.address": return protoreflect.ValueOfString("") case "regen.ecocredit.v1.QueryBalancesRequest.pagination": m := new(v1beta1.PageRequest) @@ -14366,7 +14366,7 @@ func (x *fastReflection_QueryBalancesRequest) ProtoMethods() *protoiface.Methods var n int var l int _ = l - l = len(x.Account) + l = len(x.Address) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -14417,10 +14417,10 @@ func (x *fastReflection_QueryBalancesRequest) ProtoMethods() *protoiface.Methods i-- dAtA[i] = 0x12 } - if len(x.Account) > 0 { - i -= len(x.Account) - copy(dAtA[i:], x.Account) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Account))) + if len(x.Address) > 0 { + i -= len(x.Address) + copy(dAtA[i:], x.Address) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Address))) i-- dAtA[i] = 0xa } @@ -14475,7 +14475,7 @@ func (x *fastReflection_QueryBalancesRequest) ProtoMethods() *protoiface.Methods switch fieldNum { case 1: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -14503,7 +14503,7 @@ func (x *fastReflection_QueryBalancesRequest) ProtoMethods() *protoiface.Methods if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Account = string(dAtA[iNdEx:postIndex]) + x.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -21834,8 +21834,8 @@ type QueryBalanceRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // account is the address of the account whose balance is being queried. - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + // address is the address of the account whose balance is being queried. + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // batch_denom is the unique identifier of the credit batch to query. BatchDenom string `protobuf:"bytes,2,opt,name=batch_denom,json=batchDenom,proto3" json:"batch_denom,omitempty"` } @@ -21860,9 +21860,9 @@ func (*QueryBalanceRequest) Descriptor() ([]byte, []int) { return file_regen_ecocredit_v1_query_proto_rawDescGZIP(), []int{26} } -func (x *QueryBalanceRequest) GetAccount() string { +func (x *QueryBalanceRequest) GetAddress() string { if x != nil { - return x.Account + return x.Address } return "" } @@ -21917,8 +21917,8 @@ type QueryBalancesRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // account is the address of the account whose balance is being queried. - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + // address is the address of the account whose balance is being queried. + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // pagination defines an optional pagination for the request. Pagination *v1beta1.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -21943,9 +21943,9 @@ func (*QueryBalancesRequest) Descriptor() ([]byte, []int) { return file_regen_ecocredit_v1_query_proto_rawDescGZIP(), []int{28} } -func (x *QueryBalancesRequest) GetAccount() string { +func (x *QueryBalancesRequest) GetAddress() string { if x != nil { - return x.Account + return x.Address } return "" } @@ -22488,7 +22488,7 @@ type BatchBalanceInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // address is the address of the credit holder. + // address is the address of the account that owns the credits. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // batch_denom is the unique identifier of the credit batch. BatchDenom string `protobuf:"bytes,2,opt,name=batch_denom,json=batchDenom,proto3" json:"batch_denom,omitempty"` @@ -22776,9 +22776,9 @@ var file_regen_ecocredit_v1_query_proto_rawDesc = []byte{ 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x62, 0x61, 0x74, 0x63, 0x68, 0x22, 0x50, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x61, 0x6c, 0x61, - 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, + 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x22, 0x56, 0x0a, 0x14, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3e, 0x0a, @@ -22787,8 +22787,8 @@ var file_regen_ecocredit_v1_query_proto_rawDesc = []byte{ 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x78, 0x0a, 0x14, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x46, 0x0a, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, @@ -23021,8 +23021,8 @@ var file_regen_ecocredit_v1_query_proto_rawDesc = []byte{ 0x43, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x3d, 0x12, 0x3b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x62, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x2f, 0x7b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, - 0x6d, 0x7d, 0x2f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x2f, 0x7b, 0x61, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x7d, 0x12, 0x8f, 0x01, 0x0a, 0x08, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, + 0x6d, 0x7d, 0x2f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x2f, 0x7b, 0x61, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x7d, 0x12, 0x8f, 0x01, 0x0a, 0x08, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x12, 0x28, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x65, @@ -23030,8 +23030,8 @@ var file_regen_ecocredit_v1_query_proto_rawDesc = []byte{ 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x42, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x2f, 0x76, 0x31, 0x2f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x61, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x7d, 0x12, 0x93, 0x01, 0x0a, 0x06, 0x53, 0x75, 0x70, 0x70, 0x6c, + 0x2f, 0x76, 0x31, 0x2f, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x2f, 0x7b, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x7d, 0x12, 0x93, 0x01, 0x0a, 0x06, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, diff --git a/api/regen/ecocredit/v1/query_grpc.pb.go b/api/regen/ecocredit/v1/query_grpc.pb.go index 6d73b4bc02..a20008887e 100644 --- a/api/regen/ecocredit/v1/query_grpc.pb.go +++ b/api/regen/ecocredit/v1/query_grpc.pb.go @@ -53,7 +53,7 @@ type QueryClient interface { // Batch queries for information on a credit batch. Batch(ctx context.Context, in *QueryBatchRequest, opts ...grpc.CallOption) (*QueryBatchResponse, error) // Balance queries the balance (both tradable and retired) of a given credit - // batch for a given account. + // batch for a given account address. Balance(ctx context.Context, in *QueryBalanceRequest, opts ...grpc.CallOption) (*QueryBalanceResponse, error) // Balances queries all credit balances the given account holds. Balances(ctx context.Context, in *QueryBalancesRequest, opts ...grpc.CallOption) (*QueryBalancesResponse, error) @@ -271,7 +271,7 @@ type QueryServer interface { // Batch queries for information on a credit batch. Batch(context.Context, *QueryBatchRequest) (*QueryBatchResponse, error) // Balance queries the balance (both tradable and retired) of a given credit - // batch for a given account. + // batch for a given account address. Balance(context.Context, *QueryBalanceRequest) (*QueryBalanceResponse, error) // Balances queries all credit balances the given account holds. Balances(context.Context, *QueryBalancesRequest) (*QueryBalancesResponse, error) diff --git a/api/regen/ecocredit/v1/state.pulsar.go b/api/regen/ecocredit/v1/state.pulsar.go index 34d8412e6a..2ae3e4e4dd 100644 --- a/api/regen/ecocredit/v1/state.pulsar.go +++ b/api/regen/ecocredit/v1/state.pulsar.go @@ -7265,7 +7265,7 @@ type BatchBalance struct { // batch_key is the table row identifier of the credit batch used internally // for efficient lookups. This links a batch balance to a credit batch. BatchKey uint64 `protobuf:"varint,1,opt,name=batch_key,json=batchKey,proto3" json:"batch_key,omitempty"` - // address is the address of the credit holder. + // address is the address of the account that owns the credits. Address []byte `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` // tradable_amount is the total number of tradable credits owned by address. TradableAmount string `protobuf:"bytes,3,opt,name=tradable_amount,json=tradableAmount,proto3" json:"tradable_amount,omitempty"` diff --git a/api/regen/ecocredit/v1/tx.pulsar.go b/api/regen/ecocredit/v1/tx.pulsar.go index 7fa5de5b8a..75a22ca2f4 100644 --- a/api/regen/ecocredit/v1/tx.pulsar.go +++ b/api/regen/ecocredit/v1/tx.pulsar.go @@ -7959,7 +7959,7 @@ func (x *_MsgRetire_2_list) IsValid() bool { var ( md_MsgRetire protoreflect.MessageDescriptor - fd_MsgRetire_holder protoreflect.FieldDescriptor + fd_MsgRetire_owner protoreflect.FieldDescriptor fd_MsgRetire_credits protoreflect.FieldDescriptor fd_MsgRetire_jurisdiction protoreflect.FieldDescriptor ) @@ -7967,7 +7967,7 @@ var ( func init() { file_regen_ecocredit_v1_tx_proto_init() md_MsgRetire = File_regen_ecocredit_v1_tx_proto.Messages().ByName("MsgRetire") - fd_MsgRetire_holder = md_MsgRetire.Fields().ByName("holder") + fd_MsgRetire_owner = md_MsgRetire.Fields().ByName("owner") fd_MsgRetire_credits = md_MsgRetire.Fields().ByName("credits") fd_MsgRetire_jurisdiction = md_MsgRetire.Fields().ByName("jurisdiction") } @@ -8037,9 +8037,9 @@ func (x *fastReflection_MsgRetire) Interface() protoreflect.ProtoMessage { // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_MsgRetire) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.Holder != "" { - value := protoreflect.ValueOfString(x.Holder) - if !f(fd_MsgRetire_holder, value) { + if x.Owner != "" { + value := protoreflect.ValueOfString(x.Owner) + if !f(fd_MsgRetire_owner, value) { return } } @@ -8070,8 +8070,8 @@ func (x *fastReflection_MsgRetire) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_MsgRetire) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.v1.MsgRetire.holder": - return x.Holder != "" + case "regen.ecocredit.v1.MsgRetire.owner": + return x.Owner != "" case "regen.ecocredit.v1.MsgRetire.credits": return len(x.Credits) != 0 case "regen.ecocredit.v1.MsgRetire.jurisdiction": @@ -8092,8 +8092,8 @@ func (x *fastReflection_MsgRetire) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgRetire) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.v1.MsgRetire.holder": - x.Holder = "" + case "regen.ecocredit.v1.MsgRetire.owner": + x.Owner = "" case "regen.ecocredit.v1.MsgRetire.credits": x.Credits = nil case "regen.ecocredit.v1.MsgRetire.jurisdiction": @@ -8114,8 +8114,8 @@ func (x *fastReflection_MsgRetire) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_MsgRetire) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.v1.MsgRetire.holder": - value := x.Holder + case "regen.ecocredit.v1.MsgRetire.owner": + value := x.Owner return protoreflect.ValueOfString(value) case "regen.ecocredit.v1.MsgRetire.credits": if len(x.Credits) == 0 { @@ -8146,8 +8146,8 @@ func (x *fastReflection_MsgRetire) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgRetire) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.v1.MsgRetire.holder": - x.Holder = value.Interface().(string) + case "regen.ecocredit.v1.MsgRetire.owner": + x.Owner = value.Interface().(string) case "regen.ecocredit.v1.MsgRetire.credits": lv := value.List() clv := lv.(*_MsgRetire_2_list) @@ -8180,8 +8180,8 @@ func (x *fastReflection_MsgRetire) Mutable(fd protoreflect.FieldDescriptor) prot } value := &_MsgRetire_2_list{list: &x.Credits} return protoreflect.ValueOfList(value) - case "regen.ecocredit.v1.MsgRetire.holder": - panic(fmt.Errorf("field holder of message regen.ecocredit.v1.MsgRetire is not mutable")) + case "regen.ecocredit.v1.MsgRetire.owner": + panic(fmt.Errorf("field owner of message regen.ecocredit.v1.MsgRetire is not mutable")) case "regen.ecocredit.v1.MsgRetire.jurisdiction": panic(fmt.Errorf("field jurisdiction of message regen.ecocredit.v1.MsgRetire is not mutable")) default: @@ -8197,7 +8197,7 @@ func (x *fastReflection_MsgRetire) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_MsgRetire) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.v1.MsgRetire.holder": + case "regen.ecocredit.v1.MsgRetire.owner": return protoreflect.ValueOfString("") case "regen.ecocredit.v1.MsgRetire.credits": list := []*MsgRetire_RetireCredits{} @@ -8273,7 +8273,7 @@ func (x *fastReflection_MsgRetire) ProtoMethods() *protoiface.Methods { var n int var l int _ = l - l = len(x.Holder) + l = len(x.Owner) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -8339,10 +8339,10 @@ func (x *fastReflection_MsgRetire) ProtoMethods() *protoiface.Methods { dAtA[i] = 0x12 } } - if len(x.Holder) > 0 { - i -= len(x.Holder) - copy(dAtA[i:], x.Holder) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Holder))) + if len(x.Owner) > 0 { + i -= len(x.Owner) + copy(dAtA[i:], x.Owner) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Owner))) i-- dAtA[i] = 0xa } @@ -8397,7 +8397,7 @@ func (x *fastReflection_MsgRetire) ProtoMethods() *protoiface.Methods { switch fieldNum { case 1: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Holder", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -8425,7 +8425,7 @@ func (x *fastReflection_MsgRetire) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Holder = string(dAtA[iNdEx:postIndex]) + x.Owner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -9421,7 +9421,7 @@ func (x *_MsgCancel_2_list) IsValid() bool { var ( md_MsgCancel protoreflect.MessageDescriptor - fd_MsgCancel_holder protoreflect.FieldDescriptor + fd_MsgCancel_owner protoreflect.FieldDescriptor fd_MsgCancel_credits protoreflect.FieldDescriptor fd_MsgCancel_reason protoreflect.FieldDescriptor ) @@ -9429,7 +9429,7 @@ var ( func init() { file_regen_ecocredit_v1_tx_proto_init() md_MsgCancel = File_regen_ecocredit_v1_tx_proto.Messages().ByName("MsgCancel") - fd_MsgCancel_holder = md_MsgCancel.Fields().ByName("holder") + fd_MsgCancel_owner = md_MsgCancel.Fields().ByName("owner") fd_MsgCancel_credits = md_MsgCancel.Fields().ByName("credits") fd_MsgCancel_reason = md_MsgCancel.Fields().ByName("reason") } @@ -9499,9 +9499,9 @@ func (x *fastReflection_MsgCancel) Interface() protoreflect.ProtoMessage { // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_MsgCancel) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.Holder != "" { - value := protoreflect.ValueOfString(x.Holder) - if !f(fd_MsgCancel_holder, value) { + if x.Owner != "" { + value := protoreflect.ValueOfString(x.Owner) + if !f(fd_MsgCancel_owner, value) { return } } @@ -9532,8 +9532,8 @@ func (x *fastReflection_MsgCancel) Range(f func(protoreflect.FieldDescriptor, pr // a repeated field is populated if it is non-empty. func (x *fastReflection_MsgCancel) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.v1.MsgCancel.holder": - return x.Holder != "" + case "regen.ecocredit.v1.MsgCancel.owner": + return x.Owner != "" case "regen.ecocredit.v1.MsgCancel.credits": return len(x.Credits) != 0 case "regen.ecocredit.v1.MsgCancel.reason": @@ -9554,8 +9554,8 @@ func (x *fastReflection_MsgCancel) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCancel) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.v1.MsgCancel.holder": - x.Holder = "" + case "regen.ecocredit.v1.MsgCancel.owner": + x.Owner = "" case "regen.ecocredit.v1.MsgCancel.credits": x.Credits = nil case "regen.ecocredit.v1.MsgCancel.reason": @@ -9576,8 +9576,8 @@ func (x *fastReflection_MsgCancel) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_MsgCancel) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.v1.MsgCancel.holder": - value := x.Holder + case "regen.ecocredit.v1.MsgCancel.owner": + value := x.Owner return protoreflect.ValueOfString(value) case "regen.ecocredit.v1.MsgCancel.credits": if len(x.Credits) == 0 { @@ -9608,8 +9608,8 @@ func (x *fastReflection_MsgCancel) Get(descriptor protoreflect.FieldDescriptor) // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_MsgCancel) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.v1.MsgCancel.holder": - x.Holder = value.Interface().(string) + case "regen.ecocredit.v1.MsgCancel.owner": + x.Owner = value.Interface().(string) case "regen.ecocredit.v1.MsgCancel.credits": lv := value.List() clv := lv.(*_MsgCancel_2_list) @@ -9642,8 +9642,8 @@ func (x *fastReflection_MsgCancel) Mutable(fd protoreflect.FieldDescriptor) prot } value := &_MsgCancel_2_list{list: &x.Credits} return protoreflect.ValueOfList(value) - case "regen.ecocredit.v1.MsgCancel.holder": - panic(fmt.Errorf("field holder of message regen.ecocredit.v1.MsgCancel is not mutable")) + case "regen.ecocredit.v1.MsgCancel.owner": + panic(fmt.Errorf("field owner of message regen.ecocredit.v1.MsgCancel is not mutable")) case "regen.ecocredit.v1.MsgCancel.reason": panic(fmt.Errorf("field reason of message regen.ecocredit.v1.MsgCancel is not mutable")) default: @@ -9659,7 +9659,7 @@ func (x *fastReflection_MsgCancel) Mutable(fd protoreflect.FieldDescriptor) prot // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_MsgCancel) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.v1.MsgCancel.holder": + case "regen.ecocredit.v1.MsgCancel.owner": return protoreflect.ValueOfString("") case "regen.ecocredit.v1.MsgCancel.credits": list := []*MsgCancel_CancelCredits{} @@ -9735,7 +9735,7 @@ func (x *fastReflection_MsgCancel) ProtoMethods() *protoiface.Methods { var n int var l int _ = l - l = len(x.Holder) + l = len(x.Owner) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -9801,10 +9801,10 @@ func (x *fastReflection_MsgCancel) ProtoMethods() *protoiface.Methods { dAtA[i] = 0x12 } } - if len(x.Holder) > 0 { - i -= len(x.Holder) - copy(dAtA[i:], x.Holder) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Holder))) + if len(x.Owner) > 0 { + i -= len(x.Owner) + copy(dAtA[i:], x.Owner) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Owner))) i-- dAtA[i] = 0xa } @@ -9859,7 +9859,7 @@ func (x *fastReflection_MsgCancel) ProtoMethods() *protoiface.Methods { switch fieldNum { case 1: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Holder", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -9887,7 +9887,7 @@ func (x *fastReflection_MsgCancel) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Holder = string(dAtA[iNdEx:postIndex]) + x.Owner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -15590,7 +15590,7 @@ var ( fd_MsgBridge_target protoreflect.FieldDescriptor fd_MsgBridge_recipient protoreflect.FieldDescriptor fd_MsgBridge_contract protoreflect.FieldDescriptor - fd_MsgBridge_holder protoreflect.FieldDescriptor + fd_MsgBridge_owner protoreflect.FieldDescriptor fd_MsgBridge_credits protoreflect.FieldDescriptor ) @@ -15600,7 +15600,7 @@ func init() { fd_MsgBridge_target = md_MsgBridge.Fields().ByName("target") fd_MsgBridge_recipient = md_MsgBridge.Fields().ByName("recipient") fd_MsgBridge_contract = md_MsgBridge.Fields().ByName("contract") - fd_MsgBridge_holder = md_MsgBridge.Fields().ByName("holder") + fd_MsgBridge_owner = md_MsgBridge.Fields().ByName("owner") fd_MsgBridge_credits = md_MsgBridge.Fields().ByName("credits") } @@ -15687,9 +15687,9 @@ func (x *fastReflection_MsgBridge) Range(f func(protoreflect.FieldDescriptor, pr return } } - if x.Holder != "" { - value := protoreflect.ValueOfString(x.Holder) - if !f(fd_MsgBridge_holder, value) { + if x.Owner != "" { + value := protoreflect.ValueOfString(x.Owner) + if !f(fd_MsgBridge_owner, value) { return } } @@ -15720,8 +15720,8 @@ func (x *fastReflection_MsgBridge) Has(fd protoreflect.FieldDescriptor) bool { return x.Recipient != "" case "regen.ecocredit.v1.MsgBridge.contract": return x.Contract != "" - case "regen.ecocredit.v1.MsgBridge.holder": - return x.Holder != "" + case "regen.ecocredit.v1.MsgBridge.owner": + return x.Owner != "" case "regen.ecocredit.v1.MsgBridge.credits": return len(x.Credits) != 0 default: @@ -15746,8 +15746,8 @@ func (x *fastReflection_MsgBridge) Clear(fd protoreflect.FieldDescriptor) { x.Recipient = "" case "regen.ecocredit.v1.MsgBridge.contract": x.Contract = "" - case "regen.ecocredit.v1.MsgBridge.holder": - x.Holder = "" + case "regen.ecocredit.v1.MsgBridge.owner": + x.Owner = "" case "regen.ecocredit.v1.MsgBridge.credits": x.Credits = nil default: @@ -15775,8 +15775,8 @@ func (x *fastReflection_MsgBridge) Get(descriptor protoreflect.FieldDescriptor) case "regen.ecocredit.v1.MsgBridge.contract": value := x.Contract return protoreflect.ValueOfString(value) - case "regen.ecocredit.v1.MsgBridge.holder": - value := x.Holder + case "regen.ecocredit.v1.MsgBridge.owner": + value := x.Owner return protoreflect.ValueOfString(value) case "regen.ecocredit.v1.MsgBridge.credits": if len(x.Credits) == 0 { @@ -15810,8 +15810,8 @@ func (x *fastReflection_MsgBridge) Set(fd protoreflect.FieldDescriptor, value pr x.Recipient = value.Interface().(string) case "regen.ecocredit.v1.MsgBridge.contract": x.Contract = value.Interface().(string) - case "regen.ecocredit.v1.MsgBridge.holder": - x.Holder = value.Interface().(string) + case "regen.ecocredit.v1.MsgBridge.owner": + x.Owner = value.Interface().(string) case "regen.ecocredit.v1.MsgBridge.credits": lv := value.List() clv := lv.(*_MsgBridge_5_list) @@ -15848,8 +15848,8 @@ func (x *fastReflection_MsgBridge) Mutable(fd protoreflect.FieldDescriptor) prot panic(fmt.Errorf("field recipient of message regen.ecocredit.v1.MsgBridge is not mutable")) case "regen.ecocredit.v1.MsgBridge.contract": panic(fmt.Errorf("field contract of message regen.ecocredit.v1.MsgBridge is not mutable")) - case "regen.ecocredit.v1.MsgBridge.holder": - panic(fmt.Errorf("field holder of message regen.ecocredit.v1.MsgBridge is not mutable")) + case "regen.ecocredit.v1.MsgBridge.owner": + panic(fmt.Errorf("field owner of message regen.ecocredit.v1.MsgBridge is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.v1.MsgBridge")) @@ -15869,7 +15869,7 @@ func (x *fastReflection_MsgBridge) NewField(fd protoreflect.FieldDescriptor) pro return protoreflect.ValueOfString("") case "regen.ecocredit.v1.MsgBridge.contract": return protoreflect.ValueOfString("") - case "regen.ecocredit.v1.MsgBridge.holder": + case "regen.ecocredit.v1.MsgBridge.owner": return protoreflect.ValueOfString("") case "regen.ecocredit.v1.MsgBridge.credits": list := []*MsgBridge_CancelCredits{} @@ -15955,7 +15955,7 @@ func (x *fastReflection_MsgBridge) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.Holder) + l = len(x.Owner) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -16010,10 +16010,10 @@ func (x *fastReflection_MsgBridge) ProtoMethods() *protoiface.Methods { dAtA[i] = 0x2a } } - if len(x.Holder) > 0 { - i -= len(x.Holder) - copy(dAtA[i:], x.Holder) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Holder))) + if len(x.Owner) > 0 { + i -= len(x.Owner) + copy(dAtA[i:], x.Owner) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Owner))) i-- dAtA[i] = 0x22 } @@ -16185,7 +16185,7 @@ func (x *fastReflection_MsgBridge) ProtoMethods() *protoiface.Methods { iNdEx = postIndex case 4: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Holder", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -16213,7 +16213,7 @@ func (x *fastReflection_MsgBridge) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.Holder = string(dAtA[iNdEx:postIndex]) + x.Owner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 2 { @@ -17856,8 +17856,8 @@ type MsgRetire struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // holder is the credit holder address. - Holder string `protobuf:"bytes,1,opt,name=holder,proto3" json:"holder,omitempty"` + // owner is the address of the account that owns the credits being retired. + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // credits are the credits being retired. Credits []*MsgRetire_RetireCredits `protobuf:"bytes,2,rep,name=credits,proto3" json:"credits,omitempty"` // jurisdiction is the jurisdiction of the beneficiary or buyer of the retired @@ -17888,9 +17888,9 @@ func (*MsgRetire) Descriptor() ([]byte, []int) { return file_regen_ecocredit_v1_tx_proto_rawDescGZIP(), []int{13} } -func (x *MsgRetire) GetHolder() string { +func (x *MsgRetire) GetOwner() string { if x != nil { - return x.Holder + return x.Owner } return "" } @@ -17942,8 +17942,8 @@ type MsgCancel struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // holder is the credit holder address. - Holder string `protobuf:"bytes,1,opt,name=holder,proto3" json:"holder,omitempty"` + // owner is the address of the account that owns the credits being cancelled. + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // credits are the credits being cancelled. Credits []*MsgCancel_CancelCredits `protobuf:"bytes,2,rep,name=credits,proto3" json:"credits,omitempty"` // reason is any arbitrary string that specifies the reason for cancelling @@ -17971,9 +17971,9 @@ func (*MsgCancel) Descriptor() ([]byte, []int) { return file_regen_ecocredit_v1_tx_proto_rawDescGZIP(), []int{15} } -func (x *MsgCancel) GetHolder() string { +func (x *MsgCancel) GetOwner() string { if x != nil { - return x.Holder + return x.Owner } return "" } @@ -18452,8 +18452,8 @@ type MsgBridge struct { Recipient string `protobuf:"bytes,2,opt,name=recipient,proto3" json:"recipient,omitempty"` // contract is the contract address. Contract string `protobuf:"bytes,3,opt,name=contract,proto3" json:"contract,omitempty"` - // holder is the credit holder address. - Holder string `protobuf:"bytes,4,opt,name=holder,proto3" json:"holder,omitempty"` + // owner is the address of the account that owns the credits being bridged. + Owner string `protobuf:"bytes,4,opt,name=owner,proto3" json:"owner,omitempty"` // credits are the credits being cancelled. Credits []*MsgBridge_CancelCredits `protobuf:"bytes,5,rep,name=credits,proto3" json:"credits,omitempty"` } @@ -18499,9 +18499,9 @@ func (x *MsgBridge) GetContract() string { return "" } -func (x *MsgBridge) GetHolder() string { +func (x *MsgBridge) GetOwner() string { if x != nil { - return x.Holder + return x.Owner } return "" } @@ -18883,202 +18883,201 @@ var file_regen_ecocredit_v1_tx_proto_rawDesc = []byte{ 0x64, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4a, 0x75, 0x72, 0x69, 0x73, 0x64, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x11, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6e, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xd8, 0x01, 0x0a, 0x09, 0x4d, 0x73, 0x67, - 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x45, - 0x0a, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x2b, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x2e, 0x52, - 0x65, 0x74, 0x69, 0x72, 0x65, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x52, 0x07, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6a, 0x75, 0x72, 0x69, 0x73, 0x64, 0x69, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6a, 0x75, 0x72, - 0x69, 0x73, 0x64, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x48, 0x0a, 0x0d, 0x52, 0x65, 0x74, - 0x69, 0x72, 0x65, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xd6, 0x01, 0x0a, 0x09, 0x4d, 0x73, 0x67, + 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x07, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, + 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x2e, 0x52, 0x65, 0x74, + 0x69, 0x72, 0x65, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x6a, 0x75, 0x72, 0x69, 0x73, 0x64, 0x69, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6a, 0x75, 0x72, 0x69, 0x73, + 0x64, 0x69, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x48, 0x0a, 0x0d, 0x52, 0x65, 0x74, 0x69, 0x72, + 0x65, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, + 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, + 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, + 0x74, 0x22, 0x13, 0x0a, 0x11, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xca, 0x01, 0x0a, 0x09, 0x4d, 0x73, 0x67, 0x43, 0x61, + 0x6e, 0x63, 0x65, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x07, 0x63, 0x72, + 0x65, 0x64, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x72, 0x65, + 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, + 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, + 0x6c, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x73, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x1a, 0x48, 0x0a, 0x0d, 0x43, 0x61, 0x6e, + 0x63, 0x65, 0x6c, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xcc, 0x01, 0x0a, 0x09, 0x4d, 0x73, 0x67, - 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x45, - 0x0a, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x2b, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x2e, 0x43, - 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x52, 0x07, 0x63, 0x72, - 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x1a, 0x48, 0x0a, - 0x0d, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x1f, - 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, - 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x4d, 0x73, 0x67, 0x43, 0x61, - 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x63, 0x0a, 0x13, - 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x41, 0x64, - 0x6d, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x5f, 0x61, 0x64, 0x6d, 0x69, - 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x41, 0x64, 0x6d, 0x69, - 0x6e, 0x22, 0x1d, 0x0a, 0x1b, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x90, 0x01, 0x0a, 0x15, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, + 0x75, 0x6e, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x63, 0x0a, 0x13, 0x4d, 0x73, 0x67, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, + 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x64, + 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x22, 0x1d, 0x0a, + 0x1b, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x90, 0x01, 0x0a, + 0x15, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, + 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x19, 0x0a, 0x08, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x5f, 0x69, + 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x64, + 0x64, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x6d, 0x6f, + 0x76, 0x65, 0x5f, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x22, + 0x1f, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, + 0x73, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x65, 0x0a, 0x16, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, + 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x61, - 0x64, 0x64, 0x5f, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, - 0x52, 0x0a, 0x61, 0x64, 0x64, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x12, 0x25, 0x0a, 0x0e, - 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x5f, 0x69, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x49, 0x73, 0x73, 0x75, - 0x65, 0x72, 0x73, 0x22, 0x1f, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x65, 0x0a, 0x16, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, - 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x0a, 0x1e, 0x4d, - 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x69, 0x0a, - 0x15, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x1b, 0x0a, 0x09, - 0x6e, 0x65, 0x77, 0x5f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6e, 0x65, 0x77, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, - 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, - 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x22, 0x1f, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x64, 0x6d, 0x69, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x72, 0x0a, 0x18, 0x4d, 0x73, 0x67, + 0x28, 0x09, 0x52, 0x07, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x20, 0x0a, 0x1e, 0x4d, 0x73, 0x67, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x69, 0x0a, 0x15, 0x4d, 0x73, 0x67, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x65, 0x77, 0x5f, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x65, 0x77, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, + 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x6a, 0x65, + 0x63, 0x74, 0x49, 0x64, 0x22, 0x1f, 0x0a, 0x1d, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x72, 0x0a, 0x18, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x6e, 0x65, 0x77, 0x5f, 0x6d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6e, + 0x65, 0x77, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, + 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x20, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x6e, - 0x65, 0x77, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0b, 0x6e, 0x65, 0x77, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, - 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x64, 0x22, 0x22, 0x0a, - 0x20, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x86, 0x02, 0x0a, 0x09, 0x4d, 0x73, 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x12, - 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 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, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, - 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x07, 0x63, 0x72, 0x65, - 0x64, 0x69, 0x74, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x72, 0x65, 0x67, - 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, - 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, - 0x1a, 0x48, 0x0a, 0x0d, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, - 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x4d, 0x73, - 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, - 0xf3, 0x0a, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x5d, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x12, 0x22, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, - 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x1a, 0x2a, 0x2e, 0x72, 0x65, 0x67, - 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x63, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x24, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x84, 0x02, + 0x0a, 0x09, 0x4d, 0x73, 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x72, + 0x67, 0x65, 0x74, 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, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x12, 0x14, 0x0a, + 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, + 0x6e, 0x65, 0x72, 0x12, 0x45, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x18, 0x05, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x72, 0x69, + 0x64, 0x67, 0x65, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x73, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x1a, 0x48, 0x0a, 0x0d, 0x43, 0x61, + 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x62, + 0x61, 0x74, 0x63, 0x68, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, + 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x4d, 0x73, 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xf3, 0x0a, 0x0a, 0x03, 0x4d, 0x73, + 0x67, 0x12, 0x5d, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, + 0x12, 0x22, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x1a, 0x2a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x63, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, + 0x74, 0x12, 0x24, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x1a, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x1a, 0x2c, 0x2e, - 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, - 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, - 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x0b, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x22, 0x2e, 0x72, 0x65, 0x67, - 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x2a, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5d, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, + 0x61, 0x74, 0x63, 0x68, 0x12, 0x22, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x2a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, + 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x10, 0x4d, 0x69, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, + 0x68, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, + 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x73, 0x1a, 0x2f, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x42, 0x61, + 0x74, 0x63, 0x68, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x57, 0x0a, 0x09, 0x53, 0x65, 0x61, 0x6c, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, + 0x20, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x61, 0x6c, 0x42, 0x61, 0x74, 0x63, + 0x68, 0x1a, 0x28, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x61, 0x6c, 0x42, 0x61, + 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x48, 0x0a, 0x04, 0x53, + 0x65, 0x6e, 0x64, 0x12, 0x1b, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, + 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6e, 0x64, + 0x1a, 0x23, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, + 0x1d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x1a, 0x25, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x42, 0x61, 0x74, - 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x10, 0x4d, 0x69, - 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x12, 0x27, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x74, 0x69, 0x72, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x12, + 0x1d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x1a, 0x25, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x4d, 0x69, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, - 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x1a, 0x2f, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, - 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, - 0x4d, 0x69, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x57, 0x0a, 0x09, 0x53, 0x65, 0x61, 0x6c, - 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x20, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, - 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x65, - 0x61, 0x6c, 0x42, 0x61, 0x74, 0x63, 0x68, 0x1a, 0x28, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, - 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, - 0x53, 0x65, 0x61, 0x6c, 0x42, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x48, 0x0a, 0x04, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x1b, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, + 0x6c, 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x53, 0x65, 0x6e, 0x64, 0x1a, 0x23, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, - 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, - 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x52, - 0x65, 0x74, 0x69, 0x72, 0x65, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, - 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, - 0x74, 0x69, 0x72, 0x65, 0x1a, 0x25, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, - 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x74, - 0x69, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x43, - 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, - 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, - 0x6e, 0x63, 0x65, 0x6c, 0x1a, 0x25, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, - 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x61, 0x6e, - 0x63, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x6c, 0x0a, 0x10, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, - 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x1a, 0x2f, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, - 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, - 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, 0x69, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x72, 0x0a, 0x12, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x12, - 0x29, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, - 0x61, 0x73, 0x73, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x1a, 0x31, 0x2e, 0x72, 0x65, 0x67, - 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x73, - 0x73, 0x75, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x75, 0x0a, - 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x12, 0x2a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x1a, 0x2f, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, + 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x12, 0x72, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, + 0x73, 0x73, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, + 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x73, 0x73, + 0x75, 0x65, 0x72, 0x73, 0x1a, 0x31, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, - 0x1a, 0x32, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, - 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x72, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, - 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x29, 0x2e, 0x72, 0x65, 0x67, + 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x49, 0x73, 0x73, 0x75, 0x65, 0x72, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x75, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x2a, + 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, + 0x73, 0x73, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x32, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, - 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x1a, 0x31, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, - 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x64, 0x6d, 0x69, 0x6e, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x7b, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0x12, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, - 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, - 0x34, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x72, + 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x12, 0x29, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x1a, + 0x31, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, - 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x06, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x12, - 0x1d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x1a, 0x25, - 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xd5, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, + 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x7b, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, + 0x65, 0x63, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, - 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6e, 0x65, - 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6c, 0x65, 0x64, 0x67, - 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, - 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, - 0x64, 0x69, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x45, 0x58, 0xaa, 0x02, 0x12, 0x52, 0x65, - 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x56, 0x31, - 0xca, 0x02, 0x12, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, - 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, - 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, - 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, + 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x1a, 0x34, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, + 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x4e, 0x0a, 0x06, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x12, 0x1d, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, + 0x73, 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x1a, 0x25, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, + 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, + 0xd5, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, + 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x48, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x2f, + 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2d, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2f, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x2f, 0x76, 0x31, 0x3b, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x76, 0x31, 0xa2, + 0x02, 0x03, 0x52, 0x45, 0x58, 0xaa, 0x02, 0x12, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, + 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x52, 0x65, 0x67, + 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x56, 0x31, 0xe2, + 0x02, 0x1e, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x14, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/regen/ecocredit/marketplace/v1/query.proto b/proto/regen/ecocredit/marketplace/v1/query.proto index e4d36b314e..bedff09789 100644 --- a/proto/regen/ecocredit/marketplace/v1/query.proto +++ b/proto/regen/ecocredit/marketplace/v1/query.proto @@ -12,36 +12,36 @@ option go_package = "github.com/regen-network/regen-ledger/x/ecocredit/marketpla // Msg is the regen.ecocredit.marketplace.v1 Query service. service Query { - // SellOrder queries a sell order by its ID + // SellOrder queries a sell order by its unique identifier. rpc SellOrder(QuerySellOrderRequest) returns (QuerySellOrderResponse) { option (google.api.http).get = "/regen/ecocredit/marketplace/v1/sell-orders/{sell_order_id}"; } - // SellOrders queries a paginated list of all sell orders + // SellOrders queries a paginated list of all sell orders. rpc SellOrders(QuerySellOrdersRequest) returns (QuerySellOrdersResponse) { option (google.api.http).get = "/regen/ecocredit/marketplace/v1/sell-orders"; } - // SellOrdersByDenom queries a paginated list of all sell orders of a specific - // ecocredit denom + // SellOrdersByBatchDenom queries a paginated list of all sell orders based on + // the batch denom of the credits being sold. rpc SellOrdersByBatchDenom(QuerySellOrdersByBatchDenomRequest) returns (QuerySellOrdersByBatchDenomResponse) { option (google.api.http).get = "/regen/ecocredit/marketplace/v1/sell-orders/batch-denom/{batch_denom}"; } - // SellOrdersByAddress queries a paginated list of all sell orders from a - // specific address - rpc SellOrdersByAddress(QuerySellOrdersByAddressRequest) - returns (QuerySellOrdersByAddressResponse) { + // SellOrdersBySeller queries a paginated list of all sell orders based on the + // account address of the seller. + rpc SellOrdersBySeller(QuerySellOrdersBySellerRequest) + returns (QuerySellOrdersBySellerResponse) { option (google.api.http).get = - "/regen/ecocredit/marketplace/v1/sell-orders/address/{address}"; + "/regen/ecocredit/marketplace/v1/sell-orders/seller/{seller}"; } - // AllowedDenoms queries all denoms allowed to be set in the AskPrice of a - // sell order + // AllowedDenoms queries a paginated list of all bank denoms allowed to be + // used in the marketplace. rpc AllowedDenoms(QueryAllowedDenomsRequest) returns (QueryAllowedDenomsResponse) { option (google.api.http).get = @@ -80,7 +80,8 @@ message QuerySellOrdersResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -// QuerySellOrdersByDenomRequest is the Query/SellOrdersByDenom request type. +// QuerySellOrdersByBatchDenomRequest is the Query/SellOrdersByBatchDenom +// request type. message QuerySellOrdersByBatchDenomRequest { // batch_denom is an ecocredit denom @@ -90,7 +91,8 @@ message QuerySellOrdersByBatchDenomRequest { cosmos.base.query.v1beta1.PageRequest pagination = 2; } -// QuerySellOrdersByDenomResponse is the Query/SellOrdersByDenom response type. +// QuerySellOrdersByBatchDenomResponse is the Query/SellOrdersByBatchDenom +// response type. message QuerySellOrdersByBatchDenomResponse { // sell_orders is a list of sell orders. @@ -100,20 +102,20 @@ message QuerySellOrdersByBatchDenomResponse { cosmos.base.query.v1beta1.PageResponse pagination = 2; } -// QuerySellOrdersByAddressRequest is the Query/SellOrdersByAddress request +// QuerySellOrdersBySellerRequest is the Query/SellOrdersBySeller request // type. -message QuerySellOrdersByAddressRequest { +message QuerySellOrdersBySellerRequest { - // address is the creator of the sell order - string address = 1; + // seller is the address of the account that is selling credits. + string seller = 1; // pagination defines an optional pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; } -// QuerySellOrdersByAddressResponse is the Query/SellOrdersByAddressResponse +// QuerySellOrdersBySellerResponse is the Query/SellOrdersBySellerResponse // response type. -message QuerySellOrdersByAddressResponse { +message QuerySellOrdersBySellerResponse { // sell_orders is a list of sell orders. repeated SellOrderInfo sell_orders = 1; @@ -146,7 +148,7 @@ message SellOrderInfo { // id is the unique ID of sell order. uint64 id = 1; - // seller is the account address of the owner of the credits being sold. + // seller is the address of the account that is selling credits. string seller = 2; // batch_denom is denom of the credit batch being sold. diff --git a/proto/regen/ecocredit/marketplace/v1/state.proto b/proto/regen/ecocredit/marketplace/v1/state.proto index f178af1ffb..ffe5571d08 100644 --- a/proto/regen/ecocredit/marketplace/v1/state.proto +++ b/proto/regen/ecocredit/marketplace/v1/state.proto @@ -20,7 +20,7 @@ message SellOrder { // id is the unique ID of sell order. uint64 id = 1; - // seller is the bytes address of the owner of the credits being sold. + // seller is the address of the account that is selling credits. bytes seller = 2; // batch_key is the table row identifier of the credit batch used internally diff --git a/proto/regen/ecocredit/marketplace/v1/tx.proto b/proto/regen/ecocredit/marketplace/v1/tx.proto index d17ff2b971..689d1f0650 100644 --- a/proto/regen/ecocredit/marketplace/v1/tx.proto +++ b/proto/regen/ecocredit/marketplace/v1/tx.proto @@ -28,8 +28,8 @@ service Msg { // MsgSell is the Msg/Sell request type. message MsgSell { - // owner is the address of the owner of the credits being sold. - string owner = 1; + // seller is the address of the account that is selling credits. + string seller = 1; // orders are the sell orders being created. repeated Order orders = 2; @@ -73,8 +73,8 @@ message MsgSellResponse { // MsgUpdateSellOrders is the Msg/UpdateSellOrders request type. message MsgUpdateSellOrders { - // owner is the owner of the sell orders. - string owner = 1; + // seller is the address of the account that is selling credits. + string seller = 1; // updates are updates to existing sell orders. repeated Update updates = 2; @@ -108,7 +108,8 @@ message MsgUpdateSellOrdersResponse {} // MsgCancelSellOrder is the Msg/CancelSellOrder request type. message MsgCancelSellOrder { - // seller is the address of the seller. + // seller is the address of the account that created the sell order and is + // therefore authorized to cancel the sell order. string seller = 1; // sell_order_id is the id of the seller order to cancel. @@ -121,7 +122,7 @@ message MsgCancelSellOrderResponse {} // MsgBuyDirect is the Msg/BuyDirect request type. message MsgBuyDirect { - // buyer is the address of the credit buyer. + // buyer is the address of the account that is buying credits. string buyer = 1; // orders is a list of orders for ecocredits. diff --git a/proto/regen/ecocredit/v1/events.proto b/proto/regen/ecocredit/v1/events.proto index 27da3ad8e0..e64a0bd0d2 100644 --- a/proto/regen/ecocredit/v1/events.proto +++ b/proto/regen/ecocredit/v1/events.proto @@ -90,11 +90,11 @@ message EventTransfer { // emitted for each batch_denom. This allows for easier indexing. message EventRetire { - // owner is the account that owns the retired credits. This will be the - // account receiving credits in the case that credits were retired upon - // issuance using Msg/CreateBatch, retired upon transfer using Msg/Send, - // retired upon taking from a basket using basket.Msg/Take, or retired - // upon purchase using marketplace.Msg/BuyDirect. + // owner is the address of the account that owns the retired credits. This + // will be the account receiving credits in the case that credits were retired + // upon issuance using Msg/CreateBatch, retired upon transfer using Msg/Send, + // retired upon taking from a basket using basket.Msg/Take, or retired upon + // purchase using marketplace.Msg/BuyDirect. string owner = 1; // batch_denom is the unique identifier of the credit batch within which the @@ -117,7 +117,7 @@ message EventRetire { // emitted for each batch_denom. This allows for easier indexing. message EventCancel { - // owner is the account which has cancelled the credits. + // owner is the address of the account that cancelled the credits. string owner = 1; // batch_denom is the unique identifier of the credit batch within which the diff --git a/proto/regen/ecocredit/v1/query.proto b/proto/regen/ecocredit/v1/query.proto index a08449ab45..bdac86a2ba 100644 --- a/proto/regen/ecocredit/v1/query.proto +++ b/proto/regen/ecocredit/v1/query.proto @@ -97,15 +97,15 @@ service Query { } // Balance queries the balance (both tradable and retired) of a given credit - // batch for a given account. + // batch for a given account address. rpc Balance(QueryBalanceRequest) returns (QueryBalanceResponse) { option (google.api.http).get = - "/regen/ecocredit/v1/batches/{batch_denom}/balance/{account}"; + "/regen/ecocredit/v1/batches/{batch_denom}/balance/{address}"; } // Balances queries all credit balances the given account holds. rpc Balances(QueryBalancesRequest) returns (QueryBalancesResponse) { - option (google.api.http).get = "/regen/ecocredit/v1/balances/{account}"; + option (google.api.http).get = "/regen/ecocredit/v1/balances/{address}"; } // Supply queries the tradable and retired supply of a credit batch. @@ -367,8 +367,8 @@ message QueryBatchResponse { // QueryBalanceRequest is the Query/Balance request type. message QueryBalanceRequest { - // account is the address of the account whose balance is being queried. - string account = 1; + // address is the address of the account whose balance is being queried. + string address = 1; // batch_denom is the unique identifier of the credit batch to query. string batch_denom = 2; @@ -384,8 +384,8 @@ message QueryBalanceResponse { // QueryBalancesRequest is the Query/Balances request type. message QueryBalancesRequest { - // account is the address of the account whose balance is being queried. - string account = 1; + // address is the address of the account whose balance is being queried. + string address = 1; // pagination defines an optional pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; @@ -523,7 +523,7 @@ message BatchInfo { // BatchBalanceInfo is the human-readable batch balance information. message BatchBalanceInfo { - // address is the address of the credit holder. + // address is the address of the account that owns the credits. string address = 1; // batch_denom is the unique identifier of the credit batch. diff --git a/proto/regen/ecocredit/v1/state.proto b/proto/regen/ecocredit/v1/state.proto index ad5bab1f52..24af610445 100644 --- a/proto/regen/ecocredit/v1/state.proto +++ b/proto/regen/ecocredit/v1/state.proto @@ -221,7 +221,7 @@ message BatchBalance { // for efficient lookups. This links a batch balance to a credit batch. uint64 batch_key = 1; - // address is the address of the credit holder. + // address is the address of the account that owns the credits. bytes address = 2; // tradable_amount is the total number of tradable credits owned by address. diff --git a/proto/regen/ecocredit/v1/tx.proto b/proto/regen/ecocredit/v1/tx.proto index f62e4de456..d2424d20f6 100644 --- a/proto/regen/ecocredit/v1/tx.proto +++ b/proto/regen/ecocredit/v1/tx.proto @@ -286,8 +286,8 @@ message MsgSendResponse {} // MsgRetire is the Msg/Retire request type. message MsgRetire { - // holder is the credit holder address. - string holder = 1; + // owner is the address of the account that owns the credits being retired. + string owner = 1; // credits are the credits being retired. repeated RetireCredits credits = 2; @@ -318,8 +318,8 @@ message MsgRetireResponse {} // MsgCancel is the Msg/Cancel request type. message MsgCancel { - // holder is the credit holder address. - string holder = 1; + // owner is the address of the account that owns the credits being cancelled. + string owner = 1; // credits are the credits being cancelled. repeated CancelCredits credits = 2; @@ -440,8 +440,8 @@ message MsgBridge { // contract is the contract address. string contract = 3; - // holder is the credit holder address. - string holder = 4; + // owner is the address of the account that owns the credits being bridged. + string owner = 4; // credits are the credits being cancelled. repeated CancelCredits credits = 5; diff --git a/x/ecocredit/client/marketplace/query.go b/x/ecocredit/client/marketplace/query.go index 64e56648ff..cc01784ff7 100644 --- a/x/ecocredit/client/marketplace/query.go +++ b/x/ecocredit/client/marketplace/query.go @@ -89,17 +89,17 @@ $ regen q sell-orders --pagination.limit 10 --pagination.offset 2 return cmd } -// QuerySellOrdersByAddressCmd returns a query command that retrieves all sell orders by address with pagination. -func QuerySellOrdersByAddressCmd() *cobra.Command { +// QuerySellOrdersBySellerCmd returns a query command that retrieves all sell orders by address with pagination. +func QuerySellOrdersBySellerCmd() *cobra.Command { cmd := &cobra.Command{ - Use: "sell-orders-by-address [address]", - Short: "List all sell orders by owner address with pagination", + Use: "sell-orders-by-seller [seller]", + Short: "List all sell orders by seller address with pagination", Long: strings.TrimSpace( - `Retrieve sell orders by owner address with pagination + `Retrieve sell orders by seller address with pagination Example: -$ regen q sell-orders-by-address regen1fv85...zkfu -$ regen q sell-orders-by-address regen1fv85...zkfu --pagination.limit 10 --pagination.offset 2 +$ regen q sell-orders-by-seller regen1fv85...zkfu +$ regen q sell-orders-by-seller regen1fv85...zkfu --pagination.limit 10 --pagination.offset 2 `), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { @@ -113,8 +113,8 @@ $ regen q sell-orders-by-address regen1fv85...zkfu --pagination.limit 10 --pagin if err != nil { return err } - res, err := client.SellOrdersByAddress(cmd.Context(), &marketplace.QuerySellOrdersByAddressRequest{ - Address: args[0], + res, err := client.SellOrdersBySeller(cmd.Context(), &marketplace.QuerySellOrdersBySellerRequest{ + Seller: args[0], Pagination: pagination, }) if err != nil { @@ -125,7 +125,7 @@ $ regen q sell-orders-by-address regen1fv85...zkfu --pagination.limit 10 --pagin }, } flags.AddQueryFlagsToCmd(cmd) - flags.AddPaginationFlagsToCmd(cmd, "sell-orders-by-address") + flags.AddPaginationFlagsToCmd(cmd, "sell-orders-by-seller") return cmd } diff --git a/x/ecocredit/client/marketplace/tx.go b/x/ecocredit/client/marketplace/tx.go index 9bc357da50..d606fd5c3a 100644 --- a/x/ecocredit/client/marketplace/tx.go +++ b/x/ecocredit/client/marketplace/tx.go @@ -27,8 +27,8 @@ const ( func TxSellCmd() *cobra.Command { cmd := &cobra.Command{ Use: "sell [orders]", - Short: "Creates new sell orders with transaction author (--from) as owner", - Long: `Creates new sell orders with transaction author (--from) as owner. + Short: "Creates new sell orders with transaction author (--from) as seller", + Long: `Creates new sell orders with transaction author (--from) as seller. Parameters: orders: YAML encoded order list. Note: numerical values must be written in strings. @@ -41,7 +41,7 @@ Parameters: return err } - owner := clientCtx.GetFromAddress() + seller := clientCtx.GetFromAddress() // declare orders array with ask price as string var strOrders []struct { @@ -86,7 +86,7 @@ Parameters: // create sell message msg := marketplace.MsgSell{ - Owner: owner.String(), + Seller: seller.String(), Orders: orders, } @@ -103,8 +103,8 @@ Parameters: func TxUpdateSellOrdersCmd() *cobra.Command { cmd := &cobra.Command{ Use: "update-sell-orders [updates]", - Short: "Updates existing sell orders with transaction author (--from) as owner", - Long: `Updates existing sell orders with transaction author (--from) as owner. + Short: "Updates existing sell orders with transaction author (--from) as seller", + Long: `Updates existing sell orders with transaction author (--from) as seller. Parameters: updates: YAML encoded update list. Note: numerical values must be written in strings. @@ -117,8 +117,8 @@ Parameters: return err } - // get the order owner from the --from flag - owner := clientCtx.GetFromAddress() + // get the seller address from the --from flag + seller := clientCtx.GetFromAddress() // declare updates array with ask price as string var strUpdates []struct { @@ -171,7 +171,7 @@ Parameters: // create update sell orders message msg := marketplace.MsgUpdateSellOrders{ - Owner: owner.String(), + Seller: seller.String(), Updates: updates, } diff --git a/x/ecocredit/client/query.go b/x/ecocredit/client/query.go index 16f601fa4f..df2f69ca61 100644 --- a/x/ecocredit/client/query.go +++ b/x/ecocredit/client/query.go @@ -50,7 +50,7 @@ func QueryCmd(name string) *cobra.Command { basketcli.QueryBasketBalancesCmd(), marketplacecli.QuerySellOrderCmd(), marketplacecli.QuerySellOrdersCmd(), - marketplacecli.QuerySellOrdersByAddressCmd(), + marketplacecli.QuerySellOrdersBySellerCmd(), marketplacecli.QuerySellOrdersByBatchDenomCmd(), marketplacecli.QueryAllowedDenomsCmd(), ) @@ -388,7 +388,7 @@ func QueryBalanceCmd() *cobra.Command { return err } res, err := c.Balance(cmd.Context(), &core.QueryBalanceRequest{ - BatchDenom: args[0], Account: args[1], + BatchDenom: args[0], Address: args[1], }) return printQueryResponse(ctx, res, err) }, diff --git a/x/ecocredit/client/testsuite/grpc.go b/x/ecocredit/client/testsuite/grpc.go index 15d157b275..48a604e681 100644 --- a/x/ecocredit/client/testsuite/grpc.go +++ b/x/ecocredit/client/testsuite/grpc.go @@ -379,7 +379,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrder() { expiration, err := types2.ParseDate("expiration", "2090-10-10") s.Require().NoError(err) orderIds, err := s.createSellOrder(val.ClientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, }, @@ -420,7 +420,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrders() { expiration, err := types2.ParseDate("expiration", "2090-10-10") s.Require().NoError(err) _, err = s.createSellOrder(val.ClientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, @@ -474,7 +474,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByBatchDenom() { expiration, err := types2.ParseDate("expiration", "2090-10-10") s.Require().NoError(err) _, err = s.createSellOrder(val.ClientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, @@ -520,14 +520,14 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByBatchDenom() { } } -func (s *IntegrationTestSuite) TestQuerySellOrdersByAddress() { +func (s *IntegrationTestSuite) TestQuerySellOrdersBySeller() { val := s.network.Validators[0] _, _, batchDenom := s.createClassProjectBatch(val.ClientCtx, val.Address.String()) validAsk := types.NewInt64Coin(types.DefaultBondDenom, 10) expiration, err := types2.ParseDate("expiration", "2090-10-10") s.Require().NoError(err) _, err = s.createSellOrder(val.ClientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, @@ -543,12 +543,12 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByAddress() { }{ { "valid request", - fmt.Sprintf("%s%ssell-orders/address/%s", val.APIAddress, marketplaceRoute, val.Address.String()), + fmt.Sprintf("%s%ssell-orders/seller/%s", val.APIAddress, marketplaceRoute, val.Address.String()), -1, }, { "valid request pagination", - fmt.Sprintf("%s%ssell-orders/address/%s?pagination.limit=2", val.APIAddress, marketplaceRoute, val.Address.String()), + fmt.Sprintf("%s%ssell-orders/seller/%s?pagination.limit=2", val.APIAddress, marketplaceRoute, val.Address.String()), 2, }, } @@ -559,7 +559,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByAddress() { s.Run(tc.name, func() { resp, err := rest.GetRequest(tc.url) require.NoError(err) - var res marketplace.QuerySellOrdersByAddressResponse + var res marketplace.QuerySellOrdersBySellerResponse err = val.ClientCtx.Codec.UnmarshalJSON(resp, &res) require.NoError(err) require.NotNil(res.SellOrders) diff --git a/x/ecocredit/client/testsuite/query.go b/x/ecocredit/client/testsuite/query.go index 84fea38fc6..d71fc17ae5 100644 --- a/x/ecocredit/client/testsuite/query.go +++ b/x/ecocredit/client/testsuite/query.go @@ -594,7 +594,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrderCmd() { expiration, err := types.ParseDate("expiration", "2050-03-11") s.Require().NoError(err) orderIds, err := s.createSellOrder(clientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, }, @@ -656,7 +656,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersCmd() { s.Require().NoError(err) _, err = s.createSellOrder(clientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "3", AskPrice: &validAsk, Expiration: &expiration}, @@ -703,7 +703,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersCmd() { } } -func (s *IntegrationTestSuite) TestQuerySellOrdersByAddressCmd() { +func (s *IntegrationTestSuite) TestQuerySellOrdersBySellerCmd() { val := s.network.Validators[0] clientCtx := val.ClientCtx clientCtx.OutputFormat = "JSON" @@ -712,7 +712,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByAddressCmd() { expiration, err := types.ParseDate("expiration", "2050-03-11") s.Require().NoError(err) _, err = s.createSellOrder(clientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "3", AskPrice: &validAsk, Expiration: &expiration}, @@ -748,7 +748,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByAddressCmd() { for _, tc := range testCases { s.Run(tc.name, func() { - cmd := marketplaceclient.QuerySellOrdersByAddressCmd() + cmd := marketplaceclient.QuerySellOrdersBySellerCmd() out, err := cli.ExecTestCLICmd(clientCtx, cmd, tc.args) if tc.expErr { s.Require().Error(err) @@ -756,7 +756,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByAddressCmd() { } else { s.Require().NoError(err, out.String()) - var res marketplace.QuerySellOrdersByAddressResponse + var res marketplace.QuerySellOrdersBySellerResponse s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) s.Require().NotNil(res.Pagination) s.Require().True(res.Pagination.Total > 1) @@ -775,7 +775,7 @@ func (s *IntegrationTestSuite) TestQuerySellOrdersByBatchDenomCmd() { s.Require().NoError(err) _, err = s.createSellOrder(clientCtx, &marketplace.MsgSell{ - Owner: val.Address.String(), + Seller: val.Address.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &validAsk, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "3", AskPrice: &validAsk, Expiration: &expiration}, diff --git a/x/ecocredit/client/testsuite/tx.go b/x/ecocredit/client/testsuite/tx.go index eb4e0bf68b..c4d278f2d8 100644 --- a/x/ecocredit/client/testsuite/tx.go +++ b/x/ecocredit/client/testsuite/tx.go @@ -1026,7 +1026,7 @@ func (s *IntegrationTestSuite) TestTxUpdateSellOrders() { s.Require().NoError(err) _, _, batchDenom := s.createClassProjectBatch(clientCtx, valAddrStr) orderIds, err := s.createSellOrder(clientCtx, &marketplace.MsgSell{ - Owner: valAddrStr, + Seller: valAddrStr, Orders: []*marketplace.MsgSell_Order{ {batchDenom, "10", &askCoin, true, &expiration}, }, @@ -1041,7 +1041,7 @@ func (s *IntegrationTestSuite) TestTxUpdateSellOrders() { } updatesStr := strings.Join(updates, ",") updateArg := fmt.Sprintf(`[%s]`, updatesStr) - args := []string{updateArg, makeFlagFrom(msg.Owner)} + args := []string{updateArg, makeFlagFrom(msg.Seller)} return append(args, s.commonTxFlags()...) } @@ -1075,7 +1075,7 @@ func (s *IntegrationTestSuite) TestTxUpdateSellOrders() { { name: "valid", args: makeArgs(&marketplace.MsgUpdateSellOrders{ - Owner: valAddrStr, + Seller: valAddrStr, Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: orderId, NewQuantity: "9.99", NewAskPrice: &newAsk, DisableAutoRetire: false, NewExpiration: &newExpiration}, }, @@ -1213,7 +1213,7 @@ func (s *IntegrationTestSuite) TestTxBuyDirect() { s.Require().NoError(err) _, _, batchDenom := s.createClassProjectBatch(clientCtx, valAddrStr) orderIds, err := s.createSellOrder(clientCtx, &marketplace.MsgSell{ - Owner: valAddrStr, + Seller: valAddrStr, Orders: []*marketplace.MsgSell_Order{ {batchDenom, "10", &askCoin, true, &expiration}, {batchDenom, "10", &askCoin, false, &expiration}, @@ -1326,7 +1326,7 @@ func (s *IntegrationTestSuite) TestTxBuyDirectBatch() { s.Require().NoError(err) _, _, batchDenom := s.createClassProjectBatch(clientCtx, valAddrStr) orderIds, err := s.createSellOrder(clientCtx, &marketplace.MsgSell{ - Owner: valAddrStr, + Seller: valAddrStr, Orders: []*marketplace.MsgSell_Order{ {batchDenom, "10", &askCoin, true, &expiration}, {batchDenom, "10", &askCoin, false, &expiration}, @@ -1737,7 +1737,7 @@ func (s *IntegrationTestSuite) createSellOrder(clientCtx client.Context, msg *ma // merge args ordersStr := strings.Join(orders, ",") orderArg := fmt.Sprintf(`[%s]`, ordersStr) - args := []string{orderArg, makeFlagFrom(msg.Owner)} + args := []string{orderArg, makeFlagFrom(msg.Seller)} args = append(args, s.commonTxFlags()...) // execute command diff --git a/x/ecocredit/client/tx.go b/x/ecocredit/client/tx.go index 8b9c89dc4f..9280178dd7 100644 --- a/x/ecocredit/client/tx.go +++ b/x/ecocredit/client/tx.go @@ -358,7 +358,7 @@ Parameters: return err } msg := core.MsgRetire{ - Holder: clientCtx.GetFromAddress().String(), + Owner: clientCtx.GetFromAddress().String(), Credits: credits, Jurisdiction: args[1], } @@ -390,7 +390,7 @@ Parameters: return err } msg := core.MsgCancel{ - Holder: clientCtx.GetFromAddress().String(), + Owner: clientCtx.GetFromAddress().String(), Credits: credits, Reason: args[1], } diff --git a/x/ecocredit/core/events.pb.go b/x/ecocredit/core/events.pb.go index bb6d4a348b..fbeb9035ba 100644 --- a/x/ecocredit/core/events.pb.go +++ b/x/ecocredit/core/events.pb.go @@ -387,11 +387,11 @@ func (m *EventTransfer) GetRetiredAmount() string { // retired from multiple batches in the same transaction, a separate event is // emitted for each batch_denom. This allows for easier indexing. type EventRetire struct { - // owner is the account that owns the retired credits. This will be the - // account receiving credits in the case that credits were retired upon - // issuance using Msg/CreateBatch, retired upon transfer using Msg/Send, - // retired upon taking from a basket using basket.Msg/Take, or retired - // upon purchase using marketplace.Msg/BuyDirect. + // owner is the address of the account that owns the retired credits. This + // will be the account receiving credits in the case that credits were retired + // upon issuance using Msg/CreateBatch, retired upon transfer using Msg/Send, + // retired upon taking from a basket using basket.Msg/Take, or retired upon + // purchase using marketplace.Msg/BuyDirect. Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // batch_denom is the unique identifier of the credit batch within which the // credits were retired. @@ -471,7 +471,7 @@ func (m *EventRetire) GetJurisdiction() string { // cancelled from multiple batches in the same transaction, a separate event is // emitted for each batch_denom. This allows for easier indexing. type EventCancel struct { - // owner is the account which has cancelled the credits. + // owner is the address of the account that cancelled the credits. Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // batch_denom is the unique identifier of the credit batch within which the // credits were cancelled. diff --git a/x/ecocredit/core/msg_bridge.go b/x/ecocredit/core/msg_bridge.go index 338dcf815a..b31af1ed35 100644 --- a/x/ecocredit/core/msg_bridge.go +++ b/x/ecocredit/core/msg_bridge.go @@ -33,8 +33,8 @@ func (m MsgBridge) GetSignBytes() []byte { // ValidateBasic does a sanity check on the provided data. func (m *MsgBridge) ValidateBasic() error { - if _, err := sdk.AccAddressFromBech32(m.Holder); err != nil { - return sdkerrors.Wrap(err, "holder") + if _, err := sdk.AccAddressFromBech32(m.Owner); err != nil { + return sdkerrors.Wrap(err, "owner") } if len(m.Credits) == 0 { @@ -68,7 +68,7 @@ func (m *MsgBridge) ValidateBasic() error { // GetSigners returns the expected signers for MsgCancel. func (m *MsgBridge) GetSigners() []sdk.AccAddress { - addr, _ := sdk.AccAddressFromBech32(m.Holder) + addr, _ := sdk.AccAddressFromBech32(m.Owner) return []sdk.AccAddress{addr} } diff --git a/x/ecocredit/core/msg_bridge_test.go b/x/ecocredit/core/msg_bridge_test.go index b04d148444..cc7e7dfede 100644 --- a/x/ecocredit/core/msg_bridge_test.go +++ b/x/ecocredit/core/msg_bridge_test.go @@ -20,7 +20,7 @@ func TestMsgBridge(t *testing.T) { }{ "valid msg": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -33,7 +33,7 @@ func TestMsgBridge(t *testing.T) { }, expErr: false, }, - "invalid msg without holder": { + "invalid msg without owner": { src: MsgBridge{ Credits: []*MsgBridge_CancelCredits{ { @@ -47,9 +47,9 @@ func TestMsgBridge(t *testing.T) { }, expErr: true, }, - "invalid msg with wrong holder address": { + "invalid msg with wrong owner address": { src: MsgBridge{ - Holder: "wrongHolder", + Owner: "wrong owner", Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -61,13 +61,13 @@ func TestMsgBridge(t *testing.T) { }, "invalid msg without credits": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, }, expErr: true, }, "invalid msg without Credits.BatchDenom": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { Amount: "10", @@ -78,7 +78,7 @@ func TestMsgBridge(t *testing.T) { }, "invalid msg without Credits.Amount": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -89,7 +89,7 @@ func TestMsgBridge(t *testing.T) { }, "invalid msg with wrong Credits.Amount": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -101,7 +101,7 @@ func TestMsgBridge(t *testing.T) { }, "invalid msg without bridge target": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -115,7 +115,7 @@ func TestMsgBridge(t *testing.T) { }, "invalid msg without bridge contract": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -129,7 +129,7 @@ func TestMsgBridge(t *testing.T) { }, "invalid msg without bridge recipient address": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -143,7 +143,7 @@ func TestMsgBridge(t *testing.T) { }, "invalid bridge recipient address": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, @@ -158,7 +158,7 @@ func TestMsgBridge(t *testing.T) { }, "invalid bridge target": { src: MsgBridge{ - Holder: addr1, + Owner: addr1, Credits: []*MsgBridge_CancelCredits{ { BatchDenom: batchDenom, diff --git a/x/ecocredit/core/msg_cancel.go b/x/ecocredit/core/msg_cancel.go index a6cd72e697..5aff4402f5 100644 --- a/x/ecocredit/core/msg_cancel.go +++ b/x/ecocredit/core/msg_cancel.go @@ -24,8 +24,8 @@ func (m MsgCancel) GetSignBytes() []byte { // ValidateBasic does a sanity check on the provided data. func (m *MsgCancel) ValidateBasic() error { - if _, err := sdk.AccAddressFromBech32(m.Holder); err != nil { - return sdkerrors.Wrap(err, "holder") + if _, err := sdk.AccAddressFromBech32(m.Owner); err != nil { + return sdkerrors.Wrap(err, "owner") } if len(m.Credits) == 0 { @@ -51,6 +51,6 @@ func (m *MsgCancel) ValidateBasic() error { // GetSigners returns the expected signers for MsgCancel. func (m *MsgCancel) GetSigners() []sdk.AccAddress { - addr, _ := sdk.AccAddressFromBech32(m.Holder) + addr, _ := sdk.AccAddressFromBech32(m.Owner) return []sdk.AccAddress{addr} } diff --git a/x/ecocredit/core/msg_cancel_test.go b/x/ecocredit/core/msg_cancel_test.go index 8e3f96ddec..ea44b1ea56 100644 --- a/x/ecocredit/core/msg_cancel_test.go +++ b/x/ecocredit/core/msg_cancel_test.go @@ -18,7 +18,7 @@ func TestMsgCancel(t *testing.T) { }{ "valid msg": { src: MsgCancel{ - Holder: addr1, + Owner: addr1, Credits: []*MsgCancel_CancelCredits{ { BatchDenom: batchDenom, @@ -42,7 +42,7 @@ func TestMsgCancel(t *testing.T) { }, "invalid msg with wrong holder address": { src: MsgCancel{ - Holder: "wrongHolder", + Owner: "wrong owner", Credits: []*MsgCancel_CancelCredits{ { BatchDenom: batchDenom, @@ -54,13 +54,13 @@ func TestMsgCancel(t *testing.T) { }, "invalid msg without credits": { src: MsgCancel{ - Holder: addr1, + Owner: addr1, }, expErr: true, }, "invalid msg without Credits.BatchDenom": { src: MsgCancel{ - Holder: addr1, + Owner: addr1, Credits: []*MsgCancel_CancelCredits{ { Amount: "10", @@ -71,7 +71,7 @@ func TestMsgCancel(t *testing.T) { }, "invalid msg without Credits.Amount": { src: MsgCancel{ - Holder: addr1, + Owner: addr1, Credits: []*MsgCancel_CancelCredits{ { BatchDenom: batchDenom, @@ -82,7 +82,7 @@ func TestMsgCancel(t *testing.T) { }, "invalid msg with wrong Credits.Amount": { src: MsgCancel{ - Holder: addr1, + Owner: addr1, Credits: []*MsgCancel_CancelCredits{ { BatchDenom: batchDenom, @@ -94,7 +94,7 @@ func TestMsgCancel(t *testing.T) { }, "invalid msg reason is required": { src: MsgCancel{ - Holder: addr1, + Owner: addr1, Credits: []*MsgCancel_CancelCredits{ { BatchDenom: batchDenom, diff --git a/x/ecocredit/core/msg_retire.go b/x/ecocredit/core/msg_retire.go index 88fbc3ea11..d73acdeed5 100644 --- a/x/ecocredit/core/msg_retire.go +++ b/x/ecocredit/core/msg_retire.go @@ -24,8 +24,8 @@ func (m MsgRetire) GetSignBytes() []byte { // ValidateBasic does a sanity check on the provided data. func (m *MsgRetire) ValidateBasic() error { - if _, err := sdk.AccAddressFromBech32(m.Holder); err != nil { - return sdkerrors.Wrap(err, "holder") + if _, err := sdk.AccAddressFromBech32(m.Owner); err != nil { + return sdkerrors.Wrap(err, "owner") } if len(m.Credits) == 0 { @@ -51,6 +51,6 @@ func (m *MsgRetire) ValidateBasic() error { // GetSigners returns the expected signers for MsgRetire. func (m *MsgRetire) GetSigners() []sdk.AccAddress { - addr, _ := sdk.AccAddressFromBech32(m.Holder) + addr, _ := sdk.AccAddressFromBech32(m.Owner) return []sdk.AccAddress{addr} } diff --git a/x/ecocredit/core/msg_retire_test.go b/x/ecocredit/core/msg_retire_test.go index 0efb44b29a..db4a51edd0 100644 --- a/x/ecocredit/core/msg_retire_test.go +++ b/x/ecocredit/core/msg_retire_test.go @@ -19,7 +19,7 @@ func TestMsgRetire(t *testing.T) { }{ "valid msg": { src: MsgRetire{ - Holder: addr1, + Owner: addr1, Credits: []*MsgRetire_RetireCredits{ { BatchDenom: batchDenom, @@ -44,7 +44,7 @@ func TestMsgRetire(t *testing.T) { }, "invalid msg with wrong holder address": { src: MsgRetire{ - Holder: "wrongHolder", + Owner: "wrong owner", Credits: []*MsgRetire_RetireCredits{ { BatchDenom: batchDenom, @@ -57,14 +57,14 @@ func TestMsgRetire(t *testing.T) { }, "invalid msg without credits": { src: MsgRetire{ - Holder: addr1, + Owner: addr1, Jurisdiction: "AB-CDE FG1 345", }, expErr: true, }, "invalid msg without Credits.BatchDenom": { src: MsgRetire{ - Holder: addr1, + Owner: addr1, Credits: []*MsgRetire_RetireCredits{ { Amount: "10", @@ -76,7 +76,7 @@ func TestMsgRetire(t *testing.T) { }, "invalid msg without Credits.Amount": { src: MsgRetire{ - Holder: addr1, + Owner: addr1, Credits: []*MsgRetire_RetireCredits{ { BatchDenom: batchDenom, @@ -88,7 +88,7 @@ func TestMsgRetire(t *testing.T) { }, "invalid msg with wrong Credits.Amount": { src: MsgRetire{ - Holder: addr1, + Owner: addr1, Credits: []*MsgRetire_RetireCredits{ { BatchDenom: batchDenom, @@ -101,7 +101,7 @@ func TestMsgRetire(t *testing.T) { }, "invalid msg without jurisdiction": { src: MsgRetire{ - Holder: addr1, + Owner: addr1, Credits: []*MsgRetire_RetireCredits{ { BatchDenom: batchDenom, @@ -113,7 +113,7 @@ func TestMsgRetire(t *testing.T) { }, "invalid msg with wrong jurisdiction": { src: MsgRetire{ - Holder: addr1, + Owner: addr1, Credits: []*MsgRetire_RetireCredits{ { BatchDenom: batchDenom, diff --git a/x/ecocredit/core/query.pb.go b/x/ecocredit/core/query.pb.go index 2cd04289c1..6e480c90ca 100644 --- a/x/ecocredit/core/query.pb.go +++ b/x/ecocredit/core/query.pb.go @@ -1392,8 +1392,8 @@ func (m *QueryBatchResponse) GetBatch() *BatchInfo { // QueryBalanceRequest is the Query/Balance request type. type QueryBalanceRequest struct { - // account is the address of the account whose balance is being queried. - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + // address is the address of the account whose balance is being queried. + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // batch_denom is the unique identifier of the credit batch to query. BatchDenom string `protobuf:"bytes,2,opt,name=batch_denom,json=batchDenom,proto3" json:"batch_denom,omitempty"` } @@ -1431,9 +1431,9 @@ func (m *QueryBalanceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryBalanceRequest proto.InternalMessageInfo -func (m *QueryBalanceRequest) GetAccount() string { +func (m *QueryBalanceRequest) GetAddress() string { if m != nil { - return m.Account + return m.Address } return "" } @@ -1493,8 +1493,8 @@ func (m *QueryBalanceResponse) GetBalance() *BatchBalanceInfo { // QueryBalancesRequest is the Query/Balances request type. type QueryBalancesRequest struct { - // account is the address of the account whose balance is being queried. - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + // address is the address of the account whose balance is being queried. + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // pagination defines an optional pagination for the request. Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -1532,9 +1532,9 @@ func (m *QueryBalancesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryBalancesRequest proto.InternalMessageInfo -func (m *QueryBalancesRequest) GetAccount() string { +func (m *QueryBalancesRequest) GetAddress() string { if m != nil { - return m.Account + return m.Address } return "" } @@ -2165,7 +2165,7 @@ func (m *BatchInfo) GetOpen() bool { // BatchBalanceInfo is the human-readable batch balance information. type BatchBalanceInfo struct { - // address is the address of the credit holder. + // address is the address of the account that owns the credits. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // batch_denom is the unique identifier of the credit batch. BatchDenom string `protobuf:"bytes,2,opt,name=batch_denom,json=batchDenom,proto3" json:"batch_denom,omitempty"` @@ -2294,118 +2294,117 @@ func init() { func init() { proto.RegisterFile("regen/ecocredit/v1/query.proto", fileDescriptor_c85efa417eafb74b) } var fileDescriptor_c85efa417eafb74b = []byte{ - // 1761 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x14, 0xc7, - 0x12, 0xa7, 0x17, 0x7f, 0xac, 0xcb, 0xc6, 0xe6, 0xf5, 0x33, 0x3c, 0xb3, 0xe0, 0xc5, 0xcc, 0x7b, - 0x60, 0xf3, 0xb0, 0x67, 0xb0, 0xc1, 0x10, 0x84, 0xf2, 0x61, 0x83, 0x12, 0xf9, 0x66, 0x36, 0x28, - 0x87, 0x48, 0xc8, 0x9a, 0x9d, 0x69, 0xcc, 0x92, 0xdd, 0x99, 0x65, 0x66, 0xd6, 0xb0, 0x59, 0x6d, - 0xa2, 0x44, 0x49, 0xa4, 0x5c, 0x12, 0x14, 0x2e, 0x5c, 0xa2, 0x84, 0x04, 0x29, 0x4a, 0x72, 0xe2, - 0x9c, 0x7b, 0x14, 0x29, 0x17, 0xa4, 0x5c, 0x72, 0x8c, 0x20, 0x7f, 0x48, 0xb4, 0xdd, 0xd5, 0xf3, - 0xe5, 0xf1, 0xcc, 0x38, 0xda, 0x20, 0x9f, 0x76, 0xbb, 0xa7, 0xaa, 0xeb, 0x57, 0xd5, 0x55, 0xd5, - 0xfd, 0x6b, 0x28, 0x3b, 0x6c, 0x93, 0x59, 0x1a, 0x33, 0x6c, 0xc3, 0x61, 0x66, 0xcd, 0xd3, 0xb6, - 0x16, 0xb5, 0x3b, 0x2d, 0xe6, 0xb4, 0xd5, 0xa6, 0x63, 0x7b, 0x36, 0xa5, 0xfc, 0xbb, 0xea, 0x7f, - 0x57, 0xb7, 0x16, 0x4b, 0xc7, 0x36, 0x6d, 0x7b, 0xb3, 0xce, 0x34, 0xbd, 0x59, 0xd3, 0x74, 0xcb, - 0xb2, 0x3d, 0xdd, 0xab, 0xd9, 0x96, 0x2b, 0x34, 0x4a, 0xc7, 0xf1, 0x2b, 0x1f, 0x55, 0x5b, 0x37, - 0x35, 0xaf, 0xd6, 0x60, 0xae, 0xa7, 0x37, 0x9a, 0x28, 0xf0, 0x7f, 0xc3, 0x76, 0x1b, 0xb6, 0xab, - 0x55, 0x75, 0x97, 0x09, 0x5b, 0xda, 0xd6, 0x62, 0x95, 0x79, 0xfa, 0xa2, 0xd6, 0xd4, 0x37, 0x6b, - 0x16, 0x5f, 0x0d, 0x65, 0x93, 0xe0, 0xb9, 0x9e, 0xee, 0xb1, 0x94, 0xef, 0x5e, 0xbb, 0xc9, 0x10, - 0x8c, 0x72, 0x03, 0xfe, 0x7d, 0xad, 0x67, 0xe1, 0x4a, 0x5d, 0x77, 0x5d, 0xe6, 0x56, 0xd8, 0x9d, - 0x16, 0x73, 0x3d, 0xfa, 0x3a, 0x40, 0x60, 0x6a, 0x8a, 0xcc, 0x90, 0xb9, 0xd1, 0xa5, 0x53, 0xaa, - 0xc0, 0xa5, 0xf6, 0x70, 0xa9, 0x22, 0x06, 0x88, 0x4b, 0x5d, 0xd7, 0x37, 0x19, 0xea, 0x56, 0x42, - 0x9a, 0xca, 0x43, 0x02, 0x93, 0xd1, 0xf5, 0xdd, 0xa6, 0x6d, 0xb9, 0x8c, 0x5e, 0x84, 0x61, 0x43, - 0x4c, 0x4d, 0x91, 0x99, 0xfd, 0x73, 0xa3, 0x4b, 0xd3, 0xea, 0xf6, 0x40, 0xaa, 0x5c, 0x6b, 0xcd, - 0xba, 0x69, 0x57, 0xa4, 0x34, 0x7d, 0x23, 0x82, 0xac, 0xc0, 0x91, 0xcd, 0x66, 0x22, 0x13, 0x56, - 0x23, 0xd0, 0xde, 0x85, 0x52, 0x18, 0xd9, 0x6a, 0x7b, 0xc5, 0x6c, 0xd4, 0x2c, 0x19, 0x80, 0x49, - 0x18, 0xd4, 0x7b, 0x63, 0xee, 0xfb, 0x48, 0x45, 0x0c, 0x62, 0x61, 0x29, 0xfc, 0xed, 0xb0, 0x7c, - 0x45, 0xe0, 0x68, 0xa2, 0xf1, 0x3d, 0x13, 0x1d, 0x15, 0xfe, 0x15, 0x00, 0x94, 0x41, 0x39, 0x02, - 0x45, 0x6e, 0x68, 0xa3, 0x66, 0x62, 0x5c, 0x84, 0xe1, 0x35, 0x53, 0x59, 0x03, 0x1a, 0x96, 0x47, - 0x3f, 0xce, 0xc1, 0x20, 0x17, 0xc0, 0x0c, 0xca, 0xf0, 0x42, 0xc8, 0x2a, 0x5d, 0x98, 0x0a, 0x96, - 0x5a, 0x73, 0xdd, 0x16, 0x73, 0x72, 0x20, 0xe8, 0xdb, 0xde, 0xbc, 0x07, 0x47, 0x12, 0xcc, 0xa3, - 0x43, 0x53, 0x30, 0x5c, 0x13, 0x53, 0x7c, 0x63, 0x46, 0x2a, 0x72, 0xd8, 0xbf, 0xc8, 0xb7, 0xb1, - 0x62, 0xd6, 0x1d, 0xfb, 0x36, 0x33, 0xbc, 0x17, 0xe9, 0xfa, 0x97, 0x04, 0x0e, 0xc5, 0x6c, 0xa3, - 0xdf, 0x97, 0xa1, 0xd8, 0xc4, 0x39, 0xcc, 0xc8, 0xe3, 0x49, 0x7b, 0x89, 0x7a, 0x7c, 0x37, 0x7d, - 0x85, 0xfe, 0x85, 0xe6, 0x33, 0x02, 0x27, 0x22, 0xf8, 0x56, 0xdb, 0x15, 0x76, 0x93, 0x39, 0xcc, - 0x32, 0xd8, 0x9a, 0x29, 0x03, 0x75, 0x02, 0xc6, 0x1c, 0x39, 0x1b, 0x04, 0x6b, 0xd4, 0x09, 0x24, - 0xfb, 0x16, 0xb0, 0x1f, 0x08, 0x28, 0x69, 0x80, 0xf6, 0x54, 0xf4, 0x3a, 0xd8, 0x73, 0x02, 0xac, - 0x2f, 0xb0, 0xe3, 0x3d, 0x26, 0x70, 0x2c, 0xd9, 0xfa, 0x9e, 0x8a, 0xd1, 0x79, 0x3c, 0x0e, 0xd1, - 0x8c, 0x8c, 0xcd, 0x34, 0x00, 0xda, 0x0a, 0x12, 0x6a, 0x04, 0x67, 0xd6, 0x4c, 0xe5, 0x5a, 0xb4, - 0x64, 0x7d, 0x9f, 0x2e, 0xc1, 0x30, 0x0a, 0x61, 0x03, 0xcc, 0x74, 0x49, 0xca, 0xfb, 0xe7, 0xf2, - 0xaa, 0xee, 0x19, 0xb7, 0xfe, 0xc1, 0x73, 0xd9, 0x5f, 0x3f, 0x38, 0x79, 0xaa, 0x62, 0x2a, 0xed, - 0xe4, 0xe1, 0x5a, 0x02, 0x30, 0x4a, 0xf7, 0x6f, 0x0b, 0xba, 0x98, 0xa6, 0x88, 0x6c, 0xb5, 0x2d, - 0x7a, 0xb0, 0x8c, 0xc0, 0x61, 0x18, 0x12, 0x2d, 0x17, 0xb7, 0x01, 0x47, 0x7d, 0x4b, 0xd4, 0xaf, - 0x65, 0xa2, 0x6e, 0xb3, 0xbf, 0x67, 0x22, 0xf4, 0x3e, 0xde, 0x5c, 0x7c, 0x84, 0x39, 0x0f, 0xe9, - 0xbe, 0xc5, 0xe8, 0xe3, 0x6d, 0x31, 0xda, 0x55, 0xbd, 0xf4, 0x0d, 0xc7, 0x23, 0x02, 0xd3, 0x3b, - 0xe0, 0xd8, 0x33, 0x9b, 0xe5, 0x5f, 0xf5, 0xe2, 0xbb, 0xb5, 0x67, 0x10, 0x9e, 0xc7, 0xab, 0x1e, - 0xb7, 0x21, 0x77, 0xf0, 0x38, 0x8c, 0x72, 0x43, 0x1b, 0x26, 0xb3, 0xec, 0x06, 0x6e, 0x21, 0xf0, - 0xa9, 0xab, 0xbd, 0x19, 0xff, 0xc2, 0x87, 0x5a, 0xc1, 0x85, 0x8f, 0xcb, 0xa4, 0x5d, 0xf8, 0x02, - 0x5f, 0x84, 0xac, 0xb2, 0xee, 0xf7, 0xba, 0xba, 0x6e, 0x19, 0x72, 0xa7, 0x7b, 0x77, 0x2d, 0xdd, - 0x30, 0xec, 0x96, 0xe5, 0xc9, 0x3c, 0xc6, 0x61, 0x1c, 0x5c, 0x61, 0x1b, 0xb8, 0xb7, 0xfc, 0xee, - 0x86, 0x2b, 0x22, 0xbc, 0x57, 0x7a, 0xc1, 0xe6, 0x53, 0x08, 0xf0, 0x7f, 0x3b, 0x02, 0x44, 0x55, - 0x19, 0x73, 0x3e, 0x50, 0xee, 0x45, 0xd7, 0x75, 0xb3, 0xa1, 0xf6, 0x2b, 0xd5, 0xbf, 0x91, 0x57, - 0xb3, 0xc0, 0x34, 0xfa, 0xf4, 0x1a, 0x14, 0x11, 0x9e, 0xcc, 0xa0, 0x7c, 0x4e, 0xf9, 0x5a, 0xfd, - 0xcb, 0xa4, 0x65, 0xcc, 0x89, 0x37, 0x5b, 0xcd, 0x66, 0xbd, 0x9d, 0x3b, 0x95, 0xee, 0x13, 0x4c, - 0x00, 0xa9, 0x87, 0x9e, 0xcd, 0xc2, 0x84, 0xe7, 0xe8, 0xa6, 0x5e, 0xad, 0xb3, 0x0d, 0x97, 0x7f, - 0x42, 0xe5, 0x71, 0x39, 0x2d, 0x14, 0xe8, 0x49, 0x18, 0x77, 0x98, 0x57, 0x73, 0x98, 0x29, 0xe5, - 0x44, 0x4a, 0x1c, 0xc0, 0x59, 0x14, 0x3b, 0x0d, 0x07, 0x8d, 0x9e, 0xc7, 0xf5, 0x3a, 0x33, 0x37, - 0xf4, 0x06, 0xdf, 0xae, 0xfd, 0x5c, 0x70, 0xc2, 0x9f, 0x5f, 0xe1, 0xd3, 0xca, 0x11, 0xf8, 0x8f, - 0x20, 0x01, 0x3c, 0x7e, 0xd7, 0x7b, 0x84, 0x19, 0xdd, 0x51, 0x6e, 0x48, 0x7a, 0x12, 0xfe, 0x84, - 0x88, 0x57, 0x60, 0x4c, 0x44, 0x7c, 0x83, 0x73, 0x6c, 0xdc, 0x8f, 0x72, 0x22, 0xed, 0xf1, 0xd5, - 0x2b, 0xa3, 0x46, 0xb0, 0x94, 0x32, 0x89, 0x31, 0x5c, 0xd7, 0x1d, 0xbd, 0xe1, 0x1b, 0x5d, 0x93, - 0xf7, 0x12, 0x9c, 0x45, 0x7b, 0x4b, 0x30, 0xd4, 0xe4, 0x33, 0x98, 0xce, 0xa5, 0xc4, 0xfb, 0x85, - 0xd0, 0x41, 0x49, 0xa5, 0x03, 0x23, 0x3e, 0xe5, 0xa2, 0xe3, 0x50, 0xf0, 0x1b, 0x74, 0xa1, 0x66, - 0x06, 0x97, 0xc0, 0x42, 0xf8, 0x12, 0x58, 0x82, 0x62, 0x83, 0x79, 0xba, 0xa9, 0x7b, 0x3a, 0x06, - 0xcc, 0x1f, 0xd3, 0x79, 0xa0, 0x21, 0x97, 0x37, 0xf4, 0x6a, 0xd5, 0x61, 0x5b, 0x53, 0x03, 0x5c, - 0xea, 0x60, 0xe0, 0xd8, 0x0a, 0x9f, 0x57, 0x9e, 0x10, 0x18, 0x0d, 0xdd, 0x77, 0x72, 0xda, 0x0f, - 0x1f, 0x69, 0xfb, 0xa3, 0x47, 0x9a, 0x02, 0x63, 0xb7, 0x5b, 0x4e, 0xcd, 0x35, 0x6b, 0x06, 0xcf, - 0x5e, 0x61, 0x38, 0x32, 0x17, 0x81, 0x3f, 0x18, 0x83, 0x1f, 0x27, 0x0b, 0x43, 0xdb, 0xc8, 0x82, - 0xf2, 0x53, 0x01, 0x46, 0xfc, 0x9e, 0xb5, 0xe3, 0xfd, 0x23, 0x7a, 0xe4, 0x15, 0xe2, 0x47, 0xde, - 0x24, 0x0c, 0x8a, 0xf4, 0x17, 0xf8, 0xc5, 0x20, 0x82, 0x6c, 0x20, 0x86, 0xec, 0x12, 0x80, 0xeb, - 0xe9, 0x8e, 0xb7, 0x61, 0xea, 0x1e, 0xe3, 0xb8, 0x7b, 0xfb, 0x2b, 0xde, 0x8e, 0x54, 0xf9, 0x76, - 0xa4, 0x5e, 0x97, 0x6f, 0x47, 0x95, 0x11, 0x2e, 0x7d, 0x55, 0xf7, 0x18, 0x5d, 0x86, 0x22, 0xb3, - 0x4c, 0xa1, 0x38, 0x94, 0xa9, 0x38, 0xcc, 0x2c, 0x93, 0xab, 0xbd, 0x0a, 0x07, 0x7a, 0xce, 0xf4, - 0x4a, 0x41, 0xe8, 0x0e, 0x67, 0xea, 0x8e, 0x49, 0x05, 0xbe, 0x00, 0x85, 0x01, 0xbb, 0xc9, 0xac, - 0xa9, 0xe2, 0x0c, 0x99, 0x2b, 0x56, 0xf8, 0x7f, 0xe5, 0x67, 0x02, 0x07, 0xe3, 0xbd, 0x87, 0xf7, - 0x4b, 0xd3, 0x74, 0x18, 0xbe, 0x0c, 0xf4, 0xfa, 0xa5, 0x18, 0x66, 0xb6, 0xf6, 0x48, 0x53, 0x88, - 0xd4, 0xb0, 0xdf, 0x14, 0x44, 0x09, 0x87, 0x9b, 0x02, 0xca, 0x0d, 0x44, 0x9a, 0x02, 0x8a, 0xcd, - 0xc2, 0x04, 0x73, 0x0d, 0xc7, 0xbe, 0x1b, 0xc8, 0x89, 0x1c, 0x19, 0x97, 0xd3, 0x42, 0x70, 0xe9, - 0xa3, 0xc3, 0x30, 0xc8, 0x6b, 0x90, 0x7e, 0x40, 0x60, 0x18, 0x1f, 0x6e, 0xe8, 0x6c, 0x52, 0xc5, - 0x25, 0xbc, 0xa8, 0x95, 0xe6, 0xb2, 0x05, 0x45, 0x51, 0x2b, 0xff, 0xfd, 0xf0, 0xb7, 0x3f, 0x1f, - 0x14, 0xa6, 0xe9, 0x51, 0x2d, 0xe1, 0xed, 0x4e, 0x3e, 0xf4, 0x3c, 0x26, 0x30, 0x1e, 0x7d, 0x3c, - 0xa2, 0x6a, 0x96, 0x85, 0x28, 0xe1, 0x2b, 0x69, 0xb9, 0xe5, 0x11, 0xd8, 0x22, 0x07, 0x76, 0x86, - 0x9e, 0x4e, 0x01, 0xa6, 0xf1, 0x8a, 0xd5, 0x3a, 0xfc, 0xa7, 0x4b, 0x3f, 0x21, 0x30, 0xc8, 0x57, - 0xa3, 0x27, 0xd3, 0xad, 0x49, 0x50, 0xa7, 0xb2, 0xc4, 0x10, 0x8b, 0xca, 0xb1, 0xcc, 0xd1, 0x53, - 0x69, 0x58, 0x3a, 0xb2, 0x6b, 0x74, 0xe9, 0xb7, 0x04, 0xc6, 0xc2, 0x2f, 0x3a, 0x74, 0x3e, 0xdd, - 0x50, 0xf4, 0xdd, 0xa9, 0xb4, 0x90, 0x53, 0x1a, 0xd1, 0x5d, 0xe0, 0xe8, 0xce, 0x52, 0x35, 0x1f, - 0x3a, 0x4d, 0x3e, 0x22, 0x3d, 0x24, 0x50, 0x94, 0x04, 0x99, 0xee, 0x9c, 0x31, 0xb1, 0xa7, 0xa1, - 0xd2, 0xe9, 0x1c, 0x92, 0x88, 0xec, 0x22, 0x47, 0xb6, 0x48, 0xb5, 0x9c, 0xc8, 0x7c, 0x8a, 0xfd, - 0x2b, 0x81, 0x43, 0x89, 0xaf, 0x1c, 0x74, 0x39, 0xd3, 0x7a, 0xd2, 0x33, 0x4d, 0xe9, 0xc2, 0x6e, - 0xd5, 0xd0, 0x83, 0x2b, 0xdc, 0x83, 0x97, 0xe9, 0xe5, 0x24, 0x0f, 0x24, 0x5c, 0xad, 0xda, 0x5e, - 0xf0, 0x7b, 0xf8, 0x42, 0xcd, 0xd4, 0x3a, 0xe1, 0x2e, 0xdf, 0xa5, 0x9f, 0x13, 0x18, 0x46, 0x33, - 0x29, 0x25, 0x1c, 0x65, 0x35, 0xa5, 0xb9, 0x6c, 0xc1, 0x3c, 0x95, 0xe2, 0x63, 0xec, 0x04, 0x07, - 0x46, 0x97, 0xfe, 0x48, 0x60, 0x22, 0xf6, 0x36, 0x42, 0xb5, 0x1c, 0x21, 0x8a, 0x94, 0xf4, 0xd9, - 0xfc, 0x0a, 0x88, 0x74, 0x99, 0x23, 0xd5, 0xe8, 0x42, 0x56, 0x34, 0xa3, 0x75, 0xdd, 0x6b, 0x81, - 0x48, 0x68, 0x52, 0xe2, 0x17, 0x7d, 0xbc, 0x48, 0x89, 0x5f, 0xec, 0x15, 0x22, 0xbd, 0x05, 0x4a, - 0x02, 0xf4, 0x3d, 0x81, 0x89, 0x18, 0x49, 0x4f, 0x89, 0x58, 0xf2, 0x73, 0x42, 0x4a, 0xc4, 0x76, - 0xe0, 0xff, 0xca, 0x39, 0x8e, 0x6d, 0x81, 0x9e, 0x49, 0xc1, 0x86, 0x05, 0xad, 0x75, 0xc4, 0x6f, - 0x97, 0x7e, 0x47, 0x60, 0x3c, 0x4a, 0x00, 0x53, 0xda, 0x75, 0x22, 0xaf, 0x2f, 0x69, 0xb9, 0xe5, - 0x11, 0xe8, 0x79, 0x0e, 0x54, 0xa5, 0xf3, 0x69, 0x40, 0x79, 0xa5, 0x87, 0x1b, 0xe5, 0x13, 0x79, - 0x5e, 0x87, 0xe8, 0x34, 0xcd, 0x11, 0xa5, 0x58, 0xad, 0x2c, 0xee, 0x42, 0x03, 0xf1, 0xbe, 0xc4, - 0xf1, 0x2e, 0xd1, 0xb3, 0x69, 0x78, 0x31, 0x25, 0xa3, 0xb5, 0xf3, 0x29, 0x81, 0x41, 0xbe, 0x6c, - 0xca, 0x29, 0x13, 0x66, 0xb7, 0x29, 0xa7, 0x4c, 0x84, 0xce, 0xa6, 0xd7, 0xb1, 0x84, 0xd4, 0x09, - 0x5d, 0x58, 0xba, 0xf4, 0x11, 0xaf, 0x0c, 0x7e, 0xd5, 0x49, 0xad, 0x8c, 0x30, 0xd5, 0x4d, 0xad, - 0x8c, 0x08, 0x83, 0x4d, 0xef, 0x7e, 0x89, 0x88, 0x34, 0xe4, 0x79, 0x5a, 0x07, 0x39, 0x29, 0xef, - 0x7e, 0x45, 0xc9, 0x23, 0x69, 0xa6, 0xed, 0x1c, 0xc7, 0x4c, 0x9c, 0x94, 0xa6, 0x1f, 0xcf, 0x92, - 0x78, 0x86, 0x10, 0x3d, 0x20, 0x30, 0x84, 0x2c, 0x6d, 0xe7, 0xbd, 0x89, 0xd0, 0xca, 0xd2, 0x6c, - 0xa6, 0xdc, 0x6e, 0xf2, 0x2a, 0x1a, 0x32, 0xc1, 0x22, 0xe9, 0x17, 0x04, 0x46, 0x43, 0x34, 0x8f, - 0x9e, 0xd9, 0xf9, 0x16, 0xb0, 0x8d, 0x27, 0x96, 0xe6, 0xf3, 0x09, 0x23, 0xc8, 0x39, 0x0e, 0x52, - 0xa1, 0x33, 0x89, 0xe7, 0x32, 0xff, 0xb7, 0xc0, 0x39, 0x25, 0xed, 0xc2, 0x90, 0x60, 0x74, 0x29, - 0x91, 0x8a, 0x90, 0xc7, 0x94, 0x48, 0x45, 0xe9, 0xa4, 0xa2, 0x70, 0x10, 0xc7, 0x68, 0x29, 0xf1, - 0x30, 0xe0, 0xb2, 0xab, 0xeb, 0xbf, 0x3c, 0x2b, 0x93, 0xa7, 0xcf, 0xca, 0xe4, 0x8f, 0x67, 0x65, - 0x72, 0xff, 0x79, 0x79, 0xdf, 0xd3, 0xe7, 0xe5, 0x7d, 0xbf, 0x3f, 0x2f, 0xef, 0x7b, 0xfb, 0xc2, - 0x66, 0xcd, 0xbb, 0xd5, 0xaa, 0xaa, 0x86, 0xdd, 0x10, 0xfa, 0x0b, 0x16, 0xf3, 0xee, 0xda, 0xce, - 0x3b, 0x38, 0xaa, 0x33, 0x73, 0x93, 0x39, 0xda, 0xbd, 0xd0, 0xb2, 0x86, 0xed, 0xb0, 0xea, 0x10, - 0xe7, 0x15, 0xe7, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x76, 0x58, 0x48, 0x1f, 0x6a, 0x1f, 0x00, - 0x00, + // 1751 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x1b, 0x45, + 0x14, 0xef, 0xb8, 0xf9, 0x70, 0x5e, 0xd2, 0xa4, 0x0c, 0x69, 0x49, 0xb7, 0x8d, 0x9b, 0x2e, 0xb4, + 0x49, 0x69, 0xb2, 0xdb, 0xa4, 0x4d, 0x4b, 0x55, 0xf1, 0x91, 0xb4, 0x02, 0xe5, 0x96, 0x9a, 0x8a, + 0x03, 0x52, 0x15, 0xad, 0xbd, 0xd3, 0xd4, 0xc5, 0xde, 0x75, 0x77, 0xd7, 0x69, 0x8d, 0x65, 0x10, + 0x08, 0x90, 0xb8, 0x40, 0x45, 0x2f, 0xbd, 0x20, 0x28, 0x54, 0x42, 0xc0, 0xa9, 0x67, 0xee, 0x08, + 0x89, 0x4b, 0x25, 0x2e, 0x1c, 0x51, 0xcb, 0x1f, 0x82, 0x3c, 0xf3, 0x66, 0xbf, 0xb2, 0x5e, 0x6f, + 0xc0, 0x54, 0x39, 0xd9, 0x33, 0xfb, 0xde, 0xbc, 0xdf, 0x7b, 0xf3, 0xde, 0x9b, 0xf9, 0x0d, 0x14, + 0x1c, 0xb6, 0xc9, 0x2c, 0x9d, 0x95, 0xed, 0xb2, 0xc3, 0xcc, 0x8a, 0xa7, 0x6f, 0x2d, 0xea, 0xb7, + 0x1a, 0xcc, 0x69, 0x6a, 0x75, 0xc7, 0xf6, 0x6c, 0x4a, 0xf9, 0x77, 0xcd, 0xff, 0xae, 0x6d, 0x2d, + 0x2a, 0x47, 0x36, 0x6d, 0x7b, 0xb3, 0xca, 0x74, 0xa3, 0x5e, 0xd1, 0x0d, 0xcb, 0xb2, 0x3d, 0xc3, + 0xab, 0xd8, 0x96, 0x2b, 0x34, 0x94, 0xa3, 0xf8, 0x95, 0x8f, 0x4a, 0x8d, 0xeb, 0xba, 0x57, 0xa9, + 0x31, 0xd7, 0x33, 0x6a, 0x75, 0x14, 0x78, 0xb9, 0x6c, 0xbb, 0x35, 0xdb, 0xd5, 0x4b, 0x86, 0xcb, + 0x84, 0x2d, 0x7d, 0x6b, 0xb1, 0xc4, 0x3c, 0x63, 0x51, 0xaf, 0x1b, 0x9b, 0x15, 0x8b, 0xaf, 0x86, + 0xb2, 0x49, 0xf0, 0x5c, 0xcf, 0xf0, 0x58, 0xca, 0x77, 0xaf, 0x59, 0x67, 0x08, 0x46, 0xbd, 0x06, + 0xcf, 0x5f, 0xe9, 0x58, 0xb8, 0x54, 0x35, 0x5c, 0x97, 0xb9, 0x45, 0x76, 0xab, 0xc1, 0x5c, 0x8f, + 0xbe, 0x09, 0x10, 0x98, 0x9a, 0x22, 0x33, 0x64, 0x6e, 0x74, 0xe9, 0x84, 0x26, 0x70, 0x69, 0x1d, + 0x5c, 0x9a, 0x88, 0x01, 0xe2, 0xd2, 0xd6, 0x8d, 0x4d, 0x86, 0xba, 0xc5, 0x90, 0xa6, 0x7a, 0x9f, + 0xc0, 0x64, 0x74, 0x7d, 0xb7, 0x6e, 0x5b, 0x2e, 0xa3, 0xe7, 0x61, 0xb8, 0x2c, 0xa6, 0xa6, 0xc8, + 0xcc, 0xde, 0xb9, 0xd1, 0xa5, 0x69, 0x6d, 0x7b, 0x20, 0x35, 0xae, 0xb5, 0x66, 0x5d, 0xb7, 0x8b, + 0x52, 0x9a, 0xbe, 0x15, 0x41, 0x96, 0xe3, 0xc8, 0x66, 0x7b, 0x22, 0x13, 0x56, 0x23, 0xd0, 0xde, + 0x07, 0x25, 0x8c, 0x6c, 0xb5, 0xb9, 0x62, 0xd6, 0x2a, 0x96, 0x0c, 0xc0, 0x24, 0x0c, 0x1a, 0x9d, + 0x31, 0xf7, 0x7d, 0xa4, 0x28, 0x06, 0xb1, 0xb0, 0xe4, 0xfe, 0x75, 0x58, 0xbe, 0x21, 0x70, 0x38, + 0xd1, 0xf8, 0xae, 0x89, 0x8e, 0x06, 0xcf, 0x05, 0x00, 0x65, 0x50, 0x0e, 0x41, 0x9e, 0x1b, 0xda, + 0xa8, 0x98, 0x18, 0x17, 0x61, 0x78, 0xcd, 0x54, 0xd7, 0x80, 0x86, 0xe5, 0xd1, 0x8f, 0x33, 0x30, + 0xc8, 0x05, 0x30, 0x83, 0x7a, 0x78, 0x21, 0x64, 0xd5, 0x36, 0x4c, 0x05, 0x4b, 0xad, 0xb9, 0x6e, + 0x83, 0x39, 0x19, 0x10, 0xf4, 0x6d, 0x6f, 0x3e, 0x80, 0x43, 0x09, 0xe6, 0xd1, 0xa1, 0x29, 0x18, + 0xae, 0x88, 0x29, 0xbe, 0x31, 0x23, 0x45, 0x39, 0xec, 0x5f, 0xe4, 0x9b, 0x58, 0x31, 0xeb, 0x8e, + 0x7d, 0x93, 0x95, 0xbd, 0x67, 0xe9, 0xfa, 0xd7, 0x04, 0x0e, 0xc4, 0x6c, 0xa3, 0xdf, 0x17, 0x21, + 0x5f, 0xc7, 0x39, 0xcc, 0xc8, 0xa3, 0x49, 0x7b, 0x89, 0x7a, 0x7c, 0x37, 0x7d, 0x85, 0xfe, 0x85, + 0xe6, 0x0b, 0x02, 0xc7, 0x22, 0xf8, 0x56, 0x9b, 0x45, 0x76, 0x9d, 0x39, 0xcc, 0x2a, 0xb3, 0x35, + 0x53, 0x06, 0xea, 0x18, 0x8c, 0x39, 0x72, 0x36, 0x08, 0xd6, 0xa8, 0x13, 0x48, 0xf6, 0x2d, 0x60, + 0x3f, 0x11, 0x50, 0xd3, 0x00, 0xed, 0xaa, 0xe8, 0xb5, 0xb0, 0xe7, 0x04, 0x58, 0x9f, 0x61, 0xc7, + 0x7b, 0x48, 0xe0, 0x48, 0xb2, 0xf5, 0x5d, 0x15, 0xa3, 0xb3, 0x78, 0x1c, 0xa2, 0x19, 0x19, 0x9b, + 0x69, 0x00, 0xb4, 0x15, 0x24, 0xd4, 0x08, 0xce, 0xac, 0x99, 0xea, 0x95, 0x68, 0xc9, 0xfa, 0x3e, + 0x5d, 0x80, 0x61, 0x14, 0xc2, 0x06, 0xd8, 0xd3, 0x25, 0x29, 0xef, 0x9f, 0xcb, 0xab, 0x86, 0x57, + 0xbe, 0xf1, 0x3f, 0x9e, 0xcb, 0xfe, 0xfa, 0xc1, 0xc9, 0x53, 0x12, 0x53, 0x69, 0x27, 0x0f, 0xd7, + 0x12, 0x80, 0x51, 0xba, 0x7f, 0x5b, 0xd0, 0xc6, 0x34, 0x45, 0x64, 0xab, 0x4d, 0xd1, 0x83, 0x65, + 0x04, 0x0e, 0xc2, 0x90, 0x68, 0xb9, 0xb8, 0x0d, 0x38, 0xea, 0x5b, 0xa2, 0x7e, 0x2b, 0x13, 0x75, + 0x9b, 0xfd, 0x5d, 0x13, 0xa1, 0x0f, 0xf1, 0xe6, 0xe2, 0x23, 0xcc, 0x78, 0x48, 0xf7, 0x2d, 0x46, + 0x9f, 0x6e, 0x8b, 0xd1, 0x8e, 0xea, 0xa5, 0x6f, 0x38, 0x1e, 0x10, 0x98, 0xee, 0x82, 0x63, 0xd7, + 0x6c, 0x96, 0x7f, 0xd5, 0x8b, 0xef, 0xd6, 0xae, 0x41, 0x78, 0x16, 0xaf, 0x7a, 0xdc, 0x86, 0xdc, + 0xc1, 0xa3, 0x30, 0xca, 0x0d, 0x6d, 0x98, 0xcc, 0xb2, 0x6b, 0xb8, 0x85, 0xc0, 0xa7, 0x2e, 0x77, + 0x66, 0xfc, 0x0b, 0x1f, 0x6a, 0x05, 0x17, 0x3e, 0x2e, 0x93, 0x76, 0xe1, 0x0b, 0x7c, 0x11, 0xb2, + 0xea, 0xba, 0xdf, 0xeb, 0xaa, 0x86, 0x55, 0x96, 0x3b, 0xdd, 0xb9, 0x6b, 0x19, 0xa6, 0xe9, 0x30, + 0xbc, 0x3e, 0x8e, 0x14, 0xe5, 0x30, 0x0e, 0x2e, 0xb7, 0x0d, 0xdc, 0x3b, 0x7e, 0x77, 0xc3, 0x15, + 0x11, 0xde, 0x6b, 0x9d, 0x60, 0xf3, 0x29, 0x04, 0xf8, 0x52, 0x57, 0x80, 0xa8, 0x2a, 0x63, 0xce, + 0x07, 0xea, 0x9d, 0xe8, 0xba, 0x6e, 0x6f, 0xa8, 0xfd, 0x4a, 0xf5, 0xef, 0xe4, 0xd5, 0x2c, 0x30, + 0x8d, 0x3e, 0xbd, 0x01, 0x79, 0x84, 0x27, 0x33, 0x28, 0x9b, 0x53, 0xbe, 0x56, 0xff, 0x32, 0x69, + 0x19, 0x73, 0xe2, 0xed, 0x46, 0xbd, 0x5e, 0x6d, 0x66, 0x4e, 0xa5, 0xbb, 0x04, 0x13, 0x40, 0xea, + 0xa1, 0x67, 0xb3, 0x30, 0xe1, 0x39, 0x86, 0x69, 0x94, 0xaa, 0x6c, 0xc3, 0xe5, 0x9f, 0x50, 0x79, + 0x5c, 0x4e, 0x0b, 0x05, 0x7a, 0x1c, 0xc6, 0x1d, 0xe6, 0x55, 0x1c, 0x66, 0x4a, 0x39, 0x91, 0x12, + 0xfb, 0x70, 0x16, 0xc5, 0x4e, 0xc2, 0xfe, 0x72, 0xc7, 0xe3, 0x6a, 0x95, 0x99, 0x1b, 0x46, 0xcd, + 0x6e, 0x58, 0xde, 0xd4, 0x5e, 0x2e, 0x38, 0xe1, 0xcf, 0xaf, 0xf0, 0x69, 0xf5, 0x10, 0xbc, 0x20, + 0x48, 0x00, 0x8f, 0xdf, 0xd5, 0x0e, 0x61, 0x46, 0x77, 0xd4, 0x6b, 0x92, 0x9e, 0x84, 0x3f, 0x21, + 0xe2, 0x15, 0x18, 0x13, 0x11, 0xdf, 0xe0, 0x1c, 0x1b, 0xf7, 0xa3, 0x90, 0x48, 0x7b, 0x7c, 0xf5, + 0xe2, 0x68, 0x39, 0x58, 0x4a, 0x9d, 0xc4, 0x18, 0xae, 0x1b, 0x8e, 0x51, 0xf3, 0x8d, 0xae, 0xc9, + 0x7b, 0x09, 0xce, 0xa2, 0xbd, 0x25, 0x18, 0xaa, 0xf3, 0x19, 0x4c, 0x67, 0x25, 0xf1, 0x7e, 0x21, + 0x74, 0x50, 0x52, 0x6d, 0xc1, 0x88, 0x4f, 0xb9, 0xe8, 0x38, 0xe4, 0xfc, 0x06, 0x9d, 0xab, 0x98, + 0xc1, 0x25, 0x30, 0x17, 0xbe, 0x04, 0x2a, 0x90, 0xaf, 0x31, 0xcf, 0x30, 0x0d, 0xcf, 0xc0, 0x80, + 0xf9, 0x63, 0x3a, 0x0f, 0x34, 0xe4, 0xf2, 0x86, 0x51, 0x2a, 0x39, 0x6c, 0x6b, 0x6a, 0x80, 0x4b, + 0xed, 0x0f, 0x1c, 0x5b, 0xe1, 0xf3, 0xea, 0x23, 0x02, 0xa3, 0xa1, 0xfb, 0x4e, 0x46, 0xfb, 0xe1, + 0x23, 0x6d, 0x6f, 0xf4, 0x48, 0x53, 0x61, 0xec, 0x66, 0xc3, 0xa9, 0xb8, 0x66, 0xa5, 0xcc, 0xb3, + 0x57, 0x18, 0x8e, 0xcc, 0x45, 0xe0, 0x0f, 0xc6, 0xe0, 0xc7, 0xc9, 0xc2, 0xd0, 0x36, 0xb2, 0xa0, + 0xfe, 0x92, 0x83, 0x11, 0xbf, 0x67, 0x75, 0xbd, 0x7f, 0x44, 0x8f, 0xbc, 0x5c, 0xfc, 0xc8, 0x9b, + 0x84, 0x41, 0x91, 0xfe, 0x02, 0xbf, 0x18, 0x44, 0x90, 0x0d, 0xc4, 0x90, 0x5d, 0x00, 0x70, 0x3d, + 0xc3, 0xf1, 0x36, 0x4c, 0xc3, 0x63, 0x1c, 0x77, 0x67, 0x7f, 0xc5, 0xdb, 0x91, 0x26, 0xdf, 0x8e, + 0xb4, 0xab, 0xf2, 0xed, 0xa8, 0x38, 0xc2, 0xa5, 0x2f, 0x1b, 0x1e, 0xa3, 0xcb, 0x90, 0x67, 0x96, + 0x29, 0x14, 0x87, 0x7a, 0x2a, 0x0e, 0x33, 0xcb, 0xe4, 0x6a, 0xaf, 0xc3, 0xbe, 0x8e, 0x33, 0x9d, + 0x52, 0x10, 0xba, 0xc3, 0x3d, 0x75, 0xc7, 0xa4, 0x02, 0x5f, 0x80, 0xc2, 0x80, 0x5d, 0x67, 0xd6, + 0x54, 0x7e, 0x86, 0xcc, 0xe5, 0x8b, 0xfc, 0xbf, 0xfa, 0x2b, 0x81, 0xfd, 0xf1, 0xde, 0xf3, 0x1f, + 0x5a, 0x7b, 0xa4, 0x29, 0x44, 0x6a, 0xd8, 0x6f, 0x0a, 0xa2, 0x84, 0xc3, 0x4d, 0x01, 0xe5, 0x06, + 0x22, 0x4d, 0x01, 0xc5, 0x66, 0x61, 0x82, 0xb9, 0x65, 0xc7, 0xbe, 0x1d, 0xc8, 0x89, 0x1c, 0x19, + 0x97, 0xd3, 0x42, 0x70, 0xe9, 0x93, 0x83, 0x30, 0xc8, 0x6b, 0x90, 0x7e, 0x44, 0x60, 0x18, 0x1f, + 0x6e, 0xe8, 0x6c, 0x52, 0xc5, 0x25, 0xbc, 0xa8, 0x29, 0x73, 0xbd, 0x05, 0x45, 0x51, 0xab, 0x2f, + 0x7e, 0xfc, 0xc7, 0xdf, 0xf7, 0x72, 0xd3, 0xf4, 0xb0, 0x9e, 0xf0, 0x76, 0x27, 0x1f, 0x7a, 0x1e, + 0x12, 0x18, 0x8f, 0x3e, 0x1e, 0x51, 0xad, 0x97, 0x85, 0x28, 0xe1, 0x53, 0xf4, 0xcc, 0xf2, 0x08, + 0x6c, 0x91, 0x03, 0x3b, 0x45, 0x4f, 0xa6, 0x00, 0xd3, 0x79, 0xc5, 0xea, 0x2d, 0xfe, 0xd3, 0xa6, + 0x9f, 0x11, 0x18, 0xe4, 0xab, 0xd1, 0xe3, 0xe9, 0xd6, 0x24, 0xa8, 0x13, 0xbd, 0xc4, 0x10, 0x8b, + 0xc6, 0xb1, 0xcc, 0xd1, 0x13, 0x69, 0x58, 0x5a, 0xb2, 0x6b, 0xb4, 0xe9, 0xf7, 0x04, 0xc6, 0xc2, + 0x2f, 0x3a, 0x74, 0x3e, 0xdd, 0x50, 0xf4, 0xdd, 0x49, 0x59, 0xc8, 0x28, 0x8d, 0xe8, 0xce, 0x71, + 0x74, 0xa7, 0xa9, 0x96, 0x0d, 0x9d, 0x2e, 0x1f, 0x91, 0xee, 0x13, 0xc8, 0x4b, 0x82, 0x4c, 0xbb, + 0x67, 0x4c, 0xec, 0x69, 0x48, 0x39, 0x99, 0x41, 0x12, 0x91, 0x9d, 0xe7, 0xc8, 0x16, 0xa9, 0x9e, + 0x11, 0x99, 0x4f, 0xb1, 0x7f, 0x27, 0x70, 0x20, 0xf1, 0x95, 0x83, 0x2e, 0xf7, 0xb4, 0x9e, 0xf4, + 0x4c, 0xa3, 0x9c, 0xdb, 0xa9, 0x1a, 0x7a, 0x70, 0x89, 0x7b, 0xf0, 0x2a, 0xbd, 0x98, 0xe4, 0x81, + 0x84, 0xab, 0x97, 0x9a, 0x0b, 0x7e, 0x0f, 0x5f, 0xa8, 0x98, 0x7a, 0x2b, 0xdc, 0xe5, 0xdb, 0xf4, + 0x4b, 0x02, 0xc3, 0x68, 0x26, 0xa5, 0x84, 0xa3, 0xac, 0x46, 0x99, 0xeb, 0x2d, 0x98, 0xa5, 0x52, + 0x7c, 0x8c, 0xad, 0xe0, 0xc0, 0x68, 0xd3, 0x9f, 0x09, 0x4c, 0xc4, 0xde, 0x46, 0xa8, 0x9e, 0x21, + 0x44, 0x91, 0x92, 0x3e, 0x9d, 0x5d, 0x01, 0x91, 0x2e, 0x73, 0xa4, 0x3a, 0x5d, 0xe8, 0x15, 0xcd, + 0x68, 0x5d, 0x77, 0x5a, 0x20, 0x12, 0x9a, 0x94, 0xf8, 0x45, 0x1f, 0x2f, 0x52, 0xe2, 0x17, 0x7b, + 0x85, 0x48, 0x6f, 0x81, 0x92, 0x00, 0xfd, 0x48, 0x60, 0x22, 0x46, 0xd2, 0x53, 0x22, 0x96, 0xfc, + 0x9c, 0x90, 0x12, 0xb1, 0x2e, 0xfc, 0x5f, 0x3d, 0xc3, 0xb1, 0x2d, 0xd0, 0x53, 0x29, 0xd8, 0xb0, + 0xa0, 0xf5, 0x96, 0xf8, 0x6d, 0xd3, 0x1f, 0x08, 0x8c, 0x47, 0x09, 0x60, 0x4a, 0xbb, 0x4e, 0xe4, + 0xf5, 0x8a, 0x9e, 0x59, 0x1e, 0x81, 0x9e, 0xe5, 0x40, 0x35, 0x3a, 0x9f, 0x06, 0x94, 0x57, 0x7a, + 0xb8, 0x51, 0x3e, 0x92, 0xe7, 0x75, 0x88, 0x4e, 0xd3, 0x0c, 0x51, 0x8a, 0xd5, 0xca, 0xe2, 0x0e, + 0x34, 0x10, 0xef, 0x2b, 0x1c, 0xef, 0x12, 0x3d, 0x9d, 0x86, 0x17, 0x53, 0x32, 0x5a, 0x3b, 0x9f, + 0x13, 0x18, 0xe4, 0xcb, 0xa6, 0x9c, 0x32, 0x61, 0x76, 0x9b, 0x72, 0xca, 0x44, 0xe8, 0x6c, 0x7a, + 0x1d, 0x4b, 0x48, 0xad, 0xd0, 0x85, 0xa5, 0x4d, 0x1f, 0xf0, 0xca, 0xe0, 0x57, 0x9d, 0xd4, 0xca, + 0x08, 0x53, 0xdd, 0xd4, 0xca, 0x88, 0x30, 0xd8, 0xf4, 0xee, 0x97, 0x88, 0x48, 0x47, 0x9e, 0xd7, + 0xa9, 0x5d, 0x7e, 0xc7, 0xe2, 0xdd, 0x2f, 0x2f, 0x79, 0x24, 0xed, 0x69, 0x3b, 0xc3, 0x31, 0x13, + 0x27, 0xa5, 0xe9, 0xc7, 0xb3, 0x24, 0x9e, 0x21, 0x44, 0xf7, 0x08, 0x0c, 0x21, 0x4b, 0xeb, 0xbe, + 0x37, 0x11, 0x5a, 0xa9, 0xcc, 0xf6, 0x94, 0xdb, 0x49, 0x5e, 0x45, 0x43, 0x26, 0x58, 0x24, 0xfd, + 0x8a, 0xc0, 0x68, 0x88, 0xe6, 0xd1, 0x53, 0xdd, 0x6f, 0x01, 0xdb, 0x78, 0xa2, 0x32, 0x9f, 0x4d, + 0x18, 0x41, 0xce, 0x71, 0x90, 0x2a, 0x9d, 0x49, 0x3c, 0x97, 0xf9, 0xbf, 0x05, 0xce, 0x29, 0x69, + 0x1b, 0x86, 0x04, 0xa3, 0x4b, 0x89, 0x54, 0x84, 0x3c, 0xa6, 0x44, 0x2a, 0x4a, 0x27, 0x55, 0x95, + 0x83, 0x38, 0x42, 0x95, 0xc4, 0xc3, 0x80, 0xcb, 0xae, 0xae, 0xff, 0xf6, 0xa4, 0x40, 0x1e, 0x3f, + 0x29, 0x90, 0xbf, 0x9e, 0x14, 0xc8, 0xdd, 0xa7, 0x85, 0x3d, 0x8f, 0x9f, 0x16, 0xf6, 0xfc, 0xf9, + 0xb4, 0xb0, 0xe7, 0xdd, 0x73, 0x9b, 0x15, 0xef, 0x46, 0xa3, 0xa4, 0x95, 0xed, 0x9a, 0xd0, 0x5f, + 0xb0, 0x98, 0x77, 0xdb, 0x76, 0xde, 0xc3, 0x51, 0x95, 0x99, 0x9b, 0xcc, 0xd1, 0xef, 0x84, 0x96, + 0x2d, 0xdb, 0x0e, 0x2b, 0x0d, 0x71, 0x5e, 0x71, 0xe6, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf3, + 0x1f, 0x2e, 0x40, 0x6a, 0x1f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2451,7 +2450,7 @@ type QueryClient interface { // Batch queries for information on a credit batch. Batch(ctx context.Context, in *QueryBatchRequest, opts ...grpc.CallOption) (*QueryBatchResponse, error) // Balance queries the balance (both tradable and retired) of a given credit - // batch for a given account. + // batch for a given account address. Balance(ctx context.Context, in *QueryBalanceRequest, opts ...grpc.CallOption) (*QueryBalanceResponse, error) // Balances queries all credit balances the given account holds. Balances(ctx context.Context, in *QueryBalancesRequest, opts ...grpc.CallOption) (*QueryBalancesResponse, error) @@ -2667,7 +2666,7 @@ type QueryServer interface { // Batch queries for information on a credit batch. Batch(context.Context, *QueryBatchRequest) (*QueryBatchResponse, error) // Balance queries the balance (both tradable and retired) of a given credit - // batch for a given account. + // batch for a given account address. Balance(context.Context, *QueryBalanceRequest) (*QueryBalanceResponse, error) // Balances queries all credit balances the given account holds. Balances(context.Context, *QueryBalancesRequest) (*QueryBalancesResponse, error) @@ -4261,10 +4260,10 @@ func (m *QueryBalanceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if len(m.Account) > 0 { - i -= len(m.Account) - copy(dAtA[i:], m.Account) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Account))) + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0xa } @@ -4338,10 +4337,10 @@ func (m *QueryBalancesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if len(m.Account) > 0 { - i -= len(m.Account) - copy(dAtA[i:], m.Account) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Account))) + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0xa } @@ -5307,7 +5306,7 @@ func (m *QueryBalanceRequest) Size() (n int) { } var l int _ = l - l = len(m.Account) + l = len(m.Address) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -5337,7 +5336,7 @@ func (m *QueryBalancesRequest) Size() (n int) { } var l int _ = l - l = len(m.Account) + l = len(m.Address) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -8429,7 +8428,7 @@ func (m *QueryBalanceRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -8457,7 +8456,7 @@ func (m *QueryBalanceRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Account = string(dAtA[iNdEx:postIndex]) + m.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -8629,7 +8628,7 @@ func (m *QueryBalancesRequest) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -8657,7 +8656,7 @@ func (m *QueryBalancesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Account = string(dAtA[iNdEx:postIndex]) + m.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { diff --git a/x/ecocredit/core/query.pb.gw.go b/x/ecocredit/core/query.pb.gw.go index 61d47f085a..deebd1082f 100644 --- a/x/ecocredit/core/query.pb.gw.go +++ b/x/ecocredit/core/query.pb.gw.go @@ -865,15 +865,15 @@ func request_Query_Balance_0(ctx context.Context, marshaler runtime.Marshaler, c return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "batch_denom", err) } - val, ok = pathParams["account"] + val, ok = pathParams["address"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") } - protoReq.Account, err = runtime.String(val) + protoReq.Address, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } msg, err := client.Balance(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -903,15 +903,15 @@ func local_request_Query_Balance_0(ctx context.Context, marshaler runtime.Marsha return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "batch_denom", err) } - val, ok = pathParams["account"] + val, ok = pathParams["address"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") } - protoReq.Account, err = runtime.String(val) + protoReq.Address, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } msg, err := server.Balance(ctx, &protoReq) @@ -920,7 +920,7 @@ func local_request_Query_Balance_0(ctx context.Context, marshaler runtime.Marsha } var ( - filter_Query_Balances_0 = &utilities.DoubleArray{Encoding: map[string]int{"account": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} + filter_Query_Balances_0 = &utilities.DoubleArray{Encoding: map[string]int{"address": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) func request_Query_Balances_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -934,15 +934,15 @@ func request_Query_Balances_0(ctx context.Context, marshaler runtime.Marshaler, _ = err ) - val, ok = pathParams["account"] + val, ok = pathParams["address"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") } - protoReq.Account, err = runtime.String(val) + protoReq.Address, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } if err := req.ParseForm(); err != nil { @@ -968,15 +968,15 @@ func local_request_Query_Balances_0(ctx context.Context, marshaler runtime.Marsh _ = err ) - val, ok = pathParams["account"] + val, ok = pathParams["address"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "account") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") } - protoReq.Account, err = runtime.String(val) + protoReq.Address, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "account", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) } if err := req.ParseForm(); err != nil { @@ -1932,9 +1932,9 @@ var ( pattern_Query_Batch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"regen", "ecocredit", "v1", "batches", "batch_denom"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Balance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"regen", "ecocredit", "v1", "batches", "batch_denom", "balance", "account"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Balance_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"regen", "ecocredit", "v1", "batches", "batch_denom", "balance", "address"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Balances_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"regen", "ecocredit", "v1", "balances", "account"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Balances_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"regen", "ecocredit", "v1", "balances", "address"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Supply_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 2, 5}, []string{"regen", "ecocredit", "v1", "batches", "batch_denom", "supply"}, "", runtime.AssumeColonVerbOpt(false))) diff --git a/x/ecocredit/core/state.pb.go b/x/ecocredit/core/state.pb.go index cfedb12ad5..e337277968 100644 --- a/x/ecocredit/core/state.pb.go +++ b/x/ecocredit/core/state.pb.go @@ -649,7 +649,7 @@ type BatchBalance struct { // batch_key is the table row identifier of the credit batch used internally // for efficient lookups. This links a batch balance to a credit batch. BatchKey uint64 `protobuf:"varint,1,opt,name=batch_key,json=batchKey,proto3" json:"batch_key,omitempty"` - // address is the address of the credit holder. + // address is the address of the account that owns the credits. Address []byte `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` // tradable_amount is the total number of tradable credits owned by address. TradableAmount string `protobuf:"bytes,3,opt,name=tradable_amount,json=tradableAmount,proto3" json:"tradable_amount,omitempty"` diff --git a/x/ecocredit/core/tx.pb.go b/x/ecocredit/core/tx.pb.go index 0ed3e5dadd..6ce8bfe981 100644 --- a/x/ecocredit/core/tx.pb.go +++ b/x/ecocredit/core/tx.pb.go @@ -951,8 +951,8 @@ var xxx_messageInfo_MsgSendResponse proto.InternalMessageInfo // MsgRetire is the Msg/Retire request type. type MsgRetire struct { - // holder is the credit holder address. - Holder string `protobuf:"bytes,1,opt,name=holder,proto3" json:"holder,omitempty"` + // owner is the address of the account that owns the credits being retired. + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // credits are the credits being retired. Credits []*MsgRetire_RetireCredits `protobuf:"bytes,2,rep,name=credits,proto3" json:"credits,omitempty"` // jurisdiction is the jurisdiction of the beneficiary or buyer of the retired @@ -996,9 +996,9 @@ func (m *MsgRetire) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRetire proto.InternalMessageInfo -func (m *MsgRetire) GetHolder() string { +func (m *MsgRetire) GetOwner() string { if m != nil { - return m.Holder + return m.Owner } return "" } @@ -1113,8 +1113,8 @@ var xxx_messageInfo_MsgRetireResponse proto.InternalMessageInfo // MsgCancel is the Msg/Cancel request type. type MsgCancel struct { - // holder is the credit holder address. - Holder string `protobuf:"bytes,1,opt,name=holder,proto3" json:"holder,omitempty"` + // owner is the address of the account that owns the credits being cancelled. + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` // credits are the credits being cancelled. Credits []*MsgCancel_CancelCredits `protobuf:"bytes,2,rep,name=credits,proto3" json:"credits,omitempty"` // reason is any arbitrary string that specifies the reason for cancelling @@ -1155,9 +1155,9 @@ func (m *MsgCancel) XXX_DiscardUnknown() { var xxx_messageInfo_MsgCancel proto.InternalMessageInfo -func (m *MsgCancel) GetHolder() string { +func (m *MsgCancel) GetOwner() string { if m != nil { - return m.Holder + return m.Owner } return "" } @@ -1794,8 +1794,8 @@ type MsgBridge struct { Recipient string `protobuf:"bytes,2,opt,name=recipient,proto3" json:"recipient,omitempty"` // contract is the contract address. Contract string `protobuf:"bytes,3,opt,name=contract,proto3" json:"contract,omitempty"` - // holder is the credit holder address. - Holder string `protobuf:"bytes,4,opt,name=holder,proto3" json:"holder,omitempty"` + // owner is the address of the account that owns the credits being bridged. + Owner string `protobuf:"bytes,4,opt,name=owner,proto3" json:"owner,omitempty"` // credits are the credits being cancelled. Credits []*MsgBridge_CancelCredits `protobuf:"bytes,5,rep,name=credits,proto3" json:"credits,omitempty"` } @@ -1854,9 +1854,9 @@ func (m *MsgBridge) GetContract() string { return "" } -func (m *MsgBridge) GetHolder() string { +func (m *MsgBridge) GetOwner() string { if m != nil { - return m.Holder + return m.Owner } return "" } @@ -2006,88 +2006,88 @@ var fileDescriptor_2b8ae49f50a3ddbd = []byte{ 0x14, 0xee, 0xda, 0x4e, 0x62, 0x1f, 0x27, 0xfd, 0xd9, 0xb6, 0xc1, 0xdd, 0x34, 0x8e, 0xbb, 0x50, 0x35, 0xb4, 0x65, 0xad, 0xa4, 0x08, 0x54, 0x21, 0x84, 0x92, 0x14, 0xd1, 0x20, 0x19, 0x2a, 0x53, 0x84, 0x84, 0x84, 0xac, 0xf5, 0xee, 0xe9, 0x76, 0x8b, 0x3d, 0x63, 0xcd, 0x4e, 0x7e, 0x2a, 0x2e, - 0x91, 0xb8, 0xee, 0x63, 0xf0, 0x04, 0xf4, 0x86, 0x07, 0xe0, 0x82, 0x8b, 0x5e, 0xf6, 0x02, 0x09, - 0xd4, 0x3e, 0x02, 0x2f, 0x80, 0x76, 0x66, 0x76, 0xb2, 0x6b, 0x7b, 0xd7, 0x2e, 0xe1, 0x82, 0x9b, - 0x78, 0xe7, 0xcc, 0x77, 0x7e, 0xbe, 0x33, 0x67, 0xe7, 0x9c, 0x0d, 0xac, 0x31, 0x0c, 0x90, 0xb4, - 0xd1, 0xa3, 0x1e, 0x43, 0x3f, 0xe4, 0xed, 0xc3, 0xad, 0x36, 0x3f, 0x76, 0x46, 0x8c, 0x72, 0x6a, - 0x9a, 0x62, 0xd3, 0xd1, 0x9b, 0xce, 0xe1, 0x96, 0x75, 0x29, 0xa0, 0x01, 0x15, 0xdb, 0xed, 0xf8, - 0x49, 0x22, 0xad, 0x8d, 0x80, 0xd2, 0x60, 0x80, 0x6d, 0xb1, 0xea, 0x1f, 0x3c, 0x6a, 0xf3, 0x70, - 0x88, 0x11, 0x77, 0x87, 0x23, 0x05, 0x68, 0x7a, 0x34, 0x1a, 0xd2, 0xa8, 0xdd, 0x77, 0x23, 0x6c, - 0x1f, 0x6e, 0xf5, 0x91, 0xbb, 0x5b, 0x6d, 0x8f, 0x86, 0x24, 0xd9, 0x9f, 0x16, 0xc7, 0xd3, 0x11, - 0x46, 0x72, 0xdf, 0x7e, 0x6e, 0xc0, 0xd9, 0x4e, 0x14, 0xec, 0x31, 0x74, 0x39, 0xee, 0x0d, 0xdc, - 0x28, 0x32, 0x2f, 0xc1, 0x82, 0xeb, 0x0f, 0x43, 0xd2, 0x30, 0x5a, 0xc6, 0x66, 0xad, 0x2b, 0x17, - 0x66, 0x03, 0x96, 0xc2, 0x28, 0x3a, 0x40, 0x16, 0x35, 0x4a, 0xad, 0xf2, 0x66, 0xad, 0x9b, 0x2c, - 0x4d, 0x0b, 0xaa, 0x43, 0xe4, 0xae, 0xef, 0x72, 0xb7, 0x51, 0x16, 0x2a, 0x7a, 0x6d, 0xde, 0x06, - 0x53, 0xfa, 0xed, 0xc5, 0x4e, 0x7b, 0x6e, 0xbf, 0xcf, 0xf0, 0xb0, 0x51, 0x11, 0xa8, 0xf3, 0x72, - 0xe7, 0xe1, 0xd3, 0x11, 0xee, 0x08, 0xb9, 0x79, 0x0b, 0xca, 0x8f, 0x10, 0x1b, 0x0b, 0x2d, 0x63, - 0xb3, 0xbe, 0x7d, 0xc5, 0x91, 0xd4, 0x9c, 0x98, 0x9a, 0xa3, 0xa8, 0x39, 0x7b, 0x34, 0x24, 0xdd, - 0x18, 0x65, 0xdf, 0x81, 0xd5, 0x6c, 0xe0, 0x5d, 0x8c, 0x46, 0x94, 0x44, 0x68, 0x5e, 0x81, 0xaa, - 0x17, 0x0b, 0x7a, 0xa1, 0xaf, 0x38, 0x2c, 0x89, 0xf5, 0xbe, 0x6f, 0xff, 0x6c, 0xc0, 0x79, 0xad, - 0xf5, 0x80, 0xd1, 0x27, 0xe8, 0x71, 0x73, 0x15, 0x16, 0x25, 0x17, 0x85, 0x56, 0xab, 0x8c, 0x9d, - 0x52, 0xc6, 0x4e, 0x21, 0x67, 0x1b, 0x96, 0x9f, 0x1c, 0xb0, 0x30, 0xf2, 0x43, 0x8f, 0x87, 0x94, - 0x28, 0xb6, 0x19, 0x99, 0x79, 0x0d, 0x96, 0x19, 0x3e, 0x42, 0x86, 0xc4, 0xc3, 0xd8, 0xfc, 0x82, - 0xc0, 0xd4, 0xb5, 0x6c, 0xdf, 0xb7, 0xef, 0x42, 0x63, 0x3c, 0x52, 0xcd, 0x70, 0x1d, 0x60, 0x24, - 0x45, 0x27, 0x1c, 0x6b, 0x4a, 0xb2, 0xef, 0xdb, 0x3f, 0x96, 0x53, 0x87, 0xba, 0xeb, 0x72, 0xef, - 0x71, 0x2e, 0xc7, 0xac, 0xa5, 0xd2, 0x98, 0x25, 0xf3, 0x63, 0xa8, 0xc6, 0x40, 0x97, 0x78, 0xd8, - 0x28, 0xb7, 0xca, 0x9b, 0xf5, 0xed, 0x6b, 0xce, 0x64, 0xf1, 0x3a, 0xc2, 0xc7, 0xbe, 0x02, 0x76, - 0xb5, 0x4a, 0x26, 0x4d, 0x95, 0xb1, 0x34, 0x7d, 0x02, 0x10, 0x71, 0x97, 0xf1, 0x9e, 0xef, 0xf2, - 0xe4, 0xcc, 0x2d, 0x47, 0xd6, 0xbb, 0x93, 0xd4, 0xbb, 0xf3, 0x30, 0xa9, 0xf7, 0xdd, 0xca, 0xb3, - 0x3f, 0x37, 0x8c, 0x6e, 0x4d, 0xe8, 0xdc, 0x73, 0x39, 0x9a, 0x1f, 0x41, 0x15, 0x89, 0x2f, 0xd5, - 0x17, 0xe7, 0x54, 0x5f, 0x42, 0xe2, 0x0b, 0x65, 0x13, 0x2a, 0x74, 0x84, 0xa4, 0xb1, 0xd4, 0x32, - 0x36, 0xab, 0x5d, 0xf1, 0x6c, 0xde, 0x85, 0x1a, 0x65, 0x61, 0x10, 0x92, 0x1e, 0x3f, 0x6e, 0x54, - 0x85, 0xc5, 0xab, 0xd3, 0xd8, 0x7e, 0x29, 0x40, 0x0f, 0x8f, 0xbb, 0x55, 0xaa, 0x9e, 0x62, 0x73, - 0x84, 0x72, 0x6c, 0xd4, 0x04, 0x49, 0xf1, 0x6c, 0xff, 0x62, 0xc0, 0x4a, 0x26, 0x31, 0xe6, 0x55, - 0xa8, 0x31, 0xf4, 0xc2, 0x51, 0x88, 0x84, 0x27, 0xa7, 0xa6, 0x05, 0xe6, 0x0d, 0x38, 0xc7, 0x99, - 0xeb, 0xbb, 0xfd, 0x01, 0xf6, 0xdc, 0x21, 0x3d, 0x20, 0x5c, 0x9d, 0xc7, 0xd9, 0x44, 0xbc, 0x23, - 0xa4, 0xe6, 0x75, 0x38, 0xcb, 0x90, 0x87, 0x0c, 0xfd, 0x04, 0x27, 0x4b, 0x70, 0x45, 0x49, 0x15, - 0xec, 0x43, 0x78, 0x4b, 0x0a, 0x86, 0x48, 0x78, 0x6f, 0x4a, 0x49, 0xae, 0x9e, 0x6c, 0x7f, 0x9e, - 0xda, 0xb5, 0xef, 0xa6, 0xde, 0x2c, 0x41, 0x40, 0xd7, 0xdd, 0x06, 0xd4, 0xfb, 0xb1, 0xa0, 0xe7, - 0x23, 0xa1, 0x43, 0x45, 0x01, 0x84, 0xe8, 0x5e, 0x2c, 0xb1, 0xff, 0x30, 0xe0, 0x62, 0x27, 0x0a, - 0x3a, 0x21, 0xe1, 0x42, 0x73, 0x4f, 0x24, 0x2d, 0xca, 0x2d, 0xbf, 0x31, 0x83, 0xa5, 0x71, 0x83, - 0xa7, 0x2d, 0xc0, 0xcc, 0x91, 0x56, 0xfe, 0xd5, 0x91, 0x2e, 0xa4, 0x8e, 0xf4, 0x33, 0x58, 0xee, - 0x44, 0xc1, 0x57, 0xe8, 0x0e, 0x8a, 0xdf, 0xaa, 0x59, 0xb4, 0xec, 0x75, 0x58, 0x9b, 0x92, 0xa6, - 0x24, 0xcf, 0xf6, 0x2a, 0x5c, 0x4a, 0xfb, 0xd1, 0xf2, 0x5f, 0x4b, 0xb0, 0x24, 0x36, 0x88, 0x1f, - 0xfb, 0x8e, 0x90, 0xf8, 0x27, 0xbe, 0xe5, 0x2a, 0x5b, 0x64, 0xa5, 0xf1, 0x22, 0xdb, 0x81, 0x25, - 0xc9, 0x3a, 0x52, 0xe9, 0xbc, 0x31, 0x2d, 0x1d, 0xca, 0x87, 0x13, 0xff, 0x49, 0x62, 0x4b, 0xf4, - 0xac, 0xe7, 0x06, 0xd4, 0x53, 0x1b, 0x33, 0x8b, 0xe2, 0xff, 0x53, 0xd8, 0x17, 0xe0, 0x9c, 0x62, - 0xa6, 0x33, 0xfa, 0xd2, 0x80, 0x5a, 0x27, 0x0a, 0xba, 0x42, 0x21, 0xce, 0xe9, 0x63, 0x3a, 0x48, - 0xe5, 0x54, 0xae, 0xcc, 0x4f, 0x4f, 0xb2, 0x56, 0x12, 0x59, 0xbb, 0x95, 0x93, 0x35, 0x69, 0xc7, - 0x91, 0x3f, 0xe3, 0x99, 0x9b, 0xe8, 0x0c, 0xe5, 0xc9, 0xce, 0x60, 0xdd, 0x87, 0x95, 0x8c, 0xf6, - 0xec, 0xf4, 0xae, 0xc2, 0x62, 0x26, 0xab, 0x6a, 0x65, 0x5f, 0x84, 0x0b, 0x3a, 0x22, 0xcd, 0xf7, - 0x77, 0xc9, 0x77, 0x2f, 0x7e, 0x3b, 0x06, 0xa7, 0xe7, 0x2b, 0xed, 0x38, 0xf2, 0x67, 0x82, 0xef, - 0x2a, 0x2c, 0x32, 0x74, 0x23, 0xcd, 0x54, 0xad, 0x62, 0x8e, 0x19, 0x8d, 0xd3, 0x72, 0x94, 0xc6, - 0x34, 0x47, 0x4f, 0xdc, 0x41, 0x5f, 0x8f, 0xfc, 0x64, 0x32, 0xd8, 0x11, 0x13, 0xcc, 0xf4, 0xb9, - 0xa6, 0xa0, 0xc9, 0xaf, 0x41, 0x8d, 0xe0, 0x51, 0x4f, 0x2a, 0xa9, 0x2e, 0x4f, 0xf0, 0x48, 0x58, - 0x53, 0x6f, 0xf0, 0xb8, 0x13, 0x1d, 0xc3, 0x33, 0x03, 0x2e, 0x67, 0xf7, 0xf7, 0xd5, 0xb8, 0xf4, - 0xc6, 0x61, 0x6c, 0x40, 0xdd, 0xf5, 0xfd, 0x5e, 0x32, 0x7d, 0x95, 0xc5, 0xf4, 0x05, 0xae, 0xef, - 0x27, 0x16, 0xc5, 0x6b, 0x33, 0xa4, 0x87, 0xa8, 0x31, 0x15, 0x81, 0x59, 0x91, 0x52, 0x05, 0xb3, - 0x37, 0x60, 0x7d, 0x6a, 0x44, 0x3a, 0x66, 0x14, 0xf7, 0x7e, 0x0a, 0xd0, 0x49, 0x7a, 0xf5, 0x1b, - 0xc7, 0x5c, 0x30, 0x1f, 0xd9, 0x2d, 0x68, 0x4e, 0x77, 0xa3, 0x03, 0x09, 0x53, 0xb9, 0x53, 0xa3, - 0x4f, 0xd1, 0x11, 0x66, 0xce, 0xa9, 0x94, 0x3d, 0xa7, 0xb1, 0x01, 0xa7, 0x3c, 0x3e, 0x2a, 0xa5, - 0x93, 0x92, 0x76, 0xa5, 0x63, 0x61, 0x62, 0x0c, 0xcb, 0x00, 0x66, 0xa4, 0xe5, 0x1a, 0x2c, 0xc7, - 0xe1, 0x68, 0xfe, 0x32, 0xa2, 0x3a, 0xc1, 0x23, 0xad, 0x38, 0x23, 0x28, 0x1b, 0x5a, 0x79, 0x3e, - 0x75, 0x5c, 0x3f, 0x95, 0xc4, 0x8b, 0xbc, 0xcb, 0x42, 0x3f, 0x10, 0x17, 0x17, 0x77, 0x59, 0x80, - 0xc9, 0x58, 0xa1, 0x56, 0x33, 0x9a, 0x81, 0x05, 0x55, 0x8f, 0x12, 0xce, 0x5c, 0x2f, 0xb9, 0x69, - 0xf5, 0x3a, 0x75, 0x35, 0x54, 0xf2, 0xae, 0x86, 0x85, 0xc2, 0xab, 0x41, 0x46, 0x96, 0x73, 0x35, - 0xfc, 0xe7, 0x57, 0x80, 0xf4, 0x96, 0x64, 0x67, 0xfb, 0x6f, 0x80, 0x72, 0x27, 0x0a, 0xcc, 0xef, - 0xa0, 0x9e, 0xfe, 0xb4, 0xb1, 0xf3, 0xae, 0xb1, 0x13, 0x8c, 0x75, 0x73, 0x36, 0x46, 0xcf, 0x43, - 0x1e, 0xac, 0x64, 0x3f, 0x25, 0xde, 0x29, 0x54, 0x56, 0x28, 0xeb, 0xf6, 0x3c, 0x28, 0xed, 0x44, - 0x73, 0x90, 0x33, 0x47, 0x31, 0x07, 0x81, 0x99, 0xc1, 0x21, 0x3b, 0xd3, 0x0d, 0xe0, 0xfc, 0xc4, - 0xb8, 0x96, 0x37, 0x14, 0x8c, 0x03, 0xad, 0xf6, 0x9c, 0x40, 0xed, 0xed, 0x1b, 0xa8, 0x9d, 0x8c, - 0x4f, 0xad, 0xdc, 0xd9, 0x43, 0x21, 0xac, 0xcd, 0x59, 0x08, 0x6d, 0xf8, 0x3e, 0x54, 0xc4, 0x58, - 0xb4, 0x56, 0x30, 0xcf, 0x58, 0x6f, 0x17, 0x6c, 0x6a, 0x4b, 0x5f, 0xc0, 0xa2, 0x1a, 0x07, 0xd6, - 0x0b, 0xbb, 0xbc, 0x75, 0xbd, 0x70, 0x3b, 0x6d, 0x4f, 0xb5, 0xdb, 0xf5, 0xc2, 0x2e, 0x9a, 0x6b, - 0x2f, 0xdb, 0xde, 0xe2, 0x03, 0x9b, 0xe8, 0x6d, 0x79, 0x07, 0x36, 0x0e, 0xcc, 0x3d, 0xb0, 0xbc, - 0x46, 0x66, 0x32, 0x30, 0xa7, 0x34, 0xb1, 0x77, 0x67, 0x9b, 0x51, 0x50, 0x6b, 0x6b, 0x6e, 0xa8, - 0xf6, 0x79, 0x00, 0x17, 0xa7, 0x75, 0xa1, 0x9b, 0xb3, 0x2d, 0x25, 0x58, 0x6b, 0x7b, 0x7e, 0xec, - 0x24, 0xd5, 0x4c, 0xcf, 0x29, 0xa6, 0x9a, 0x86, 0xce, 0xa0, 0x3a, 0xad, 0xbd, 0x98, 0x3f, 0xc0, - 0xe5, 0xe9, 0xbd, 0xe5, 0xf6, 0x3c, 0xb6, 0x34, 0xdd, 0xf7, 0xdf, 0x04, 0x9d, 0xae, 0x4c, 0xd5, - 0x3f, 0xd6, 0x0b, 0x2f, 0xf1, 0xdc, 0xca, 0xcc, 0xde, 0xba, 0xbb, 0x0f, 0x7e, 0x7b, 0xd5, 0x34, - 0x5e, 0xbc, 0x6a, 0x1a, 0x7f, 0xbd, 0x6a, 0x1a, 0xcf, 0x5e, 0x37, 0xcf, 0xbc, 0x78, 0xdd, 0x3c, - 0xf3, 0xf2, 0x75, 0xf3, 0xcc, 0xb7, 0x1f, 0x04, 0x21, 0x7f, 0x7c, 0xd0, 0x77, 0x3c, 0x3a, 0x6c, - 0x0b, 0x53, 0xef, 0x11, 0xe4, 0x47, 0x94, 0x7d, 0xaf, 0x56, 0x03, 0xf4, 0x03, 0x64, 0xed, 0xe3, - 0xd4, 0x3f, 0xaa, 0x3c, 0xca, 0xb0, 0xbf, 0x28, 0xbe, 0xe4, 0xef, 0xfc, 0x13, 0x00, 0x00, 0xff, - 0xff, 0x26, 0x46, 0xe0, 0xf7, 0x4f, 0x13, 0x00, 0x00, + 0xe1, 0x01, 0xfa, 0x18, 0x3c, 0x01, 0xbd, 0xe1, 0x01, 0x10, 0x57, 0xbd, 0x42, 0x5c, 0x20, 0x81, + 0xda, 0x47, 0xe0, 0x05, 0xd0, 0xce, 0xcc, 0x8e, 0x77, 0x6d, 0xef, 0x3a, 0x25, 0x5c, 0x70, 0xd3, + 0xec, 0x9c, 0xf9, 0xce, 0xcf, 0x77, 0xe6, 0xcc, 0x9c, 0xe3, 0xc2, 0x1a, 0xc3, 0x00, 0x49, 0x1b, + 0x3d, 0xea, 0x31, 0xf4, 0x43, 0xde, 0x3e, 0xdc, 0x6a, 0xf3, 0x63, 0x67, 0xc4, 0x28, 0xa7, 0xa6, + 0x29, 0x36, 0x1d, 0xbd, 0xe9, 0x1c, 0x6e, 0x59, 0x97, 0x02, 0x1a, 0x50, 0xb1, 0xdd, 0x8e, 0xbf, + 0x24, 0xd2, 0xda, 0x08, 0x28, 0x0d, 0x06, 0xd8, 0x16, 0xab, 0xfe, 0xc1, 0xa3, 0x36, 0x0f, 0x87, + 0x18, 0x71, 0x77, 0x38, 0x52, 0x80, 0xa6, 0x47, 0xa3, 0x21, 0x8d, 0xda, 0x7d, 0x37, 0xc2, 0xf6, + 0xe1, 0x56, 0x1f, 0xb9, 0xbb, 0xd5, 0xf6, 0x68, 0x48, 0x92, 0xfd, 0x59, 0x71, 0x3c, 0x1d, 0x61, + 0x24, 0xf7, 0xed, 0xe7, 0x06, 0x9c, 0xed, 0x44, 0xc1, 0x1e, 0x43, 0x97, 0xe3, 0xde, 0xc0, 0x8d, + 0x22, 0xf3, 0x12, 0x2c, 0xb8, 0xfe, 0x30, 0x24, 0x0d, 0xa3, 0x65, 0x6c, 0xd6, 0xba, 0x72, 0x61, + 0x36, 0x60, 0x29, 0x8c, 0xa2, 0x03, 0x64, 0x51, 0xa3, 0xd4, 0x2a, 0x6f, 0xd6, 0xba, 0xc9, 0xd2, + 0xb4, 0xa0, 0x3a, 0x44, 0xee, 0xfa, 0x2e, 0x77, 0x1b, 0x65, 0xa1, 0xa2, 0xd7, 0xe6, 0x6d, 0x30, + 0xa5, 0xdf, 0x5e, 0xec, 0xb4, 0xe7, 0xf6, 0xfb, 0x0c, 0x0f, 0x1b, 0x15, 0x81, 0x3a, 0x2f, 0x77, + 0x1e, 0x3e, 0x1d, 0xe1, 0x8e, 0x90, 0x9b, 0xb7, 0xa0, 0xfc, 0x08, 0xb1, 0xb1, 0xd0, 0x32, 0x36, + 0xeb, 0xdb, 0x57, 0x1c, 0x49, 0xcd, 0x89, 0xa9, 0x39, 0x8a, 0x9a, 0xb3, 0x47, 0x43, 0xd2, 0x8d, + 0x51, 0xf6, 0x1d, 0x58, 0xcd, 0x06, 0xde, 0xc5, 0x68, 0x44, 0x49, 0x84, 0xe6, 0x15, 0xa8, 0x7a, + 0xb1, 0xa0, 0x17, 0xfa, 0x8a, 0xc3, 0x92, 0x58, 0xef, 0xfb, 0xf6, 0x8f, 0x06, 0x9c, 0xd7, 0x5a, + 0x0f, 0x18, 0x7d, 0x82, 0x1e, 0x37, 0x57, 0x61, 0x51, 0x72, 0x51, 0x68, 0xb5, 0xca, 0xd8, 0x29, + 0x65, 0xec, 0x14, 0x72, 0xb6, 0x61, 0xf9, 0xc9, 0x01, 0x0b, 0x23, 0x3f, 0xf4, 0x78, 0x48, 0x89, + 0x62, 0x9b, 0x91, 0x99, 0xd7, 0x60, 0x99, 0xe1, 0x23, 0x64, 0x48, 0x3c, 0x8c, 0xcd, 0x2f, 0x08, + 0x4c, 0x5d, 0xcb, 0xf6, 0x7d, 0xfb, 0x2e, 0x34, 0x26, 0x23, 0xd5, 0x0c, 0xd7, 0x01, 0x46, 0x52, + 0x34, 0xe6, 0x58, 0x53, 0x92, 0x7d, 0xdf, 0xfe, 0xbe, 0x9c, 0x3a, 0xd4, 0x5d, 0x97, 0x7b, 0x8f, + 0x73, 0x39, 0x66, 0x2d, 0x95, 0x26, 0x2c, 0x99, 0x1f, 0x42, 0x35, 0x06, 0xba, 0xc4, 0xc3, 0x46, + 0xb9, 0x55, 0xde, 0xac, 0x6f, 0x5f, 0x73, 0xa6, 0x8b, 0xd7, 0x11, 0x3e, 0xf6, 0x15, 0xb0, 0xab, + 0x55, 0x32, 0x69, 0xaa, 0x4c, 0xa4, 0xe9, 0x23, 0x80, 0x88, 0xbb, 0x8c, 0xf7, 0x7c, 0x97, 0x27, + 0x67, 0x6e, 0x39, 0xb2, 0xde, 0x9d, 0xa4, 0xde, 0x9d, 0x87, 0x49, 0xbd, 0xef, 0x56, 0x9e, 0xfd, + 0xb9, 0x61, 0x74, 0x6b, 0x42, 0xe7, 0x9e, 0xcb, 0xd1, 0xfc, 0x00, 0xaa, 0x48, 0x7c, 0xa9, 0xbe, + 0x78, 0x42, 0xf5, 0x25, 0x24, 0xbe, 0x50, 0x36, 0xa1, 0x42, 0x47, 0x48, 0x1a, 0x4b, 0x2d, 0x63, + 0xb3, 0xda, 0x15, 0xdf, 0xe6, 0x5d, 0xa8, 0x51, 0x16, 0x06, 0x21, 0xe9, 0xf1, 0xe3, 0x46, 0x55, + 0x58, 0xbc, 0x3a, 0x8b, 0xed, 0xe7, 0x02, 0xf4, 0xf0, 0xb8, 0x5b, 0xa5, 0xea, 0x2b, 0x36, 0x47, + 0x28, 0xc7, 0x46, 0x4d, 0x90, 0x14, 0xdf, 0xf6, 0x4f, 0x06, 0xac, 0x64, 0x12, 0x63, 0x5e, 0x85, + 0x1a, 0x43, 0x2f, 0x1c, 0x85, 0x48, 0x78, 0x72, 0x6a, 0x5a, 0x60, 0xde, 0x80, 0x73, 0x9c, 0xb9, + 0xbe, 0xdb, 0x1f, 0x60, 0xcf, 0x1d, 0xd2, 0x03, 0xc2, 0xd5, 0x79, 0x9c, 0x4d, 0xc4, 0x3b, 0x42, + 0x6a, 0x5e, 0x87, 0xb3, 0x0c, 0x79, 0xc8, 0xd0, 0x4f, 0x70, 0xb2, 0x04, 0x57, 0x94, 0x54, 0xc1, + 0xde, 0x87, 0x37, 0xa4, 0x60, 0x88, 0x84, 0xf7, 0x66, 0x94, 0xe4, 0xea, 0x78, 0xfb, 0xd3, 0xd4, + 0xae, 0x7d, 0x37, 0x75, 0xb3, 0x04, 0x01, 0x5d, 0x77, 0x1b, 0x50, 0xef, 0xc7, 0x82, 0x9e, 0x8f, + 0x84, 0x0e, 0x15, 0x05, 0x10, 0xa2, 0x7b, 0xb1, 0xc4, 0xfe, 0xc3, 0x80, 0x8b, 0x9d, 0x28, 0xe8, + 0x84, 0x84, 0x0b, 0xcd, 0x3d, 0x91, 0xb4, 0x28, 0xb7, 0xfc, 0x26, 0x0c, 0x96, 0x26, 0x0d, 0x9e, + 0xb6, 0x00, 0x33, 0x47, 0x5a, 0xf9, 0x57, 0x47, 0xba, 0x90, 0x3a, 0xd2, 0x4f, 0x60, 0xb9, 0x13, + 0x05, 0x5f, 0xa0, 0x3b, 0x28, 0xbe, 0x55, 0xf3, 0x68, 0xd9, 0xeb, 0xb0, 0x36, 0x23, 0x4d, 0x49, + 0x9e, 0xed, 0x55, 0xb8, 0x94, 0xf6, 0xa3, 0xe5, 0x3f, 0x97, 0x60, 0x49, 0x6c, 0x10, 0x3f, 0xf6, + 0x1d, 0x21, 0xf1, 0xc7, 0xbe, 0xe5, 0x2a, 0x5b, 0x64, 0xa5, 0xc9, 0x22, 0xdb, 0x81, 0x25, 0xc9, + 0x3a, 0x52, 0xe9, 0xbc, 0x31, 0x2b, 0x1d, 0xca, 0x87, 0x13, 0xff, 0x93, 0xc4, 0x96, 0xe8, 0x59, + 0xcf, 0x0d, 0xa8, 0xa7, 0x36, 0xe6, 0x16, 0xc5, 0xff, 0xa7, 0xb0, 0x2f, 0xc0, 0x39, 0xc5, 0x4c, + 0x67, 0xf4, 0x37, 0x03, 0x6a, 0x9d, 0x28, 0xe8, 0x0a, 0x85, 0xb8, 0xf5, 0xd1, 0x23, 0xa2, 0x53, + 0x2a, 0x17, 0xe6, 0xc7, 0xe3, 0x9c, 0x95, 0x44, 0xce, 0x6e, 0xe5, 0xe4, 0x4c, 0x5a, 0x71, 0xe4, + 0x9f, 0xc9, 0xbc, 0x4d, 0xf5, 0x85, 0xf2, 0x74, 0x5f, 0xb0, 0xee, 0xc3, 0x4a, 0x46, 0x7b, 0x7e, + 0x72, 0x57, 0x61, 0x31, 0x93, 0x53, 0xb5, 0xb2, 0x2f, 0xc2, 0x05, 0x1d, 0x91, 0x66, 0xfb, 0xab, + 0x64, 0xbb, 0x17, 0xdf, 0x8d, 0xc1, 0x69, 0xd9, 0x4a, 0x2b, 0x8e, 0xfc, 0x33, 0xc5, 0x76, 0x15, + 0x16, 0x19, 0xba, 0x91, 0xe6, 0xa9, 0x56, 0x31, 0xc3, 0x8c, 0xc6, 0x69, 0x19, 0x4a, 0x63, 0x9a, + 0xa1, 0x27, 0xde, 0x9f, 0x2f, 0x47, 0x7e, 0x32, 0x15, 0xec, 0x88, 0xe9, 0x65, 0xf6, 0x4c, 0x53, + 0xd0, 0xe0, 0xd7, 0xa0, 0x46, 0xf0, 0xa8, 0x27, 0x95, 0x54, 0x87, 0x27, 0x78, 0x24, 0xac, 0xa9, + 0xdb, 0x3b, 0xe9, 0x44, 0xc7, 0xf0, 0xcc, 0x80, 0xcb, 0xd9, 0xfd, 0x7d, 0x35, 0x2a, 0xbd, 0x76, + 0x18, 0x1b, 0x50, 0x77, 0x7d, 0xbf, 0x97, 0x4c, 0x5e, 0x65, 0x31, 0x79, 0x81, 0xeb, 0xfb, 0x89, + 0x45, 0x71, 0x65, 0x86, 0xf4, 0x10, 0x35, 0xa6, 0x22, 0x30, 0x2b, 0x52, 0xaa, 0x60, 0xf6, 0x06, + 0xac, 0xcf, 0x8c, 0x48, 0xc7, 0x8c, 0xe2, 0xcd, 0x4f, 0x01, 0x3a, 0x49, 0x9f, 0x7e, 0xed, 0x98, + 0x0b, 0x66, 0x23, 0xbb, 0x05, 0xcd, 0xd9, 0x6e, 0x74, 0x20, 0x61, 0x2a, 0x77, 0x6a, 0xec, 0x29, + 0x3a, 0xc2, 0xcc, 0x39, 0x95, 0xb2, 0xe7, 0x34, 0x31, 0xdc, 0x94, 0x27, 0xc7, 0xa4, 0x74, 0x52, + 0xd2, 0xae, 0x74, 0x2c, 0x4c, 0x8c, 0x60, 0x19, 0xc0, 0x9c, 0xb4, 0x5c, 0x83, 0xe5, 0x38, 0x1c, + 0xcd, 0x5f, 0x46, 0x54, 0x27, 0x78, 0xa4, 0x15, 0xe7, 0x04, 0x65, 0x43, 0x2b, 0xcf, 0xa7, 0x8e, + 0xeb, 0x87, 0x92, 0xb8, 0xc6, 0xbb, 0x2c, 0xf4, 0x03, 0x8c, 0xef, 0x07, 0x77, 0x59, 0x80, 0xc9, + 0x48, 0xa1, 0x56, 0x73, 0x1a, 0x81, 0x05, 0x55, 0x8f, 0x12, 0xce, 0x5c, 0x2f, 0x79, 0x65, 0xf5, + 0x7a, 0xfc, 0x30, 0x54, 0x72, 0x1e, 0x86, 0x85, 0xc2, 0x87, 0x41, 0xc6, 0x95, 0xf3, 0x30, 0xfc, + 0xe7, 0x0f, 0x80, 0xf4, 0x96, 0xe4, 0x66, 0xfb, 0x6f, 0x80, 0x72, 0x27, 0x0a, 0xcc, 0x6f, 0xa0, + 0x9e, 0xfe, 0x51, 0x63, 0xe7, 0x3d, 0x62, 0x63, 0x8c, 0x75, 0x73, 0x3e, 0x46, 0x4f, 0x42, 0x1e, + 0xac, 0x64, 0x7f, 0x44, 0xbc, 0x55, 0xa8, 0xac, 0x50, 0xd6, 0xed, 0x93, 0xa0, 0xb4, 0x13, 0xcd, + 0x41, 0x4e, 0x1b, 0xc5, 0x1c, 0x04, 0x66, 0x0e, 0x87, 0xec, 0x34, 0x37, 0x80, 0xf3, 0x53, 0x83, + 0x5a, 0xde, 0x38, 0x30, 0x09, 0xb4, 0xda, 0x27, 0x04, 0x6a, 0x6f, 0x5f, 0x41, 0x6d, 0x3c, 0x38, + 0xb5, 0x72, 0xa7, 0x0e, 0x85, 0xb0, 0x36, 0xe7, 0x21, 0xb4, 0xe1, 0xfb, 0x50, 0x11, 0x03, 0xd1, + 0x5a, 0xc1, 0x24, 0x63, 0xbd, 0x59, 0xb0, 0xa9, 0x2d, 0x7d, 0x06, 0x8b, 0x6a, 0x10, 0x58, 0x2f, + 0xec, 0xf0, 0xd6, 0xf5, 0xc2, 0xed, 0xb4, 0x3d, 0xd5, 0x6a, 0xd7, 0x0b, 0x7b, 0x68, 0xae, 0xbd, + 0x6c, 0x73, 0x8b, 0x0f, 0x6c, 0xaa, 0xb3, 0xe5, 0x1d, 0xd8, 0x24, 0x30, 0xf7, 0xc0, 0xf2, 0xda, + 0x98, 0xc9, 0xc0, 0x9c, 0xd1, 0xc2, 0xde, 0x9e, 0x6f, 0x46, 0x41, 0xad, 0xad, 0x13, 0x43, 0xb5, + 0xcf, 0x03, 0xb8, 0x38, 0xab, 0x07, 0xdd, 0x9c, 0x6f, 0x29, 0xc1, 0x5a, 0xdb, 0x27, 0xc7, 0x4e, + 0x53, 0xcd, 0x74, 0x9c, 0x62, 0xaa, 0x69, 0xe8, 0x1c, 0xaa, 0xb3, 0x9a, 0x8b, 0xf9, 0x1d, 0x5c, + 0x9e, 0xdd, 0x59, 0x6e, 0x9f, 0xc4, 0x96, 0xa6, 0xfb, 0xee, 0xeb, 0xa0, 0xd3, 0x95, 0xa9, 0xba, + 0xc7, 0x7a, 0xe1, 0x23, 0x9e, 0x5b, 0x99, 0xd9, 0x57, 0x77, 0xf7, 0xc1, 0x2f, 0x2f, 0x9b, 0xc6, + 0x8b, 0x97, 0x4d, 0xe3, 0xaf, 0x97, 0x4d, 0xe3, 0xd9, 0xab, 0xe6, 0x99, 0x17, 0xaf, 0x9a, 0x67, + 0x7e, 0x7f, 0xd5, 0x3c, 0xf3, 0xf5, 0x7b, 0x41, 0xc8, 0x1f, 0x1f, 0xf4, 0x1d, 0x8f, 0x0e, 0xdb, + 0xc2, 0xd4, 0x3b, 0x04, 0xf9, 0x11, 0x65, 0xdf, 0xaa, 0xd5, 0x00, 0xfd, 0x00, 0x59, 0xfb, 0x38, + 0xf5, 0x5f, 0x54, 0x1e, 0x65, 0xd8, 0x5f, 0x14, 0xbf, 0xe1, 0xef, 0xfc, 0x13, 0x00, 0x00, 0xff, + 0xff, 0x20, 0xfb, 0xcc, 0xb8, 0x49, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3386,10 +3386,10 @@ func (m *MsgRetire) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - if len(m.Holder) > 0 { - i -= len(m.Holder) - copy(dAtA[i:], m.Holder) - i = encodeVarintTx(dAtA, i, uint64(len(m.Holder))) + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) i-- dAtA[i] = 0xa } @@ -3497,10 +3497,10 @@ func (m *MsgCancel) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - if len(m.Holder) > 0 { - i -= len(m.Holder) - copy(dAtA[i:], m.Holder) - i = encodeVarintTx(dAtA, i, uint64(len(m.Holder))) + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) i-- dAtA[i] = 0xa } @@ -3947,10 +3947,10 @@ func (m *MsgBridge) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x2a } } - if len(m.Holder) > 0 { - i -= len(m.Holder) - copy(dAtA[i:], m.Holder) - i = encodeVarintTx(dAtA, i, uint64(len(m.Holder))) + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) i-- dAtA[i] = 0x22 } @@ -4348,7 +4348,7 @@ func (m *MsgRetire) Size() (n int) { } var l int _ = l - l = len(m.Holder) + l = len(m.Owner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -4397,7 +4397,7 @@ func (m *MsgCancel) Size() (n int) { } var l int _ = l - l = len(m.Holder) + l = len(m.Owner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -4616,7 +4616,7 @@ func (m *MsgBridge) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Holder) + l = len(m.Owner) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -6686,7 +6686,7 @@ func (m *MsgRetire) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Holder", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -6714,7 +6714,7 @@ func (m *MsgRetire) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Holder = string(dAtA[iNdEx:postIndex]) + m.Owner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -6998,7 +6998,7 @@ func (m *MsgCancel) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Holder", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -7026,7 +7026,7 @@ func (m *MsgCancel) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Holder = string(dAtA[iNdEx:postIndex]) + m.Owner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -8418,7 +8418,7 @@ func (m *MsgBridge) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Holder", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -8446,7 +8446,7 @@ func (m *MsgBridge) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Holder = string(dAtA[iNdEx:postIndex]) + m.Owner = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 2 { diff --git a/x/ecocredit/marketplace/features/msg_sell.feature b/x/ecocredit/marketplace/features/msg_sell.feature index df8278ad50..7f11ee691b 100644 --- a/x/ecocredit/marketplace/features/msg_sell.feature +++ b/x/ecocredit/marketplace/features/msg_sell.feature @@ -4,7 +4,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -24,7 +24,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -45,7 +45,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -66,7 +66,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -90,29 +90,29 @@ Feature: MsgSell When the message is validated Then expect no error - Scenario: an error is returned if owner is empty + Scenario: an error is returned if seller is empty Given the message """ {} """ When the message is validated - Then expect the error "owner cannot be empty: invalid request" + Then expect the error "seller cannot be empty: invalid request" - Scenario: an error is returned if owner is not a valid bech32 address + Scenario: an error is returned if seller is not a valid bech32 address Given the message """ { - "owner": "foo" + "seller": "foo" } """ When the message is validated - Then expect the error "owner is not a valid address: decoding bech32 failed: invalid bech32 string length 3: invalid request" + Then expect the error "seller is not a valid address: decoding bech32 failed: invalid bech32 string length 3: invalid request" Scenario: an error is returned if orders is empty Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27" + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27" } """ When the message is validated @@ -122,7 +122,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ {} ] @@ -135,7 +135,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "foo" @@ -150,7 +150,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001" @@ -165,7 +165,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -181,7 +181,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -197,7 +197,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -214,7 +214,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -233,7 +233,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", @@ -252,7 +252,7 @@ Feature: MsgSell Given the message """ { - "owner": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", + "seller": "cosmos1depk54cuajgkzea6zpgkq36tnjwdzv4afc3d27", "orders": [ { "batch_denom": "C01-001-20200101-20210101-001", diff --git a/x/ecocredit/marketplace/msg_sell.go b/x/ecocredit/marketplace/msg_sell.go index 08ca4907c2..e29f1594a1 100644 --- a/x/ecocredit/marketplace/msg_sell.go +++ b/x/ecocredit/marketplace/msg_sell.go @@ -27,12 +27,12 @@ func (m MsgSell) GetSignBytes() []byte { // ValidateBasic does a sanity check on the provided data. func (m *MsgSell) ValidateBasic() error { - if len(m.Owner) == 0 { - return sdkerrors.ErrInvalidRequest.Wrap("owner cannot be empty") + if len(m.Seller) == 0 { + return sdkerrors.ErrInvalidRequest.Wrap("seller cannot be empty") } - if _, err := sdk.AccAddressFromBech32(m.Owner); err != nil { - return sdkerrors.ErrInvalidRequest.Wrapf("owner is not a valid address: %s", err) + if _, err := sdk.AccAddressFromBech32(m.Seller); err != nil { + return sdkerrors.ErrInvalidRequest.Wrapf("seller is not a valid address: %s", err) } if len(m.Orders) == 0 { @@ -88,6 +88,6 @@ func (m *MsgSell) ValidateBasic() error { // GetSigners returns the expected signers for MsgSell. func (m *MsgSell) GetSigners() []sdk.AccAddress { - addr, _ := sdk.AccAddressFromBech32(m.Owner) + addr, _ := sdk.AccAddressFromBech32(m.Seller) return []sdk.AccAddress{addr} } diff --git a/x/ecocredit/marketplace/msg_update_sell_orders.go b/x/ecocredit/marketplace/msg_update_sell_orders.go index b05c4dd4e2..4f551220b0 100644 --- a/x/ecocredit/marketplace/msg_update_sell_orders.go +++ b/x/ecocredit/marketplace/msg_update_sell_orders.go @@ -24,7 +24,7 @@ func (m MsgUpdateSellOrders) GetSignBytes() []byte { // ValidateBasic does a sanity check on the provided data. func (m *MsgUpdateSellOrders) ValidateBasic() error { - if _, err := sdk.AccAddressFromBech32(m.Owner); err != nil { + if _, err := sdk.AccAddressFromBech32(m.Seller); err != nil { return sdkerrors.ErrInvalidAddress } @@ -52,6 +52,6 @@ func (m *MsgUpdateSellOrders) ValidateBasic() error { // GetSigners returns the expected signers for MsgUpdateSellOrders. func (m *MsgUpdateSellOrders) GetSigners() []sdk.AccAddress { - addr, _ := sdk.AccAddressFromBech32(m.Owner) + addr, _ := sdk.AccAddressFromBech32(m.Seller) return []sdk.AccAddress{addr} } diff --git a/x/ecocredit/marketplace/msg_update_sell_orders_test.go b/x/ecocredit/marketplace/msg_update_sell_orders_test.go index 0fe5f20cd1..a39a450560 100644 --- a/x/ecocredit/marketplace/msg_update_sell_orders_test.go +++ b/x/ecocredit/marketplace/msg_update_sell_orders_test.go @@ -23,7 +23,7 @@ func TestMsgUpdateSellOrders(t *testing.T) { }{ "valid": { src: MsgUpdateSellOrders{ - Owner: a1.String(), + Seller: a1.String(), Updates: []*MsgUpdateSellOrders_Update{ { NewQuantity: "1.5", @@ -38,9 +38,9 @@ func TestMsgUpdateSellOrders(t *testing.T) { }, expErr: false, }, - "invalid: bad owner address": { + "invalid: bad seller address": { src: MsgUpdateSellOrders{ - Owner: "foobar", + Seller: "foobar", Updates: []*MsgUpdateSellOrders_Update{ { NewQuantity: "1.5", @@ -56,7 +56,7 @@ func TestMsgUpdateSellOrders(t *testing.T) { }, "invalid: bad quantity": { src: MsgUpdateSellOrders{ - Owner: a1.String(), + Seller: a1.String(), Updates: []*MsgUpdateSellOrders_Update{ { NewQuantity: "-1.5", @@ -72,7 +72,7 @@ func TestMsgUpdateSellOrders(t *testing.T) { }, "invalid: bad ask price": { src: MsgUpdateSellOrders{ - Owner: a1.String(), + Seller: a1.String(), Updates: []*MsgUpdateSellOrders_Update{ { NewQuantity: "1.5", diff --git a/x/ecocredit/marketplace/query.pb.go b/x/ecocredit/marketplace/query.pb.go index 15812a4c0e..b35a7c22a9 100644 --- a/x/ecocredit/marketplace/query.pb.go +++ b/x/ecocredit/marketplace/query.pb.go @@ -223,7 +223,8 @@ func (m *QuerySellOrdersResponse) GetPagination() *query.PageResponse { return nil } -// QuerySellOrdersByDenomRequest is the Query/SellOrdersByDenom request type. +// QuerySellOrdersByBatchDenomRequest is the Query/SellOrdersByBatchDenom +// request type. type QuerySellOrdersByBatchDenomRequest struct { // batch_denom is an ecocredit denom BatchDenom string `protobuf:"bytes,1,opt,name=batch_denom,json=batchDenom,proto3" json:"batch_denom,omitempty"` @@ -278,7 +279,8 @@ func (m *QuerySellOrdersByBatchDenomRequest) GetPagination() *query.PageRequest return nil } -// QuerySellOrdersByDenomResponse is the Query/SellOrdersByDenom response type. +// QuerySellOrdersByBatchDenomResponse is the Query/SellOrdersByBatchDenom +// response type. type QuerySellOrdersByBatchDenomResponse struct { // sell_orders is a list of sell orders. SellOrders []*SellOrderInfo `protobuf:"bytes,1,rep,name=sell_orders,json=sellOrders,proto3" json:"sell_orders,omitempty"` @@ -333,27 +335,27 @@ func (m *QuerySellOrdersByBatchDenomResponse) GetPagination() *query.PageRespons return nil } -// QuerySellOrdersByAddressRequest is the Query/SellOrdersByAddress request +// QuerySellOrdersBySellerRequest is the Query/SellOrdersBySeller request // type. -type QuerySellOrdersByAddressRequest struct { - // address is the creator of the sell order - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` +type QuerySellOrdersBySellerRequest struct { + // seller is the address of the account that is selling credits. + Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // pagination defines an optional pagination for the request. Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QuerySellOrdersByAddressRequest) Reset() { *m = QuerySellOrdersByAddressRequest{} } -func (m *QuerySellOrdersByAddressRequest) String() string { return proto.CompactTextString(m) } -func (*QuerySellOrdersByAddressRequest) ProtoMessage() {} -func (*QuerySellOrdersByAddressRequest) Descriptor() ([]byte, []int) { +func (m *QuerySellOrdersBySellerRequest) Reset() { *m = QuerySellOrdersBySellerRequest{} } +func (m *QuerySellOrdersBySellerRequest) String() string { return proto.CompactTextString(m) } +func (*QuerySellOrdersBySellerRequest) ProtoMessage() {} +func (*QuerySellOrdersBySellerRequest) Descriptor() ([]byte, []int) { return fileDescriptor_1f2df4a89dfae849, []int{6} } -func (m *QuerySellOrdersByAddressRequest) XXX_Unmarshal(b []byte) error { +func (m *QuerySellOrdersBySellerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QuerySellOrdersByAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QuerySellOrdersBySellerRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QuerySellOrdersByAddressRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QuerySellOrdersBySellerRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -363,53 +365,53 @@ func (m *QuerySellOrdersByAddressRequest) XXX_Marshal(b []byte, deterministic bo return b[:n], nil } } -func (m *QuerySellOrdersByAddressRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QuerySellOrdersByAddressRequest.Merge(m, src) +func (m *QuerySellOrdersBySellerRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySellOrdersBySellerRequest.Merge(m, src) } -func (m *QuerySellOrdersByAddressRequest) XXX_Size() int { +func (m *QuerySellOrdersBySellerRequest) XXX_Size() int { return m.Size() } -func (m *QuerySellOrdersByAddressRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QuerySellOrdersByAddressRequest.DiscardUnknown(m) +func (m *QuerySellOrdersBySellerRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySellOrdersBySellerRequest.DiscardUnknown(m) } -var xxx_messageInfo_QuerySellOrdersByAddressRequest proto.InternalMessageInfo +var xxx_messageInfo_QuerySellOrdersBySellerRequest proto.InternalMessageInfo -func (m *QuerySellOrdersByAddressRequest) GetAddress() string { +func (m *QuerySellOrdersBySellerRequest) GetSeller() string { if m != nil { - return m.Address + return m.Seller } return "" } -func (m *QuerySellOrdersByAddressRequest) GetPagination() *query.PageRequest { +func (m *QuerySellOrdersBySellerRequest) GetPagination() *query.PageRequest { if m != nil { return m.Pagination } return nil } -// QuerySellOrdersByAddressResponse is the Query/SellOrdersByAddressResponse +// QuerySellOrdersBySellerResponse is the Query/SellOrdersBySellerResponse // response type. -type QuerySellOrdersByAddressResponse struct { +type QuerySellOrdersBySellerResponse struct { // sell_orders is a list of sell orders. SellOrders []*SellOrderInfo `protobuf:"bytes,1,rep,name=sell_orders,json=sellOrders,proto3" json:"sell_orders,omitempty"` // pagination defines an optional pagination for the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } -func (m *QuerySellOrdersByAddressResponse) Reset() { *m = QuerySellOrdersByAddressResponse{} } -func (m *QuerySellOrdersByAddressResponse) String() string { return proto.CompactTextString(m) } -func (*QuerySellOrdersByAddressResponse) ProtoMessage() {} -func (*QuerySellOrdersByAddressResponse) Descriptor() ([]byte, []int) { +func (m *QuerySellOrdersBySellerResponse) Reset() { *m = QuerySellOrdersBySellerResponse{} } +func (m *QuerySellOrdersBySellerResponse) String() string { return proto.CompactTextString(m) } +func (*QuerySellOrdersBySellerResponse) ProtoMessage() {} +func (*QuerySellOrdersBySellerResponse) Descriptor() ([]byte, []int) { return fileDescriptor_1f2df4a89dfae849, []int{7} } -func (m *QuerySellOrdersByAddressResponse) XXX_Unmarshal(b []byte) error { +func (m *QuerySellOrdersBySellerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QuerySellOrdersByAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QuerySellOrdersBySellerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QuerySellOrdersByAddressResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QuerySellOrdersBySellerResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -419,26 +421,26 @@ func (m *QuerySellOrdersByAddressResponse) XXX_Marshal(b []byte, deterministic b return b[:n], nil } } -func (m *QuerySellOrdersByAddressResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QuerySellOrdersByAddressResponse.Merge(m, src) +func (m *QuerySellOrdersBySellerResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySellOrdersBySellerResponse.Merge(m, src) } -func (m *QuerySellOrdersByAddressResponse) XXX_Size() int { +func (m *QuerySellOrdersBySellerResponse) XXX_Size() int { return m.Size() } -func (m *QuerySellOrdersByAddressResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QuerySellOrdersByAddressResponse.DiscardUnknown(m) +func (m *QuerySellOrdersBySellerResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QuerySellOrdersBySellerResponse.DiscardUnknown(m) } -var xxx_messageInfo_QuerySellOrdersByAddressResponse proto.InternalMessageInfo +var xxx_messageInfo_QuerySellOrdersBySellerResponse proto.InternalMessageInfo -func (m *QuerySellOrdersByAddressResponse) GetSellOrders() []*SellOrderInfo { +func (m *QuerySellOrdersBySellerResponse) GetSellOrders() []*SellOrderInfo { if m != nil { return m.SellOrders } return nil } -func (m *QuerySellOrdersByAddressResponse) GetPagination() *query.PageResponse { +func (m *QuerySellOrdersBySellerResponse) GetPagination() *query.PageResponse { if m != nil { return m.Pagination } @@ -551,7 +553,7 @@ func (m *QueryAllowedDenomsResponse) GetPagination() *query.PageResponse { type SellOrderInfo struct { // id is the unique ID of sell order. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - // seller is the account address of the owner of the credits being sold. + // seller is the address of the account that is selling credits. Seller string `protobuf:"bytes,2,opt,name=seller,proto3" json:"seller,omitempty"` // batch_denom is denom of the credit batch being sold. BatchDenom string `protobuf:"bytes,3,opt,name=batch_denom,json=batchDenom,proto3" json:"batch_denom,omitempty"` @@ -668,8 +670,8 @@ func init() { proto.RegisterType((*QuerySellOrdersResponse)(nil), "regen.ecocredit.marketplace.v1.QuerySellOrdersResponse") proto.RegisterType((*QuerySellOrdersByBatchDenomRequest)(nil), "regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomRequest") proto.RegisterType((*QuerySellOrdersByBatchDenomResponse)(nil), "regen.ecocredit.marketplace.v1.QuerySellOrdersByBatchDenomResponse") - proto.RegisterType((*QuerySellOrdersByAddressRequest)(nil), "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressRequest") - proto.RegisterType((*QuerySellOrdersByAddressResponse)(nil), "regen.ecocredit.marketplace.v1.QuerySellOrdersByAddressResponse") + proto.RegisterType((*QuerySellOrdersBySellerRequest)(nil), "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerRequest") + proto.RegisterType((*QuerySellOrdersBySellerResponse)(nil), "regen.ecocredit.marketplace.v1.QuerySellOrdersBySellerResponse") proto.RegisterType((*QueryAllowedDenomsRequest)(nil), "regen.ecocredit.marketplace.v1.QueryAllowedDenomsRequest") proto.RegisterType((*QueryAllowedDenomsResponse)(nil), "regen.ecocredit.marketplace.v1.QueryAllowedDenomsResponse") proto.RegisterType((*SellOrderInfo)(nil), "regen.ecocredit.marketplace.v1.SellOrderInfo") @@ -680,61 +682,60 @@ func init() { } var fileDescriptor_1f2df4a89dfae849 = []byte{ - // 860 bytes of a gzipped FileDescriptorProto + // 843 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0x4e, 0x7b, 0x77, 0xb3, 0x71, 0x59, 0x5e, 0x89, 0x5e, 0x11, 0xcc, 0x00, 0x8e, 0x65, 0x24, - 0x58, 0x01, 0xee, 0xc1, 0xbb, 0x62, 0x11, 0xbb, 0x8a, 0x16, 0x7b, 0x59, 0x56, 0x91, 0xf8, 0x9d, - 0x20, 0x21, 0x71, 0x31, 0x3d, 0x9e, 0x8e, 0x33, 0xf2, 0x78, 0xda, 0x99, 0xee, 0xc9, 0x8f, 0xa2, - 0x5c, 0xe0, 0x8c, 0x84, 0x04, 0x47, 0x9e, 0x22, 0x47, 0x90, 0xc2, 0x95, 0x63, 0x24, 0x2e, 0xdc, - 0x40, 0x09, 0x0f, 0xc0, 0x23, 0xa0, 0xe9, 0xee, 0x19, 0xff, 0xc4, 0xc4, 0x4c, 0x36, 0x87, 0xdc, - 0xa6, 0xbb, 0xaa, 0xba, 0xbe, 0xef, 0xab, 0xa9, 0x2a, 0x78, 0x23, 0x62, 0x3d, 0x16, 0xda, 0xac, - 0xcb, 0xbb, 0x11, 0xf3, 0x7c, 0x69, 0x0f, 0x68, 0xd4, 0x67, 0x72, 0x18, 0xd0, 0x2e, 0xb3, 0xb7, - 0x9b, 0xf6, 0x56, 0xcc, 0xa2, 0x3d, 0x32, 0x8c, 0xb8, 0xe4, 0xb8, 0xaa, 0x7c, 0x49, 0xe6, 0x4b, - 0xc6, 0x7c, 0xc9, 0x76, 0xd3, 0x7a, 0xb9, 0xc7, 0x79, 0x2f, 0x60, 0x36, 0x1d, 0xfa, 0x36, 0x0d, - 0x43, 0x2e, 0xa9, 0xf4, 0x79, 0x28, 0x74, 0xb4, 0xb5, 0x62, 0xac, 0xea, 0xe4, 0xc6, 0x1b, 0xb6, - 0xf4, 0x07, 0x4c, 0x48, 0x3a, 0x18, 0x1a, 0x87, 0x79, 0x50, 0x84, 0xa4, 0x92, 0xa5, 0xbe, 0x5d, - 0x2e, 0x06, 0x5c, 0xd8, 0x2e, 0x15, 0x4c, 0x63, 0xb4, 0xb7, 0x9b, 0x2e, 0x93, 0xb4, 0x69, 0x0f, - 0x69, 0xcf, 0x0f, 0x55, 0x66, 0xed, 0x5b, 0x7f, 0x08, 0xcf, 0x7f, 0x9e, 0x78, 0xac, 0xb3, 0x20, - 0xf8, 0x34, 0xf2, 0x58, 0xe4, 0xb0, 0xad, 0x98, 0x09, 0x89, 0xeb, 0x50, 0x16, 0x2c, 0x08, 0x3a, - 0x3c, 0xb9, 0xec, 0xf8, 0x5e, 0x05, 0xd5, 0xd0, 0x9d, 0xeb, 0x4e, 0x49, 0xa4, 0x8e, 0x6b, 0x5e, - 0x7d, 0x03, 0x96, 0xa7, 0x83, 0xc5, 0x90, 0x87, 0x82, 0xe1, 0x8f, 0x00, 0x46, 0xd1, 0x2a, 0xb4, - 0x74, 0xb7, 0x41, 0xce, 0x97, 0x88, 0x64, 0xcf, 0xac, 0x85, 0x1b, 0xdc, 0x29, 0x66, 0x99, 0xea, - 0x5f, 0x4f, 0xe7, 0x11, 0x29, 0xca, 0x0f, 0x01, 0x46, 0x94, 0x4c, 0x9e, 0xd7, 0x88, 0xe6, 0x4f, - 0x12, 0xfe, 0x44, 0xd7, 0xc8, 0xf0, 0x27, 0x9f, 0xd1, 0x1e, 0x33, 0xb1, 0xce, 0x58, 0x64, 0xfd, - 0x10, 0xc1, 0x0b, 0x67, 0x52, 0x18, 0x2e, 0x9f, 0x40, 0x69, 0xc4, 0x45, 0x54, 0x50, 0xed, 0x5a, - 0x7e, 0x32, 0x90, 0x91, 0x11, 0xf8, 0xe9, 0x04, 0xe6, 0x82, 0xc2, 0xfc, 0xfa, 0x5c, 0xcc, 0x1a, - 0xcc, 0x04, 0xe8, 0xef, 0x10, 0xd4, 0xa7, 0x40, 0xb7, 0xf7, 0xda, 0x54, 0x76, 0x37, 0x3f, 0x60, - 0x21, 0x1f, 0xa4, 0x1a, 0xad, 0x40, 0xc9, 0x4d, 0x2e, 0x3b, 0x5e, 0x72, 0xab, 0x44, 0x2a, 0x3a, - 0xe0, 0x66, 0x7e, 0x53, 0x22, 0x16, 0x2e, 0x2c, 0xe2, 0x11, 0x82, 0x57, 0xcf, 0xc5, 0x73, 0xd5, - 0x05, 0xfd, 0x16, 0xc1, 0xca, 0x19, 0x02, 0x2d, 0xcf, 0x8b, 0x98, 0xc8, 0xfe, 0xb8, 0x0a, 0xdc, - 0xa4, 0xfa, 0xc6, 0x28, 0x99, 0x1e, 0x2f, 0x4d, 0xc6, 0x5f, 0x10, 0xd4, 0xfe, 0x1b, 0xc5, 0x55, - 0xd7, 0xb0, 0x0b, 0x2f, 0x2a, 0xf0, 0xad, 0x20, 0xe0, 0x3b, 0xcc, 0x53, 0x95, 0xbf, 0xf4, 0x76, - 0xfd, 0x19, 0x81, 0x35, 0x2b, 0x8b, 0x11, 0x67, 0x1d, 0x6e, 0x51, 0x6d, 0xd0, 0xff, 0x7c, 0xaa, - 0xcf, 0x5b, 0xf3, 0xf4, 0x19, 0x7f, 0xce, 0x29, 0xd3, 0xf1, 0xc7, 0x2f, 0x4f, 0xa1, 0x9f, 0x0a, - 0x50, 0x9e, 0x28, 0x04, 0xbe, 0x05, 0x85, 0x6c, 0xc0, 0x16, 0x7c, 0x0f, 0x2f, 0xc3, 0x62, 0x52, - 0x1a, 0x16, 0xa9, 0x34, 0x45, 0xc7, 0x9c, 0xa6, 0x3b, 0xf9, 0xda, 0x99, 0x4e, 0xb6, 0x60, 0x69, - 0x2b, 0xa6, 0xa1, 0xf4, 0xe5, 0x5e, 0xe5, 0xba, 0xb2, 0x66, 0x67, 0xfc, 0x12, 0x14, 0xa9, 0xe8, - 0x9b, 0xd0, 0x1b, 0xda, 0x48, 0x45, 0x5f, 0x07, 0xbe, 0x02, 0x90, 0x18, 0xe9, 0x80, 0xc7, 0xa1, - 0xac, 0x2c, 0x2a, 0x6b, 0xe2, 0xde, 0x52, 0x17, 0x98, 0xc0, 0x6d, 0xcf, 0x17, 0xd4, 0x0d, 0x58, - 0x87, 0xc6, 0x92, 0x77, 0x22, 0x26, 0xfd, 0x88, 0x55, 0x6e, 0xd6, 0xd0, 0x9d, 0x25, 0xe7, 0x39, - 0x63, 0x6a, 0xc5, 0x92, 0x3b, 0xca, 0x80, 0x1f, 0x00, 0xb0, 0xdd, 0xa1, 0x1f, 0x69, 0xad, 0x8a, - 0x4a, 0x2b, 0x8b, 0xe8, 0x1d, 0x47, 0xd2, 0x1d, 0x47, 0xbe, 0x48, 0x77, 0x9c, 0x33, 0xe6, 0x7d, - 0xf7, 0xc7, 0x25, 0xb8, 0xa1, 0x6a, 0x8b, 0x7f, 0x45, 0x50, 0xcc, 0x84, 0xc2, 0xef, 0xcc, 0x2b, - 0xde, 0xcc, 0x3d, 0x66, 0xdd, 0xcf, 0x1b, 0xa6, 0x2b, 0x56, 0x7f, 0xfc, 0xcd, 0xef, 0x7f, 0xff, - 0x50, 0x58, 0xc5, 0x0f, 0xed, 0x79, 0x9b, 0x97, 0x05, 0x41, 0x43, 0xb7, 0xa1, 0xbd, 0x3f, 0xb1, - 0x32, 0x0f, 0xf0, 0x21, 0x02, 0x18, 0x75, 0x31, 0xce, 0x89, 0x25, 0x6d, 0x1b, 0xeb, 0xdd, 0xdc, - 0x71, 0x86, 0xc4, 0x3d, 0x45, 0xa2, 0x81, 0xdf, 0xcc, 0x41, 0x02, 0xff, 0x83, 0x60, 0x79, 0xf6, - 0x04, 0xc7, 0xed, 0x9c, 0x40, 0x66, 0xac, 0x23, 0xeb, 0xf1, 0x33, 0xbd, 0x61, 0x88, 0x7d, 0xac, - 0x88, 0x3d, 0xc5, 0x4f, 0xf2, 0x54, 0x47, 0x35, 0x4a, 0x43, 0x35, 0x80, 0xbd, 0x3f, 0xd6, 0x48, - 0x07, 0xf8, 0x4f, 0x04, 0xb7, 0x67, 0x4c, 0x5b, 0xfc, 0x28, 0x37, 0xd6, 0xc9, 0x6d, 0x61, 0xbd, - 0x7f, 0xf1, 0x07, 0x0c, 0xd3, 0x27, 0x8a, 0xe9, 0x23, 0xbc, 0x9a, 0x87, 0xa9, 0x59, 0x49, 0xf6, - 0xbe, 0xf9, 0x38, 0xc0, 0x47, 0x08, 0xca, 0x13, 0xc3, 0x12, 0xbf, 0xf7, 0xbf, 0xa0, 0xcd, 0x1a, - 0xe3, 0xd6, 0x83, 0x8b, 0x84, 0x1a, 0x3e, 0xf7, 0x15, 0x9f, 0xb7, 0x31, 0x99, 0xc7, 0xc7, 0x4c, - 0x5f, 0x5d, 0x2f, 0xd1, 0xfe, 0xf2, 0xb7, 0x93, 0x2a, 0x3a, 0x3e, 0xa9, 0xa2, 0xbf, 0x4e, 0xaa, - 0xe8, 0xfb, 0xd3, 0xea, 0xc2, 0xf1, 0x69, 0x75, 0xe1, 0x8f, 0xd3, 0xea, 0xc2, 0x57, 0xab, 0x3d, - 0x5f, 0x6e, 0xc6, 0x2e, 0xe9, 0xf2, 0x81, 0x7e, 0xb3, 0x11, 0x32, 0xb9, 0xc3, 0xa3, 0xbe, 0x39, - 0x05, 0xcc, 0xeb, 0xb1, 0xc8, 0xde, 0x9d, 0x9d, 0xca, 0x5d, 0x54, 0xf3, 0xe8, 0xde, 0xbf, 0x01, - 0x00, 0x00, 0xff, 0xff, 0x6f, 0xb0, 0x82, 0x91, 0xed, 0x0b, 0x00, 0x00, + 0x10, 0x4e, 0x7b, 0x77, 0x43, 0x5c, 0x96, 0x57, 0xa2, 0x11, 0xc1, 0x0c, 0x30, 0x89, 0x8c, 0x04, + 0x2b, 0xc0, 0x3d, 0x78, 0x57, 0x2c, 0x62, 0x57, 0x0b, 0x8a, 0x17, 0x58, 0xad, 0xc4, 0xef, 0x04, + 0x09, 0x89, 0x8b, 0xe9, 0xf1, 0x74, 0x9c, 0x91, 0xc7, 0xd3, 0xce, 0x74, 0x4f, 0x7e, 0x14, 0x45, + 0x42, 0xdc, 0x11, 0x48, 0x5c, 0x79, 0x8a, 0x1c, 0x73, 0x08, 0x57, 0x8e, 0x91, 0xb8, 0x20, 0x4e, + 0x28, 0xe1, 0x01, 0x78, 0x04, 0x34, 0xdd, 0x3d, 0xe3, 0x5f, 0x62, 0x26, 0xc9, 0x21, 0xb7, 0x99, + 0xae, 0xaa, 0xae, 0xef, 0xfb, 0xaa, 0xab, 0x0a, 0xde, 0x88, 0x59, 0x97, 0x45, 0x0e, 0xeb, 0xf0, + 0x4e, 0xcc, 0xfc, 0x40, 0x3a, 0x7d, 0x1a, 0xf7, 0x98, 0x1c, 0x84, 0xb4, 0xc3, 0x9c, 0xed, 0xa6, + 0xb3, 0x95, 0xb0, 0x78, 0x8f, 0x0c, 0x62, 0x2e, 0x39, 0xb6, 0x95, 0x2f, 0xc9, 0x7d, 0xc9, 0x88, + 0x2f, 0xd9, 0x6e, 0x5a, 0x2f, 0x77, 0x39, 0xef, 0x86, 0xcc, 0xa1, 0x83, 0xc0, 0xa1, 0x51, 0xc4, + 0x25, 0x95, 0x01, 0x8f, 0x84, 0x8e, 0xb6, 0x56, 0x8c, 0x55, 0xfd, 0x79, 0xc9, 0x86, 0x23, 0x83, + 0x3e, 0x13, 0x92, 0xf6, 0x07, 0xc6, 0x61, 0x1e, 0x14, 0x21, 0xa9, 0x64, 0x99, 0x6f, 0x87, 0x8b, + 0x3e, 0x17, 0x8e, 0x47, 0x05, 0xd3, 0x18, 0x9d, 0xed, 0xa6, 0xc7, 0x24, 0x6d, 0x3a, 0x03, 0xda, + 0x0d, 0x22, 0x95, 0x59, 0xfb, 0xd6, 0x1f, 0xc2, 0xf3, 0x5f, 0xa6, 0x1e, 0xeb, 0x2c, 0x0c, 0x3f, + 0x8f, 0x7d, 0x16, 0xbb, 0x6c, 0x2b, 0x61, 0x42, 0xe2, 0x3a, 0x54, 0x05, 0x0b, 0xc3, 0x36, 0x4f, + 0x0f, 0xdb, 0x81, 0x5f, 0x43, 0xab, 0xe8, 0xce, 0x4d, 0xb7, 0x22, 0x32, 0xc7, 0xa7, 0x7e, 0x7d, + 0x03, 0x96, 0x27, 0x83, 0xc5, 0x80, 0x47, 0x82, 0xe1, 0x4f, 0x00, 0x86, 0xd1, 0x2a, 0xb4, 0x72, + 0xb7, 0x41, 0xce, 0x97, 0x88, 0xe4, 0xd7, 0x3c, 0x8d, 0x36, 0xb8, 0x5b, 0xce, 0x33, 0xd5, 0xbf, + 0x9d, 0xcc, 0x23, 0x32, 0x94, 0x1f, 0x03, 0x0c, 0x29, 0x99, 0x3c, 0xaf, 0x11, 0xcd, 0x9f, 0xa4, + 0xfc, 0x89, 0xae, 0x91, 0xe1, 0x4f, 0xbe, 0xa0, 0x5d, 0x66, 0x62, 0xdd, 0x91, 0xc8, 0xfa, 0x21, + 0x82, 0x17, 0xa6, 0x52, 0x18, 0x2e, 0x9f, 0x41, 0x65, 0xc8, 0x45, 0xd4, 0xd0, 0xea, 0x8d, 0xe2, + 0x64, 0x20, 0x27, 0x23, 0xf0, 0x93, 0x31, 0xcc, 0x25, 0x85, 0xf9, 0xf5, 0xb9, 0x98, 0x35, 0x98, + 0x31, 0xd0, 0x3f, 0x20, 0xa8, 0x4f, 0x80, 0x6e, 0xed, 0xb5, 0xa8, 0xec, 0x6c, 0x7e, 0xc8, 0x22, + 0xde, 0xcf, 0x34, 0x5a, 0x81, 0x8a, 0x97, 0x1e, 0xb6, 0xfd, 0xf4, 0x54, 0x89, 0x54, 0x76, 0xc1, + 0xcb, 0xfd, 0x26, 0x44, 0x2c, 0x5d, 0x58, 0xc4, 0x63, 0x04, 0xaf, 0x9e, 0x8b, 0xe7, 0xba, 0x0b, + 0xfa, 0x1d, 0x02, 0x7b, 0x8a, 0x40, 0xfa, 0x3d, 0x6c, 0x8b, 0x65, 0x58, 0x14, 0xea, 0xc0, 0xe8, + 0x68, 0xfe, 0xae, 0x4c, 0xc3, 0x23, 0x04, 0x2b, 0xff, 0x09, 0xe1, 0xba, 0xeb, 0xd7, 0x81, 0x17, + 0x15, 0xf6, 0xb5, 0x30, 0xe4, 0x3b, 0xcc, 0x57, 0x55, 0xbf, 0xf2, 0x56, 0x3d, 0x42, 0x60, 0xcd, + 0xca, 0x62, 0xc4, 0x59, 0x87, 0xdb, 0x54, 0x1b, 0xf4, 0x7b, 0xcf, 0xf4, 0x79, 0x6b, 0x9e, 0x3e, + 0xa3, 0xd7, 0xb9, 0x55, 0x3a, 0x7a, 0xf9, 0xd5, 0x29, 0xf4, 0x4b, 0x09, 0xaa, 0x63, 0x85, 0xc0, + 0xb7, 0xa1, 0x94, 0x0f, 0xd7, 0x52, 0xe0, 0x8f, 0x3c, 0xb0, 0xd2, 0xd8, 0x03, 0x9b, 0xe8, 0xe2, + 0x1b, 0x53, 0x5d, 0x6c, 0xc1, 0xd2, 0x56, 0x42, 0x23, 0x19, 0xc8, 0xbd, 0xda, 0x4d, 0x65, 0xcd, + 0xff, 0xf1, 0x4b, 0x50, 0xa6, 0xa2, 0x67, 0x42, 0x6f, 0x69, 0x23, 0x15, 0x3d, 0x1d, 0xf8, 0x0a, + 0x40, 0x6a, 0xa4, 0x7d, 0x9e, 0x44, 0xb2, 0xb6, 0xa8, 0xac, 0xa9, 0xfb, 0x9a, 0x3a, 0xc0, 0x04, + 0x9e, 0xf3, 0x03, 0x41, 0xbd, 0x90, 0xb5, 0x69, 0x22, 0x79, 0x3b, 0x66, 0x32, 0x88, 0x59, 0xed, + 0x99, 0x55, 0x74, 0x67, 0xc9, 0x7d, 0xd6, 0x98, 0xd6, 0x12, 0xc9, 0x5d, 0x65, 0xc0, 0x0f, 0x00, + 0xd8, 0xee, 0x20, 0x88, 0xb5, 0x56, 0x65, 0xa5, 0x95, 0x45, 0xf4, 0x7e, 0x23, 0xd9, 0x7e, 0x23, + 0x5f, 0x65, 0xfb, 0xcd, 0x1d, 0xf1, 0xbe, 0xfb, 0xe3, 0x12, 0xdc, 0x52, 0xb5, 0xc5, 0xbf, 0x22, + 0x28, 0xe7, 0x42, 0xe1, 0x77, 0xe6, 0x15, 0x6f, 0xe6, 0x0e, 0xb3, 0xee, 0x17, 0x0d, 0xd3, 0x15, + 0xab, 0x3f, 0xfe, 0xfe, 0xf7, 0xbf, 0x7f, 0x2e, 0x3d, 0xc2, 0x0f, 0x9d, 0x79, 0x5b, 0x97, 0x85, + 0x61, 0x43, 0xb7, 0xa1, 0xb3, 0x3f, 0xb6, 0x2e, 0x0f, 0xf0, 0x21, 0x02, 0x18, 0x36, 0x31, 0x2e, + 0x88, 0x25, 0x6b, 0x1b, 0xeb, 0xdd, 0xc2, 0x71, 0x86, 0xc4, 0x3d, 0x45, 0xa2, 0x81, 0xdf, 0x2c, + 0x40, 0x02, 0xff, 0x83, 0x60, 0x79, 0xf6, 0xf4, 0xc6, 0xad, 0x82, 0x40, 0x66, 0xac, 0x22, 0xeb, + 0xf1, 0xa5, 0xee, 0x30, 0xc4, 0x3e, 0x55, 0xc4, 0x9e, 0xe0, 0x8f, 0x8a, 0x54, 0x47, 0x35, 0x4a, + 0x43, 0x35, 0x80, 0xb3, 0x3f, 0xd2, 0x48, 0x07, 0xf8, 0x4f, 0x04, 0x78, 0x7a, 0xd8, 0xe2, 0xf7, + 0x0b, 0x43, 0x1d, 0x5b, 0x14, 0xd6, 0x07, 0x17, 0x8e, 0xbf, 0xcc, 0x23, 0xd4, 0xc3, 0x42, 0xbf, + 0x45, 0x16, 0x1f, 0xe0, 0x63, 0x04, 0xd5, 0xb1, 0x39, 0x89, 0xdf, 0xfb, 0x5f, 0xb8, 0x66, 0x4d, + 0x70, 0xeb, 0xc1, 0x45, 0x42, 0x0d, 0x9b, 0xfb, 0x8a, 0xcd, 0xdb, 0x98, 0xcc, 0x63, 0x63, 0x06, + 0xaf, 0x2e, 0x95, 0x68, 0x7d, 0xfd, 0xdb, 0xa9, 0x8d, 0x4e, 0x4e, 0x6d, 0xf4, 0xd7, 0xa9, 0x8d, + 0x7e, 0x3a, 0xb3, 0x17, 0x4e, 0xce, 0xec, 0x85, 0x3f, 0xce, 0xec, 0x85, 0x6f, 0x1e, 0x75, 0x03, + 0xb9, 0x99, 0x78, 0xa4, 0xc3, 0xfb, 0xfa, 0xce, 0x46, 0xc4, 0xe4, 0x0e, 0x8f, 0x7b, 0xe6, 0x2f, + 0x64, 0x7e, 0x97, 0xc5, 0xce, 0xee, 0xec, 0x54, 0xde, 0xa2, 0x1a, 0x45, 0xf7, 0xfe, 0x0d, 0x00, + 0x00, 0xff, 0xff, 0x12, 0x07, 0x52, 0xe9, 0xe4, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -749,18 +750,18 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { - // SellOrder queries a sell order by its ID + // SellOrder queries a sell order by its unique identifier. SellOrder(ctx context.Context, in *QuerySellOrderRequest, opts ...grpc.CallOption) (*QuerySellOrderResponse, error) - // SellOrders queries a paginated list of all sell orders + // SellOrders queries a paginated list of all sell orders. SellOrders(ctx context.Context, in *QuerySellOrdersRequest, opts ...grpc.CallOption) (*QuerySellOrdersResponse, error) - // SellOrdersByDenom queries a paginated list of all sell orders of a specific - // ecocredit denom + // SellOrdersByBatchDenom queries a paginated list of all sell orders based on + // the batch denom of the credits being sold. SellOrdersByBatchDenom(ctx context.Context, in *QuerySellOrdersByBatchDenomRequest, opts ...grpc.CallOption) (*QuerySellOrdersByBatchDenomResponse, error) - // SellOrdersByAddress queries a paginated list of all sell orders from a - // specific address - SellOrdersByAddress(ctx context.Context, in *QuerySellOrdersByAddressRequest, opts ...grpc.CallOption) (*QuerySellOrdersByAddressResponse, error) - // AllowedDenoms queries all denoms allowed to be set in the AskPrice of a - // sell order + // SellOrdersBySeller queries a paginated list of all sell orders based on the + // account address of the seller. + SellOrdersBySeller(ctx context.Context, in *QuerySellOrdersBySellerRequest, opts ...grpc.CallOption) (*QuerySellOrdersBySellerResponse, error) + // AllowedDenoms queries a paginated list of all bank denoms allowed to be + // used in the marketplace. AllowedDenoms(ctx context.Context, in *QueryAllowedDenomsRequest, opts ...grpc.CallOption) (*QueryAllowedDenomsResponse, error) } @@ -799,9 +800,9 @@ func (c *queryClient) SellOrdersByBatchDenom(ctx context.Context, in *QuerySellO return out, nil } -func (c *queryClient) SellOrdersByAddress(ctx context.Context, in *QuerySellOrdersByAddressRequest, opts ...grpc.CallOption) (*QuerySellOrdersByAddressResponse, error) { - out := new(QuerySellOrdersByAddressResponse) - err := c.cc.Invoke(ctx, "/regen.ecocredit.marketplace.v1.Query/SellOrdersByAddress", in, out, opts...) +func (c *queryClient) SellOrdersBySeller(ctx context.Context, in *QuerySellOrdersBySellerRequest, opts ...grpc.CallOption) (*QuerySellOrdersBySellerResponse, error) { + out := new(QuerySellOrdersBySellerResponse) + err := c.cc.Invoke(ctx, "/regen.ecocredit.marketplace.v1.Query/SellOrdersBySeller", in, out, opts...) if err != nil { return nil, err } @@ -819,18 +820,18 @@ func (c *queryClient) AllowedDenoms(ctx context.Context, in *QueryAllowedDenomsR // QueryServer is the server API for Query service. type QueryServer interface { - // SellOrder queries a sell order by its ID + // SellOrder queries a sell order by its unique identifier. SellOrder(context.Context, *QuerySellOrderRequest) (*QuerySellOrderResponse, error) - // SellOrders queries a paginated list of all sell orders + // SellOrders queries a paginated list of all sell orders. SellOrders(context.Context, *QuerySellOrdersRequest) (*QuerySellOrdersResponse, error) - // SellOrdersByDenom queries a paginated list of all sell orders of a specific - // ecocredit denom + // SellOrdersByBatchDenom queries a paginated list of all sell orders based on + // the batch denom of the credits being sold. SellOrdersByBatchDenom(context.Context, *QuerySellOrdersByBatchDenomRequest) (*QuerySellOrdersByBatchDenomResponse, error) - // SellOrdersByAddress queries a paginated list of all sell orders from a - // specific address - SellOrdersByAddress(context.Context, *QuerySellOrdersByAddressRequest) (*QuerySellOrdersByAddressResponse, error) - // AllowedDenoms queries all denoms allowed to be set in the AskPrice of a - // sell order + // SellOrdersBySeller queries a paginated list of all sell orders based on the + // account address of the seller. + SellOrdersBySeller(context.Context, *QuerySellOrdersBySellerRequest) (*QuerySellOrdersBySellerResponse, error) + // AllowedDenoms queries a paginated list of all bank denoms allowed to be + // used in the marketplace. AllowedDenoms(context.Context, *QueryAllowedDenomsRequest) (*QueryAllowedDenomsResponse, error) } @@ -847,8 +848,8 @@ func (*UnimplementedQueryServer) SellOrders(ctx context.Context, req *QuerySellO func (*UnimplementedQueryServer) SellOrdersByBatchDenom(ctx context.Context, req *QuerySellOrdersByBatchDenomRequest) (*QuerySellOrdersByBatchDenomResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SellOrdersByBatchDenom not implemented") } -func (*UnimplementedQueryServer) SellOrdersByAddress(ctx context.Context, req *QuerySellOrdersByAddressRequest) (*QuerySellOrdersByAddressResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SellOrdersByAddress not implemented") +func (*UnimplementedQueryServer) SellOrdersBySeller(ctx context.Context, req *QuerySellOrdersBySellerRequest) (*QuerySellOrdersBySellerResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SellOrdersBySeller not implemented") } func (*UnimplementedQueryServer) AllowedDenoms(ctx context.Context, req *QueryAllowedDenomsRequest) (*QueryAllowedDenomsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method AllowedDenoms not implemented") @@ -912,20 +913,20 @@ func _Query_SellOrdersByBatchDenom_Handler(srv interface{}, ctx context.Context, return interceptor(ctx, in, info, handler) } -func _Query_SellOrdersByAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QuerySellOrdersByAddressRequest) +func _Query_SellOrdersBySeller_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QuerySellOrdersBySellerRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).SellOrdersByAddress(ctx, in) + return srv.(QueryServer).SellOrdersBySeller(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/regen.ecocredit.marketplace.v1.Query/SellOrdersByAddress", + FullMethod: "/regen.ecocredit.marketplace.v1.Query/SellOrdersBySeller", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).SellOrdersByAddress(ctx, req.(*QuerySellOrdersByAddressRequest)) + return srv.(QueryServer).SellOrdersBySeller(ctx, req.(*QuerySellOrdersBySellerRequest)) } return interceptor(ctx, in, info, handler) } @@ -965,8 +966,8 @@ var _Query_serviceDesc = grpc.ServiceDesc{ Handler: _Query_SellOrdersByBatchDenom_Handler, }, { - MethodName: "SellOrdersByAddress", - Handler: _Query_SellOrdersByAddress_Handler, + MethodName: "SellOrdersBySeller", + Handler: _Query_SellOrdersBySeller_Handler, }, { MethodName: "AllowedDenoms", @@ -1215,7 +1216,7 @@ func (m *QuerySellOrdersByBatchDenomResponse) MarshalToSizedBuffer(dAtA []byte) return len(dAtA) - i, nil } -func (m *QuerySellOrdersByAddressRequest) Marshal() (dAtA []byte, err error) { +func (m *QuerySellOrdersBySellerRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1225,12 +1226,12 @@ func (m *QuerySellOrdersByAddressRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QuerySellOrdersByAddressRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QuerySellOrdersBySellerRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QuerySellOrdersByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QuerySellOrdersBySellerRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1247,17 +1248,17 @@ func (m *QuerySellOrdersByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int i-- dAtA[i] = 0x12 } - if len(m.Address) > 0 { - i -= len(m.Address) - copy(dAtA[i:], m.Address) - i = encodeVarintQuery(dAtA, i, uint64(len(m.Address))) + if len(m.Seller) > 0 { + i -= len(m.Seller) + copy(dAtA[i:], m.Seller) + i = encodeVarintQuery(dAtA, i, uint64(len(m.Seller))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *QuerySellOrdersByAddressResponse) Marshal() (dAtA []byte, err error) { +func (m *QuerySellOrdersBySellerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -1267,12 +1268,12 @@ func (m *QuerySellOrdersByAddressResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QuerySellOrdersByAddressResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QuerySellOrdersBySellerResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QuerySellOrdersByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QuerySellOrdersBySellerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -1579,13 +1580,13 @@ func (m *QuerySellOrdersByBatchDenomResponse) Size() (n int) { return n } -func (m *QuerySellOrdersByAddressRequest) Size() (n int) { +func (m *QuerySellOrdersBySellerRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.Address) + l = len(m.Seller) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -1596,7 +1597,7 @@ func (m *QuerySellOrdersByAddressRequest) Size() (n int) { return n } -func (m *QuerySellOrdersByAddressResponse) Size() (n int) { +func (m *QuerySellOrdersBySellerResponse) Size() (n int) { if m == nil { return 0 } @@ -2291,7 +2292,7 @@ func (m *QuerySellOrdersByBatchDenomResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QuerySellOrdersByAddressRequest) Unmarshal(dAtA []byte) error { +func (m *QuerySellOrdersBySellerRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2314,15 +2315,15 @@ func (m *QuerySellOrdersByAddressRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QuerySellOrdersByAddressRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySellOrdersBySellerRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QuerySellOrdersByAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySellOrdersBySellerRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Seller", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2350,7 +2351,7 @@ func (m *QuerySellOrdersByAddressRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Address = string(dAtA[iNdEx:postIndex]) + m.Seller = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -2409,7 +2410,7 @@ func (m *QuerySellOrdersByAddressRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QuerySellOrdersByAddressResponse) Unmarshal(dAtA []byte) error { +func (m *QuerySellOrdersBySellerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2432,10 +2433,10 @@ func (m *QuerySellOrdersByAddressResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QuerySellOrdersByAddressResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QuerySellOrdersBySellerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QuerySellOrdersByAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QuerySellOrdersBySellerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/ecocredit/marketplace/query.pb.gw.go b/x/ecocredit/marketplace/query.pb.gw.go index 19035f0b29..1bb0e8b17b 100644 --- a/x/ecocredit/marketplace/query.pb.gw.go +++ b/x/ecocredit/marketplace/query.pb.gw.go @@ -196,11 +196,11 @@ func local_request_Query_SellOrdersByBatchDenom_0(ctx context.Context, marshaler } var ( - filter_Query_SellOrdersByAddress_0 = &utilities.DoubleArray{Encoding: map[string]int{"address": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} + filter_Query_SellOrdersBySeller_0 = &utilities.DoubleArray{Encoding: map[string]int{"seller": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) -func request_Query_SellOrdersByAddress_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QuerySellOrdersByAddressRequest +func request_Query_SellOrdersBySeller_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySellOrdersBySellerRequest var metadata runtime.ServerMetadata var ( @@ -210,31 +210,31 @@ func request_Query_SellOrdersByAddress_0(ctx context.Context, marshaler runtime. _ = err ) - val, ok = pathParams["address"] + val, ok = pathParams["seller"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "seller") } - protoReq.Address, err = runtime.String(val) + protoReq.Seller, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "seller", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SellOrdersByAddress_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SellOrdersBySeller_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := client.SellOrdersByAddress(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + msg, err := client.SellOrdersBySeller(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err } -func local_request_Query_SellOrdersByAddress_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QuerySellOrdersByAddressRequest +func local_request_Query_SellOrdersBySeller_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QuerySellOrdersBySellerRequest var metadata runtime.ServerMetadata var ( @@ -244,25 +244,25 @@ func local_request_Query_SellOrdersByAddress_0(ctx context.Context, marshaler ru _ = err ) - val, ok = pathParams["address"] + val, ok = pathParams["seller"] if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "address") + return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "seller") } - protoReq.Address, err = runtime.String(val) + protoReq.Seller, err = runtime.String(val) if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "address", err) + return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "seller", err) } if err := req.ParseForm(); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SellOrdersByAddress_0); err != nil { + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_SellOrdersBySeller_0); err != nil { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - msg, err := server.SellOrdersByAddress(ctx, &protoReq) + msg, err := server.SellOrdersBySeller(ctx, &protoReq) return msg, metadata, err } @@ -378,7 +378,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_SellOrdersByAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_SellOrdersBySeller_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -389,7 +389,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_SellOrdersByAddress_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_SellOrdersBySeller_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -397,7 +397,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_SellOrdersByAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_SellOrdersBySeller_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -525,7 +525,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_SellOrdersByAddress_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_SellOrdersBySeller_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -534,14 +534,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_SellOrdersByAddress_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_SellOrdersBySeller_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_SellOrdersByAddress_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_SellOrdersBySeller_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -575,7 +575,7 @@ var ( pattern_Query_SellOrdersByBatchDenom_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 6}, []string{"regen", "ecocredit", "marketplace", "v1", "sell-orders", "batch-denom", "batch_denom"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_SellOrdersByAddress_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 5}, []string{"regen", "ecocredit", "marketplace", "v1", "sell-orders", "address"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_SellOrdersBySeller_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5, 1, 0, 4, 1, 5, 5}, []string{"regen", "ecocredit", "marketplace", "v1", "sell-orders", "seller"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_AllowedDenoms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"regen", "ecocredit", "marketplace", "v1", "allowed-denoms"}, "", runtime.AssumeColonVerbOpt(false))) ) @@ -587,7 +587,7 @@ var ( forward_Query_SellOrdersByBatchDenom_0 = runtime.ForwardResponseMessage - forward_Query_SellOrdersByAddress_0 = runtime.ForwardResponseMessage + forward_Query_SellOrdersBySeller_0 = runtime.ForwardResponseMessage forward_Query_AllowedDenoms_0 = runtime.ForwardResponseMessage ) diff --git a/x/ecocredit/marketplace/state.pb.go b/x/ecocredit/marketplace/state.pb.go index 0a339f3d54..65eeea0f79 100644 --- a/x/ecocredit/marketplace/state.pb.go +++ b/x/ecocredit/marketplace/state.pb.go @@ -28,7 +28,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type SellOrder struct { // id is the unique ID of sell order. Id uint64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` - // seller is the bytes address of the owner of the credits being sold. + // seller is the address of the account that is selling credits. Seller []byte `protobuf:"bytes,2,opt,name=seller,proto3" json:"seller,omitempty"` // batch_key is the table row identifier of the credit batch used internally // for efficient lookups. This links a sell order to a credit batch. diff --git a/x/ecocredit/marketplace/tx.pb.go b/x/ecocredit/marketplace/tx.pb.go index 280d9e7c6b..a33ef7f143 100644 --- a/x/ecocredit/marketplace/tx.pb.go +++ b/x/ecocredit/marketplace/tx.pb.go @@ -35,8 +35,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgSell is the Msg/Sell request type. type MsgSell struct { - // owner is the address of the owner of the credits being sold. - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` + // seller is the address of the account that is selling credits. + Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // orders are the sell orders being created. Orders []*MsgSell_Order `protobuf:"bytes,2,rep,name=orders,proto3" json:"orders,omitempty"` } @@ -74,9 +74,9 @@ func (m *MsgSell) XXX_DiscardUnknown() { var xxx_messageInfo_MsgSell proto.InternalMessageInfo -func (m *MsgSell) GetOwner() string { +func (m *MsgSell) GetSeller() string { if m != nil { - return m.Owner + return m.Seller } return "" } @@ -227,8 +227,8 @@ func (m *MsgSellResponse) GetSellOrderIds() []uint64 { // MsgUpdateSellOrders is the Msg/UpdateSellOrders request type. type MsgUpdateSellOrders struct { - // owner is the owner of the sell orders. - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty"` + // seller is the address of the account that is selling credits. + Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // updates are updates to existing sell orders. Updates []*MsgUpdateSellOrders_Update `protobuf:"bytes,2,rep,name=updates,proto3" json:"updates,omitempty"` } @@ -266,9 +266,9 @@ func (m *MsgUpdateSellOrders) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateSellOrders proto.InternalMessageInfo -func (m *MsgUpdateSellOrders) GetOwner() string { +func (m *MsgUpdateSellOrders) GetSeller() string { if m != nil { - return m.Owner + return m.Seller } return "" } @@ -404,7 +404,8 @@ var xxx_messageInfo_MsgUpdateSellOrdersResponse proto.InternalMessageInfo // MsgCancelSellOrder is the Msg/CancelSellOrder request type. type MsgCancelSellOrder struct { - // seller is the address of the seller. + // seller is the address of the account that created the sell order and is + // therefore authorized to cancel the sell order. Seller string `protobuf:"bytes,1,opt,name=seller,proto3" json:"seller,omitempty"` // sell_order_id is the id of the seller order to cancel. SellOrderId uint64 `protobuf:"varint,2,opt,name=sell_order_id,json=sellOrderId,proto3" json:"sell_order_id,omitempty"` @@ -496,7 +497,7 @@ var xxx_messageInfo_MsgCancelSellOrderResponse proto.InternalMessageInfo // MsgBuyDirect is the Msg/BuyDirect request type. type MsgBuyDirect struct { - // buyer is the address of the credit buyer. + // buyer is the address of the account that is buying credits. Buyer string `protobuf:"bytes,1,opt,name=buyer,proto3" json:"buyer,omitempty"` // orders is a list of orders for ecocredits. Orders []*MsgBuyDirect_Order `protobuf:"bytes,2,rep,name=orders,proto3" json:"orders,omitempty"` @@ -693,56 +694,55 @@ func init() { } var fileDescriptor_68c9b4e4b7fcb584 = []byte{ - // 772 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4b, 0x4f, 0xe3, 0x56, - 0x14, 0xc6, 0x79, 0x01, 0x27, 0x3c, 0x5a, 0x83, 0x68, 0xea, 0xb6, 0x26, 0x8d, 0x2a, 0x91, 0x45, - 0xb9, 0x16, 0xa1, 0x2a, 0x12, 0x15, 0x52, 0x79, 0xa9, 0x2a, 0x52, 0x54, 0x6a, 0xa8, 0x2a, 0x75, - 0xe3, 0xfa, 0x71, 0x6b, 0x6e, 0xe3, 0xf8, 0xa6, 0xbe, 0xd7, 0x04, 0x96, 0x95, 0x46, 0x9a, 0xc5, - 0x6c, 0xf8, 0x59, 0xb3, 0x64, 0x37, 0x23, 0xcd, 0x62, 0x46, 0x64, 0x33, 0xab, 0xf9, 0x0d, 0x23, - 0x5f, 0x3f, 0x12, 0x12, 0x60, 0x92, 0xec, 0x7c, 0xce, 0xf9, 0xce, 0x43, 0xdf, 0x77, 0xce, 0x35, - 0x6c, 0x04, 0xd8, 0xc5, 0xbe, 0x86, 0x6d, 0x6a, 0x07, 0xd8, 0x21, 0x5c, 0x6b, 0x9b, 0x41, 0x0b, - 0xf3, 0x8e, 0x67, 0xda, 0x58, 0xbb, 0xdc, 0xd2, 0xf8, 0x15, 0xea, 0x04, 0x94, 0x53, 0x59, 0x15, - 0x40, 0x94, 0x01, 0xd1, 0x00, 0x10, 0x5d, 0x6e, 0x29, 0xab, 0x2e, 0x75, 0xa9, 0x80, 0x6a, 0xd1, - 0x57, 0x9c, 0xa5, 0xa8, 0x36, 0x65, 0x6d, 0xca, 0x34, 0xcb, 0x64, 0x51, 0x39, 0x0b, 0x73, 0x73, - 0x4b, 0xb3, 0x29, 0xf1, 0x93, 0xf8, 0xba, 0x4b, 0xa9, 0xeb, 0x61, 0x4d, 0x58, 0x56, 0xf8, 0x8f, - 0xc6, 0x49, 0x1b, 0x33, 0x6e, 0xb6, 0x3b, 0x31, 0xa0, 0xf6, 0x2a, 0x07, 0xb3, 0x4d, 0xe6, 0x9e, - 0x61, 0xcf, 0x93, 0x57, 0xa1, 0x48, 0xbb, 0x3e, 0x0e, 0x2a, 0x52, 0x55, 0xaa, 0xcf, 0xeb, 0xb1, - 0x21, 0x1f, 0x43, 0x89, 0x06, 0x0e, 0x0e, 0x58, 0x25, 0x57, 0xcd, 0xd7, 0xcb, 0x8d, 0x4d, 0xf4, - 0xf4, 0xa4, 0x28, 0x29, 0x87, 0x7e, 0x8b, 0xb2, 0xf4, 0x24, 0x59, 0xf9, 0x20, 0x41, 0x51, 0x78, - 0xe4, 0x75, 0x28, 0x5b, 0x26, 0xb7, 0x2f, 0x0c, 0x07, 0xfb, 0xb4, 0x9d, 0x34, 0x03, 0xe1, 0x3a, - 0x8a, 0x3c, 0xb2, 0x02, 0x73, 0xff, 0x85, 0xa6, 0xcf, 0x09, 0xbf, 0xae, 0xe4, 0x44, 0x34, 0xb3, - 0xe5, 0x1f, 0x61, 0xde, 0x64, 0x2d, 0xa3, 0x13, 0x10, 0x1b, 0x57, 0xf2, 0x55, 0xa9, 0x5e, 0x6e, - 0x7c, 0x89, 0x62, 0x12, 0x50, 0x44, 0x02, 0x4a, 0x48, 0x40, 0x87, 0x94, 0xf8, 0xfa, 0x9c, 0xc9, - 0x5a, 0xa7, 0x11, 0x54, 0x46, 0xb0, 0xe2, 0x10, 0x66, 0x5a, 0x1e, 0x36, 0xcc, 0x90, 0x53, 0x23, - 0xc0, 0x9c, 0x04, 0xb8, 0x52, 0xa8, 0x4a, 0xf5, 0x39, 0xfd, 0xf3, 0x24, 0xb4, 0x1f, 0x72, 0xaa, - 0x8b, 0x80, 0xfc, 0x33, 0x00, 0xbe, 0xea, 0x90, 0xc0, 0xe4, 0x84, 0xfa, 0x95, 0xa2, 0x68, 0xa4, - 0xa0, 0x98, 0x4d, 0x94, 0xb2, 0x89, 0xce, 0x53, 0x36, 0x0f, 0x0a, 0x37, 0x6f, 0xd7, 0x25, 0x7d, - 0x20, 0xa7, 0xb6, 0x03, 0xcb, 0x09, 0x13, 0x3a, 0x66, 0x1d, 0xea, 0x33, 0x2c, 0x7f, 0x07, 0x4b, - 0x0c, 0x7b, 0x9e, 0x21, 0x28, 0x31, 0x88, 0xc3, 0x2a, 0x52, 0x35, 0x5f, 0x2f, 0xe8, 0x0b, 0x91, - 0x57, 0x90, 0xf3, 0xab, 0xc3, 0x6a, 0x2f, 0xf2, 0xb0, 0xd2, 0x64, 0xee, 0x1f, 0x1d, 0xc7, 0xe4, - 0xf8, 0x2c, 0x8d, 0xb0, 0x47, 0xe4, 0x39, 0x87, 0xd9, 0x50, 0x20, 0x53, 0x7d, 0x76, 0xc7, 0xd0, - 0x67, 0xb8, 0x36, 0x8a, 0x1d, 0x7a, 0x5a, 0x4a, 0x79, 0x9e, 0x83, 0x52, 0xec, 0x93, 0x6b, 0xb0, - 0x78, 0x6f, 0x68, 0xd1, 0xbe, 0xa0, 0x97, 0x07, 0x66, 0x96, 0xbf, 0x85, 0x05, 0x1f, 0x77, 0x8d, - 0x21, 0xd5, 0xca, 0x3e, 0xee, 0xfe, 0x9e, 0x0a, 0xb7, 0x07, 0x8b, 0x11, 0x64, 0x02, 0xf1, 0xa2, - 0xf4, 0xfd, 0x69, 0xf5, 0xfb, 0x05, 0x96, 0xa2, 0x76, 0x53, 0x68, 0x18, 0x8d, 0x79, 0xdc, 0x97, - 0xf1, 0x1b, 0xf8, 0xea, 0x01, 0xc2, 0x52, 0x49, 0x6b, 0xa7, 0x20, 0x37, 0x99, 0x7b, 0x68, 0xfa, - 0x36, 0xf6, 0xb2, 0xb0, 0xbc, 0x06, 0xa5, 0x88, 0x9e, 0x4c, 0xab, 0xc4, 0x1a, 0xe5, 0x32, 0x37, - 0xc2, 0x65, 0xed, 0x6b, 0x50, 0x46, 0x2b, 0x66, 0xfd, 0xde, 0xe4, 0x60, 0xa1, 0xc9, 0xdc, 0x83, - 0xf0, 0xfa, 0x88, 0x04, 0xd8, 0xe6, 0xd1, 0x56, 0x58, 0xe1, 0x75, 0x7f, 0x2b, 0x84, 0x21, 0x9f, - 0x0c, 0x1d, 0x6d, 0x63, 0x8c, 0xa5, 0xc8, 0x6a, 0x0e, 0x5d, 0xee, 0xfb, 0xec, 0x72, 0xc7, 0x18, - 0xff, 0xde, 0xf1, 0xe6, 0x47, 0x8f, 0xd7, 0x22, 0x4e, 0xa2, 0x7f, 0xe1, 0x93, 0xc7, 0x6b, 0x11, - 0xe7, 0x49, 0xf1, 0x8b, 0x8f, 0x89, 0xbf, 0x03, 0x5f, 0xc4, 0x90, 0x36, 0xf6, 0xb9, 0xf1, 0x6f, - 0x18, 0x10, 0xe6, 0x10, 0x5b, 0x6c, 0x41, 0x49, 0x8c, 0xb4, 0xd6, 0x0f, 0x9f, 0x0c, 0x44, 0x6b, - 0x6b, 0xb0, 0x3a, 0x48, 0x44, 0xca, 0x7a, 0xa3, 0x97, 0x87, 0x7c, 0x93, 0xb9, 0xf2, 0xdf, 0x50, - 0x10, 0x2f, 0xe5, 0xc6, 0x98, 0x6f, 0xa0, 0xa2, 0x8d, 0x09, 0xcc, 0x9e, 0x88, 0x67, 0x12, 0x7c, - 0x36, 0x72, 0xf9, 0xdb, 0x53, 0x9c, 0xb4, 0xf2, 0xd3, 0x14, 0x49, 0xd9, 0x18, 0xff, 0x4b, 0xb0, - 0x3c, 0xbc, 0xd4, 0xe3, 0xec, 0xd0, 0x50, 0x8e, 0xb2, 0x3b, 0x79, 0x4e, 0x36, 0x03, 0x85, 0xf9, - 0xfe, 0x9a, 0x7f, 0x3f, 0xc9, 0x02, 0x2b, 0x3f, 0x4c, 0x82, 0x4e, 0x1b, 0x1e, 0xfc, 0xf9, 0xf2, - 0x4e, 0x95, 0x6e, 0xef, 0x54, 0xe9, 0xdd, 0x9d, 0x2a, 0xdd, 0xf4, 0xd4, 0x99, 0xdb, 0x9e, 0x3a, - 0xf3, 0xba, 0xa7, 0xce, 0xfc, 0xb5, 0xe7, 0x12, 0x7e, 0x11, 0x5a, 0xc8, 0xa6, 0x6d, 0x4d, 0x54, - 0xde, 0xf4, 0x31, 0xef, 0xd2, 0xa0, 0x95, 0x58, 0x1e, 0x76, 0x5c, 0x1c, 0x68, 0x57, 0x0f, 0xff, - 0xe7, 0xad, 0x92, 0x78, 0x6c, 0xb6, 0x3f, 0x06, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xa3, 0xce, 0xf4, - 0x0d, 0x08, 0x00, 0x00, + // 766 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x49, 0x6f, 0xdb, 0x46, + 0x14, 0x36, 0xb5, 0xd9, 0x7e, 0xf2, 0xd2, 0xd2, 0x86, 0xab, 0xb2, 0x2d, 0xad, 0x0a, 0x05, 0xac, + 0x43, 0x3d, 0x84, 0xe5, 0xa2, 0x06, 0x5c, 0x18, 0xa8, 0x37, 0x14, 0x35, 0x20, 0xd4, 0xa5, 0x1d, + 0x04, 0xc8, 0x85, 0xe1, 0x32, 0xa1, 0x27, 0xa2, 0x38, 0x0a, 0x67, 0xe8, 0xe5, 0x18, 0x20, 0x40, + 0x4e, 0x01, 0xfc, 0xb3, 0x72, 0xf4, 0x31, 0x41, 0x0e, 0x09, 0xac, 0x4b, 0x4e, 0xf9, 0x0d, 0x01, + 0x87, 0x8b, 0x65, 0xc9, 0x76, 0x24, 0xdd, 0xf8, 0xde, 0xfb, 0xde, 0x82, 0xef, 0x7b, 0x6f, 0x08, + 0x2b, 0x01, 0x76, 0xb1, 0xaf, 0x61, 0x9b, 0xda, 0x01, 0x76, 0x08, 0xd7, 0xda, 0x66, 0xd0, 0xc2, + 0xbc, 0xe3, 0x99, 0x36, 0xd6, 0x4e, 0xd7, 0x34, 0x7e, 0x8e, 0x3a, 0x01, 0xe5, 0x54, 0x56, 0x05, + 0x10, 0x65, 0x40, 0xd4, 0x03, 0x44, 0xa7, 0x6b, 0xca, 0xa2, 0x4b, 0x5d, 0x2a, 0xa0, 0x5a, 0xf4, + 0x15, 0x67, 0x29, 0xaa, 0x4d, 0x59, 0x9b, 0x32, 0xcd, 0x32, 0x59, 0x54, 0xce, 0xc2, 0xdc, 0x5c, + 0xd3, 0x6c, 0x4a, 0xfc, 0x24, 0xbe, 0xec, 0x52, 0xea, 0x7a, 0x58, 0x13, 0x96, 0x15, 0x3e, 0xd3, + 0x38, 0x69, 0x63, 0xc6, 0xcd, 0x76, 0x27, 0x06, 0xd4, 0xde, 0xe7, 0x60, 0xb2, 0xc9, 0xdc, 0x23, + 0xec, 0x79, 0xf2, 0x12, 0x94, 0x18, 0xf6, 0x3c, 0x1c, 0x54, 0xa4, 0xaa, 0x54, 0x9f, 0xd6, 0x13, + 0x4b, 0xde, 0x87, 0x12, 0x0d, 0x1c, 0x1c, 0xb0, 0x4a, 0xae, 0x9a, 0xaf, 0x97, 0x1b, 0xab, 0xe8, + 0xe1, 0x59, 0x51, 0x52, 0x10, 0xfd, 0x17, 0x65, 0xe9, 0x49, 0xb2, 0xf2, 0x45, 0x82, 0xa2, 0xf0, + 0xc8, 0xcb, 0x50, 0xb6, 0x4c, 0x6e, 0x9f, 0x18, 0x0e, 0xf6, 0x69, 0x3b, 0xe9, 0x06, 0xc2, 0xb5, + 0x17, 0x79, 0x64, 0x05, 0xa6, 0x5e, 0x84, 0xa6, 0xcf, 0x09, 0xbf, 0xa8, 0xe4, 0x44, 0x34, 0xb3, + 0xe5, 0x3f, 0x61, 0xda, 0x64, 0x2d, 0xa3, 0x13, 0x10, 0x1b, 0x57, 0xf2, 0x55, 0xa9, 0x5e, 0x6e, + 0xfc, 0x88, 0x62, 0x1a, 0x50, 0x44, 0x03, 0x4a, 0x68, 0x40, 0xbb, 0x94, 0xf8, 0xfa, 0x94, 0xc9, + 0x5a, 0x87, 0x11, 0x54, 0x46, 0xb0, 0xe0, 0x10, 0x66, 0x5a, 0x1e, 0x36, 0xcc, 0x90, 0x53, 0x23, + 0xc0, 0x9c, 0x04, 0xb8, 0x52, 0xa8, 0x4a, 0xf5, 0x29, 0xfd, 0xfb, 0x24, 0xb4, 0x1d, 0x72, 0xaa, + 0x8b, 0x80, 0xfc, 0x37, 0x00, 0x3e, 0xef, 0x90, 0xc0, 0xe4, 0x84, 0xfa, 0x95, 0xa2, 0x68, 0xa4, + 0xa0, 0x98, 0x4f, 0x94, 0xf2, 0x89, 0x8e, 0x53, 0x3e, 0x77, 0x0a, 0x97, 0x1f, 0x97, 0x25, 0xbd, + 0x27, 0xa7, 0xb6, 0x01, 0xf3, 0x09, 0x13, 0x3a, 0x66, 0x1d, 0xea, 0x33, 0x2c, 0xff, 0x06, 0x73, + 0x11, 0xa9, 0x86, 0xa0, 0xc4, 0x20, 0x0e, 0xab, 0x48, 0xd5, 0x7c, 0xbd, 0xa0, 0xcf, 0x44, 0x5e, + 0x41, 0xce, 0xbf, 0x0e, 0xab, 0xbd, 0xc9, 0xc3, 0x42, 0x93, 0xb9, 0x8f, 0x3a, 0x8e, 0xc9, 0xf1, + 0x51, 0x1a, 0x61, 0xf7, 0x0a, 0x74, 0x0c, 0x93, 0xa1, 0xc0, 0xa6, 0x0a, 0x6d, 0x0e, 0xa1, 0x50, + 0x7f, 0x75, 0x14, 0x3b, 0xf4, 0xb4, 0x94, 0xf2, 0x3a, 0x07, 0xa5, 0xd8, 0x27, 0xd7, 0x60, 0xf6, + 0xd6, 0xd8, 0xa2, 0x7f, 0x41, 0x2f, 0xf7, 0x4c, 0x2d, 0xff, 0x0a, 0x33, 0x3e, 0x3e, 0x33, 0xfa, + 0x74, 0x2b, 0xfb, 0xf8, 0xec, 0xff, 0x54, 0xba, 0x2d, 0x98, 0x8d, 0x20, 0x23, 0xc8, 0x17, 0xa5, + 0x6f, 0x8f, 0xab, 0xe0, 0x3f, 0x30, 0x17, 0xb5, 0x1b, 0x43, 0xc5, 0x68, 0xcc, 0xfd, 0x1b, 0x21, + 0x7f, 0x81, 0x9f, 0xee, 0x20, 0x2c, 0x15, 0xb5, 0x76, 0x08, 0x72, 0x93, 0xb9, 0xbb, 0xa6, 0x6f, + 0x63, 0x2f, 0x0b, 0xdf, 0x2b, 0xd6, 0x00, 0x97, 0xb9, 0x01, 0x2e, 0x6b, 0x3f, 0x83, 0x32, 0x58, + 0x31, 0xeb, 0xf7, 0x21, 0x07, 0x33, 0x4d, 0xe6, 0xee, 0x84, 0x17, 0x7b, 0x24, 0xc0, 0x36, 0x97, + 0x17, 0xa1, 0x68, 0x85, 0x17, 0x59, 0xa7, 0xd8, 0x90, 0x0f, 0xfa, 0xce, 0xb6, 0x31, 0xc4, 0x52, + 0x64, 0x35, 0xfb, 0x6e, 0xf7, 0x73, 0x76, 0xbb, 0x43, 0x8c, 0x7f, 0xeb, 0x7c, 0xf3, 0x83, 0xe7, + 0x6b, 0x11, 0x27, 0xd1, 0xbf, 0xf0, 0xcd, 0xf3, 0xb5, 0x88, 0xf3, 0xa0, 0xf8, 0xc5, 0xfb, 0xc4, + 0xdf, 0x80, 0x1f, 0x62, 0x48, 0x1b, 0xfb, 0xdc, 0x78, 0x1e, 0x06, 0x84, 0x39, 0xc4, 0x16, 0x5b, + 0x50, 0x12, 0x23, 0x2d, 0xdd, 0x84, 0x0f, 0x7a, 0xa2, 0xb5, 0x25, 0x58, 0xec, 0x25, 0x22, 0x65, + 0xbd, 0xd1, 0xcd, 0x43, 0xbe, 0xc9, 0x5c, 0xf9, 0x29, 0x14, 0xc4, 0x6b, 0xb9, 0x32, 0xe4, 0x2b, + 0xa8, 0x68, 0x43, 0x02, 0xb3, 0x47, 0xe2, 0x95, 0x04, 0xdf, 0x0d, 0xdc, 0xfe, 0xfa, 0x18, 0x27, + 0xad, 0xfc, 0x35, 0x46, 0x52, 0x36, 0xc6, 0x4b, 0x09, 0xe6, 0xfb, 0x97, 0x7a, 0x98, 0x1d, 0xea, + 0xcb, 0x51, 0x36, 0x47, 0xcf, 0xc9, 0x66, 0xa0, 0x30, 0x7d, 0xb3, 0xe6, 0xbf, 0x8f, 0xb2, 0xc0, + 0xca, 0x1f, 0xa3, 0xa0, 0xd3, 0x86, 0x3b, 0x8f, 0xdf, 0x5e, 0xab, 0xd2, 0xd5, 0xb5, 0x2a, 0x7d, + 0xba, 0x56, 0xa5, 0xcb, 0xae, 0x3a, 0x71, 0xd5, 0x55, 0x27, 0xde, 0x75, 0xd5, 0x89, 0x27, 0x5b, + 0x2e, 0xe1, 0x27, 0xa1, 0x85, 0x6c, 0xda, 0xd6, 0x44, 0xe5, 0x55, 0x1f, 0xf3, 0x33, 0x1a, 0xb4, + 0x12, 0xcb, 0xc3, 0x8e, 0x8b, 0x03, 0xed, 0xfc, 0xee, 0x7f, 0xbd, 0x55, 0x12, 0x8f, 0xcd, 0xfa, + 0xd7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x72, 0x0f, 0xe7, 0x11, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -975,10 +975,10 @@ func (m *MsgSell) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) + if len(m.Seller) > 0 { + i -= len(m.Seller) + copy(dAtA[i:], m.Seller) + i = encodeVarintTx(dAtA, i, uint64(len(m.Seller))) i-- dAtA[i] = 0xa } @@ -1129,10 +1129,10 @@ func (m *MsgUpdateSellOrders) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x12 } } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) + if len(m.Seller) > 0 { + i -= len(m.Seller) + copy(dAtA[i:], m.Seller) + i = encodeVarintTx(dAtA, i, uint64(len(m.Seller))) i-- dAtA[i] = 0xa } @@ -1435,7 +1435,7 @@ func (m *MsgSell) Size() (n int) { } var l int _ = l - l = len(m.Owner) + l = len(m.Seller) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -1498,7 +1498,7 @@ func (m *MsgUpdateSellOrders) Size() (n int) { } var l int _ = l - l = len(m.Owner) + l = len(m.Seller) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -1664,7 +1664,7 @@ func (m *MsgSell) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Seller", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1692,7 +1692,7 @@ func (m *MsgSell) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Owner = string(dAtA[iNdEx:postIndex]) + m.Seller = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -2112,7 +2112,7 @@ func (m *MsgUpdateSellOrders) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Seller", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2140,7 +2140,7 @@ func (m *MsgUpdateSellOrders) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Owner = string(dAtA[iNdEx:postIndex]) + m.Seller = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { diff --git a/x/ecocredit/server/core/bridge.go b/x/ecocredit/server/core/bridge.go index 3ad8465235..1c56f9dbaa 100644 --- a/x/ecocredit/server/core/bridge.go +++ b/x/ecocredit/server/core/bridge.go @@ -20,7 +20,7 @@ func (k Keeper) Bridge(ctx context.Context, req *core.MsgBridge) (*core.MsgBridg } _, err := k.Cancel(ctx, &core.MsgCancel{ - Holder: req.Holder, + Owner: req.Owner, Credits: creditsToCancel, Reason: fmt.Sprintf("bridge-%s", req.Target), }) diff --git a/x/ecocredit/server/core/bridge_test.go b/x/ecocredit/server/core/bridge_test.go index 9f21f92563..3f0dfc5d0c 100644 --- a/x/ecocredit/server/core/bridge_test.go +++ b/x/ecocredit/server/core/bridge_test.go @@ -19,7 +19,7 @@ func TestBridge_Valid(t *testing.T) { // s.addr balance -> tradable 10.5 , retired 10.5 _, err := s.k.Bridge(s.ctx, &core.MsgBridge{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgBridge_CancelCredits{ { BatchDenom: batchDenom, diff --git a/x/ecocredit/server/core/cancel.go b/x/ecocredit/server/core/cancel.go index e11301e1ab..42d076346c 100644 --- a/x/ecocredit/server/core/cancel.go +++ b/x/ecocredit/server/core/cancel.go @@ -15,10 +15,10 @@ import ( "github.com/regen-network/regen-ledger/x/ecocredit/core" ) -// Cancel credits, removing them from the supply and balance of the holder +// Cancel credits, removing them from the supply and balance of the owner func (k Keeper) Cancel(ctx context.Context, req *core.MsgCancel) (*core.MsgCancelResponse, error) { sdkCtx := types.UnwrapSDKContext(ctx) - holder, err := sdk.AccAddressFromBech32(req.Holder) + owner, err := sdk.AccAddressFromBech32(req.Owner) if err != nil { return nil, err } @@ -32,7 +32,7 @@ func (k Keeper) Cancel(ctx context.Context, req *core.MsgCancel) (*core.MsgCance if err != nil { return nil, err } - userBalance, err := k.stateStore.BatchBalanceTable().Get(ctx, holder, batch.Key) + userBalance, err := k.stateStore.BatchBalanceTable().Get(ctx, owner, batch.Key) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func (k Keeper) Cancel(ctx context.Context, req *core.MsgCancel) (*core.MsgCance if err = k.stateStore.BatchBalanceTable().Update(ctx, &api.BatchBalance{ BatchKey: batch.Key, - Address: holder, + Address: owner, TradableAmount: userBalTradable.String(), RetiredAmount: userBalance.RetiredAmount, }); err != nil { @@ -77,7 +77,7 @@ func (k Keeper) Cancel(ctx context.Context, req *core.MsgCancel) (*core.MsgCance } if err = sdkCtx.EventManager().EmitTypedEvent(&core.EventCancel{ - Owner: holder.String(), + Owner: owner.String(), BatchDenom: credit.BatchDenom, Amount: credit.Amount, Reason: req.Reason, diff --git a/x/ecocredit/server/core/cancel_test.go b/x/ecocredit/server/core/cancel_test.go index 1554855cba..4d67d7b8ac 100644 --- a/x/ecocredit/server/core/cancel_test.go +++ b/x/ecocredit/server/core/cancel_test.go @@ -19,7 +19,7 @@ func TestCancel_Valid(t *testing.T) { // s.addr balance -> tradable 10.5 , retired 10.5 _, err := s.k.Cancel(s.ctx, &core.MsgCancel{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgCancel_CancelCredits{ { BatchDenom: batchDenom, @@ -48,7 +48,7 @@ func TestCancel_InsufficientFunds(t *testing.T) { s.setupClassProjectBatch(t) _, err := s.k.Cancel(s.ctx, &core.MsgCancel{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgCancel_CancelCredits{ { BatchDenom: "C01-001-20200101-20210101-01", @@ -66,7 +66,7 @@ func TestCancel_BadPrecision(t *testing.T) { s.setupClassProjectBatch(t) _, err := s.k.Cancel(s.ctx, &core.MsgCancel{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgCancel_CancelCredits{ { BatchDenom: "C01-001-20200101-20210101-01", @@ -83,7 +83,7 @@ func TestCancel_InvalidBatch(t *testing.T) { s.setupClassProjectBatch(t) _, err := s.k.Cancel(s.ctx, &core.MsgCancel{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgCancel_CancelCredits{ { BatchDenom: "C00-00000000-00000000-01", diff --git a/x/ecocredit/server/core/query_balance.go b/x/ecocredit/server/core/query_balance.go index 01c764d5e2..e4aad9876c 100644 --- a/x/ecocredit/server/core/query_balance.go +++ b/x/ecocredit/server/core/query_balance.go @@ -17,7 +17,7 @@ func (k Keeper) Balance(ctx context.Context, req *core.QueryBalanceRequest) (*co return nil, err } - addr, err := sdk.AccAddressFromBech32(req.Account) + addr, err := sdk.AccAddressFromBech32(req.Address) if err != nil { return nil, err } diff --git a/x/ecocredit/server/core/query_balance_test.go b/x/ecocredit/server/core/query_balance_test.go index 9022f6d5cb..54d4d5783b 100644 --- a/x/ecocredit/server/core/query_balance_test.go +++ b/x/ecocredit/server/core/query_balance_test.go @@ -36,7 +36,7 @@ func TestQuery_Balance(t *testing.T) { // query balance for s.addr res, err := s.k.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: s.addr.String(), + Address: s.addr.String(), BatchDenom: batchDenom, }) assert.NilError(t, err) @@ -49,7 +49,7 @@ func TestQuery_Balance(t *testing.T) { // query balance for address with no balance res, err = s.k.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: noBalance.String(), + Address: noBalance.String(), BatchDenom: batchDenom, }) assert.NilError(t, err) @@ -60,7 +60,7 @@ func TestQuery_Balance(t *testing.T) { // query balance with unknown batch denom _, err = s.k.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: s.addr.String(), + Address: s.addr.String(), BatchDenom: "A00-00000000-00000000-001", }) assert.ErrorContains(t, err, ormerrors.NotFound.Error()) diff --git a/x/ecocredit/server/core/query_balances.go b/x/ecocredit/server/core/query_balances.go index 281a064a05..14f9103293 100644 --- a/x/ecocredit/server/core/query_balances.go +++ b/x/ecocredit/server/core/query_balances.go @@ -12,7 +12,7 @@ import ( ) func (k Keeper) Balances(ctx context.Context, req *core.QueryBalancesRequest) (*core.QueryBalancesResponse, error) { - addr, err := sdk.AccAddressFromBech32(req.Account) + addr, err := sdk.AccAddressFromBech32(req.Address) if err != nil { return nil, err } diff --git a/x/ecocredit/server/core/query_balances_test.go b/x/ecocredit/server/core/query_balances_test.go index 51beb1f613..d98962236f 100644 --- a/x/ecocredit/server/core/query_balances_test.go +++ b/x/ecocredit/server/core/query_balances_test.go @@ -31,7 +31,7 @@ func TestQuery_Balances(t *testing.T) { // query balances for s.addr res, err := s.k.Balances(s.ctx, &core.QueryBalancesRequest{ - Account: s.addr.String(), + Address: s.addr.String(), Pagination: &query.PageRequest{Limit: 1, CountTotal: true}, }) assert.NilError(t, err) @@ -43,7 +43,7 @@ func TestQuery_Balances(t *testing.T) { // query balances for address with no balance res, err = s.k.Balances(s.ctx, &core.QueryBalancesRequest{ - Account: noBalAddr.String(), + Address: noBalAddr.String(), }) assert.NilError(t, err) assert.Equal(t, 0, len(res.Balances)) diff --git a/x/ecocredit/server/core/retire.go b/x/ecocredit/server/core/retire.go index 5ae93e27b8..7681b5fe1f 100644 --- a/x/ecocredit/server/core/retire.go +++ b/x/ecocredit/server/core/retire.go @@ -18,7 +18,7 @@ import ( // WARNING: retiring credits is permanent. Retired credits cannot be un-retired. func (k Keeper) Retire(ctx context.Context, req *core.MsgRetire) (*core.MsgRetireResponse, error) { sdkCtx := types.UnwrapSDKContext(ctx) - holder, _ := sdk.AccAddressFromBech32(req.Holder) + owner, _ := sdk.AccAddressFromBech32(req.Owner) for _, credit := range req.Credits { batch, err := k.stateStore.BatchTable().GetByDenom(ctx, credit.BatchDenom) @@ -29,7 +29,7 @@ func (k Keeper) Retire(ctx context.Context, req *core.MsgRetire) (*core.MsgRetir if err != nil { return nil, err } - userBalance, err := k.stateStore.BatchBalanceTable().Get(ctx, holder, batch.Key) + userBalance, err := k.stateStore.BatchBalanceTable().Get(ctx, owner, batch.Key) if err != nil { return nil, err } @@ -72,7 +72,7 @@ func (k Keeper) Retire(ctx context.Context, req *core.MsgRetire) (*core.MsgRetir if err = k.stateStore.BatchBalanceTable().Update(ctx, &api.BatchBalance{ BatchKey: batch.Key, - Address: holder, + Address: owner, TradableAmount: userTradableBalance.String(), RetiredAmount: userRetiredBalance.String(), }); err != nil { @@ -87,7 +87,7 @@ func (k Keeper) Retire(ctx context.Context, req *core.MsgRetire) (*core.MsgRetir }) if err = sdkCtx.EventManager().EmitTypedEvent(&core.EventRetire{ - Owner: req.Holder, + Owner: req.Owner, BatchDenom: credit.BatchDenom, Amount: credit.Amount, Jurisdiction: req.Jurisdiction, diff --git a/x/ecocredit/server/core/retire_test.go b/x/ecocredit/server/core/retire_test.go index 5cb8c518b4..49f4554d98 100644 --- a/x/ecocredit/server/core/retire_test.go +++ b/x/ecocredit/server/core/retire_test.go @@ -24,7 +24,7 @@ func TestRetire_Valid(t *testing.T) { // retire 10.0 -> 0.5 leftover in tradable, retired becomes 20.5 _, err := s.k.Retire(s.ctx, &core.MsgRetire{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgRetire_RetireCredits{ {BatchDenom: "C01-001-20200101-20210101-01", Amount: "10.0"}, }, @@ -52,7 +52,7 @@ func TestRetire_Invalid(t *testing.T) { // invalid batch denom _, err := s.k.Retire(s.ctx, &core.MsgRetire{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgRetire_RetireCredits{ {BatchDenom: "A00-00000000-00000000-01", Amount: "10.35"}, }, @@ -62,7 +62,7 @@ func TestRetire_Invalid(t *testing.T) { // out of precision _, err = s.k.Retire(s.ctx, &core.MsgRetire{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgRetire_RetireCredits{ {BatchDenom: batchDenom, Amount: "10.35250982359823095"}, }, @@ -72,7 +72,7 @@ func TestRetire_Invalid(t *testing.T) { // not enough credits _, err = s.k.Retire(s.ctx, &core.MsgRetire{ - Holder: s.addr.String(), + Owner: s.addr.String(), Credits: []*core.MsgRetire_RetireCredits{ {BatchDenom: batchDenom, Amount: "150"}, }, diff --git a/x/ecocredit/server/marketplace/buy_direct_test.go b/x/ecocredit/server/marketplace/buy_direct_test.go index 7b2a0ad3d2..6994bdd9c2 100644 --- a/x/ecocredit/server/marketplace/buy_direct_test.go +++ b/x/ecocredit/server/marketplace/buy_direct_test.go @@ -25,7 +25,7 @@ func TestBuyDirect_ValidTradable(t *testing.T) { sellExp := time.Now() userCoinBalance := sdk.NewInt64Coin(validAskDenom, 30) sellOrderId := s.createSellOrder(&marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &ask, DisableAutoRetire: true, Expiration: &sellExp}, }, @@ -61,7 +61,7 @@ func TestBuyDirect_ValidRetired(t *testing.T) { // make a sell order sellExp := time.Now() sellOrderId := s.createSellOrder(&marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &ask, DisableAutoRetire: false, Expiration: &sellExp}, }, @@ -99,7 +99,7 @@ func TestBuyDirect_OrderFilled(t *testing.T) { // make a sell order sellExp := time.Now() sellOrderId := s.createSellOrder(&marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &ask, DisableAutoRetire: false, Expiration: &sellExp}, }, @@ -140,7 +140,7 @@ func TestBuyDirect_Invalid(t *testing.T) { // make a sell order sellExp := time.Now() sellOrderId := s.createSellOrder(&marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &ask, DisableAutoRetire: false, Expiration: &sellExp}, }, @@ -210,7 +210,7 @@ func TestBuyDirect_Decimal(t *testing.T) { // make a sell order sellExp := time.Now() sellOrderId := s.createSellOrder(&marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: batchDenom, @@ -261,7 +261,7 @@ func TestBuyDirect_MultipleOrders(t *testing.T) { purchaseAmt1 := "12.3531" purchaseAmt2 := "15.39201" sellOrderIds := s.createSellOrder(&marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: batchDenom, diff --git a/x/ecocredit/server/marketplace/msg_sell.go b/x/ecocredit/server/marketplace/msg_sell.go index 61409ff6c2..bffae845e7 100644 --- a/x/ecocredit/server/marketplace/msg_sell.go +++ b/x/ecocredit/server/marketplace/msg_sell.go @@ -21,7 +21,7 @@ import ( func (k Keeper) Sell(ctx context.Context, req *marketplace.MsgSell) (*marketplace.MsgSellResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) - ownerAcc, err := sdk.AccAddressFromBech32(req.Owner) + sellerAcc, err := sdk.AccAddressFromBech32(req.Seller) if err != nil { return nil, err } @@ -60,7 +60,7 @@ func (k Keeper) Sell(ctx context.Context, req *marketplace.MsgSell) (*marketplac return nil, err } - if err = k.escrowCredits(ctx, orderIndex, ownerAcc, batch.Key, sellQty); err != nil { + if err = k.escrowCredits(ctx, orderIndex, sellerAcc, batch.Key, sellQty); err != nil { return nil, err } @@ -80,7 +80,7 @@ func (k Keeper) Sell(ctx context.Context, req *marketplace.MsgSell) (*marketplac } id, err := k.stateStore.SellOrderTable().InsertReturningID(ctx, &marketApi.SellOrder{ - Seller: ownerAcc, + Seller: sellerAcc, BatchKey: batch.Key, Quantity: order.Quantity, MarketId: marketId, diff --git a/x/ecocredit/server/marketplace/msg_sell_test.go b/x/ecocredit/server/marketplace/msg_sell_test.go index e9c353b226..e14c3d1283 100644 --- a/x/ecocredit/server/marketplace/msg_sell_test.go +++ b/x/ecocredit/server/marketplace/msg_sell_test.go @@ -161,7 +161,7 @@ func (s *sellSuite) AliceHasATradableBatchBalanceWithDenomAndAmount(a string, b func (s *sellSuite) AliceAttemptsToCreateASellOrderWithBatchDenom(a string) { s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: a, @@ -174,7 +174,7 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrderWithBatchDenom(a string) { func (s *sellSuite) AliceAttemptsToCreateASellOrderWithBatchDenomAndAskDenom(a string, b string) { s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: a, @@ -190,7 +190,7 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrderWithBatchDenomAndAskDenom(a s func (s *sellSuite) AliceAttemptsToCreateASellOrderWithCreditQuantity(a string) { s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: s.batchDenom, @@ -207,14 +207,14 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrderWithTheProperties(a gocuke.Do require.NoError(s.t, err) s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{order}, }) } func (s *sellSuite) AliceAttemptsToCreateTwoSellOrdersEachWithCreditQuantity(a string) { s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: s.batchDenom, @@ -235,7 +235,7 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrderWithAskPrice(a string) { require.NoError(s.t, err) s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: s.batchDenom, @@ -248,7 +248,7 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrderWithAskPrice(a string) { func (s *sellSuite) AliceAttemptsToCreateASellOrderWithAskDenom(a string) { s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: s.batchDenom, @@ -267,7 +267,7 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrderWithExpiration(a string) { require.NoError(s.t, err) s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: s.batchDenom, @@ -281,7 +281,7 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrderWithExpiration(a string) { func (s *sellSuite) AliceAttemptsToCreateASellOrder() { s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: s.batchDenom, @@ -296,7 +296,7 @@ func (s *sellSuite) AliceAttemptsToCreateASellOrder() { func (s *sellSuite) AliceAttemptsToCreateTwoSellOrders() { s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: s.batchDenom, @@ -322,7 +322,7 @@ func (s *sellSuite) AliceAttemptsToCreateTwoSellOrdersEachWithTheProperties(a go require.NoError(s.t, err) s.res, s.err = s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.alice.String(), + Seller: s.alice.String(), Orders: []*marketplace.MsgSell_Order{order, order}, }) } diff --git a/x/ecocredit/server/marketplace/prune_test.go b/x/ecocredit/server/marketplace/prune_test.go index a35c46a5b4..2180bdda1a 100644 --- a/x/ecocredit/server/marketplace/prune_test.go +++ b/x/ecocredit/server/marketplace/prune_test.go @@ -26,7 +26,7 @@ func TestSell_Prune(t *testing.T) { assert.NilError(t, err) res, err := s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "10", AskPrice: &ask, Expiration: &expired}, {BatchDenom: batchDenom, Quantity: "10", AskPrice: &ask, Expiration: ¬Expired}, @@ -75,7 +75,7 @@ func TestPrune_NilExpiration(t *testing.T) { assert.NilError(t, err) msg := &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "5", AskPrice: &ask, Expiration: nil}, {BatchDenom: batchDenom, Quantity: "10", AskPrice: &ask, Expiration: &expired}, diff --git a/x/ecocredit/server/marketplace/query_sell_orders.go b/x/ecocredit/server/marketplace/query_sell_orders.go index 40bb307d70..3d71637fe3 100644 --- a/x/ecocredit/server/marketplace/query_sell_orders.go +++ b/x/ecocredit/server/marketplace/query_sell_orders.go @@ -121,14 +121,14 @@ func (k Keeper) SellOrdersByBatchDenom(ctx context.Context, req *marketplace.Que return &marketplace.QuerySellOrdersByBatchDenomResponse{SellOrders: orders, Pagination: pr}, nil } -// SellOrdersByAddress queries all sell orders created by the given address with optional pagination -func (k Keeper) SellOrdersByAddress(ctx context.Context, req *marketplace.QuerySellOrdersByAddressRequest) (*marketplace.QuerySellOrdersByAddressResponse, error) { +// SellOrdersBySeller queries all sell orders created by the given address with optional pagination +func (k Keeper) SellOrdersBySeller(ctx context.Context, req *marketplace.QuerySellOrdersBySellerRequest) (*marketplace.QuerySellOrdersBySellerResponse, error) { pg, err := ormutil.GogoPageReqToPulsarPageReq(req.Pagination) if err != nil { return nil, err } - seller, err := sdk.AccAddressFromBech32(req.Address) + seller, err := sdk.AccAddressFromBech32(req.Seller) if err != nil { return nil, err } @@ -176,5 +176,5 @@ func (k Keeper) SellOrdersByAddress(ctx context.Context, req *marketplace.QueryS return nil, err } - return &marketplace.QuerySellOrdersByAddressResponse{SellOrders: orders, Pagination: pr}, nil + return &marketplace.QuerySellOrdersBySellerResponse{SellOrders: orders, Pagination: pr}, nil } diff --git a/x/ecocredit/server/marketplace/query_sell_orders_test.go b/x/ecocredit/server/marketplace/query_sell_orders_test.go index 00a28c8b98..fd29653de6 100644 --- a/x/ecocredit/server/marketplace/query_sell_orders_test.go +++ b/x/ecocredit/server/marketplace/query_sell_orders_test.go @@ -96,7 +96,7 @@ func TestSellOrdersByDenom(t *testing.T) { assert.ErrorContains(t, err, ormerrors.NotFound.Error()) } -func TestSellOrdersByAddress(t *testing.T) { +func TestSellOrdersBySeller(t *testing.T) { t.Parallel() s := setupBase(t) s.testSellSetup(batchDenom, ask.Denom, ask.Denom[1:], classId, start, end, creditType) @@ -107,8 +107,8 @@ func TestSellOrdersByAddress(t *testing.T) { order1 := insertSellOrder(t, s, s.addr, 1) order2 := insertSellOrder(t, s, otherAddr, 1) - res, err := s.k.SellOrdersByAddress(s.ctx, &marketplace.QuerySellOrdersByAddressRequest{ - Address: s.addr.String(), + res, err := s.k.SellOrdersBySeller(s.ctx, &marketplace.QuerySellOrdersBySellerRequest{ + Seller: s.addr.String(), Pagination: &query.PageRequest{CountTotal: true}, }) assert.NilError(t, err) @@ -116,8 +116,8 @@ func TestSellOrdersByAddress(t *testing.T) { assertOrderEqual(t, s.ctx, s.k, res.SellOrders[0], order1) assert.Equal(t, uint64(1), res.Pagination.Total) - res, err = s.k.SellOrdersByAddress(s.ctx, &marketplace.QuerySellOrdersByAddressRequest{ - Address: otherAddr.String(), + res, err = s.k.SellOrdersBySeller(s.ctx, &marketplace.QuerySellOrdersBySellerRequest{ + Seller: otherAddr.String(), Pagination: &query.PageRequest{CountTotal: true}, }) assert.NilError(t, err) @@ -126,8 +126,8 @@ func TestSellOrdersByAddress(t *testing.T) { assert.Equal(t, uint64(1), res.Pagination.Total) // addr with no sell orders should just return empty slice - res, err = s.k.SellOrdersByAddress(s.ctx, &marketplace.QuerySellOrdersByAddressRequest{ - Address: noOrdersAddr.String(), + res, err = s.k.SellOrdersBySeller(s.ctx, &marketplace.QuerySellOrdersBySellerRequest{ + Seller: noOrdersAddr.String(), Pagination: &query.PageRequest{CountTotal: true}, }) assert.NilError(t, err) @@ -135,8 +135,8 @@ func TestSellOrdersByAddress(t *testing.T) { assert.Equal(t, uint64(0), res.Pagination.Total) // bad address should fail - res, err = s.k.SellOrdersByAddress(s.ctx, &marketplace.QuerySellOrdersByAddressRequest{ - Address: "foobar1vlk23jrkl", + res, err = s.k.SellOrdersBySeller(s.ctx, &marketplace.QuerySellOrdersBySellerRequest{ + Seller: "foobar1vlk23jrkl", Pagination: nil, }) assert.ErrorContains(t, err, "decoding bech32 failed") diff --git a/x/ecocredit/server/marketplace/update_sell_orders.go b/x/ecocredit/server/marketplace/update_sell_orders.go index 3e2b6abd79..0f1e35bb3f 100644 --- a/x/ecocredit/server/marketplace/update_sell_orders.go +++ b/x/ecocredit/server/marketplace/update_sell_orders.go @@ -21,7 +21,7 @@ import ( // is true, and you do not want to change that, you MUST provide a value of true in the update. // Otherwise, the sell order will be changed to false. func (k Keeper) UpdateSellOrders(ctx context.Context, req *marketplace.MsgUpdateSellOrders) (*marketplace.MsgUpdateSellOrdersResponse, error) { - seller, err := sdk.AccAddressFromBech32(req.Owner) + seller, err := sdk.AccAddressFromBech32(req.Seller) if err != nil { return nil, err } @@ -37,7 +37,7 @@ func (k Keeper) UpdateSellOrders(ctx context.Context, req *marketplace.MsgUpdate } sellOrderAddr := sdk.AccAddress(sellOrder.Seller) if !seller.Equals(sellOrderAddr) { - return nil, sdkerrors.ErrUnauthorized.Wrapf("unable to update sell order: got: %s, want: %s", req.Owner, sellOrderAddr.String()) + return nil, sdkerrors.ErrUnauthorized.Wrapf("unable to update sell order: got: %s, want: %s", req.Seller, sellOrderAddr.String()) } if err = k.applySellOrderUpdates(ctx, orderIndex, sellOrder, update); err != nil { return nil, err diff --git a/x/ecocredit/server/marketplace/update_sell_orders_test.go b/x/ecocredit/server/marketplace/update_sell_orders_test.go index 4418014cef..6d59ad5289 100644 --- a/x/ecocredit/server/marketplace/update_sell_orders_test.go +++ b/x/ecocredit/server/marketplace/update_sell_orders_test.go @@ -24,7 +24,7 @@ func TestUpdateSellOrders_QuantityAndAutoRetire(t *testing.T) { expiration := time.Now() _, err := s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "5.22", AskPrice: &ask, DisableAutoRetire: false, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "30", AskPrice: &ask, DisableAutoRetire: true, Expiration: &expiration}, @@ -35,7 +35,7 @@ func TestUpdateSellOrders_QuantityAndAutoRetire(t *testing.T) { balBefore, _ := s.getBalanceAndSupply(1, s.addr) _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewQuantity: "10", DisableAutoRetire: true}, {SellOrderId: 2, NewQuantity: "28.7232", DisableAutoRetire: false}, @@ -72,7 +72,7 @@ func TestUpdateSellOrders_QuantityInvalid(t *testing.T) { expiration := time.Now() _, err := s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "5.22", AskPrice: &ask, DisableAutoRetire: false, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "30", AskPrice: &ask, DisableAutoRetire: true, Expiration: &expiration}, @@ -82,7 +82,7 @@ func TestUpdateSellOrders_QuantityInvalid(t *testing.T) { // cannot update sell order that does not exist _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 25, NewQuantity: "3"}, }, @@ -91,7 +91,7 @@ func TestUpdateSellOrders_QuantityInvalid(t *testing.T) { // cannot increase sell order with more credits than in balance _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewQuantity: "1000000000"}, }, @@ -100,7 +100,7 @@ func TestUpdateSellOrders_QuantityInvalid(t *testing.T) { // cannot increase sell order with higher precision than credit type _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewQuantity: "10.329083409234908234"}, }, @@ -115,7 +115,7 @@ func TestUpdateSellOrders_Unauthorized(t *testing.T) { _, _, unauthorized := testdata.KeyTestPubAddr() expiration := time.Now() _, err := s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "5.22", AskPrice: &ask, DisableAutoRetire: false, Expiration: &expiration}, {BatchDenom: batchDenom, Quantity: "30", AskPrice: &ask, DisableAutoRetire: true, Expiration: &expiration}, @@ -125,7 +125,7 @@ func TestUpdateSellOrders_Unauthorized(t *testing.T) { // cannot edit the sell order with this address _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: unauthorized.String(), + Seller: unauthorized.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewQuantity: "1"}, }, @@ -140,7 +140,7 @@ func TestUpdateSellOrder_AskPrice(t *testing.T) { expiration := time.Now() _, err := s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "5.22", AskPrice: &ask, DisableAutoRetire: false, Expiration: &expiration}, }, @@ -151,7 +151,7 @@ func TestUpdateSellOrder_AskPrice(t *testing.T) { // can update price of same denom askUpdate := sdk.NewInt64Coin(ask.Denom, 25) _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewAskPrice: &askUpdate}, }, @@ -172,7 +172,7 @@ func TestUpdateSellOrder_AskPrice(t *testing.T) { DisplayDenom: askUpdate.Denom, })) _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewAskPrice: &askUpdate}, }, @@ -197,7 +197,7 @@ func TestUpdateSellOrder_Expiration(t *testing.T) { // create a sell order - expiration does not matter at this point, as the block time has not been set yet. _, err := s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "5.22", AskPrice: &ask, DisableAutoRetire: false, Expiration: &past}, }, @@ -209,7 +209,7 @@ func TestUpdateSellOrder_Expiration(t *testing.T) { // should work with future time _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewExpiration: &future}, }, @@ -218,7 +218,7 @@ func TestUpdateSellOrder_Expiration(t *testing.T) { // should work with the same time as blockTime _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewExpiration: &middle}, }, @@ -227,7 +227,7 @@ func TestUpdateSellOrder_Expiration(t *testing.T) { // should not work with past time _, err = s.k.UpdateSellOrders(s.ctx, &marketplace.MsgUpdateSellOrders{ - Owner: s.addr.String(), + Seller: s.addr.String(), Updates: []*marketplace.MsgUpdateSellOrders_Update{ {SellOrderId: 1, NewExpiration: &past}, }, @@ -242,7 +242,7 @@ func TestSellOrder_InvalidDenom(t *testing.T) { invalidAsk := sdk.NewInt64Coin("ubar", 10) expiration := time.Now() _, err := s.k.Sell(s.ctx, &marketplace.MsgSell{ - Owner: s.addr.String(), + Seller: s.addr.String(), Orders: []*marketplace.MsgSell_Order{ {BatchDenom: batchDenom, Quantity: "5.22", AskPrice: &invalidAsk, DisableAutoRetire: false, Expiration: &expiration}, }, diff --git a/x/ecocredit/server/testsuite/suite.go b/x/ecocredit/server/testsuite/suite.go index fc7a0b8cba..29eebc1189 100644 --- a/x/ecocredit/server/testsuite/suite.go +++ b/x/ecocredit/server/testsuite/suite.go @@ -242,7 +242,7 @@ func (s *IntegrationTestSuite) TestBasketScenario() { // make sure user doesn't have any of that credit - should error out userCreditBalance, err := s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: user.String(), + Address: user.String(), BatchDenom: batchDenom, }) require.NoError(err) @@ -339,7 +339,7 @@ func (s *IntegrationTestSuite) TestBasketScenario() { // check retired balance, should be equal to the amount we put in cbRes, err := s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: user.String(), + Address: user.String(), BatchDenom: batchDenom, }) require.NoError(err) @@ -485,7 +485,7 @@ func (s *IntegrationTestSuite) TestScenario() { // query balances queryBalanceRes, err := s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr1, + Address: addr1, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -494,7 +494,7 @@ func (s *IntegrationTestSuite) TestScenario() { s.Require().Equal(r0, queryBalanceRes.Balance.RetiredAmount) queryBalanceRes, err = s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr2, + Address: addr2, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -503,7 +503,7 @@ func (s *IntegrationTestSuite) TestScenario() { s.Require().Equal(r1, queryBalanceRes.Balance.RetiredAmount) queryBalanceRes, err = s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr4, + Address: addr4, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -513,7 +513,7 @@ func (s *IntegrationTestSuite) TestScenario() { // if we didn't issue tradable or retired balances, they'll be default to zero. queryBalanceRes, err = s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr5, + Address: addr5, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -531,7 +531,7 @@ func (s *IntegrationTestSuite) TestScenario() { // cancel credits cancelCases := []struct { name string - holder string + owner string toCancel string expectErr bool expTradable string @@ -543,28 +543,28 @@ func (s *IntegrationTestSuite) TestScenario() { }{ { name: "can't cancel more credits than are tradable", - holder: addr4, + owner: addr4, toCancel: "101", expectErr: true, expErrMessage: "insufficient funds", }, { name: "can't cancel with a higher precision than the credit type", - holder: addr4, + owner: addr4, toCancel: "0.1234567", expectErr: true, expErrMessage: "exceeds maximum decimal places", }, { name: "can't cancel no credits", - holder: addr4, + owner: addr4, toCancel: "0", expectErr: true, expErrMessage: "expected a positive decimal", }, { name: "can cancel a small amount of credits", - holder: addr4, + owner: addr4, toCancel: "2.0002", expectErr: false, expTradable: "97.9998", @@ -575,7 +575,7 @@ func (s *IntegrationTestSuite) TestScenario() { }, { name: "can cancel all remaining credits", - holder: addr4, + owner: addr4, toCancel: "97.9998", expectErr: false, expTradable: "0", @@ -586,14 +586,14 @@ func (s *IntegrationTestSuite) TestScenario() { }, { name: "can't cancel anymore credits", - holder: addr4, + owner: addr4, toCancel: "1", expectErr: true, expErrMessage: "insufficient funds", }, { name: "can cancel from account with positive retired balance", - holder: addr1, + owner: addr1, toCancel: "1", expectErr: false, expTradable: "9.37", @@ -607,7 +607,7 @@ func (s *IntegrationTestSuite) TestScenario() { for _, tc := range cancelCases { s.Run(tc.name, func() { _, err := s.msgClient.Cancel(s.ctx, &core.MsgCancel{ - Holder: tc.holder, + Owner: tc.owner, Credits: []*core.MsgCancel_CancelCredits{ { BatchDenom: batchDenom, @@ -625,7 +625,7 @@ func (s *IntegrationTestSuite) TestScenario() { // query balance queryBalanceRes, err = s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: tc.holder, + Address: tc.owner, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -746,7 +746,7 @@ func (s *IntegrationTestSuite) TestScenario() { tc := tc s.Run(tc.name, func() { _, err := s.msgClient.Retire(s.ctx, &core.MsgRetire{ - Holder: addr1, + Owner: addr1, Credits: []*core.MsgRetire_RetireCredits{ { BatchDenom: batchDenom, @@ -764,7 +764,7 @@ func (s *IntegrationTestSuite) TestScenario() { // query balance queryBalanceRes, err = s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr1, + Address: addr1, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -917,7 +917,7 @@ func (s *IntegrationTestSuite) TestScenario() { // query sender balance queryBalanceRes, err = s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr2, + Address: addr2, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -927,7 +927,7 @@ func (s *IntegrationTestSuite) TestScenario() { // query recipient balance queryBalanceRes, err = s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr3, + Address: addr3, BatchDenom: batchDenom, }) s.Require().NoError(err) @@ -1030,7 +1030,7 @@ func (s *IntegrationTestSuite) TestScenario() { order2QtyDec, err := math.NewDecFromString(order2Qty) s.Require().NoError(err) createSellOrder, err := s.marketServer.Sell(s.ctx, &marketplace.MsgSell{ - Owner: sellerAcc.String(), + Seller: sellerAcc.String(), Orders: []*marketplace.MsgSell_Order{ { BatchDenom: batchDenom, @@ -1179,7 +1179,7 @@ func (s *IntegrationTestSuite) getAccountInfo(addr sdk.AccAddress, batchDenom, b func (s *IntegrationTestSuite) getUserBatchBalance(addr sdk.AccAddress, denom string) *core.BatchBalanceInfo { bal, err := s.queryClient.Balance(s.ctx, &core.QueryBalanceRequest{ - Account: addr.String(), + Address: addr.String(), BatchDenom: denom, }) s.Require().NoError(err) diff --git a/x/ecocredit/simulation/basket/operations.go b/x/ecocredit/simulation/basket/operations.go index ee5c4f27de..9c9b73c0b2 100644 --- a/x/ecocredit/simulation/basket/operations.go +++ b/x/ecocredit/simulation/basket/operations.go @@ -288,7 +288,7 @@ func SimulateMsgPut(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, count := 0 for _, batch := range batches { balanceRes, err := qryClient.Balance(ctx, &core.QueryBalanceRequest{ - Account: ownerAddr, BatchDenom: batch.Denom, + Address: ownerAddr, BatchDenom: batch.Denom, }) if err != nil { return simtypes.NoOpMsg(ecocredit.ModuleName, TypeMsgPut, err.Error()), nil, err diff --git a/x/ecocredit/simulation/marketplace/operations.go b/x/ecocredit/simulation/marketplace/operations.go index 11621f14d7..009e34bcba 100644 --- a/x/ecocredit/simulation/marketplace/operations.go +++ b/x/ecocredit/simulation/marketplace/operations.go @@ -177,8 +177,8 @@ func SimulateMsgSell(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, return func( r *rand.Rand, baseApp *baseapp.BaseApp, sdkCtx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - owner, _ := simtypes.RandomAcc(r, accs) - ownerAddr := owner.Address.String() + seller, _ := simtypes.RandomAcc(r, accs) + sellerAddr := seller.Address.String() ctx := sdk.WrapSDKContext(sdkCtx) class, op, err := utils.GetRandomClass(sdkCtx, r, qryClient, TypeMsgSell) @@ -186,7 +186,7 @@ func SimulateMsgSell(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, return op, nil, err } - batchRes, err := qryClient.BatchesByIssuer(ctx, &core.QueryBatchesByIssuerRequest{Issuer: owner.Address.String()}) + batchRes, err := qryClient.BatchesByIssuer(ctx, &core.QueryBatchesByIssuerRequest{Issuer: seller.Address.String()}) if err != nil { return simtypes.NoOpMsg(ecocredit.ModuleName, TypeMsgSell, err.Error()), nil, err } @@ -202,7 +202,7 @@ func SimulateMsgSell(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, sellOrders := make([]*marketplace.MsgSell_Order, max) for i := 0; i < max; i++ { - bal, err := qryClient.Balance(ctx, &core.QueryBalanceRequest{Account: ownerAddr, BatchDenom: batches[i].Denom}) + bal, err := qryClient.Balance(ctx, &core.QueryBalanceRequest{Address: sellerAddr, BatchDenom: batches[i].Denom}) if err != nil { return simtypes.NoOpMsg(ecocredit.ModuleName, TypeMsgSell, err.Error()), nil, err } @@ -238,11 +238,11 @@ func SimulateMsgSell(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, } msg := &marketplace.MsgSell{ - Owner: owner.Address.String(), + Seller: seller.Address.String(), Orders: sellOrders, } - spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, ownerAddr, TypeMsgSell) + spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, sellerAddr, TypeMsgSell) if spendable == nil { return op, nil, err } @@ -272,11 +272,11 @@ func SimulateMsgUpdateSellOrder(ak ecocredit.AccountKeeper, bk ecocredit.BankKee return func( r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - owner, _ := simtypes.RandomAcc(r, accs) - ownerAddr := owner.Address.String() + seller, _ := simtypes.RandomAcc(r, accs) + sellerAddr := seller.Address.String() ctx := sdk.WrapSDKContext(sdkCtx) - result, err := mktQryClient.SellOrdersByAddress(ctx, &marketplace.QuerySellOrdersByAddressRequest{Address: ownerAddr}) + result, err := mktQryClient.SellOrdersBySeller(ctx, &marketplace.QuerySellOrdersBySellerRequest{Seller: sellerAddr}) if err != nil { return simtypes.NoOpMsg(ecocredit.ModuleName, TypeMsgUpdateSellOrder, err.Error()), nil, err } @@ -321,11 +321,11 @@ func SimulateMsgUpdateSellOrder(ak ecocredit.AccountKeeper, bk ecocredit.BankKee } msg := &marketplace.MsgUpdateSellOrders{ - Owner: ownerAddr, + Seller: sellerAddr, Updates: updatedOrders, } - spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, ownerAddr, TypeMsgUpdateSellOrder) + spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, sellerAddr, TypeMsgUpdateSellOrder) if spendable == nil { return op, nil, err } @@ -355,11 +355,11 @@ func SimulateMsgCancelSellOrder(ak ecocredit.AccountKeeper, bk ecocredit.BankKee return func( r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accs []simtypes.Account, chainID string, ) (simtypes.OperationMsg, []simtypes.FutureOperation, error) { - owner, _ := simtypes.RandomAcc(r, accs) - ownerAddr := owner.Address.String() + seller, _ := simtypes.RandomAcc(r, accs) + sellerAddr := seller.Address.String() ctx := sdk.WrapSDKContext(sdkCtx) - result, err := mktQryClient.SellOrdersByAddress(ctx, &marketplace.QuerySellOrdersByAddressRequest{Address: ownerAddr}) + result, err := mktQryClient.SellOrdersBySeller(ctx, &marketplace.QuerySellOrdersBySellerRequest{Seller: sellerAddr}) if err != nil { return simtypes.NoOpMsg(ecocredit.ModuleName, TypeMsgCancelSellOrder, err.Error()), nil, err } @@ -372,11 +372,11 @@ func SimulateMsgCancelSellOrder(ak ecocredit.AccountKeeper, bk ecocredit.BankKee // select random order order := orders[r.Intn(len(orders))] msg := &marketplace.MsgCancelSellOrder{ - Seller: ownerAddr, + Seller: sellerAddr, SellOrderId: order.Id, } - spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, ownerAddr, TypeMsgCancelSellOrder) + spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, sellerAddr, TypeMsgCancelSellOrder) if spendable == nil { return op, nil, err } diff --git a/x/ecocredit/simulation/operations.go b/x/ecocredit/simulation/operations.go index 1518a12164..1576ad3c92 100644 --- a/x/ecocredit/simulation/operations.go +++ b/x/ecocredit/simulation/operations.go @@ -553,7 +553,7 @@ func SimulateMsgSend(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, admin := sdk.AccAddress(project.Admin).String() balres, err := qryClient.Balance(ctx, &core.QueryBalanceRequest{ - Account: admin, + Address: admin, BatchDenom: batch.Denom, }) if err != nil { @@ -668,7 +668,7 @@ func SimulateMsgRetire(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, admin := sdk.AccAddress(project.Admin).String() balanceRes, err := qryClient.Balance(ctx, &core.QueryBalanceRequest{ - Account: admin, + Address: admin, BatchDenom: batch.Denom, }) if err != nil { @@ -699,7 +699,7 @@ func SimulateMsgRetire(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, } msg := &core.MsgRetire{ - Holder: account.Address.String(), + Owner: account.Address.String(), Credits: []*core.MsgRetire_RetireCredits{ { BatchDenom: batch.Denom, @@ -753,7 +753,7 @@ func SimulateMsgCancel(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, admin := sdk.AccAddress(project.Admin).String() balanceRes, err := qryClient.Balance(ctx, &core.QueryBalanceRequest{ - Account: admin, + Address: admin, BatchDenom: batch.Denom, }) if err != nil { @@ -770,7 +770,7 @@ func SimulateMsgCancel(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, } msg := &core.MsgCancel{ - Holder: admin, + Owner: admin, Credits: []*core.MsgCancel_CancelCredits{ { BatchDenom: batch.Denom, @@ -1105,19 +1105,19 @@ func SimulateMsgBridge(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, qryC } issuers := issuersRes.Issuers - holder := issuers[r.Intn(len(issuers))] - holderAddr, err := sdk.AccAddressFromBech32(holder) + owner := issuers[r.Intn(len(issuers))] + ownerAddr, err := sdk.AccAddressFromBech32(owner) if err != nil { return simtypes.NoOpMsg(ecocredit.ModuleName, TypeMsgBridge, err.Error()), nil, err } - _, found := simtypes.FindAccount(accs, holderAddr) + _, found := simtypes.FindAccount(accs, ownerAddr) if !found { return simtypes.NoOpMsg(ecocredit.ModuleName, TypeMsgBridge, "not a simulation account"), nil, nil } balanceRes, err := qryClient.Balance(ctx, &core.QueryBalanceRequest{ - Account: holder, + Address: owner, BatchDenom: batch.Denom, }) if err != nil { @@ -1147,7 +1147,7 @@ func SimulateMsgBridge(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, qryC Target: "polygon", Recipient: "0x323b5d4c32345ced77393b3530b1eed0f346429d", Contract: "0x06012c8cf97bead5deae237070f9587f8e7a266d", - Holder: holder, + Owner: owner, Credits: []*core.MsgBridge_CancelCredits{ { BatchDenom: batch.Denom, @@ -1156,7 +1156,7 @@ func SimulateMsgBridge(ak ecocredit.AccountKeeper, bk ecocredit.BankKeeper, qryC }, } - spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, holder, TypeMsgBridge) + spendable, account, op, err := utils.GetAccountAndSpendableCoins(sdkCtx, bk, accs, owner, TypeMsgBridge) if spendable == nil { return op, nil, err } diff --git a/x/ecocredit/spec/04_queries.md b/x/ecocredit/spec/04_queries.md index b0b7fc8c4d..d026bb46c5 100644 --- a/x/ecocredit/spec/04_queries.md +++ b/x/ecocredit/spec/04_queries.md @@ -40,5 +40,5 @@ For examples on how to query state using gRPC and REST, see the [ecocredit clien - [AllowedDenoms](https://buf.build/regen/regen-ledger/docs/main:regen.ecocredit.marketplace.v1#regen.ecocredit.marketplace.v1.Query.AllowedDenoms) - [SellOrder](https://buf.build/regen/regen-ledger/docs/main:regen.ecocredit.marketplace.v1#regen.ecocredit.marketplace.v1.Query.SellOrder) - [SellOrders](https://buf.build/regen/regen-ledger/docs/main:regen.ecocredit.marketplace.v1#regen.ecocredit.marketplace.v1.Query.SellOrders) -- [SellOrdersByAddress](https://buf.build/regen/regen-ledger/docs/main:regen.ecocredit.marketplace.v1#regen.ecocredit.marketplace.v1.Query.SellOrdersByAddress) +- [SellOrdersBySeller](https://buf.build/regen/regen-ledger/docs/main:regen.ecocredit.marketplace.v1#regen.ecocredit.marketplace.v1.Query.SellOrdersBySeller) - [SellOrdersByBatchDenom](https://buf.build/regen/regen-ledger/docs/main:regen.ecocredit.marketplace.v1#regen.ecocredit.marketplace.v1.Query.SellOrdersByBatchDenom)