From c6055f7accc3711c27c5646b03c1089ec239b447 Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 10:17:12 -0700 Subject: [PATCH 1/9] refactor(x/ecocredit): update core supply and basket field names --- api/regen/ecocredit/basket/v1/query.pulsar.go | 24 +- api/regen/ecocredit/basket/v1/tx.pulsar.go | 225 +++++++++----- api/regen/ecocredit/v1/query.pulsar.go | 118 +++---- proto/regen/ecocredit/basket/v1/query.proto | 34 +- proto/regen/ecocredit/basket/v1/tx.proto | 12 +- proto/regen/ecocredit/v1/query.proto | 8 +- x/ecocredit/basket/query.pb.go | 24 +- x/ecocredit/basket/tx.pb.go | 170 ++++++---- x/ecocredit/client/testsuite/grpc.go | 4 +- x/ecocredit/client/testsuite/query.go | 4 +- x/ecocredit/core/query.pb.go | 291 +++++++++--------- x/ecocredit/server/core/query_supply.go | 4 +- x/ecocredit/server/core/query_supply_test.go | 4 +- x/ecocredit/server/testsuite/suite.go | 56 ++-- 14 files changed, 585 insertions(+), 393 deletions(-) diff --git a/api/regen/ecocredit/basket/v1/query.pulsar.go b/api/regen/ecocredit/basket/v1/query.pulsar.go index e7c76ad653..47cc71a413 100644 --- a/api/regen/ecocredit/basket/v1/query.pulsar.go +++ b/api/regen/ecocredit/basket/v1/query.pulsar.go @@ -5666,14 +5666,18 @@ type QueryBasketResponse struct { unknownFields protoimpl.UnknownFields // basket is the queried basket. - // Deprecated: This field is still populated and will be removed in the - // next version. Use basket_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using Basket + // but will be updated to use BasketInfo in the next version. In the meantime + // basket_info is available using BasketInfo. // // Deprecated: Do not use. Basket *Basket `protobuf:"bytes,1,opt,name=basket,proto3" json:"basket,omitempty"` // classes are the credit classes that can be deposited in the basket. Classes []string `protobuf:"bytes,2,rep,name=classes,proto3" json:"classes,omitempty"` // basket_info is the queried basket. + // + // Since Revision 1 BasketInfo *BasketInfo `protobuf:"bytes,3,opt,name=basket_info,json=basketInfo,proto3" json:"basket_info,omitempty"` } @@ -5763,14 +5767,18 @@ type QueryBasketsResponse struct { unknownFields protoimpl.UnknownFields // baskets are the fetched baskets. - // Deprecated: This field is still populated and will be removed in the - // next version. Use baskets_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using Basket + // but will be updated to use BasketInfo in the next version. In the meantime + // baskets_info is available using BasketInfo. // // Deprecated: Do not use. Baskets []*Basket `protobuf:"bytes,1,rep,name=baskets,proto3" json:"baskets,omitempty"` // pagination defines the pagination in the response. Pagination *v1beta1.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // baskets_info are the fetched baskets. + // + // Since Revision 1 BasketsInfo []*BasketInfo `protobuf:"bytes,3,rep,name=baskets_info,json=basketsInfo,proto3" json:"baskets_info,omitempty"` } @@ -5869,14 +5877,18 @@ type QueryBasketBalancesResponse struct { unknownFields protoimpl.UnknownFields // balances is a list of credit balances in the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. Use balances_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using + // BasketBalance but will be updated to use BasketBalanceInfo in the next + // version. In the meantime baskets_info is available using BasketBalanceInfo. // // Deprecated: Do not use. Balances []*BasketBalance `protobuf:"bytes,1,rep,name=balances,proto3" json:"balances,omitempty"` // pagination defines the pagination in the response. Pagination *v1beta1.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // balances_info is a list of credit balances in the basket. + // + // Since Revision 1 BalancesInfo []*BasketBalanceInfo `protobuf:"bytes,3,rep,name=balances_info,json=balancesInfo,proto3" json:"balances_info,omitempty"` } diff --git a/api/regen/ecocredit/basket/v1/tx.pulsar.go b/api/regen/ecocredit/basket/v1/tx.pulsar.go index 9bfe667c8f..18da32e0a0 100644 --- a/api/regen/ecocredit/basket/v1/tx.pulsar.go +++ b/api/regen/ecocredit/basket/v1/tx.pulsar.go @@ -2536,8 +2536,9 @@ var ( fd_MsgTake_owner protoreflect.FieldDescriptor fd_MsgTake_basket_denom protoreflect.FieldDescriptor fd_MsgTake_amount protoreflect.FieldDescriptor - fd_MsgTake_retirement_jurisdiction protoreflect.FieldDescriptor + fd_MsgTake_retirement_location protoreflect.FieldDescriptor fd_MsgTake_retire_on_take protoreflect.FieldDescriptor + fd_MsgTake_retirement_jurisdiction protoreflect.FieldDescriptor ) func init() { @@ -2546,8 +2547,9 @@ func init() { fd_MsgTake_owner = md_MsgTake.Fields().ByName("owner") fd_MsgTake_basket_denom = md_MsgTake.Fields().ByName("basket_denom") fd_MsgTake_amount = md_MsgTake.Fields().ByName("amount") - fd_MsgTake_retirement_jurisdiction = md_MsgTake.Fields().ByName("retirement_jurisdiction") + fd_MsgTake_retirement_location = md_MsgTake.Fields().ByName("retirement_location") fd_MsgTake_retire_on_take = md_MsgTake.Fields().ByName("retire_on_take") + fd_MsgTake_retirement_jurisdiction = md_MsgTake.Fields().ByName("retirement_jurisdiction") } var _ protoreflect.Message = (*fastReflection_MsgTake)(nil) @@ -2633,9 +2635,9 @@ func (x *fastReflection_MsgTake) Range(f func(protoreflect.FieldDescriptor, prot return } } - if x.RetirementJurisdiction != "" { - value := protoreflect.ValueOfString(x.RetirementJurisdiction) - if !f(fd_MsgTake_retirement_jurisdiction, value) { + if x.RetirementLocation != "" { + value := protoreflect.ValueOfString(x.RetirementLocation) + if !f(fd_MsgTake_retirement_location, value) { return } } @@ -2645,6 +2647,12 @@ func (x *fastReflection_MsgTake) Range(f func(protoreflect.FieldDescriptor, prot return } } + if x.RetirementJurisdiction != "" { + value := protoreflect.ValueOfString(x.RetirementJurisdiction) + if !f(fd_MsgTake_retirement_jurisdiction, value) { + return + } + } } // Has reports whether a field is populated. @@ -2666,10 +2674,12 @@ func (x *fastReflection_MsgTake) Has(fd protoreflect.FieldDescriptor) bool { return x.BasketDenom != "" case "regen.ecocredit.basket.v1.MsgTake.amount": return x.Amount != "" - case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": - return x.RetirementJurisdiction != "" + case "regen.ecocredit.basket.v1.MsgTake.retirement_location": + return x.RetirementLocation != "" case "regen.ecocredit.basket.v1.MsgTake.retire_on_take": return x.RetireOnTake != false + case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": + return x.RetirementJurisdiction != "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.basket.v1.MsgTake")) @@ -2692,10 +2702,12 @@ func (x *fastReflection_MsgTake) Clear(fd protoreflect.FieldDescriptor) { x.BasketDenom = "" case "regen.ecocredit.basket.v1.MsgTake.amount": x.Amount = "" - case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": - x.RetirementJurisdiction = "" + case "regen.ecocredit.basket.v1.MsgTake.retirement_location": + x.RetirementLocation = "" case "regen.ecocredit.basket.v1.MsgTake.retire_on_take": x.RetireOnTake = false + case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": + x.RetirementJurisdiction = "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.basket.v1.MsgTake")) @@ -2721,12 +2733,15 @@ func (x *fastReflection_MsgTake) Get(descriptor protoreflect.FieldDescriptor) pr case "regen.ecocredit.basket.v1.MsgTake.amount": value := x.Amount return protoreflect.ValueOfString(value) - case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": - value := x.RetirementJurisdiction + case "regen.ecocredit.basket.v1.MsgTake.retirement_location": + value := x.RetirementLocation return protoreflect.ValueOfString(value) case "regen.ecocredit.basket.v1.MsgTake.retire_on_take": value := x.RetireOnTake return protoreflect.ValueOfBool(value) + case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": + value := x.RetirementJurisdiction + return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.basket.v1.MsgTake")) @@ -2753,10 +2768,12 @@ func (x *fastReflection_MsgTake) Set(fd protoreflect.FieldDescriptor, value prot x.BasketDenom = value.Interface().(string) case "regen.ecocredit.basket.v1.MsgTake.amount": x.Amount = value.Interface().(string) - case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": - x.RetirementJurisdiction = value.Interface().(string) + case "regen.ecocredit.basket.v1.MsgTake.retirement_location": + x.RetirementLocation = value.Interface().(string) case "regen.ecocredit.basket.v1.MsgTake.retire_on_take": x.RetireOnTake = value.Bool() + case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": + x.RetirementJurisdiction = value.Interface().(string) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.basket.v1.MsgTake")) @@ -2783,10 +2800,12 @@ func (x *fastReflection_MsgTake) Mutable(fd protoreflect.FieldDescriptor) protor panic(fmt.Errorf("field basket_denom of message regen.ecocredit.basket.v1.MsgTake is not mutable")) case "regen.ecocredit.basket.v1.MsgTake.amount": panic(fmt.Errorf("field amount of message regen.ecocredit.basket.v1.MsgTake is not mutable")) - case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": - panic(fmt.Errorf("field retirement_jurisdiction of message regen.ecocredit.basket.v1.MsgTake is not mutable")) + case "regen.ecocredit.basket.v1.MsgTake.retirement_location": + panic(fmt.Errorf("field retirement_location of message regen.ecocredit.basket.v1.MsgTake is not mutable")) case "regen.ecocredit.basket.v1.MsgTake.retire_on_take": panic(fmt.Errorf("field retire_on_take of message regen.ecocredit.basket.v1.MsgTake is not mutable")) + case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": + panic(fmt.Errorf("field retirement_jurisdiction of message regen.ecocredit.basket.v1.MsgTake is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.basket.v1.MsgTake")) @@ -2806,10 +2825,12 @@ func (x *fastReflection_MsgTake) NewField(fd protoreflect.FieldDescriptor) proto return protoreflect.ValueOfString("") case "regen.ecocredit.basket.v1.MsgTake.amount": return protoreflect.ValueOfString("") - case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": + case "regen.ecocredit.basket.v1.MsgTake.retirement_location": return protoreflect.ValueOfString("") case "regen.ecocredit.basket.v1.MsgTake.retire_on_take": return protoreflect.ValueOfBool(false) + case "regen.ecocredit.basket.v1.MsgTake.retirement_jurisdiction": + return protoreflect.ValueOfString("") default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: regen.ecocredit.basket.v1.MsgTake")) @@ -2891,13 +2912,17 @@ func (x *fastReflection_MsgTake) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.RetirementJurisdiction) + l = len(x.RetirementLocation) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } if x.RetireOnTake { n += 2 } + l = len(x.RetirementJurisdiction) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -2927,6 +2952,13 @@ func (x *fastReflection_MsgTake) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.RetirementJurisdiction) > 0 { + i -= len(x.RetirementJurisdiction) + copy(dAtA[i:], x.RetirementJurisdiction) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.RetirementJurisdiction))) + i-- + dAtA[i] = 0x32 + } if x.RetireOnTake { i-- if x.RetireOnTake { @@ -2937,10 +2969,10 @@ func (x *fastReflection_MsgTake) ProtoMethods() *protoiface.Methods { i-- dAtA[i] = 0x28 } - if len(x.RetirementJurisdiction) > 0 { - i -= len(x.RetirementJurisdiction) - copy(dAtA[i:], x.RetirementJurisdiction) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.RetirementJurisdiction))) + if len(x.RetirementLocation) > 0 { + i -= len(x.RetirementLocation) + copy(dAtA[i:], x.RetirementLocation) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.RetirementLocation))) i-- dAtA[i] = 0x22 } @@ -3112,7 +3144,7 @@ func (x *fastReflection_MsgTake) 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 RetirementJurisdiction", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RetirementLocation", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3140,7 +3172,7 @@ func (x *fastReflection_MsgTake) ProtoMethods() *protoiface.Methods { if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.RetirementJurisdiction = string(dAtA[iNdEx:postIndex]) + x.RetirementLocation = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 0 { @@ -3162,6 +3194,38 @@ func (x *fastReflection_MsgTake) ProtoMethods() *protoiface.Methods { } } x.RetireOnTake = bool(v != 0) + case 6: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RetirementJurisdiction", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.RetirementJurisdiction = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -3987,13 +4051,20 @@ type MsgTake struct { BasketDenom string `protobuf:"bytes,2,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // amount is the integer number of basket tokens to convert into credits. Amount string `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount,omitempty"` - // retirement_jurisdiction is the optional retirement jurisdiction for the + // retirement_location is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. - RetirementJurisdiction string `protobuf:"bytes,4,opt,name=retirement_jurisdiction,json=retirementJurisdiction,proto3" json:"retirement_jurisdiction,omitempty"` + // + // Deprecated (Since Revision 1): This field is will be removed in the next + // version in favor of retirement_jurisdiction. If retirement_jurisdiction is + // set, this field will be ignored. + RetirementLocation string `protobuf:"bytes,4,opt,name=retirement_location,json=retirementLocation,proto3" json:"retirement_location,omitempty"` // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as // retired or tradable credits. RetireOnTake bool `protobuf:"varint,5,opt,name=retire_on_take,json=retireOnTake,proto3" json:"retire_on_take,omitempty"` + // retirement_jurisdiction is the optional retirement jurisdiction for the + // credits which will be used only if retire_on_take is true for this basket. + RetirementJurisdiction string `protobuf:"bytes,6,opt,name=retirement_jurisdiction,json=retirementJurisdiction,proto3" json:"retirement_jurisdiction,omitempty"` } func (x *MsgTake) Reset() { @@ -4037,9 +4108,9 @@ func (x *MsgTake) GetAmount() string { return "" } -func (x *MsgTake) GetRetirementJurisdiction() string { +func (x *MsgTake) GetRetirementLocation() string { if x != nil { - return x.RetirementJurisdiction + return x.RetirementLocation } return "" } @@ -4051,6 +4122,13 @@ func (x *MsgTake) GetRetireOnTake() bool { return false } +func (x *MsgTake) GetRetirementJurisdiction() string { + if x != nil { + return x.RetirementJurisdiction + } + return "" +} + // MsgTakeFromBasketResponse is the Msg/TakeFromBasket response type. type MsgTakeResponse struct { state protoimpl.MessageState @@ -4143,58 +4221,61 @@ var file_regen_ecocredit_basket_v1_tx_proto_rawDesc = []byte{ 0x0e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, 0xb9, 0x01, 0x0a, 0x07, 0x4d, 0x73, 0x67, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, 0xea, 0x01, 0x0a, 0x07, 0x4d, 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 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, 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, 0x12, 0x24, - 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x5f, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x6b, 0x65, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x4f, 0x6e, - 0x54, 0x61, 0x6b, 0x65, 0x22, 0x54, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x13, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, + 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x6f, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, + 0x5f, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x6b, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, + 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x4f, 0x6e, 0x54, 0x61, 0x6b, 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, 0x54, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, + 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, + 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x43, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x32, 0x90, 0x02, 0x0a, 0x03, + 0x4d, 0x73, 0x67, 0x12, 0x5c, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x24, 0x2e, + 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, + 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x1a, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, + 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, + 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x53, 0x0a, 0x03, 0x50, 0x75, 0x74, 0x12, 0x21, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, - 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x43, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x32, 0x90, 0x02, 0x0a, 0x03, 0x4d, - 0x73, 0x67, 0x12, 0x5c, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x24, 0x2e, 0x72, - 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, - 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x1a, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, + 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x65, + 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, + 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x04, 0x54, 0x61, 0x6b, 0x65, 0x12, 0x22, + 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, + 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x61, + 0x6b, 0x65, 0x1a, 0x2a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x53, 0x0a, 0x03, 0x50, 0x75, 0x74, 0x12, 0x21, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, - 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, - 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x65, 0x67, - 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, - 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x04, 0x54, 0x61, 0x6b, 0x65, 0x12, 0x22, 0x2e, - 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, - 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x61, 0x6b, - 0x65, 0x1a, 0x2a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, - 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, - 0x67, 0x54, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xfd, 0x01, - 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, - 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x42, - 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4c, 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, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2f, 0x76, 0x31, 0x3b, - 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x45, 0x42, 0xaa, 0x02, - 0x19, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x19, 0x52, 0x65, 0x67, - 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x42, 0x61, 0x73, - 0x6b, 0x65, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x25, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, - 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x5c, - 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, - 0x1c, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x3a, 0x3a, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xfd, + 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, + 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4c, 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, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2f, 0x76, 0x31, + 0x3b, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x45, 0x42, 0xaa, + 0x02, 0x19, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x19, 0x52, 0x65, + 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x42, 0x61, + 0x73, 0x6b, 0x65, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x25, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, + 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, + 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, + 0x02, 0x1c, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, + 0x69, 0x74, 0x3a, 0x3a, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/regen/ecocredit/v1/query.pulsar.go b/api/regen/ecocredit/v1/query.pulsar.go index 8ac300843f..a44eaee82c 100644 --- a/api/regen/ecocredit/v1/query.pulsar.go +++ b/api/regen/ecocredit/v1/query.pulsar.go @@ -16579,16 +16579,16 @@ func (x *fastReflection_QuerySupplyRequest) ProtoMethods() *protoiface.Methods { var ( md_QuerySupplyResponse protoreflect.MessageDescriptor - fd_QuerySupplyResponse_tradable_supply protoreflect.FieldDescriptor - fd_QuerySupplyResponse_retired_supply protoreflect.FieldDescriptor + fd_QuerySupplyResponse_tradable_amount protoreflect.FieldDescriptor + fd_QuerySupplyResponse_retired_amount protoreflect.FieldDescriptor fd_QuerySupplyResponse_cancelled_amount protoreflect.FieldDescriptor ) func init() { file_regen_ecocredit_v1_query_proto_init() md_QuerySupplyResponse = File_regen_ecocredit_v1_query_proto.Messages().ByName("QuerySupplyResponse") - fd_QuerySupplyResponse_tradable_supply = md_QuerySupplyResponse.Fields().ByName("tradable_supply") - fd_QuerySupplyResponse_retired_supply = md_QuerySupplyResponse.Fields().ByName("retired_supply") + fd_QuerySupplyResponse_tradable_amount = md_QuerySupplyResponse.Fields().ByName("tradable_amount") + fd_QuerySupplyResponse_retired_amount = md_QuerySupplyResponse.Fields().ByName("retired_amount") fd_QuerySupplyResponse_cancelled_amount = md_QuerySupplyResponse.Fields().ByName("cancelled_amount") } @@ -16657,15 +16657,15 @@ func (x *fastReflection_QuerySupplyResponse) Interface() protoreflect.ProtoMessa // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_QuerySupplyResponse) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { - if x.TradableSupply != "" { - value := protoreflect.ValueOfString(x.TradableSupply) - if !f(fd_QuerySupplyResponse_tradable_supply, value) { + if x.TradableAmount != "" { + value := protoreflect.ValueOfString(x.TradableAmount) + if !f(fd_QuerySupplyResponse_tradable_amount, value) { return } } - if x.RetiredSupply != "" { - value := protoreflect.ValueOfString(x.RetiredSupply) - if !f(fd_QuerySupplyResponse_retired_supply, value) { + if x.RetiredAmount != "" { + value := protoreflect.ValueOfString(x.RetiredAmount) + if !f(fd_QuerySupplyResponse_retired_amount, value) { return } } @@ -16690,10 +16690,10 @@ func (x *fastReflection_QuerySupplyResponse) Range(f func(protoreflect.FieldDesc // a repeated field is populated if it is non-empty. func (x *fastReflection_QuerySupplyResponse) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { - case "regen.ecocredit.v1.QuerySupplyResponse.tradable_supply": - return x.TradableSupply != "" - case "regen.ecocredit.v1.QuerySupplyResponse.retired_supply": - return x.RetiredSupply != "" + case "regen.ecocredit.v1.QuerySupplyResponse.tradable_amount": + return x.TradableAmount != "" + case "regen.ecocredit.v1.QuerySupplyResponse.retired_amount": + return x.RetiredAmount != "" case "regen.ecocredit.v1.QuerySupplyResponse.cancelled_amount": return x.CancelledAmount != "" default: @@ -16712,10 +16712,10 @@ func (x *fastReflection_QuerySupplyResponse) Has(fd protoreflect.FieldDescriptor // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QuerySupplyResponse) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { - case "regen.ecocredit.v1.QuerySupplyResponse.tradable_supply": - x.TradableSupply = "" - case "regen.ecocredit.v1.QuerySupplyResponse.retired_supply": - x.RetiredSupply = "" + case "regen.ecocredit.v1.QuerySupplyResponse.tradable_amount": + x.TradableAmount = "" + case "regen.ecocredit.v1.QuerySupplyResponse.retired_amount": + x.RetiredAmount = "" case "regen.ecocredit.v1.QuerySupplyResponse.cancelled_amount": x.CancelledAmount = "" default: @@ -16734,11 +16734,11 @@ func (x *fastReflection_QuerySupplyResponse) Clear(fd protoreflect.FieldDescript // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_QuerySupplyResponse) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { - case "regen.ecocredit.v1.QuerySupplyResponse.tradable_supply": - value := x.TradableSupply + case "regen.ecocredit.v1.QuerySupplyResponse.tradable_amount": + value := x.TradableAmount return protoreflect.ValueOfString(value) - case "regen.ecocredit.v1.QuerySupplyResponse.retired_supply": - value := x.RetiredSupply + case "regen.ecocredit.v1.QuerySupplyResponse.retired_amount": + value := x.RetiredAmount return protoreflect.ValueOfString(value) case "regen.ecocredit.v1.QuerySupplyResponse.cancelled_amount": value := x.CancelledAmount @@ -16763,10 +16763,10 @@ func (x *fastReflection_QuerySupplyResponse) Get(descriptor protoreflect.FieldDe // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QuerySupplyResponse) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { - case "regen.ecocredit.v1.QuerySupplyResponse.tradable_supply": - x.TradableSupply = value.Interface().(string) - case "regen.ecocredit.v1.QuerySupplyResponse.retired_supply": - x.RetiredSupply = value.Interface().(string) + case "regen.ecocredit.v1.QuerySupplyResponse.tradable_amount": + x.TradableAmount = value.Interface().(string) + case "regen.ecocredit.v1.QuerySupplyResponse.retired_amount": + x.RetiredAmount = value.Interface().(string) case "regen.ecocredit.v1.QuerySupplyResponse.cancelled_amount": x.CancelledAmount = value.Interface().(string) default: @@ -16789,10 +16789,10 @@ func (x *fastReflection_QuerySupplyResponse) Set(fd protoreflect.FieldDescriptor // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_QuerySupplyResponse) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.v1.QuerySupplyResponse.tradable_supply": - panic(fmt.Errorf("field tradable_supply of message regen.ecocredit.v1.QuerySupplyResponse is not mutable")) - case "regen.ecocredit.v1.QuerySupplyResponse.retired_supply": - panic(fmt.Errorf("field retired_supply of message regen.ecocredit.v1.QuerySupplyResponse is not mutable")) + case "regen.ecocredit.v1.QuerySupplyResponse.tradable_amount": + panic(fmt.Errorf("field tradable_amount of message regen.ecocredit.v1.QuerySupplyResponse is not mutable")) + case "regen.ecocredit.v1.QuerySupplyResponse.retired_amount": + panic(fmt.Errorf("field retired_amount of message regen.ecocredit.v1.QuerySupplyResponse is not mutable")) case "regen.ecocredit.v1.QuerySupplyResponse.cancelled_amount": panic(fmt.Errorf("field cancelled_amount of message regen.ecocredit.v1.QuerySupplyResponse is not mutable")) default: @@ -16808,9 +16808,9 @@ func (x *fastReflection_QuerySupplyResponse) Mutable(fd protoreflect.FieldDescri // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_QuerySupplyResponse) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { - case "regen.ecocredit.v1.QuerySupplyResponse.tradable_supply": + case "regen.ecocredit.v1.QuerySupplyResponse.tradable_amount": return protoreflect.ValueOfString("") - case "regen.ecocredit.v1.QuerySupplyResponse.retired_supply": + case "regen.ecocredit.v1.QuerySupplyResponse.retired_amount": return protoreflect.ValueOfString("") case "regen.ecocredit.v1.QuerySupplyResponse.cancelled_amount": return protoreflect.ValueOfString("") @@ -16883,11 +16883,11 @@ func (x *fastReflection_QuerySupplyResponse) ProtoMethods() *protoiface.Methods var n int var l int _ = l - l = len(x.TradableSupply) + l = len(x.TradableAmount) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.RetiredSupply) + l = len(x.RetiredAmount) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } @@ -16931,17 +16931,17 @@ func (x *fastReflection_QuerySupplyResponse) ProtoMethods() *protoiface.Methods i-- dAtA[i] = 0x1a } - if len(x.RetiredSupply) > 0 { - i -= len(x.RetiredSupply) - copy(dAtA[i:], x.RetiredSupply) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.RetiredSupply))) + if len(x.RetiredAmount) > 0 { + i -= len(x.RetiredAmount) + copy(dAtA[i:], x.RetiredAmount) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.RetiredAmount))) i-- dAtA[i] = 0x12 } - if len(x.TradableSupply) > 0 { - i -= len(x.TradableSupply) - copy(dAtA[i:], x.TradableSupply) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.TradableSupply))) + if len(x.TradableAmount) > 0 { + i -= len(x.TradableAmount) + copy(dAtA[i:], x.TradableAmount) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.TradableAmount))) i-- dAtA[i] = 0xa } @@ -16996,7 +16996,7 @@ func (x *fastReflection_QuerySupplyResponse) 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 TradableSupply", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field TradableAmount", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -17024,11 +17024,11 @@ func (x *fastReflection_QuerySupplyResponse) ProtoMethods() *protoiface.Methods if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.TradableSupply = string(dAtA[iNdEx:postIndex]) + x.TradableAmount = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RetiredSupply", wireType) + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RetiredAmount", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -17056,7 +17056,7 @@ func (x *fastReflection_QuerySupplyResponse) ProtoMethods() *protoiface.Methods if postIndex > l { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF } - x.RetiredSupply = string(dAtA[iNdEx:postIndex]) + x.RetiredAmount = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { @@ -23138,12 +23138,12 @@ type QuerySupplyResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // tradable_supply is the decimal number of tradable credits in the batch + // tradable_amount is the decimal number of tradable credits in the batch // supply. - TradableSupply string `protobuf:"bytes,1,opt,name=tradable_supply,json=tradableSupply,proto3" json:"tradable_supply,omitempty"` - // retired_supply is the decimal number of retired credits in the batch + TradableAmount string `protobuf:"bytes,1,opt,name=tradable_amount,json=tradableAmount,proto3" json:"tradable_amount,omitempty"` + // retired_amount is the decimal number of retired credits in the batch // supply. - RetiredSupply string `protobuf:"bytes,2,opt,name=retired_supply,json=retiredSupply,proto3" json:"retired_supply,omitempty"` + RetiredAmount string `protobuf:"bytes,2,opt,name=retired_amount,json=retiredAmount,proto3" json:"retired_amount,omitempty"` // cancelled_amount is the decimal number of cancelled credits in the batch // supply. CancelledAmount string `protobuf:"bytes,3,opt,name=cancelled_amount,json=cancelledAmount,proto3" json:"cancelled_amount,omitempty"` @@ -23169,16 +23169,16 @@ func (*QuerySupplyResponse) Descriptor() ([]byte, []int) { return file_regen_ecocredit_v1_query_proto_rawDescGZIP(), []int{33} } -func (x *QuerySupplyResponse) GetTradableSupply() string { +func (x *QuerySupplyResponse) GetTradableAmount() string { if x != nil { - return x.TradableSupply + return x.TradableAmount } return "" } -func (x *QuerySupplyResponse) GetRetiredSupply() string { +func (x *QuerySupplyResponse) GetRetiredAmount() string { if x != nil { - return x.RetiredSupply + return x.RetiredAmount } return "" } @@ -23917,11 +23917,11 @@ var file_regen_ecocredit_v1_query_proto_rawDesc = []byte{ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x61, 0x74, 0x63, 0x68, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x22, 0x90, 0x01, 0x0a, 0x13, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x74, 0x72, - 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x72, 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x75, 0x70, - 0x70, 0x6c, 0x79, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x73, - 0x75, 0x70, 0x70, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x74, - 0x69, 0x72, 0x65, 0x64, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x61, + 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x72, 0x61, 0x64, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x61, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x74, + 0x69, 0x72, 0x65, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x6c, 0x65, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x19, 0x0a, 0x17, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x72, diff --git a/proto/regen/ecocredit/basket/v1/query.proto b/proto/regen/ecocredit/basket/v1/query.proto index 7847bb2790..7ba4248ce7 100644 --- a/proto/regen/ecocredit/basket/v1/query.proto +++ b/proto/regen/ecocredit/basket/v1/query.proto @@ -40,46 +40,59 @@ service Query { // QueryBasketRequest is the Query/Basket request type. message QueryBasketRequest { + // basket_denom represents the denom of the basket to query. string basket_denom = 1; } // QueryBasketResponse is the Query/Basket response type. message QueryBasketResponse { + // basket is the queried basket. - // Deprecated: This field is still populated and will be removed in the - // next version. Use basket_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using Basket + // but will be updated to use BasketInfo in the next version. In the meantime + // basket_info is available using BasketInfo. Basket basket = 1 [ deprecated = true ]; // classes are the credit classes that can be deposited in the basket. repeated string classes = 2; // basket_info is the queried basket. + // + // Since Revision 1 BasketInfo basket_info = 3; } // QueryBasketsRequest is the Query/Baskets request type. message QueryBasketsRequest { + // pagination defines an optional pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 1; } // QueryBasketsResponse is the Query/Baskets response type. message QueryBasketsResponse { + // baskets are the fetched baskets. - // Deprecated: This field is still populated and will be removed in the - // next version. Use baskets_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using Basket + // but will be updated to use BasketInfo in the next version. In the meantime + // baskets_info is available using BasketInfo. repeated Basket baskets = 1 [ deprecated = true ]; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; // baskets_info are the fetched baskets. + // + // Since Revision 1 repeated BasketInfo baskets_info = 3; } // QueryBasketBalancesRequest is the Query/BasketBalances request type. message QueryBasketBalancesRequest { + // basket_denom is the denom of the basket. string basket_denom = 1; @@ -89,20 +102,26 @@ message QueryBasketBalancesRequest { // QueryBasketBalancesResponse is the Query/BasketBalances response type. message QueryBasketBalancesResponse { + // balances is a list of credit balances in the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. Use balances_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using + // BasketBalance but will be updated to use BasketBalanceInfo in the next + // version. In the meantime baskets_info is available using BasketBalanceInfo. repeated BasketBalance balances = 1 [ deprecated = true ]; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; // balances_info is a list of credit balances in the basket. + // + // Since Revision 1 repeated BasketBalanceInfo balances_info = 3; } // QueryBasketBalanceRequest is the Query/BasketBalance request type. message QueryBasketBalanceRequest { + // basket_denom is the denom of the basket. string basket_denom = 1; @@ -112,12 +131,14 @@ message QueryBasketBalanceRequest { // QueryBasketBalanceResponse is the Query/BasketBalance response type. message QueryBasketBalanceResponse { + // balance is the amount of the queried credit batch in the basket. string balance = 1; } // BasketInfo is the human-readable basket information. message BasketInfo { + // basket_denom is the basket bank denom. string basket_denom = 1; @@ -147,6 +168,7 @@ message BasketInfo { // BasketBalanceInfo is the human-readable basket balance information. message BasketBalanceInfo { + // batch_denom is the denom of the credit batch string batch_denom = 1; diff --git a/proto/regen/ecocredit/basket/v1/tx.proto b/proto/regen/ecocredit/basket/v1/tx.proto index 085dfc3e53..287156528f 100644 --- a/proto/regen/ecocredit/basket/v1/tx.proto +++ b/proto/regen/ecocredit/basket/v1/tx.proto @@ -124,14 +124,22 @@ message MsgTake { // amount is the integer number of basket tokens to convert into credits. string amount = 3; - // retirement_jurisdiction is the optional retirement jurisdiction for the + // retirement_location is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. - string retirement_jurisdiction = 4; + // + // Deprecated (Since Revision 1): This field is will be removed in the next + // version in favor of retirement_jurisdiction. If retirement_jurisdiction is + // set, this field will be ignored. + string retirement_location = 4; // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as // retired or tradable credits. bool retire_on_take = 5; + + // retirement_jurisdiction is the optional retirement jurisdiction for the + // credits which will be used only if retire_on_take is true for this basket. + string retirement_jurisdiction = 6; } // MsgTakeFromBasketResponse is the Msg/TakeFromBasket response type. diff --git a/proto/regen/ecocredit/v1/query.proto b/proto/regen/ecocredit/v1/query.proto index af8e5b4649..7b3dd88ff0 100644 --- a/proto/regen/ecocredit/v1/query.proto +++ b/proto/regen/ecocredit/v1/query.proto @@ -491,13 +491,13 @@ message QuerySupplyRequest { // QuerySupplyResponse is the Query/Supply response type. message QuerySupplyResponse { - // tradable_supply is the decimal number of tradable credits in the batch + // tradable_amount is the decimal number of tradable credits in the batch // supply. - string tradable_supply = 1; + string tradable_amount = 1; - // retired_supply is the decimal number of retired credits in the batch + // retired_amount is the decimal number of retired credits in the batch // supply. - string retired_supply = 2; + string retired_amount = 2; // cancelled_amount is the decimal number of cancelled credits in the batch // supply. diff --git a/x/ecocredit/basket/query.pb.go b/x/ecocredit/basket/query.pb.go index e011b387c1..8dbd0b1c9c 100644 --- a/x/ecocredit/basket/query.pb.go +++ b/x/ecocredit/basket/query.pb.go @@ -78,12 +78,16 @@ func (m *QueryBasketRequest) GetBasketDenom() string { // QueryBasketResponse is the Query/Basket response type. type QueryBasketResponse struct { // basket is the queried basket. - // Deprecated: This field is still populated and will be removed in the - // next version. Use basket_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using Basket + // but will be updated to use BasketInfo in the next version. In the meantime + // basket_info is available using BasketInfo. Basket *Basket `protobuf:"bytes,1,opt,name=basket,proto3" json:"basket,omitempty"` // Deprecated: Do not use. // classes are the credit classes that can be deposited in the basket. Classes []string `protobuf:"bytes,2,rep,name=classes,proto3" json:"classes,omitempty"` // basket_info is the queried basket. + // + // Since Revision 1 BasketInfo *BasketInfo `protobuf:"bytes,3,opt,name=basket_info,json=basketInfo,proto3" json:"basket_info,omitempty"` } @@ -191,12 +195,16 @@ func (m *QueryBasketsRequest) GetPagination() *query.PageRequest { // QueryBasketsResponse is the Query/Baskets response type. type QueryBasketsResponse struct { // baskets are the fetched baskets. - // Deprecated: This field is still populated and will be removed in the - // next version. Use baskets_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using Basket + // but will be updated to use BasketInfo in the next version. In the meantime + // baskets_info is available using BasketInfo. Baskets []*Basket `protobuf:"bytes,1,rep,name=baskets,proto3" json:"baskets,omitempty"` // Deprecated: Do not use. // pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // baskets_info are the fetched baskets. + // + // Since Revision 1 BasketsInfo []*BasketInfo `protobuf:"bytes,3,rep,name=baskets_info,json=basketsInfo,proto3" json:"baskets_info,omitempty"` } @@ -313,12 +321,16 @@ func (m *QueryBasketBalancesRequest) GetPagination() *query.PageRequest { // QueryBasketBalancesResponse is the Query/BasketBalances response type. type QueryBasketBalancesResponse struct { // balances is a list of credit balances in the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. Use balances_info instead. + // + // Deprecated (Since Revision 1): This field is still populated using + // BasketBalance but will be updated to use BasketBalanceInfo in the next + // version. In the meantime baskets_info is available using BasketBalanceInfo. Balances []*BasketBalance `protobuf:"bytes,1,rep,name=balances,proto3" json:"balances,omitempty"` // Deprecated: Do not use. // pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` // balances_info is a list of credit balances in the basket. + // + // Since Revision 1 BalancesInfo []*BasketBalanceInfo `protobuf:"bytes,3,rep,name=balances_info,json=balancesInfo,proto3" json:"balances_info,omitempty"` } diff --git a/x/ecocredit/basket/tx.pb.go b/x/ecocredit/basket/tx.pb.go index 30c1fd0eb7..ef7a6d4432 100644 --- a/x/ecocredit/basket/tx.pb.go +++ b/x/ecocredit/basket/tx.pb.go @@ -343,13 +343,20 @@ type MsgTake struct { BasketDenom string `protobuf:"bytes,2,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // amount is the integer number of basket tokens to convert into credits. Amount string `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount,omitempty"` - // retirement_jurisdiction is the optional retirement jurisdiction for the + // retirement_location is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. - RetirementJurisdiction string `protobuf:"bytes,4,opt,name=retirement_jurisdiction,json=retirementJurisdiction,proto3" json:"retirement_jurisdiction,omitempty"` + // + // Deprecated (Since Revision 1): This field is will be removed in the next + // version in favor of retirement_jurisdiction. If retirement_jurisdiction is + // set, this field will be ignored. + RetirementLocation string `protobuf:"bytes,4,opt,name=retirement_location,json=retirementLocation,proto3" json:"retirement_location,omitempty"` // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as // retired or tradable credits. RetireOnTake bool `protobuf:"varint,5,opt,name=retire_on_take,json=retireOnTake,proto3" json:"retire_on_take,omitempty"` + // retirement_jurisdiction is the optional retirement jurisdiction for the + // credits which will be used only if retire_on_take is true for this basket. + RetirementJurisdiction string `protobuf:"bytes,6,opt,name=retirement_jurisdiction,json=retirementJurisdiction,proto3" json:"retirement_jurisdiction,omitempty"` } func (m *MsgTake) Reset() { *m = MsgTake{} } @@ -406,9 +413,9 @@ func (m *MsgTake) GetAmount() string { return "" } -func (m *MsgTake) GetRetirementJurisdiction() string { +func (m *MsgTake) GetRetirementLocation() string { if m != nil { - return m.RetirementJurisdiction + return m.RetirementLocation } return "" } @@ -420,6 +427,13 @@ func (m *MsgTake) GetRetireOnTake() bool { return false } +func (m *MsgTake) GetRetirementJurisdiction() string { + if m != nil { + return m.RetirementJurisdiction + } + return "" +} + // MsgTakeFromBasketResponse is the Msg/TakeFromBasket response type. type MsgTakeResponse struct { // credits are the credits taken out of the basket. @@ -480,51 +494,52 @@ func init() { } var fileDescriptor_a60f962a3c61f018 = []byte{ - // 694 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x4e, 0xdb, 0x4e, - 0x10, 0x8e, 0xe3, 0x90, 0x90, 0x0d, 0x84, 0x1f, 0xfb, 0x43, 0xd4, 0xe4, 0x60, 0x82, 0x45, 0x45, - 0x5a, 0x81, 0xdd, 0x50, 0xa9, 0x7f, 0x8e, 0x24, 0x9c, 0xaa, 0x46, 0x45, 0x2e, 0xea, 0xa1, 0x6a, - 0x65, 0x39, 0xf6, 0xd4, 0x75, 0x93, 0x78, 0xa3, 0xdd, 0x75, 0x80, 0x7b, 0x1f, 0x80, 0xe7, 0xe8, - 0xa5, 0xe7, 0xbe, 0x01, 0x47, 0x8e, 0x3d, 0xb5, 0x15, 0xbc, 0x48, 0xe5, 0xdd, 0x8d, 0x1b, 0x09, - 0x35, 0x54, 0x9c, 0xb2, 0xf3, 0xcd, 0x37, 0x5f, 0x66, 0xf6, 0x1b, 0x2f, 0xb2, 0x28, 0x44, 0x90, - 0x38, 0x10, 0x90, 0x80, 0x42, 0x18, 0x73, 0xa7, 0xef, 0xb3, 0x01, 0x70, 0x67, 0xd2, 0x76, 0xf8, - 0xa9, 0x3d, 0xa6, 0x84, 0x13, 0xbc, 0x21, 0x38, 0x76, 0xce, 0xb1, 0x25, 0xc7, 0x9e, 0xb4, 0x1b, - 0x6b, 0x11, 0x89, 0x88, 0x60, 0x39, 0xd9, 0x49, 0x16, 0x34, 0xee, 0xcf, 0x11, 0x3d, 0x1b, 0x03, - 0x53, 0x34, 0x33, 0x20, 0x6c, 0x44, 0x58, 0x96, 0x05, 0x67, 0xd2, 0xee, 0x03, 0xf7, 0xdb, 0x4e, - 0x40, 0xe2, 0x44, 0xe6, 0xad, 0xaf, 0x3a, 0xaa, 0xf6, 0x58, 0xd4, 0xa5, 0xe0, 0x73, 0xc0, 0x06, - 0xaa, 0x04, 0x29, 0xf5, 0x39, 0xa1, 0x86, 0xd6, 0xd4, 0x5a, 0x55, 0x77, 0x1a, 0x62, 0x8c, 0x4a, - 0x89, 0x3f, 0x02, 0xa3, 0x28, 0x60, 0x71, 0xc6, 0x4d, 0x54, 0x0b, 0x81, 0x05, 0x34, 0x1e, 0xf3, - 0x98, 0x24, 0x86, 0x2e, 0x52, 0xb3, 0x10, 0x36, 0xd1, 0x22, 0x9c, 0x8e, 0x49, 0x02, 0x09, 0x37, - 0x4a, 0x4d, 0xad, 0xb5, 0xdc, 0x29, 0x1a, 0x9a, 0x9b, 0x63, 0xd8, 0x46, 0xff, 0x87, 0x31, 0xf3, - 0xfb, 0x43, 0xf0, 0xfc, 0x94, 0x13, 0x8f, 0x02, 0x8f, 0x29, 0x18, 0x0b, 0x4d, 0xad, 0xb5, 0xe8, - 0xae, 0xaa, 0xd4, 0x41, 0xca, 0x89, 0x2b, 0x12, 0x78, 0x17, 0x61, 0x39, 0xad, 0x97, 0xcd, 0xe8, - 0xf9, 0xfd, 0x3e, 0x85, 0x89, 0x51, 0x16, 0x7f, 0xfc, 0x9f, 0xcc, 0x1c, 0x9f, 0x8d, 0xe1, 0x40, - 0xe0, 0x78, 0x07, 0xad, 0xf8, 0xc3, 0x21, 0x39, 0x81, 0xd0, 0x0b, 0x86, 0x3e, 0x63, 0xc0, 0x8c, - 0x4a, 0x53, 0x6f, 0x55, 0xdd, 0xba, 0x82, 0xbb, 0x12, 0xc5, 0x2f, 0xd1, 0x72, 0xe8, 0x73, 0xf0, - 0x02, 0x1a, 0x73, 0xa0, 0xb1, 0x6f, 0x2c, 0x36, 0xb5, 0x56, 0x6d, 0x7f, 0xc7, 0xfe, 0xab, 0x29, - 0xf6, 0xa1, 0xcf, 0xa1, 0xab, 0xe8, 0xee, 0x52, 0x38, 0x13, 0xe1, 0xf7, 0x48, 0xff, 0x00, 0x60, - 0x54, 0x9b, 0x7a, 0xab, 0xb6, 0xbf, 0x61, 0x4b, 0x03, 0xb2, 0x52, 0xb0, 0x95, 0x01, 0x76, 0x97, - 0xc4, 0x49, 0xe7, 0xd1, 0xc5, 0x8f, 0xcd, 0xc2, 0x97, 0x9f, 0x9b, 0xad, 0x28, 0xe6, 0x1f, 0xd3, - 0xbe, 0x1d, 0x90, 0x91, 0xa3, 0xdc, 0x92, 0x3f, 0x7b, 0x2c, 0x1c, 0x28, 0x33, 0xb3, 0x02, 0xe6, - 0x66, 0xba, 0xd6, 0x13, 0xb4, 0x9a, 0x1b, 0xe6, 0x02, 0x1b, 0x93, 0x84, 0x01, 0xde, 0x42, 0x4b, - 0xb2, 0x37, 0x2f, 0x84, 0x84, 0x8c, 0x94, 0x7b, 0x35, 0x89, 0x1d, 0x66, 0x90, 0xf5, 0x59, 0x43, - 0xe5, 0x1e, 0x8b, 0x8e, 0x52, 0x8e, 0xd7, 0xd0, 0x02, 0x39, 0x49, 0x60, 0x6a, 0xb2, 0x0c, 0x6e, - 0x68, 0x14, 0x6f, 0x68, 0xe0, 0x03, 0x54, 0x91, 0x37, 0xc1, 0x0c, 0x5d, 0x8c, 0x37, 0xef, 0x8a, - 0x3a, 0xe2, 0xd4, 0x15, 0xb0, 0x3b, 0xad, 0xb3, 0x9e, 0xa3, 0xba, 0xec, 0x22, 0xef, 0x3d, 0xb3, - 0x69, 0x44, 0xd2, 0x84, 0x7b, 0x14, 0x02, 0x88, 0x27, 0x10, 0xaa, 0xbe, 0xea, 0x12, 0x76, 0x15, - 0x6a, 0x7d, 0xd3, 0x50, 0xa5, 0xc7, 0xa2, 0x63, 0x7f, 0x00, 0x77, 0x1f, 0x61, 0x1d, 0x95, 0xa5, - 0xac, 0xda, 0x57, 0x15, 0xe1, 0xa7, 0xe8, 0x9e, 0xdc, 0xbe, 0x11, 0x24, 0xdc, 0xfb, 0x94, 0xd2, - 0x98, 0x85, 0x71, 0x20, 0x16, 0xbb, 0x24, 0x88, 0xeb, 0x7f, 0xd2, 0x2f, 0x66, 0xb2, 0x78, 0x1b, - 0xd5, 0x65, 0xc6, 0x23, 0x89, 0xc7, 0xfd, 0xc1, 0x74, 0x7d, 0x97, 0x24, 0xfa, 0x2a, 0xc9, 0xfa, - 0xb5, 0x8e, 0xd1, 0x8a, 0x6a, 0x3d, 0x9f, 0x7b, 0xe6, 0x32, 0xb5, 0xbb, 0x5d, 0xe6, 0xfe, 0x79, - 0x11, 0xe9, 0x3d, 0x16, 0xe1, 0x77, 0xa8, 0xac, 0xbe, 0xe0, 0xed, 0x39, 0x1a, 0xf9, 0xda, 0x34, - 0x76, 0xff, 0x85, 0x95, 0x37, 0xfa, 0x1a, 0xe9, 0xd9, 0xd6, 0x6c, 0xcd, 0x2f, 0x3a, 0x4a, 0x79, - 0xe3, 0xc1, 0xad, 0x94, 0x5c, 0xf4, 0x0d, 0x2a, 0x09, 0x23, 0xad, 0xf9, 0x25, 0x19, 0xa7, 0xf1, - 0xf0, 0x76, 0xce, 0x54, 0xb7, 0xe3, 0x5e, 0x5c, 0x99, 0xda, 0xe5, 0x95, 0xa9, 0xfd, 0xba, 0x32, - 0xb5, 0xf3, 0x6b, 0xb3, 0x70, 0x79, 0x6d, 0x16, 0xbe, 0x5f, 0x9b, 0x85, 0xb7, 0xcf, 0x66, 0xbe, - 0x33, 0xa1, 0xb7, 0x97, 0x00, 0x3f, 0x21, 0x74, 0xa0, 0xa2, 0x21, 0x84, 0x11, 0x50, 0xe7, 0xf4, - 0xc6, 0x9b, 0xda, 0x2f, 0x8b, 0xb7, 0xf2, 0xf1, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x0f, - 0x7d, 0x6d, 0xc9, 0x05, 0x00, 0x00, + // 710 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x4f, 0xe3, 0x46, + 0x18, 0x8e, 0xe3, 0x90, 0x90, 0x09, 0x84, 0x32, 0x20, 0x6a, 0x72, 0x30, 0xc1, 0xa2, 0x22, 0xad, + 0xc0, 0x6e, 0xa8, 0xd4, 0x8f, 0x23, 0x09, 0xa7, 0x8a, 0xa8, 0xc8, 0x45, 0x3d, 0x54, 0xad, 0xac, + 0x89, 0xfd, 0xd6, 0x75, 0x93, 0x78, 0xa2, 0x99, 0x71, 0x80, 0x7b, 0x7f, 0x00, 0xbf, 0xa3, 0x97, + 0xfe, 0x0d, 0x8e, 0x1c, 0xf7, 0xb4, 0xbb, 0x82, 0xdb, 0xfe, 0x8a, 0x95, 0x67, 0x26, 0x26, 0x12, + 0xda, 0xb0, 0xe2, 0x14, 0xbf, 0xcf, 0xf3, 0xbc, 0x4f, 0xde, 0x2f, 0x1b, 0x39, 0x0c, 0x62, 0x48, + 0x3d, 0x08, 0x69, 0xc8, 0x20, 0x4a, 0x84, 0x37, 0x24, 0x7c, 0x04, 0xc2, 0x9b, 0x75, 0x3d, 0x71, + 0xed, 0x4e, 0x19, 0x15, 0x14, 0xef, 0x4a, 0x8d, 0x5b, 0x68, 0x5c, 0xa5, 0x71, 0x67, 0xdd, 0xd6, + 0x76, 0x4c, 0x63, 0x2a, 0x55, 0x5e, 0xfe, 0xa4, 0x12, 0x5a, 0x5f, 0x2d, 0x31, 0xbd, 0x99, 0x02, + 0xd7, 0x32, 0x3b, 0xa4, 0x7c, 0x42, 0x79, 0xce, 0x82, 0x37, 0xeb, 0x0e, 0x41, 0x90, 0xae, 0x17, + 0xd2, 0x24, 0x55, 0xbc, 0xf3, 0xbf, 0x89, 0xea, 0x03, 0x1e, 0xf7, 0x19, 0x10, 0x01, 0xd8, 0x42, + 0xb5, 0x30, 0x63, 0x44, 0x50, 0x66, 0x19, 0x6d, 0xa3, 0x53, 0xf7, 0xe7, 0x21, 0xc6, 0xa8, 0x92, + 0x92, 0x09, 0x58, 0x65, 0x09, 0xcb, 0x67, 0xdc, 0x46, 0x8d, 0x08, 0x78, 0xc8, 0x92, 0xa9, 0x48, + 0x68, 0x6a, 0x99, 0x92, 0x5a, 0x84, 0xb0, 0x8d, 0x56, 0xe1, 0x7a, 0x4a, 0x53, 0x48, 0x85, 0x55, + 0x69, 0x1b, 0x9d, 0xf5, 0x5e, 0xd9, 0x32, 0xfc, 0x02, 0xc3, 0x2e, 0xda, 0x8a, 0x12, 0x4e, 0x86, + 0x63, 0x08, 0x48, 0x26, 0x68, 0xc0, 0x40, 0x24, 0x0c, 0xac, 0x95, 0xb6, 0xd1, 0x59, 0xf5, 0x37, + 0x35, 0x75, 0x9a, 0x09, 0xea, 0x4b, 0x02, 0x1f, 0x21, 0xac, 0xba, 0x0d, 0xf2, 0x1e, 0x03, 0x32, + 0x1c, 0x32, 0x98, 0x59, 0x55, 0xf9, 0xc7, 0x5f, 0x28, 0xe6, 0xf2, 0x66, 0x0a, 0xa7, 0x12, 0xc7, + 0x87, 0x68, 0x83, 0x8c, 0xc7, 0xf4, 0x0a, 0xa2, 0x20, 0x1c, 0x13, 0xce, 0x81, 0x5b, 0xb5, 0xb6, + 0xd9, 0xa9, 0xfb, 0x4d, 0x0d, 0xf7, 0x15, 0x8a, 0xcf, 0xd1, 0x7a, 0x44, 0x04, 0x04, 0x21, 0x4b, + 0x04, 0xb0, 0x84, 0x58, 0xab, 0x6d, 0xa3, 0xd3, 0x38, 0x39, 0x74, 0x3f, 0xb9, 0x14, 0xf7, 0x8c, + 0x08, 0xe8, 0x6b, 0xb9, 0xbf, 0x16, 0x2d, 0x44, 0xf8, 0x4f, 0x64, 0xfe, 0x05, 0x60, 0xd5, 0xdb, + 0x66, 0xa7, 0x71, 0xb2, 0xeb, 0xaa, 0x05, 0xe4, 0xa9, 0xe0, 0xea, 0x05, 0xb8, 0x7d, 0x9a, 0xa4, + 0xbd, 0x6f, 0xef, 0xde, 0xee, 0x95, 0xfe, 0x7b, 0xb7, 0xd7, 0x89, 0x13, 0xf1, 0x77, 0x36, 0x74, + 0x43, 0x3a, 0xf1, 0xf4, 0xb6, 0xd4, 0xcf, 0x31, 0x8f, 0x46, 0x7a, 0x99, 0x79, 0x02, 0xf7, 0x73, + 0x5f, 0xe7, 0x7b, 0xb4, 0x59, 0x2c, 0xcc, 0x07, 0x3e, 0xa5, 0x29, 0x07, 0xbc, 0x8f, 0xd6, 0x54, + 0x6d, 0x41, 0x04, 0x29, 0x9d, 0xe8, 0xed, 0x35, 0x14, 0x76, 0x96, 0x43, 0xce, 0xbf, 0x06, 0xaa, + 0x0e, 0x78, 0x7c, 0x91, 0x09, 0xbc, 0x8d, 0x56, 0xe8, 0x55, 0x0a, 0xf3, 0x25, 0xab, 0xe0, 0x99, + 0x47, 0xf9, 0x99, 0x07, 0x3e, 0x45, 0x35, 0x35, 0x09, 0x6e, 0x99, 0xb2, 0xbd, 0x65, 0x23, 0xea, + 0xc9, 0xa7, 0xbe, 0x84, 0xfd, 0x79, 0x9e, 0xf3, 0x13, 0x6a, 0xaa, 0x2a, 0x8a, 0xda, 0xf3, 0x35, + 0x4d, 0x68, 0x96, 0x8a, 0x80, 0x41, 0x08, 0xc9, 0x0c, 0x22, 0x5d, 0x57, 0x53, 0xc1, 0xbe, 0x46, + 0x9d, 0x0f, 0x06, 0xaa, 0x0d, 0x78, 0x7c, 0x49, 0x46, 0xf0, 0xfa, 0x16, 0x76, 0x50, 0x55, 0xd9, + 0xea, 0x7b, 0xd5, 0x11, 0xf6, 0xd0, 0x96, 0xba, 0xbe, 0x09, 0xa4, 0x22, 0x18, 0xd3, 0x90, 0xc8, + 0xa3, 0xae, 0x48, 0x11, 0x7e, 0xa2, 0xce, 0x35, 0x83, 0x0f, 0x50, 0x53, 0xa1, 0x01, 0x4d, 0x03, + 0x41, 0x46, 0xf3, 0xb3, 0x5d, 0x53, 0xe8, 0x2f, 0xa9, 0xac, 0xf3, 0x07, 0xf4, 0xe5, 0x82, 0xed, + 0x3f, 0x19, 0x4b, 0x78, 0x94, 0x84, 0xd2, 0x5a, 0x9d, 0xed, 0xce, 0x13, 0xfd, 0xf3, 0x02, 0xeb, + 0x5c, 0xa2, 0x0d, 0xdd, 0x6b, 0x31, 0xa8, 0x85, 0xe9, 0x1b, 0xaf, 0x9b, 0xfe, 0xc9, 0x6d, 0x19, + 0x99, 0x03, 0x1e, 0xe3, 0x3f, 0x50, 0x55, 0xbf, 0xf2, 0x07, 0x4b, 0x3c, 0x8a, 0x3b, 0x6b, 0x1d, + 0x7d, 0x8e, 0xaa, 0x28, 0xf4, 0x57, 0x64, 0xe6, 0x67, 0xb6, 0xbf, 0x3c, 0xe9, 0x22, 0x13, 0xad, + 0xaf, 0x5f, 0x94, 0x14, 0xa6, 0xbf, 0xa1, 0x8a, 0x9c, 0xa8, 0xb3, 0x3c, 0x25, 0xd7, 0xb4, 0xbe, + 0x79, 0x59, 0x33, 0xf7, 0xed, 0xf9, 0x77, 0x0f, 0xb6, 0x71, 0xff, 0x60, 0x1b, 0xef, 0x1f, 0x6c, + 0xe3, 0xf6, 0xd1, 0x2e, 0xdd, 0x3f, 0xda, 0xa5, 0x37, 0x8f, 0x76, 0xe9, 0xf7, 0x1f, 0x17, 0x5e, + 0x4c, 0xe9, 0x77, 0x9c, 0x82, 0xb8, 0xa2, 0x6c, 0xa4, 0xa3, 0x31, 0x44, 0x31, 0x30, 0xef, 0xfa, + 0xd9, 0x47, 0x78, 0x58, 0x95, 0x1f, 0xd7, 0xef, 0x3e, 0x06, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x14, + 0x16, 0x50, 0xfa, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -919,6 +934,13 @@ func (m *MsgTake) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.RetirementJurisdiction) > 0 { + i -= len(m.RetirementJurisdiction) + copy(dAtA[i:], m.RetirementJurisdiction) + i = encodeVarintTx(dAtA, i, uint64(len(m.RetirementJurisdiction))) + i-- + dAtA[i] = 0x32 + } if m.RetireOnTake { i-- if m.RetireOnTake { @@ -929,10 +951,10 @@ func (m *MsgTake) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - if len(m.RetirementJurisdiction) > 0 { - i -= len(m.RetirementJurisdiction) - copy(dAtA[i:], m.RetirementJurisdiction) - i = encodeVarintTx(dAtA, i, uint64(len(m.RetirementJurisdiction))) + if len(m.RetirementLocation) > 0 { + i -= len(m.RetirementLocation) + copy(dAtA[i:], m.RetirementLocation) + i = encodeVarintTx(dAtA, i, uint64(len(m.RetirementLocation))) i-- dAtA[i] = 0x22 } @@ -1122,13 +1144,17 @@ func (m *MsgTake) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.RetirementJurisdiction) + l = len(m.RetirementLocation) if l > 0 { n += 1 + l + sovTx(uint64(l)) } if m.RetireOnTake { n += 2 } + l = len(m.RetirementJurisdiction) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } return n } @@ -1911,7 +1937,7 @@ func (m *MsgTake) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RetirementJurisdiction", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field RetirementLocation", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1939,7 +1965,7 @@ func (m *MsgTake) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RetirementJurisdiction = string(dAtA[iNdEx:postIndex]) + m.RetirementLocation = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 0 { @@ -1961,6 +1987,38 @@ func (m *MsgTake) Unmarshal(dAtA []byte) error { } } m.RetireOnTake = bool(v != 0) + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RetirementJurisdiction", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RetirementJurisdiction = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/x/ecocredit/client/testsuite/grpc.go b/x/ecocredit/client/testsuite/grpc.go index 736b1c8d69..c0afa0b795 100644 --- a/x/ecocredit/client/testsuite/grpc.go +++ b/x/ecocredit/client/testsuite/grpc.go @@ -539,8 +539,8 @@ func (s *IntegrationTestSuite) TestQuerySupply() { err = s.val.ClientCtx.Codec.UnmarshalJSON(resp, &res) require.NoError(err) require.NotNil(res) - require.NotEmpty(res.RetiredSupply) - require.NotEmpty(res.TradableSupply) + require.NotEmpty(res.RetiredAmount) + require.NotEmpty(res.TradableAmount) }) } } diff --git a/x/ecocredit/client/testsuite/query.go b/x/ecocredit/client/testsuite/query.go index 997782b9b3..554bd37ef3 100644 --- a/x/ecocredit/client/testsuite/query.go +++ b/x/ecocredit/client/testsuite/query.go @@ -525,8 +525,8 @@ func (s *IntegrationTestSuite) TestQuerySupplyCmd() { var res core.QuerySupplyResponse s.Require().NoError(clientCtx.Codec.UnmarshalJSON(out.Bytes(), &res)) - s.Require().NotEmpty(res.TradableSupply) - s.Require().NotEmpty(res.RetiredSupply) + s.Require().NotEmpty(res.TradableAmount) + s.Require().NotEmpty(res.RetiredAmount) } }) } diff --git a/x/ecocredit/core/query.pb.go b/x/ecocredit/core/query.pb.go index fa3dd765e9..3f3209df03 100644 --- a/x/ecocredit/core/query.pb.go +++ b/x/ecocredit/core/query.pb.go @@ -1751,12 +1751,12 @@ func (m *QuerySupplyRequest) GetBatchDenom() string { // QuerySupplyResponse is the Query/Supply response type. type QuerySupplyResponse struct { - // tradable_supply is the decimal number of tradable credits in the batch + // tradable_amount is the decimal number of tradable credits in the batch // supply. - TradableSupply string `protobuf:"bytes,1,opt,name=tradable_supply,json=tradableSupply,proto3" json:"tradable_supply,omitempty"` - // retired_supply is the decimal number of retired credits in the batch + TradableAmount string `protobuf:"bytes,1,opt,name=tradable_amount,json=tradableAmount,proto3" json:"tradable_amount,omitempty"` + // retired_amount is the decimal number of retired credits in the batch // supply. - RetiredSupply string `protobuf:"bytes,2,opt,name=retired_supply,json=retiredSupply,proto3" json:"retired_supply,omitempty"` + RetiredAmount string `protobuf:"bytes,2,opt,name=retired_amount,json=retiredAmount,proto3" json:"retired_amount,omitempty"` // cancelled_amount is the decimal number of cancelled credits in the batch // supply. CancelledAmount string `protobuf:"bytes,3,opt,name=cancelled_amount,json=cancelledAmount,proto3" json:"cancelled_amount,omitempty"` @@ -1795,16 +1795,16 @@ func (m *QuerySupplyResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QuerySupplyResponse proto.InternalMessageInfo -func (m *QuerySupplyResponse) GetTradableSupply() string { +func (m *QuerySupplyResponse) GetTradableAmount() string { if m != nil { - return m.TradableSupply + return m.TradableAmount } return "" } -func (m *QuerySupplyResponse) GetRetiredSupply() string { +func (m *QuerySupplyResponse) GetRetiredAmount() string { if m != nil { - return m.RetiredSupply + return m.RetiredAmount } return "" } @@ -2397,130 +2397,129 @@ func init() { func init() { proto.RegisterFile("regen/ecocredit/v1/query.proto", fileDescriptor_c85efa417eafb74b) } var fileDescriptor_c85efa417eafb74b = []byte{ - // 1956 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x8f, 0x1c, 0x47, - 0x15, 0x77, 0x8d, 0xbd, 0xbb, 0xb3, 0x6f, 0x37, 0xbb, 0xa6, 0x70, 0x60, 0xdd, 0xf1, 0x8e, 0x9d, - 0xc6, 0xf1, 0xae, 0xe3, 0x9d, 0x6e, 0xef, 0x3a, 0x0e, 0x24, 0xe1, 0xcb, 0x4b, 0x04, 0xda, 0xdb, - 0x66, 0x88, 0x8c, 0xb4, 0xe0, 0x2c, 0x3d, 0xd3, 0xe5, 0xc9, 0x84, 0x99, 0xee, 0x49, 0x77, 0x8f, - 0x93, 0x61, 0x34, 0x04, 0x90, 0x22, 0x6e, 0x60, 0x01, 0x42, 0xb9, 0x44, 0x7c, 0x88, 0x13, 0x07, - 0x24, 0x10, 0x17, 0x94, 0x03, 0x37, 0xc4, 0x31, 0x52, 0x38, 0xf0, 0x71, 0x41, 0x36, 0x07, 0xfe, - 0x0c, 0x34, 0x55, 0xaf, 0xba, 0xbb, 0x7a, 0x7a, 0xaa, 0xdb, 0x30, 0x89, 0xf6, 0xb4, 0xdb, 0x35, - 0xef, 0xd5, 0xfb, 0xfd, 0x5e, 0xbd, 0x7a, 0xef, 0xd5, 0x83, 0x5a, 0xc0, 0xda, 0xcc, 0xb3, 0x59, - 0xcb, 0x6f, 0x05, 0xcc, 0xed, 0x44, 0xf6, 0xbd, 0x5d, 0xfb, 0xf5, 0x01, 0x0b, 0x86, 0x56, 0x3f, - 0xf0, 0x23, 0x9f, 0x52, 0xfe, 0xbb, 0x15, 0xff, 0x6e, 0xdd, 0xdb, 0x35, 0x2e, 0xb4, 0x7d, 0xbf, - 0xdd, 0x65, 0xb6, 0xd3, 0xef, 0xd8, 0x8e, 0xe7, 0xf9, 0x91, 0x13, 0x75, 0x7c, 0x2f, 0x14, 0x1a, - 0xc6, 0x45, 0xfc, 0x95, 0x7f, 0x35, 0x07, 0x77, 0xed, 0xa8, 0xd3, 0x63, 0x61, 0xe4, 0xf4, 0xfa, - 0x28, 0xf0, 0x74, 0xcb, 0x0f, 0x7b, 0x7e, 0x68, 0x37, 0x9d, 0x90, 0x09, 0x5b, 0xf6, 0xbd, 0xdd, - 0x26, 0x8b, 0x9c, 0x5d, 0xbb, 0xef, 0xb4, 0x3b, 0x1e, 0xdf, 0x0d, 0x65, 0xf3, 0xe0, 0x85, 0x91, - 0x13, 0x31, 0xcd, 0xef, 0xd1, 0xb0, 0xcf, 0x10, 0x8c, 0x79, 0x07, 0x3e, 0xfe, 0xd2, 0xc4, 0xc2, - 0x97, 0xba, 0x4e, 0x18, 0xb2, 0xb0, 0xc1, 0x5e, 0x1f, 0xb0, 0x30, 0xa2, 0x5f, 0x06, 0x48, 0x4c, - 0x6d, 0x90, 0x4b, 0x64, 0x7b, 0x65, 0xef, 0x8a, 0x25, 0x70, 0x59, 0x13, 0x5c, 0x96, 0xf0, 0x01, - 0xe2, 0xb2, 0x0e, 0x9d, 0x36, 0x43, 0xdd, 0x46, 0x4a, 0xd3, 0x7c, 0x87, 0xc0, 0x39, 0x75, 0xff, - 0xb0, 0xef, 0x7b, 0x21, 0xa3, 0x9f, 0x86, 0xa5, 0x96, 0x58, 0xda, 0x20, 0x97, 0x4e, 0x6f, 0xaf, - 0xec, 0x6d, 0x5a, 0xd3, 0x8e, 0xb4, 0xb8, 0xd6, 0x81, 0x77, 0xd7, 0x6f, 0x48, 0x69, 0xfa, 0x15, - 0x05, 0x59, 0x85, 0x23, 0xdb, 0x2a, 0x44, 0x26, 0xac, 0x2a, 0xd0, 0xbe, 0x0d, 0x46, 0x1a, 0xd9, - 0xfe, 0xf0, 0x96, 0xdb, 0xeb, 0x78, 0xd2, 0x01, 0xe7, 0x60, 0xc1, 0x99, 0x7c, 0x73, 0xee, 0xcb, - 0x0d, 0xf1, 0x91, 0x71, 0x4b, 0xe5, 0x7f, 0x76, 0xcb, 0xcf, 0x09, 0x3c, 0x91, 0x6b, 0xfc, 0xc4, - 0x78, 0xc7, 0x82, 0x8f, 0x25, 0x00, 0xa5, 0x53, 0xce, 0x43, 0x95, 0x1b, 0x3a, 0xee, 0xb8, 0xe8, - 0x17, 0x61, 0xf8, 0xc0, 0x35, 0x0f, 0x80, 0xa6, 0xe5, 0x91, 0xc7, 0x0d, 0x58, 0xe0, 0x02, 0x18, - 0x41, 0x05, 0x2c, 0x84, 0xac, 0x39, 0x86, 0x8d, 0x64, 0xab, 0x83, 0x30, 0x1c, 0xb0, 0xa0, 0x04, - 0x82, 0xb9, 0x9d, 0xcd, 0x77, 0xe0, 0x7c, 0x8e, 0x79, 0x24, 0xb4, 0x01, 0x4b, 0x1d, 0xb1, 0xc4, - 0x0f, 0x66, 0xb9, 0x21, 0x3f, 0xe7, 0xe7, 0xf9, 0x57, 0xf0, 0xc6, 0x1c, 0x06, 0xfe, 0x6b, 0xac, - 0x15, 0xcd, 0xfd, 0x4a, 0xbe, 0x4b, 0xe0, 0xf1, 0x8c, 0x01, 0x24, 0xf7, 0x02, 0x54, 0xfb, 0xb8, - 0x86, 0x61, 0x77, 0x31, 0xef, 0xc0, 0x50, 0x8f, 0x1f, 0x59, 0xac, 0x30, 0x3f, 0xfe, 0xdf, 0x95, - 0x77, 0x43, 0xe2, 0xdb, 0x2f, 0x1b, 0x84, 0x73, 0x0b, 0x81, 0x5f, 0x13, 0xb8, 0x90, 0x0f, 0xe1, - 0x44, 0x79, 0xea, 0x87, 0x04, 0x9e, 0xcc, 0xc0, 0x6c, 0xb0, 0xbb, 0x2c, 0x60, 0x5e, 0x8b, 0x1d, - 0xb8, 0xd2, 0x5f, 0x4f, 0xc2, 0x6a, 0x20, 0x57, 0x13, 0x9f, 0xad, 0x04, 0x89, 0xe4, 0xdc, 0xfc, - 0xf6, 0x1b, 0x02, 0xa6, 0x0e, 0xd0, 0x89, 0xf2, 0xde, 0x68, 0x2a, 0xcc, 0x3e, 0xc2, 0x02, 0x90, - 0x13, 0x61, 0x6a, 0x05, 0x38, 0x19, 0x3e, 0x7a, 0x06, 0xbb, 0x03, 0x34, 0x23, 0x7d, 0xb3, 0x09, - 0x80, 0xb6, 0x92, 0x80, 0x5a, 0xc6, 0x95, 0x03, 0xd7, 0x7c, 0x49, 0xcd, 0x60, 0x31, 0xa7, 0xe7, - 0x60, 0x09, 0x85, 0x30, 0x7d, 0x15, 0x52, 0x92, 0xf2, 0x71, 0x9b, 0xb2, 0xef, 0x44, 0xad, 0x57, - 0x3f, 0xc4, 0x36, 0x25, 0xde, 0x3f, 0x29, 0xc4, 0x4d, 0xb1, 0xa4, 0x2b, 0xc4, 0x5c, 0x4b, 0x00, - 0x46, 0xe9, 0xf9, 0x1d, 0xc1, 0x18, 0xc3, 0x14, 0x91, 0xed, 0x0f, 0x45, 0x49, 0x92, 0x1e, 0xf8, - 0x04, 0x2c, 0x8a, 0x0a, 0x84, 0xc7, 0x80, 0x5f, 0x73, 0x0b, 0xd4, 0x5f, 0xc8, 0x40, 0x9d, 0xb2, - 0x7f, 0x62, 0x3c, 0xf4, 0x16, 0x36, 0x72, 0x31, 0xc2, 0x8f, 0xba, 0x5c, 0xbc, 0x3d, 0xe5, 0xa3, - 0x47, 0xba, 0x2f, 0x73, 0xc3, 0xf1, 0x4b, 0x02, 0x9b, 0x33, 0x70, 0x9c, 0x98, 0xc3, 0x8a, 0x3b, - 0xdf, 0xec, 0x69, 0x9d, 0x18, 0x84, 0xcf, 0x60, 0xe7, 0xcb, 0x6d, 0xc8, 0x13, 0xbc, 0x08, 0x2b, - 0xdc, 0xd0, 0xb1, 0xcb, 0x3c, 0xbf, 0x87, 0x47, 0x08, 0x7c, 0xe9, 0xc5, 0xc9, 0x4a, 0xdc, 0xff, - 0xa2, 0x56, 0xd2, 0xff, 0x72, 0x19, 0x5d, 0xff, 0x9b, 0x70, 0x11, 0xb2, 0xe6, 0x61, 0x9c, 0xeb, - 0xba, 0x8e, 0xd7, 0x92, 0x27, 0x3d, 0x69, 0x3d, 0x1d, 0xd7, 0x0d, 0x18, 0x76, 0xd3, 0xcb, 0x0d, - 0xf9, 0x99, 0x05, 0x57, 0x99, 0x02, 0x77, 0x3b, 0xce, 0x6e, 0xb8, 0x23, 0xc2, 0xfb, 0xfc, 0xc4, - 0xd9, 0x7c, 0x09, 0x01, 0x5e, 0x9e, 0x09, 0x10, 0x55, 0xa5, 0xcf, 0xf9, 0x87, 0xf9, 0xa6, 0xba, - 0x6f, 0x58, 0x0c, 0x75, 0x5e, 0xa1, 0xfe, 0x2b, 0xd9, 0xc4, 0x26, 0xa6, 0x91, 0xd3, 0x17, 0xa1, - 0x8a, 0xf0, 0x64, 0x04, 0x95, 0x23, 0x15, 0x6b, 0xcd, 0x2f, 0x92, 0x6e, 0x62, 0x4c, 0x7c, 0x75, - 0xd0, 0xef, 0x77, 0x87, 0xa5, 0x43, 0xe9, 0x3e, 0xc1, 0x00, 0x90, 0x7a, 0xc8, 0x6c, 0x0b, 0xd6, - 0xa3, 0xc0, 0x71, 0x9d, 0x66, 0x97, 0x1d, 0x87, 0xfc, 0x27, 0x54, 0x5e, 0x93, 0xcb, 0x42, 0x81, - 0x3e, 0x05, 0x6b, 0x01, 0x8b, 0x3a, 0x01, 0x73, 0xa5, 0x9c, 0x08, 0x89, 0xc7, 0x70, 0x15, 0xc5, - 0xae, 0xc2, 0xd9, 0xd6, 0x84, 0x71, 0xb7, 0xcb, 0xdc, 0x63, 0xa7, 0xe7, 0x0f, 0xbc, 0x68, 0xe3, - 0x34, 0x17, 0x5c, 0x8f, 0xd7, 0x6f, 0xf1, 0x65, 0xf3, 0x3c, 0x7c, 0x52, 0xbc, 0x89, 0xb8, 0xff, - 0x5e, 0x1e, 0xf6, 0xe3, 0xb3, 0x36, 0xef, 0xc8, 0xd7, 0x5a, 0xfa, 0x27, 0x44, 0x7c, 0x0b, 0x56, - 0x85, 0xc7, 0x8f, 0xf9, 0xc8, 0x01, 0xcf, 0xa3, 0x96, 0xfb, 0x0a, 0x8c, 0xd5, 0x1b, 0x2b, 0xad, - 0x64, 0x2b, 0xf3, 0x1c, 0xfa, 0xf0, 0xd0, 0x09, 0x9c, 0x5e, 0x6c, 0xf4, 0x40, 0xf6, 0x25, 0xb8, - 0x8a, 0xf6, 0xf6, 0x60, 0xb1, 0xcf, 0x57, 0x30, 0x9c, 0x8d, 0xdc, 0xfe, 0x42, 0xe8, 0xa0, 0xa4, - 0x39, 0x82, 0xe5, 0xf8, 0x05, 0x4a, 0xd7, 0xa0, 0x12, 0x27, 0xe8, 0x4a, 0xc7, 0x4d, 0x9a, 0xc0, - 0x4a, 0xba, 0x09, 0x34, 0xa0, 0xda, 0x63, 0x91, 0xe3, 0x3a, 0x91, 0x83, 0x0e, 0x8b, 0xbf, 0xe9, - 0x0e, 0xd0, 0x14, 0xe5, 0x63, 0xa7, 0xd9, 0x0c, 0xd8, 0xbd, 0x8d, 0x33, 0x5c, 0xea, 0x6c, 0x42, - 0xec, 0x16, 0x5f, 0x37, 0x7f, 0x47, 0x60, 0x25, 0xd5, 0xef, 0x94, 0xb4, 0x9f, 0x2e, 0x69, 0xa7, - 0xd5, 0x92, 0x66, 0xc2, 0xea, 0x6b, 0x83, 0xa0, 0x13, 0xba, 0x9d, 0x16, 0x8f, 0x5e, 0x61, 0x58, - 0x59, 0x53, 0xe0, 0x2f, 0x64, 0xe0, 0x67, 0x1f, 0x0b, 0x8b, 0x53, 0x8f, 0x05, 0xf3, 0xbd, 0x0a, - 0x2c, 0xc7, 0x39, 0x6b, 0x66, 0xff, 0xa1, 0x96, 0xbc, 0x4a, 0xb6, 0xe4, 0x9d, 0x83, 0x05, 0x11, - 0xfe, 0x02, 0xbf, 0xf8, 0x50, 0x90, 0x9d, 0xc9, 0x20, 0x7b, 0x0e, 0x20, 0x8c, 0x9c, 0x20, 0x3a, - 0x76, 0x9d, 0x88, 0x71, 0xdc, 0x93, 0xf3, 0x15, 0xa3, 0x34, 0x4b, 0x8e, 0xd2, 0xac, 0x97, 0xe5, - 0x28, 0xad, 0xb1, 0xcc, 0xa5, 0x5f, 0x74, 0x22, 0x46, 0x6f, 0x42, 0x95, 0x79, 0xae, 0x50, 0x5c, - 0x2c, 0x54, 0x5c, 0x62, 0x9e, 0xcb, 0xd5, 0xbe, 0x00, 0x8f, 0x4d, 0xc8, 0x4c, 0xae, 0x82, 0xd0, - 0x5d, 0x2a, 0xd4, 0x5d, 0x95, 0x0a, 0x7c, 0x03, 0x0a, 0x67, 0xfc, 0x3e, 0xf3, 0x36, 0xaa, 0x97, - 0xc8, 0x76, 0xb5, 0xc1, 0xff, 0x37, 0xff, 0x4c, 0xe0, 0x6c, 0x36, 0xf7, 0xfc, 0x1f, 0xa9, 0x5d, - 0x49, 0x0a, 0xca, 0x1d, 0x8e, 0x93, 0x82, 0xb8, 0xc2, 0xe9, 0xa4, 0x80, 0x72, 0x67, 0x94, 0xa4, - 0x80, 0x62, 0x5b, 0xb0, 0xce, 0xc2, 0x56, 0xe0, 0xbf, 0x91, 0xc8, 0x89, 0x18, 0x59, 0x93, 0xcb, - 0x42, 0x70, 0xef, 0xfe, 0x26, 0x2c, 0xf0, 0x3b, 0x48, 0xbf, 0x47, 0x60, 0x09, 0xe7, 0x58, 0x74, - 0x2b, 0xef, 0xc6, 0xe5, 0x0c, 0x18, 0x8d, 0xed, 0x62, 0x41, 0x71, 0xa9, 0xcd, 0x4f, 0x7d, 0xff, - 0x83, 0x7f, 0xff, 0xa4, 0xb2, 0x49, 0x9f, 0xb0, 0x73, 0x46, 0x99, 0x72, 0xee, 0xf5, 0x57, 0x02, - 0x6b, 0xea, 0x2c, 0x8d, 0x5a, 0x45, 0x16, 0xd4, 0x07, 0x9f, 0x61, 0x97, 0x96, 0x47, 0x60, 0x0e, - 0x07, 0xf6, 0x75, 0xba, 0xa3, 0x01, 0x56, 0x6f, 0x0e, 0xeb, 0xfc, 0xd2, 0xda, 0x23, 0xfe, 0x67, - 0x7c, 0x74, 0x8d, 0x5e, 0xd5, 0xc8, 0xdb, 0x8a, 0x30, 0xfd, 0x2d, 0x81, 0x05, 0x6e, 0x9d, 0x3e, - 0xa5, 0x47, 0x27, 0x49, 0x5c, 0x29, 0x12, 0x43, 0xec, 0xb7, 0x39, 0xf6, 0x43, 0x7a, 0x79, 0x26, - 0x16, 0x7b, 0x24, 0x73, 0xcc, 0xf8, 0x68, 0x9b, 0x5e, 0xd1, 0x61, 0x4e, 0x24, 0xe9, 0x07, 0x04, - 0x56, 0xd3, 0x83, 0x33, 0xba, 0xa3, 0x07, 0xa4, 0x8e, 0xf7, 0x8c, 0x7a, 0x49, 0x69, 0x64, 0x71, - 0x97, 0xb3, 0xf8, 0xa6, 0xe6, 0x04, 0xea, 0x38, 0x9e, 0x4b, 0xb3, 0xb9, 0x4e, 0xad, 0x72, 0x6c, - 0x6c, 0x39, 0xdb, 0x7b, 0x9b, 0x40, 0x55, 0x3e, 0xd4, 0xe9, 0xec, 0xc8, 0xcd, 0x4c, 0xec, 0x8c, - 0xab, 0x25, 0x24, 0x91, 0xc9, 0x65, 0xce, 0xa4, 0x46, 0x2f, 0xe4, 0x21, 0x8b, 0xdf, 0xf5, 0x3f, - 0xad, 0xc0, 0x7a, 0x66, 0x24, 0x45, 0xed, 0x42, 0x23, 0xea, 0x83, 0xc8, 0xb8, 0x5e, 0x5e, 0x01, - 0xc1, 0xbd, 0x4b, 0x38, 0xba, 0x9f, 0x11, 0x7a, 0x5d, 0x07, 0x6f, 0x12, 0xeb, 0x53, 0xa1, 0x63, - 0xd3, 0xba, 0x4e, 0x67, 0x3a, 0xd6, 0x76, 0xa9, 0x5d, 0xf2, 0x74, 0x62, 0xb7, 0xfc, 0xa0, 0x02, - 0x8f, 0xe7, 0x4e, 0x9c, 0xe8, 0xcd, 0x12, 0x5c, 0xa7, 0x47, 0x66, 0xc6, 0xb3, 0x8f, 0xaa, 0x86, - 0x8e, 0x7a, 0x8b, 0xfb, 0x69, 0x48, 0x5f, 0x28, 0x72, 0x53, 0x5c, 0x4f, 0xeb, 0x1d, 0xd7, 0x1e, - 0xa5, 0x2b, 0xee, 0xf8, 0xe8, 0x79, 0xfa, 0x19, 0xad, 0xc7, 0x34, 0xba, 0xf4, 0xef, 0x24, 0x1d, - 0x20, 0x22, 0x0f, 0x96, 0x09, 0x10, 0x25, 0x11, 0x5e, 0x2f, 0xaf, 0x80, 0xbc, 0x5b, 0x9c, 0xf7, - 0x1d, 0xfd, 0x51, 0x4f, 0xa7, 0xc2, 0x1d, 0xfa, 0xb4, 0x96, 0xa9, 0x9a, 0x0b, 0xdf, 0x23, 0xb0, - 0x84, 0x00, 0x34, 0x65, 0x46, 0x7d, 0x79, 0x1b, 0xdb, 0xc5, 0x82, 0xc8, 0xe1, 0x0e, 0xe7, 0xf0, - 0x35, 0xba, 0xad, 0x81, 0x64, 0x8f, 0x92, 0x9e, 0x66, 0x66, 0x26, 0x8f, 0xe1, 0xa7, 0x85, 0x79, - 0x91, 0xc4, 0x27, 0xaf, 0x06, 0xbd, 0x3a, 0xde, 0xd2, 0xa0, 0xcf, 0xcc, 0xa9, 0xf4, 0x45, 0x52, - 0x3e, 0x91, 0xff, 0x49, 0x60, 0x3d, 0x33, 0xc6, 0xd1, 0x44, 0x47, 0xfe, 0xc0, 0x49, 0x13, 0x1d, - 0x33, 0x26, 0x44, 0x26, 0xe3, 0xd8, 0x8e, 0xf3, 0xb3, 0x2e, 0x62, 0x9b, 0x04, 0x87, 0xc8, 0xb6, - 0xf6, 0x48, 0xfc, 0x1d, 0x1f, 0xd5, 0xe9, 0x35, 0x8d, 0x86, 0x9d, 0x11, 0xa7, 0xff, 0x20, 0xb0, - 0xa6, 0x0e, 0x15, 0x34, 0x2d, 0x40, 0xee, 0xac, 0xc8, 0xb0, 0x4b, 0xcb, 0x23, 0xb5, 0x36, 0xa7, - 0xe6, 0xe4, 0xa7, 0xac, 0x14, 0xb5, 0xa9, 0x2c, 0x67, 0xe5, 0xd7, 0x2c, 0xc9, 0x2d, 0x2b, 0x4f, - 0xff, 0x23, 0xdb, 0xc6, 0xd4, 0x54, 0x87, 0x96, 0x38, 0x8a, 0xcc, 0x75, 0xd8, 0x7d, 0x04, 0x0d, - 0xa4, 0xe8, 0x73, 0x8a, 0x1d, 0x7a, 0xa3, 0x80, 0x62, 0xee, 0x15, 0xd9, 0xcb, 0xaf, 0x18, 0x92, - 0x66, 0x9e, 0x0e, 0xfd, 0x03, 0x81, 0x05, 0x8e, 0x46, 0xd3, 0xf3, 0xa4, 0x67, 0x33, 0x9a, 0x9e, - 0x47, 0x19, 0xc6, 0x98, 0xdf, 0xe0, 0x4c, 0x6e, 0xd3, 0xad, 0x99, 0x90, 0xec, 0x51, 0xaa, 0xd9, - 0x9e, 0x79, 0xc1, 0x25, 0x7a, 0x45, 0x98, 0xbe, 0x53, 0x99, 0x5c, 0x70, 0xde, 0xd3, 0x6b, 0x2f, - 0x78, 0x7a, 0xa6, 0xa3, 0xbd, 0xe0, 0xca, 0xa8, 0xc6, 0xfc, 0xa3, 0xa8, 0xc1, 0xbf, 0x27, 0xb3, - 0x0e, 0x82, 0x8b, 0xab, 0x98, 0x26, 0xa9, 0x93, 0x3f, 0x23, 0xc6, 0x47, 0x9f, 0xcb, 0xaf, 0x49, - 0xb9, 0x54, 0x92, 0xcd, 0x62, 0xf5, 0xcf, 0xd2, 0xe7, 0x35, 0x56, 0xc3, 0x44, 0x32, 0xcf, 0x8f, - 0xf4, 0x47, 0x04, 0xaa, 0x72, 0x4e, 0x43, 0x0b, 0x29, 0x97, 0x68, 0x9f, 0xb2, 0x43, 0x1f, 0xd3, - 0xe2, 0xce, 0x99, 0xd1, 0xa6, 0x4e, 0xa3, 0xa4, 0x7f, 0x22, 0xb0, 0x88, 0x53, 0x90, 0xd9, 0xd1, - 0xa3, 0x8c, 0x6d, 0x8c, 0xad, 0x42, 0x39, 0xc4, 0xe2, 0x72, 0x2c, 0xaf, 0xe4, 0x17, 0x12, 0x31, - 0x8f, 0xc9, 0xc4, 0x59, 0xc1, 0x2d, 0x51, 0x0f, 0x47, 0xec, 0x40, 0x7f, 0x4c, 0x60, 0x25, 0x35, - 0x72, 0xa1, 0xd7, 0x66, 0x77, 0xce, 0x53, 0x33, 0x1b, 0x63, 0xa7, 0x9c, 0x30, 0x12, 0xda, 0xe6, - 0x84, 0x4c, 0x7a, 0x29, 0xb7, 0x2f, 0xe3, 0xff, 0xd5, 0xf9, 0x7c, 0x87, 0x8e, 0x61, 0x51, 0x4c, - 0x57, 0x34, 0x5e, 0x55, 0x06, 0x39, 0x1a, 0xaf, 0xaa, 0xa3, 0x1d, 0xd3, 0xe4, 0x20, 0x2e, 0x50, - 0x23, 0xb7, 0xe4, 0x72, 0xd9, 0xfd, 0xc3, 0xbf, 0x3c, 0xa8, 0x91, 0xf7, 0x1f, 0xd4, 0xc8, 0xbf, - 0x1e, 0xd4, 0xc8, 0xfd, 0x87, 0xb5, 0x53, 0xef, 0x3f, 0xac, 0x9d, 0xfa, 0xdb, 0xc3, 0xda, 0xa9, - 0xa3, 0x67, 0xdb, 0x9d, 0xe8, 0xd5, 0x41, 0xd3, 0x6a, 0xf9, 0x3d, 0xa1, 0x5f, 0xf7, 0x58, 0xf4, - 0x86, 0x1f, 0x7c, 0x0b, 0xbf, 0xba, 0xcc, 0x6d, 0xb3, 0xc0, 0x7e, 0x33, 0xb5, 0x6d, 0xcb, 0x0f, - 0x58, 0x73, 0x91, 0xbf, 0xf1, 0x6f, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x44, 0x56, 0x0f, 0x29, - 0x05, 0x24, 0x00, 0x00, + // 1943 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x24, 0x47, + 0x15, 0xdf, 0x9a, 0x5d, 0xdb, 0xe3, 0x67, 0xc7, 0x5e, 0x8a, 0x0d, 0x78, 0x3b, 0xeb, 0x59, 0xa7, + 0xd9, 0xac, 0x67, 0xb3, 0x9e, 0x6e, 0xdb, 0x9b, 0x0d, 0x24, 0xe1, 0xcb, 0x26, 0x02, 0xf9, 0xe6, + 0x0c, 0xd1, 0x22, 0x19, 0x1c, 0xd3, 0x33, 0x5d, 0x9e, 0x4c, 0x98, 0xe9, 0x9e, 0x74, 0xf7, 0x38, + 0x19, 0x46, 0x43, 0x00, 0x29, 0xe2, 0x06, 0x2b, 0x40, 0x28, 0x97, 0x88, 0x0f, 0x71, 0xe2, 0x80, + 0x04, 0xe2, 0x82, 0x72, 0xe0, 0x86, 0x38, 0x46, 0x0a, 0x07, 0x3e, 0x2e, 0x68, 0x97, 0x03, 0x7f, + 0x06, 0x9a, 0xaa, 0x57, 0xfd, 0x35, 0x3d, 0xd5, 0xbd, 0x30, 0x89, 0x7c, 0xb2, 0xbb, 0xe6, 0xbd, + 0x7a, 0xbf, 0xdf, 0xab, 0x57, 0xef, 0xbd, 0x7a, 0x50, 0xf1, 0x58, 0x8b, 0x39, 0x26, 0x6b, 0xba, + 0x4d, 0x8f, 0xd9, 0xed, 0xc0, 0x3c, 0xdb, 0x31, 0x5f, 0xef, 0x33, 0x6f, 0x60, 0xf4, 0x3c, 0x37, + 0x70, 0x29, 0xe5, 0xbf, 0x1b, 0xe1, 0xef, 0xc6, 0xd9, 0x8e, 0x76, 0xad, 0xe5, 0xba, 0xad, 0x0e, + 0x33, 0xad, 0x5e, 0xdb, 0xb4, 0x1c, 0xc7, 0x0d, 0xac, 0xa0, 0xed, 0x3a, 0xbe, 0xd0, 0xd0, 0xae, + 0xe3, 0xaf, 0xfc, 0xab, 0xd1, 0x3f, 0x35, 0x83, 0x76, 0x97, 0xf9, 0x81, 0xd5, 0xed, 0xa1, 0xc0, + 0xd3, 0x4d, 0xd7, 0xef, 0xba, 0xbe, 0xd9, 0xb0, 0x7c, 0x26, 0x6c, 0x99, 0x67, 0x3b, 0x0d, 0x16, + 0x58, 0x3b, 0x66, 0xcf, 0x6a, 0xb5, 0x1d, 0xbe, 0x1b, 0xca, 0x66, 0xc1, 0xf3, 0x03, 0x2b, 0x60, + 0x8a, 0xdf, 0x83, 0x41, 0x8f, 0x21, 0x18, 0xfd, 0x18, 0x3e, 0xfe, 0xd2, 0xd8, 0xc2, 0x97, 0x3a, + 0x96, 0xef, 0x33, 0xbf, 0xce, 0x5e, 0xef, 0x33, 0x3f, 0xa0, 0x5f, 0x06, 0x88, 0x4c, 0xad, 0x91, + 0x0d, 0x52, 0x5d, 0xda, 0xbd, 0x69, 0x08, 0x5c, 0xc6, 0x18, 0x97, 0x21, 0x7c, 0x80, 0xb8, 0x8c, + 0x43, 0xab, 0xc5, 0x50, 0xb7, 0x1e, 0xd3, 0xd4, 0xdf, 0x21, 0x70, 0x25, 0xb9, 0xbf, 0xdf, 0x73, + 0x1d, 0x9f, 0xd1, 0x4f, 0xc3, 0x42, 0x53, 0x2c, 0xad, 0x91, 0x8d, 0x8b, 0xd5, 0xa5, 0xdd, 0x75, + 0x63, 0xd2, 0x91, 0x06, 0xd7, 0x3a, 0x70, 0x4e, 0xdd, 0xba, 0x94, 0xa6, 0x5f, 0x49, 0x20, 0x2b, + 0x71, 0x64, 0x9b, 0xb9, 0xc8, 0x84, 0xd5, 0x04, 0xb4, 0x6f, 0x83, 0x16, 0x47, 0xb6, 0x3f, 0xd8, + 0xb3, 0xbb, 0x6d, 0x47, 0x3a, 0xe0, 0x0a, 0xcc, 0x59, 0xe3, 0x6f, 0xce, 0x7d, 0xb1, 0x2e, 0x3e, + 0x52, 0x6e, 0x29, 0xfd, 0xcf, 0x6e, 0xf9, 0x39, 0x81, 0x27, 0x32, 0x8d, 0x9f, 0x1b, 0xef, 0x18, + 0xf0, 0xb1, 0x08, 0xa0, 0x74, 0xca, 0x55, 0x28, 0x73, 0x43, 0x27, 0x6d, 0x1b, 0xfd, 0x22, 0x0c, + 0x1f, 0xd8, 0xfa, 0x01, 0xd0, 0xb8, 0x3c, 0xf2, 0xb8, 0x03, 0x73, 0x5c, 0x00, 0x23, 0x28, 0x87, + 0x85, 0x90, 0xd5, 0x47, 0xb0, 0x16, 0x6d, 0x75, 0xe0, 0xfb, 0x7d, 0xe6, 0x15, 0x40, 0x30, 0xb3, + 0xb3, 0xf9, 0x0e, 0x5c, 0xcd, 0x30, 0x8f, 0x84, 0xd6, 0x60, 0xa1, 0x2d, 0x96, 0xf8, 0xc1, 0x2c, + 0xd6, 0xe5, 0xe7, 0xec, 0x3c, 0xff, 0x0a, 0xde, 0x98, 0x43, 0xcf, 0x7d, 0x8d, 0x35, 0x83, 0x99, + 0x5f, 0xc9, 0x77, 0x09, 0x3c, 0x9e, 0x32, 0x80, 0xe4, 0x5e, 0x80, 0x72, 0x0f, 0xd7, 0x30, 0xec, + 0xae, 0x67, 0x1d, 0x18, 0xea, 0xf1, 0x23, 0x0b, 0x15, 0x66, 0xc7, 0xff, 0xbb, 0xf2, 0x6e, 0x48, + 0x7c, 0xfb, 0x45, 0x83, 0x70, 0x66, 0x21, 0xf0, 0x6b, 0x02, 0xd7, 0xb2, 0x21, 0x9c, 0x2b, 0x4f, + 0xfd, 0x90, 0xc0, 0x93, 0x29, 0x98, 0x75, 0x76, 0xca, 0x3c, 0xe6, 0x34, 0xd9, 0x81, 0x2d, 0xfd, + 0xf5, 0x24, 0x2c, 0x7b, 0x72, 0x35, 0xf2, 0xd9, 0x92, 0x17, 0x49, 0xce, 0xcc, 0x6f, 0xbf, 0x21, + 0xa0, 0xab, 0x00, 0x9d, 0x2b, 0xef, 0x0d, 0x27, 0xc2, 0xec, 0x23, 0x2c, 0x00, 0x19, 0x11, 0x96, + 0xac, 0x00, 0xe7, 0xc3, 0x47, 0xcf, 0x60, 0x77, 0x80, 0x66, 0xa4, 0x6f, 0xd6, 0x01, 0xd0, 0x56, + 0x14, 0x50, 0x8b, 0xb8, 0x72, 0x60, 0xeb, 0x2f, 0x25, 0x33, 0x58, 0xc8, 0xe9, 0x39, 0x58, 0x40, + 0x21, 0x4c, 0x5f, 0xb9, 0x94, 0xa4, 0x7c, 0xd8, 0xa6, 0xec, 0x5b, 0x41, 0xf3, 0xd5, 0x0f, 0xb1, + 0x4d, 0x09, 0xf7, 0x8f, 0x0a, 0x71, 0x43, 0x2c, 0xa9, 0x0a, 0x31, 0xd7, 0x12, 0x80, 0x51, 0x7a, + 0x76, 0x47, 0x30, 0xc2, 0x30, 0x45, 0x64, 0xfb, 0x03, 0x51, 0x92, 0xa4, 0x07, 0x3e, 0x01, 0xf3, + 0xa2, 0x02, 0xe1, 0x31, 0xe0, 0xd7, 0xcc, 0x02, 0xf5, 0x17, 0x32, 0x50, 0x27, 0xec, 0x9f, 0x1b, + 0x0f, 0xbd, 0x85, 0x8d, 0x5c, 0x88, 0xf0, 0xa3, 0x2e, 0x17, 0x6f, 0x4f, 0xf8, 0xe8, 0x91, 0xee, + 0xcb, 0xcc, 0x70, 0xfc, 0x92, 0xc0, 0xfa, 0x14, 0x1c, 0xe7, 0xe6, 0xb0, 0xc2, 0xce, 0x37, 0x7d, + 0x5a, 0xe7, 0x06, 0xe1, 0x33, 0xd8, 0xf9, 0x72, 0x1b, 0xf2, 0x04, 0xaf, 0xc3, 0x12, 0x37, 0x74, + 0x62, 0x33, 0xc7, 0xed, 0xe2, 0x11, 0x02, 0x5f, 0x7a, 0x71, 0xbc, 0x12, 0xf6, 0xbf, 0xa8, 0x15, + 0xf5, 0xbf, 0x5c, 0x46, 0xd5, 0xff, 0x46, 0x5c, 0x84, 0xac, 0x7e, 0x18, 0xe6, 0xba, 0x8e, 0xe5, + 0x34, 0xe5, 0x49, 0x8f, 0x5b, 0x4f, 0xcb, 0xb6, 0x3d, 0x86, 0xdd, 0xf4, 0x62, 0x5d, 0x7e, 0xa6, + 0xc1, 0x95, 0x26, 0xc0, 0xdd, 0x0b, 0xb3, 0x1b, 0xee, 0x88, 0xf0, 0x3e, 0x3f, 0x76, 0x36, 0x5f, + 0x42, 0x80, 0x37, 0xa6, 0x02, 0x44, 0x55, 0xe9, 0x73, 0xfe, 0xa1, 0xbf, 0x99, 0xdc, 0xd7, 0xcf, + 0x87, 0x3a, 0xab, 0x50, 0xff, 0x95, 0x6c, 0x62, 0x23, 0xd3, 0xc8, 0xe9, 0x8b, 0x50, 0x46, 0x78, + 0x32, 0x82, 0x8a, 0x91, 0x0a, 0xb5, 0x66, 0x17, 0x49, 0x77, 0x31, 0x26, 0xbe, 0xda, 0xef, 0xf5, + 0x3a, 0x83, 0xc2, 0xa1, 0x74, 0x9f, 0x60, 0x00, 0x48, 0x3d, 0x64, 0xb6, 0x09, 0xab, 0x81, 0x67, + 0xd9, 0x56, 0xa3, 0xc3, 0x4e, 0xac, 0xae, 0xdb, 0x77, 0x02, 0x54, 0x5e, 0x91, 0xcb, 0x7b, 0x7c, + 0x95, 0x3e, 0x05, 0x2b, 0x1e, 0x0b, 0xda, 0x1e, 0xb3, 0xa5, 0x9c, 0x08, 0x89, 0xc7, 0x70, 0x15, + 0xc5, 0x6e, 0xc1, 0xe5, 0xe6, 0x98, 0x71, 0xa7, 0x13, 0x09, 0x5e, 0xe4, 0x82, 0xab, 0xe1, 0xba, + 0x10, 0xd5, 0xaf, 0xc2, 0x27, 0xc5, 0x9b, 0x88, 0xfb, 0xef, 0xe5, 0x41, 0x2f, 0x3c, 0x6b, 0xfd, + 0x58, 0xbe, 0xd6, 0xe2, 0x3f, 0x21, 0xe2, 0x3d, 0x58, 0x16, 0x1e, 0x3f, 0xe1, 0x23, 0x07, 0x3c, + 0x8f, 0x4a, 0xe6, 0x2b, 0x30, 0x54, 0xaf, 0x2f, 0x35, 0xa3, 0xad, 0xf4, 0x2b, 0xe8, 0xc3, 0x43, + 0xcb, 0xb3, 0xba, 0xa1, 0xd1, 0x03, 0xd9, 0x97, 0xe0, 0x2a, 0xda, 0xdb, 0x85, 0xf9, 0x1e, 0x5f, + 0xc1, 0x70, 0xd6, 0x32, 0xfb, 0x0b, 0xa1, 0x83, 0x92, 0xfa, 0x10, 0x16, 0xc3, 0x17, 0x28, 0x5d, + 0x81, 0x52, 0x98, 0xa0, 0x4b, 0x6d, 0x3b, 0x6a, 0x02, 0x4b, 0xf1, 0x26, 0x50, 0x83, 0x72, 0x97, + 0x05, 0x96, 0x6d, 0x05, 0x16, 0x3a, 0x2c, 0xfc, 0xa6, 0x5b, 0x40, 0x63, 0x94, 0x4f, 0xac, 0x46, + 0xc3, 0x63, 0x67, 0x6b, 0x97, 0xb8, 0xd4, 0xe5, 0x88, 0xd8, 0x1e, 0x5f, 0xd7, 0x7f, 0x47, 0x60, + 0x29, 0xd6, 0xef, 0x14, 0xb4, 0x1f, 0x2f, 0x69, 0x17, 0x93, 0x25, 0x4d, 0x87, 0xe5, 0xd7, 0xfa, + 0x5e, 0xdb, 0xb7, 0xdb, 0x4d, 0x1e, 0xbd, 0xc2, 0x70, 0x62, 0x2d, 0x01, 0x7f, 0x2e, 0x05, 0x3f, + 0xfd, 0x58, 0x98, 0x9f, 0x78, 0x2c, 0xe8, 0xef, 0x95, 0x60, 0x31, 0xcc, 0x59, 0x53, 0xfb, 0x8f, + 0x64, 0xc9, 0x2b, 0xa5, 0x4b, 0xde, 0x15, 0x98, 0x13, 0xe1, 0x2f, 0xf0, 0x8b, 0x8f, 0x04, 0xb2, + 0x4b, 0x29, 0x64, 0xcf, 0x01, 0xf8, 0x81, 0xe5, 0x05, 0x27, 0xb6, 0x15, 0x30, 0x8e, 0x7b, 0x7c, + 0xbe, 0x62, 0x94, 0x66, 0xc8, 0x51, 0x9a, 0xf1, 0xb2, 0x1c, 0xa5, 0xd5, 0x17, 0xb9, 0xf4, 0x8b, + 0x56, 0xc0, 0xe8, 0x5d, 0x28, 0x33, 0xc7, 0x16, 0x8a, 0xf3, 0xb9, 0x8a, 0x0b, 0xcc, 0xb1, 0xb9, + 0xda, 0x17, 0xe0, 0xb1, 0x31, 0x99, 0xf1, 0x55, 0x10, 0xba, 0x0b, 0xb9, 0xba, 0xcb, 0x52, 0x81, + 0x6f, 0x40, 0xe1, 0x92, 0xdb, 0x63, 0xce, 0x5a, 0x79, 0x83, 0x54, 0xcb, 0x75, 0xfe, 0xbf, 0xfe, + 0x67, 0x02, 0x97, 0xd3, 0xb9, 0xe7, 0xff, 0x48, 0xed, 0x59, 0x49, 0xe1, 0x62, 0xc1, 0xa4, 0x70, + 0x29, 0x2b, 0x29, 0x6c, 0xc2, 0x2a, 0xf3, 0x9b, 0x9e, 0xfb, 0x46, 0x24, 0x27, 0x62, 0x64, 0x45, + 0x2e, 0x0b, 0xc1, 0xdd, 0xfb, 0xeb, 0x30, 0xc7, 0xef, 0x20, 0xfd, 0x1e, 0x81, 0x05, 0x9c, 0x63, + 0xd1, 0xcd, 0xac, 0x1b, 0x97, 0x31, 0x60, 0xd4, 0xaa, 0xf9, 0x82, 0xe2, 0x52, 0xeb, 0x9f, 0xfa, + 0xfe, 0x07, 0xff, 0xfe, 0x49, 0x69, 0x9d, 0x3e, 0x61, 0x66, 0x8c, 0x32, 0xe5, 0xdc, 0xeb, 0xaf, + 0x04, 0x56, 0x92, 0xb3, 0x34, 0x6a, 0xe4, 0x59, 0x48, 0x3e, 0xf8, 0x34, 0xb3, 0xb0, 0x3c, 0x02, + 0xb3, 0x38, 0xb0, 0xaf, 0xd3, 0x2d, 0x05, 0xb0, 0x5a, 0x63, 0x50, 0xe3, 0x97, 0xd6, 0x1c, 0xf2, + 0x3f, 0xa3, 0xa3, 0xdb, 0xf4, 0x96, 0x42, 0xde, 0x4c, 0x08, 0xd3, 0xdf, 0x12, 0x98, 0xe3, 0xd6, + 0xe9, 0x53, 0x6a, 0x74, 0x92, 0xc4, 0xcd, 0x3c, 0x31, 0xc4, 0x7e, 0x8f, 0x63, 0x3f, 0xa4, 0x37, + 0xa6, 0x62, 0x31, 0x87, 0x32, 0xc7, 0x8c, 0x8e, 0xaa, 0xf4, 0xa6, 0x0a, 0x73, 0x24, 0x49, 0x3f, + 0x20, 0xb0, 0x1c, 0x1f, 0x9c, 0xd1, 0x2d, 0x35, 0xa0, 0xe4, 0x78, 0x4f, 0xab, 0x15, 0x94, 0x46, + 0x16, 0xa7, 0x9c, 0xc5, 0x37, 0x15, 0x27, 0x50, 0xc3, 0xf1, 0x5c, 0x9c, 0xcd, 0x36, 0x35, 0x8a, + 0xb1, 0x31, 0xe5, 0x6c, 0xef, 0x6d, 0x02, 0x65, 0xf9, 0x50, 0xa7, 0xd3, 0x23, 0x37, 0x35, 0xb1, + 0xd3, 0x6e, 0x15, 0x90, 0x44, 0x26, 0x37, 0x38, 0x93, 0x0a, 0xbd, 0x96, 0x85, 0x2c, 0x7c, 0xd7, + 0xff, 0xb4, 0x04, 0xab, 0xa9, 0x91, 0x14, 0x35, 0x73, 0x8d, 0x24, 0x1f, 0x44, 0xda, 0x76, 0x71, + 0x05, 0x04, 0xf7, 0x2e, 0xe1, 0xe8, 0x7e, 0x46, 0xe8, 0xb6, 0x0a, 0xde, 0x38, 0xd6, 0x27, 0x42, + 0xc7, 0xa4, 0x35, 0x95, 0xce, 0x64, 0xac, 0xed, 0x50, 0xb3, 0xe0, 0xe9, 0x84, 0x6e, 0xf9, 0x41, + 0x09, 0x1e, 0xcf, 0x9c, 0x38, 0xd1, 0xbb, 0x05, 0xb8, 0x4e, 0x8e, 0xcc, 0xb4, 0x67, 0x1f, 0x55, + 0x0d, 0x1d, 0xf5, 0x16, 0xf7, 0xd3, 0x80, 0xbe, 0x90, 0xe7, 0xa6, 0xb0, 0x9e, 0xd6, 0xda, 0xb6, + 0x39, 0x8c, 0x57, 0xdc, 0xd1, 0xd1, 0xf3, 0xf4, 0x33, 0x4a, 0x8f, 0x29, 0x74, 0xe9, 0xdf, 0x49, + 0x3c, 0x40, 0x44, 0x1e, 0x2c, 0x12, 0x20, 0x89, 0x44, 0xb8, 0x5d, 0x5c, 0x01, 0x79, 0x37, 0x39, + 0xef, 0x63, 0xf5, 0x51, 0x4f, 0xa6, 0xc2, 0x2d, 0xfa, 0xb4, 0x92, 0x69, 0x32, 0x17, 0xbe, 0x47, + 0x60, 0x01, 0x01, 0x28, 0xca, 0x4c, 0xf2, 0xe5, 0xad, 0x55, 0xf3, 0x05, 0x91, 0xc3, 0x31, 0xe7, + 0xf0, 0x35, 0x5a, 0x55, 0x40, 0x32, 0x87, 0x51, 0x4f, 0x33, 0x35, 0x93, 0x87, 0xf0, 0xe3, 0xc2, + 0xbc, 0x48, 0xe2, 0x93, 0x57, 0x81, 0x3e, 0x39, 0xde, 0x52, 0xa0, 0x4f, 0xcd, 0xa9, 0xd4, 0x45, + 0x52, 0x3e, 0x91, 0xff, 0x49, 0x60, 0x35, 0x35, 0xc6, 0x51, 0x44, 0x47, 0xf6, 0xc0, 0x49, 0x11, + 0x1d, 0x53, 0x26, 0x44, 0x3a, 0xe3, 0xd8, 0x4e, 0xb2, 0xb3, 0x2e, 0x62, 0x1b, 0x07, 0x87, 0xc8, + 0xb6, 0xe6, 0x50, 0xfc, 0x1d, 0x1d, 0xd5, 0xe8, 0x6d, 0x85, 0x86, 0x99, 0x12, 0xa7, 0xff, 0x20, + 0xb0, 0x92, 0x1c, 0x2a, 0x28, 0x5a, 0x80, 0xcc, 0x59, 0x91, 0x66, 0x16, 0x96, 0x47, 0x6a, 0x2d, + 0x4e, 0xcd, 0xca, 0x4e, 0x59, 0x31, 0x6a, 0x13, 0x59, 0xce, 0xc8, 0xae, 0x59, 0x92, 0x5b, 0x5a, + 0x9e, 0xfe, 0x47, 0xb6, 0x8d, 0xb1, 0xa9, 0x0e, 0x2d, 0x70, 0x14, 0xa9, 0xeb, 0xb0, 0xf3, 0x08, + 0x1a, 0x48, 0xd1, 0xe5, 0x14, 0xdb, 0xf4, 0x4e, 0x0e, 0xc5, 0xcc, 0x2b, 0xb2, 0x9b, 0x5d, 0x31, + 0x24, 0xcd, 0x2c, 0x1d, 0xfa, 0x07, 0x02, 0x73, 0x1c, 0x8d, 0xa2, 0xe7, 0x89, 0xcf, 0x66, 0x14, + 0x3d, 0x4f, 0x62, 0x18, 0xa3, 0x7f, 0x83, 0x33, 0xb9, 0x47, 0x37, 0xa7, 0x42, 0x32, 0x87, 0xb1, + 0x66, 0x7b, 0xea, 0x05, 0x97, 0xe8, 0x13, 0xc2, 0xf4, 0x9d, 0xd2, 0xf8, 0x82, 0xf3, 0x9e, 0x5e, + 0x79, 0xc1, 0xe3, 0x33, 0x1d, 0xe5, 0x05, 0x4f, 0x8c, 0x6a, 0xf4, 0x3f, 0x8a, 0x1a, 0xfc, 0x7b, + 0x32, 0xed, 0x20, 0xb8, 0x78, 0x12, 0xd3, 0x38, 0x75, 0xf2, 0x67, 0xc4, 0xe8, 0xe8, 0x73, 0xd9, + 0x35, 0x29, 0x93, 0x4a, 0xb4, 0x59, 0xa8, 0xfe, 0x59, 0xfa, 0xbc, 0xc2, 0xaa, 0x1f, 0x49, 0x66, + 0xf9, 0x91, 0xfe, 0x88, 0x40, 0x59, 0xce, 0x69, 0x68, 0x2e, 0xe5, 0x02, 0xed, 0x53, 0x7a, 0xe8, + 0xa3, 0x1b, 0xdc, 0x39, 0x53, 0xda, 0xd4, 0x49, 0x94, 0xf4, 0x4f, 0x04, 0xe6, 0xc5, 0x74, 0x85, + 0x4e, 0x8f, 0x9e, 0xc4, 0xd8, 0x46, 0xdb, 0xcc, 0x95, 0x43, 0x2c, 0x36, 0xc7, 0xf2, 0x4a, 0x76, + 0x21, 0xf1, 0xb9, 0x6c, 0x2a, 0xce, 0x72, 0x6e, 0x49, 0xf2, 0x70, 0xc4, 0x0e, 0xf4, 0xc7, 0x04, + 0x96, 0x62, 0x23, 0x17, 0x7a, 0x7b, 0x7a, 0xe7, 0x3c, 0x31, 0xb3, 0xd1, 0xb6, 0x8a, 0x09, 0x23, + 0xa1, 0x2a, 0x27, 0xa4, 0xd3, 0x8d, 0xcc, 0xbe, 0x8c, 0xff, 0x57, 0xe3, 0xf3, 0x1d, 0x3a, 0x82, + 0x79, 0x31, 0x5d, 0x51, 0x78, 0x35, 0x31, 0xc8, 0x51, 0x78, 0x35, 0x39, 0xda, 0xd1, 0x75, 0x0e, + 0xe2, 0x1a, 0xd5, 0x32, 0x4b, 0x2e, 0x97, 0xdd, 0x3f, 0xfc, 0xcb, 0x83, 0x0a, 0x79, 0xff, 0x41, + 0x85, 0xfc, 0xeb, 0x41, 0x85, 0xdc, 0x7f, 0x58, 0xb9, 0xf0, 0xfe, 0xc3, 0xca, 0x85, 0xbf, 0x3d, + 0xac, 0x5c, 0x38, 0x7a, 0xb6, 0xd5, 0x0e, 0x5e, 0xed, 0x37, 0x8c, 0xa6, 0xdb, 0x15, 0xfa, 0x35, + 0x87, 0x05, 0x6f, 0xb8, 0xde, 0xb7, 0xf0, 0xab, 0xc3, 0xec, 0x16, 0xf3, 0xcc, 0x37, 0x63, 0xdb, + 0x36, 0x5d, 0x8f, 0x35, 0xe6, 0xf9, 0x1b, 0xff, 0xce, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb4, + 0xa4, 0x1d, 0xe4, 0x05, 0x24, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4691,17 +4690,17 @@ func (m *QuerySupplyResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - if len(m.RetiredSupply) > 0 { - i -= len(m.RetiredSupply) - copy(dAtA[i:], m.RetiredSupply) - i = encodeVarintQuery(dAtA, i, uint64(len(m.RetiredSupply))) + if len(m.RetiredAmount) > 0 { + i -= len(m.RetiredAmount) + copy(dAtA[i:], m.RetiredAmount) + i = encodeVarintQuery(dAtA, i, uint64(len(m.RetiredAmount))) i-- dAtA[i] = 0x12 } - if len(m.TradableSupply) > 0 { - i -= len(m.TradableSupply) - copy(dAtA[i:], m.TradableSupply) - i = encodeVarintQuery(dAtA, i, uint64(len(m.TradableSupply))) + if len(m.TradableAmount) > 0 { + i -= len(m.TradableAmount) + copy(dAtA[i:], m.TradableAmount) + i = encodeVarintQuery(dAtA, i, uint64(len(m.TradableAmount))) i-- dAtA[i] = 0xa } @@ -5655,11 +5654,11 @@ func (m *QuerySupplyResponse) Size() (n int) { } var l int _ = l - l = len(m.TradableSupply) + l = len(m.TradableAmount) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } - l = len(m.RetiredSupply) + l = len(m.RetiredAmount) if l > 0 { n += 1 + l + sovQuery(uint64(l)) } @@ -9424,7 +9423,7 @@ func (m *QuerySupplyResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TradableSupply", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TradableAmount", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -9452,11 +9451,11 @@ func (m *QuerySupplyResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TradableSupply = string(dAtA[iNdEx:postIndex]) + m.TradableAmount = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RetiredSupply", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field RetiredAmount", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -9484,7 +9483,7 @@ func (m *QuerySupplyResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RetiredSupply = string(dAtA[iNdEx:postIndex]) + m.RetiredAmount = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { diff --git a/x/ecocredit/server/core/query_supply.go b/x/ecocredit/server/core/query_supply.go index 91d7027b3e..a1c1554a2b 100644 --- a/x/ecocredit/server/core/query_supply.go +++ b/x/ecocredit/server/core/query_supply.go @@ -21,8 +21,8 @@ func (k Keeper) Supply(ctx context.Context, request *core.QuerySupplyRequest) (* } return &core.QuerySupplyResponse{ - TradableSupply: supply.TradableAmount, - RetiredSupply: supply.RetiredAmount, + TradableAmount: supply.TradableAmount, + RetiredAmount: supply.RetiredAmount, CancelledAmount: supply.CancelledAmount, }, nil } diff --git a/x/ecocredit/server/core/query_supply_test.go b/x/ecocredit/server/core/query_supply_test.go index 6430b42223..0f0526d16e 100644 --- a/x/ecocredit/server/core/query_supply_test.go +++ b/x/ecocredit/server/core/query_supply_test.go @@ -37,8 +37,8 @@ func TestQuery_Supply(t *testing.T) { // valid query res, err := s.k.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) assert.NilError(t, err) - assert.Equal(t, tradable, res.TradableSupply) - assert.Equal(t, retired, res.RetiredSupply) + assert.Equal(t, tradable, res.TradableAmount) + assert.Equal(t, retired, res.RetiredAmount) assert.Equal(t, cancelled, res.CancelledAmount) // bad denom query diff --git a/x/ecocredit/server/testsuite/suite.go b/x/ecocredit/server/testsuite/suite.go index 1be93e9f09..9c2f4cf228 100644 --- a/x/ecocredit/server/testsuite/suite.go +++ b/x/ecocredit/server/testsuite/suite.go @@ -512,8 +512,8 @@ func (s *IntegrationTestSuite) TestScenario() { querySupplyRes, err := s.queryClient.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) s.Require().NoError(err) s.Require().NotNil(querySupplyRes) - s.Require().Equal(tSupply0, querySupplyRes.TradableSupply) - s.Require().Equal(rSupply0, querySupplyRes.RetiredSupply) + s.Require().Equal(tSupply0, querySupplyRes.TradableAmount) + s.Require().Equal(rSupply0, querySupplyRes.RetiredAmount) // cancel credits cancelCases := []struct { @@ -522,7 +522,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel string expectErr bool expTradable string - expTradableSupply string + expTradableAmount string expRetired string expTotalAmount string expAmountCancelled string @@ -555,7 +555,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel: "2.0002", expectErr: false, expTradable: "97.9998", - expTradableSupply: "1115.7567", + expTradableAmount: "1115.7567", expRetired: "0", expTotalAmount: "11120.50169", expAmountCancelled: "2.0002", @@ -566,7 +566,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel: "97.9998", expectErr: false, expTradable: "0", - expTradableSupply: "1017.7569", + expTradableAmount: "1017.7569", expRetired: "0", expTotalAmount: "11022.50189", expAmountCancelled: "100.0000", @@ -584,7 +584,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel: "1", expectErr: false, expTradable: "9.37", - expTradableSupply: "1016.7569", + expTradableAmount: "1016.7569", expRetired: "4.286", expTotalAmount: "11021.50189", expAmountCancelled: "101.0000", @@ -624,8 +624,8 @@ func (s *IntegrationTestSuite) TestScenario() { querySupplyRes, err = s.queryClient.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) s.Require().NoError(err) s.Require().NotNil(querySupplyRes) - s.assertDecStrEqual(tc.expTradableSupply, querySupplyRes.TradableSupply) - s.assertDecStrEqual(rSupply0, querySupplyRes.RetiredSupply) + s.assertDecStrEqual(tc.expTradableAmount, querySupplyRes.TradableAmount) + s.assertDecStrEqual(rSupply0, querySupplyRes.RetiredAmount) s.assertDecStrEqual(tc.expAmountCancelled, querySupplyRes.CancelledAmount) // query batch @@ -644,8 +644,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr bool expTradable string expRetired string - expTradableSupply string - expRetiredSupply string + expTradableAmount string + expRetiredAmount string expErrMessage string }{ { @@ -697,8 +697,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr: false, expTradable: "9.3699", expRetired: "4.2861", - expTradableSupply: "1016.7568", - expRetiredSupply: "10004.74509", + expTradableAmount: "1016.7568", + expRetiredAmount: "10004.74509", }, { name: "can retire more credits", @@ -707,8 +707,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr: false, expTradable: "0.3699", expRetired: "13.2861", - expTradableSupply: "1007.7568", - expRetiredSupply: "10013.74509", + expTradableAmount: "1007.7568", + expRetiredAmount: "10013.74509", }, { name: "can retire all credits", @@ -717,8 +717,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr: false, expTradable: "0", expRetired: "13.656", - expTradableSupply: "1007.3869", - expRetiredSupply: "10014.11499", + expTradableAmount: "1007.3869", + expRetiredAmount: "10014.11499", }, { name: "can't retire any more credits", @@ -763,8 +763,8 @@ func (s *IntegrationTestSuite) TestScenario() { querySupplyRes, err = s.queryClient.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) s.Require().NoError(err) s.Require().NotNil(querySupplyRes) - s.assertDecStrEqual(tc.expTradableSupply, querySupplyRes.TradableSupply) - s.assertDecStrEqual(tc.expRetiredSupply, querySupplyRes.RetiredSupply) + s.assertDecStrEqual(tc.expTradableAmount, querySupplyRes.TradableAmount) + s.assertDecStrEqual(tc.expRetiredAmount, querySupplyRes.RetiredAmount) } }) } @@ -779,8 +779,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender string expTradableRecipient string expRetiredRecipient string - expTradableSupply string - expRetiredSupply string + expTradableAmount string + expRetiredAmount string expErrMessage string }{ { @@ -841,8 +841,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender: "10000.45899", expTradableRecipient: "10", expRetiredRecipient: "20", - expTradableSupply: "987.3869", - expRetiredSupply: "10034.11499", + expTradableAmount: "987.3869", + expRetiredAmount: "10034.11499", }, { name: "can send with no retirement jurisdiction", @@ -854,8 +854,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender: "10000.45899", expTradableRecipient: "20", expRetiredRecipient: "20", - expTradableSupply: "987.3869", - expRetiredSupply: "10034.11499", + expTradableAmount: "987.3869", + expRetiredAmount: "10034.11499", }, { name: "can send all tradable", @@ -867,8 +867,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender: "10000.45899", expTradableRecipient: "87.3869", expRetiredRecipient: "920", - expTradableSupply: "87.3869", - expRetiredSupply: "10934.11499", + expTradableAmount: "87.3869", + expRetiredAmount: "10934.11499", }, { name: "can't send any more", @@ -926,8 +926,8 @@ func (s *IntegrationTestSuite) TestScenario() { querySupplyRes, err = s.queryClient.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) s.Require().NoError(err) s.Require().NotNil(querySupplyRes) - s.assertDecStrEqual(tc.expTradableSupply, querySupplyRes.TradableSupply) - s.assertDecStrEqual(tc.expRetiredSupply, querySupplyRes.RetiredSupply) + s.assertDecStrEqual(tc.expTradableAmount, querySupplyRes.TradableAmount) + s.assertDecStrEqual(tc.expRetiredAmount, querySupplyRes.RetiredAmount) } }) } From 25d4bbb7227cc62eb49775485f73612060efd929 Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 10:59:57 -0700 Subject: [PATCH 2/9] refactor(x/ecocredit): update core supply and basket field names --- x/ecocredit/basket/msg_take.go | 16 +++++++-- x/ecocredit/server/basket/msg_take.go | 18 ++++++---- x/ecocredit/server/testsuite/suite.go | 50 +++++++++++++-------------- 3 files changed, 50 insertions(+), 34 deletions(-) diff --git a/x/ecocredit/basket/msg_take.go b/x/ecocredit/basket/msg_take.go index 80bcc49ad7..69d95d9098 100644 --- a/x/ecocredit/basket/msg_take.go +++ b/x/ecocredit/basket/msg_take.go @@ -50,12 +50,22 @@ func (m MsgTake) ValidateBasic() error { } if m.RetireOnTake { - if len(m.RetirementJurisdiction) == 0 { + // retirement_location is deprecated but still supported + if len(m.RetirementLocation) == 0 && len(m.RetirementJurisdiction) == 0 { return sdkerrors.ErrInvalidRequest.Wrap("retirement jurisdiction cannot be empty if retire on take is true") } - if err := core.ValidateJurisdiction(m.RetirementJurisdiction); err != nil { - return sdkerrors.ErrInvalidRequest.Wrap(err.Error()) + // retirement_location is deprecated but still supported + if len(m.RetirementLocation) != 0 { + if err := core.ValidateJurisdiction(m.RetirementLocation); err != nil { + return sdkerrors.ErrInvalidRequest.Wrap(err.Error()) + } + } + + if len(m.RetirementJurisdiction) != 0 { + if err := core.ValidateJurisdiction(m.RetirementJurisdiction); err != nil { + return sdkerrors.ErrInvalidRequest.Wrap(err.Error()) + } } } diff --git a/x/ecocredit/server/basket/msg_take.go b/x/ecocredit/server/basket/msg_take.go index b8349836cf..90361f6255 100644 --- a/x/ecocredit/server/basket/msg_take.go +++ b/x/ecocredit/server/basket/msg_take.go @@ -99,6 +99,14 @@ func (k Keeper) Take(ctx context.Context, msg *baskettypes.MsgTake) (*baskettype return nil, err } + // retirement_location is deprecated but still supported + var retirementJurisdiction string + if len(msg.RetirementJurisdiction) != 0 { + retirementJurisdiction = msg.RetirementJurisdiction + } else { + retirementJurisdiction = msg.RetirementLocation + } + cmp := balance.Cmp(amountCreditsNeeded) if cmp > 0 { credits = append(credits, &baskettypes.BasketCredit{ @@ -111,9 +119,8 @@ func (k Keeper) Take(ctx context.Context, msg *baskettypes.MsgTake) (*baskettype acct, basketBalance.BatchDenom, amountCreditsNeeded, - basket.BasketDenom, retire, - msg.RetirementJurisdiction, + retirementJurisdiction, ) if err != nil { return nil, err @@ -142,9 +149,8 @@ func (k Keeper) Take(ctx context.Context, msg *baskettypes.MsgTake) (*baskettype acct, basketBalance.BatchDenom, balance, - basket.BasketDenom, retire, - msg.RetirementJurisdiction, + retirementJurisdiction, ) if err != nil { return nil, err @@ -180,7 +186,7 @@ func (k Keeper) Take(ctx context.Context, msg *baskettypes.MsgTake) (*baskettype }, err } -func (k Keeper) addCreditBalance(ctx context.Context, owner sdk.AccAddress, batchDenom string, amount math.Dec, basketDenom string, retire bool, retirementJurisdiction string) error { +func (k Keeper) addCreditBalance(ctx context.Context, owner sdk.AccAddress, batchDenom string, amount math.Dec, retire bool, jurisdiction string) error { sdkCtx := types.UnwrapSDKContext(ctx) batch, err := k.coreStore.BatchTable().GetByDenom(ctx, batchDenom) if err != nil { @@ -216,7 +222,7 @@ func (k Keeper) addCreditBalance(ctx context.Context, owner sdk.AccAddress, batc Owner: owner.String(), BatchDenom: batchDenom, Amount: amount.String(), - Jurisdiction: retirementJurisdiction, + Jurisdiction: jurisdiction, }) } } diff --git a/x/ecocredit/server/testsuite/suite.go b/x/ecocredit/server/testsuite/suite.go index 9c2f4cf228..a9a05caed7 100644 --- a/x/ecocredit/server/testsuite/suite.go +++ b/x/ecocredit/server/testsuite/suite.go @@ -522,7 +522,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel string expectErr bool expTradable string - expTradableAmount string + expTradableSupply string expRetired string expTotalAmount string expAmountCancelled string @@ -555,7 +555,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel: "2.0002", expectErr: false, expTradable: "97.9998", - expTradableAmount: "1115.7567", + expTradableSupply: "1115.7567", expRetired: "0", expTotalAmount: "11120.50169", expAmountCancelled: "2.0002", @@ -566,7 +566,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel: "97.9998", expectErr: false, expTradable: "0", - expTradableAmount: "1017.7569", + expTradableSupply: "1017.7569", expRetired: "0", expTotalAmount: "11022.50189", expAmountCancelled: "100.0000", @@ -584,7 +584,7 @@ func (s *IntegrationTestSuite) TestScenario() { toCancel: "1", expectErr: false, expTradable: "9.37", - expTradableAmount: "1016.7569", + expTradableSupply: "1016.7569", expRetired: "4.286", expTotalAmount: "11021.50189", expAmountCancelled: "101.0000", @@ -624,7 +624,7 @@ func (s *IntegrationTestSuite) TestScenario() { querySupplyRes, err = s.queryClient.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) s.Require().NoError(err) s.Require().NotNil(querySupplyRes) - s.assertDecStrEqual(tc.expTradableAmount, querySupplyRes.TradableAmount) + s.assertDecStrEqual(tc.expTradableSupply, querySupplyRes.TradableAmount) s.assertDecStrEqual(rSupply0, querySupplyRes.RetiredAmount) s.assertDecStrEqual(tc.expAmountCancelled, querySupplyRes.CancelledAmount) @@ -644,8 +644,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr bool expTradable string expRetired string - expTradableAmount string - expRetiredAmount string + expTradableSupply string + expRetiredSupply string expErrMessage string }{ { @@ -697,8 +697,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr: false, expTradable: "9.3699", expRetired: "4.2861", - expTradableAmount: "1016.7568", - expRetiredAmount: "10004.74509", + expTradableSupply: "1016.7568", + expRetiredSupply: "10004.74509", }, { name: "can retire more credits", @@ -707,8 +707,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr: false, expTradable: "0.3699", expRetired: "13.2861", - expTradableAmount: "1007.7568", - expRetiredAmount: "10013.74509", + expTradableSupply: "1007.7568", + expRetiredSupply: "10013.74509", }, { name: "can retire all credits", @@ -717,8 +717,8 @@ func (s *IntegrationTestSuite) TestScenario() { expectErr: false, expTradable: "0", expRetired: "13.656", - expTradableAmount: "1007.3869", - expRetiredAmount: "10014.11499", + expTradableSupply: "1007.3869", + expRetiredSupply: "10014.11499", }, { name: "can't retire any more credits", @@ -763,8 +763,8 @@ func (s *IntegrationTestSuite) TestScenario() { querySupplyRes, err = s.queryClient.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) s.Require().NoError(err) s.Require().NotNil(querySupplyRes) - s.assertDecStrEqual(tc.expTradableAmount, querySupplyRes.TradableAmount) - s.assertDecStrEqual(tc.expRetiredAmount, querySupplyRes.RetiredAmount) + s.assertDecStrEqual(tc.expTradableSupply, querySupplyRes.TradableAmount) + s.assertDecStrEqual(tc.expRetiredSupply, querySupplyRes.RetiredAmount) } }) } @@ -779,8 +779,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender string expTradableRecipient string expRetiredRecipient string - expTradableAmount string - expRetiredAmount string + expTradableSupply string + expRetiredSupply string expErrMessage string }{ { @@ -841,8 +841,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender: "10000.45899", expTradableRecipient: "10", expRetiredRecipient: "20", - expTradableAmount: "987.3869", - expRetiredAmount: "10034.11499", + expTradableSupply: "987.3869", + expRetiredSupply: "10034.11499", }, { name: "can send with no retirement jurisdiction", @@ -854,8 +854,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender: "10000.45899", expTradableRecipient: "20", expRetiredRecipient: "20", - expTradableAmount: "987.3869", - expRetiredAmount: "10034.11499", + expTradableSupply: "987.3869", + expRetiredSupply: "10034.11499", }, { name: "can send all tradable", @@ -867,8 +867,8 @@ func (s *IntegrationTestSuite) TestScenario() { expRetiredSender: "10000.45899", expTradableRecipient: "87.3869", expRetiredRecipient: "920", - expTradableAmount: "87.3869", - expRetiredAmount: "10934.11499", + expTradableSupply: "87.3869", + expRetiredSupply: "10934.11499", }, { name: "can't send any more", @@ -926,8 +926,8 @@ func (s *IntegrationTestSuite) TestScenario() { querySupplyRes, err = s.queryClient.Supply(s.ctx, &core.QuerySupplyRequest{BatchDenom: batchDenom}) s.Require().NoError(err) s.Require().NotNil(querySupplyRes) - s.assertDecStrEqual(tc.expTradableAmount, querySupplyRes.TradableAmount) - s.assertDecStrEqual(tc.expRetiredAmount, querySupplyRes.RetiredAmount) + s.assertDecStrEqual(tc.expTradableSupply, querySupplyRes.TradableAmount) + s.assertDecStrEqual(tc.expRetiredSupply, querySupplyRes.RetiredAmount) } }) } From 8d4a2cafc9301009ee89763f32039db0af2bc133 Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 11:03:03 -0700 Subject: [PATCH 3/9] refactor(x/ecocredit): update core supply and basket field names --- api/regen/ecocredit/basket/v1/tx.pulsar.go | 2 ++ proto/regen/ecocredit/basket/v1/tx.proto | 2 ++ x/ecocredit/basket/tx.pb.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/api/regen/ecocredit/basket/v1/tx.pulsar.go b/api/regen/ecocredit/basket/v1/tx.pulsar.go index 18da32e0a0..92efcb8811 100644 --- a/api/regen/ecocredit/basket/v1/tx.pulsar.go +++ b/api/regen/ecocredit/basket/v1/tx.pulsar.go @@ -4064,6 +4064,8 @@ type MsgTake struct { RetireOnTake bool `protobuf:"varint,5,opt,name=retire_on_take,json=retireOnTake,proto3" json:"retire_on_take,omitempty"` // retirement_jurisdiction is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. + // + // Since Revision 1 RetirementJurisdiction string `protobuf:"bytes,6,opt,name=retirement_jurisdiction,json=retirementJurisdiction,proto3" json:"retirement_jurisdiction,omitempty"` } diff --git a/proto/regen/ecocredit/basket/v1/tx.proto b/proto/regen/ecocredit/basket/v1/tx.proto index 287156528f..f4ac18757d 100644 --- a/proto/regen/ecocredit/basket/v1/tx.proto +++ b/proto/regen/ecocredit/basket/v1/tx.proto @@ -139,6 +139,8 @@ message MsgTake { // retirement_jurisdiction is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. + // + // Since Revision 1 string retirement_jurisdiction = 6; } diff --git a/x/ecocredit/basket/tx.pb.go b/x/ecocredit/basket/tx.pb.go index ef7a6d4432..bd06d5a171 100644 --- a/x/ecocredit/basket/tx.pb.go +++ b/x/ecocredit/basket/tx.pb.go @@ -356,6 +356,8 @@ type MsgTake struct { RetireOnTake bool `protobuf:"varint,5,opt,name=retire_on_take,json=retireOnTake,proto3" json:"retire_on_take,omitempty"` // retirement_jurisdiction is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. + // + // Since Revision 1 RetirementJurisdiction string `protobuf:"bytes,6,opt,name=retirement_jurisdiction,json=retirementJurisdiction,proto3" json:"retirement_jurisdiction,omitempty"` } From ea5c58843a9c28c22faa6b20ecc13d578e2bacce Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 11:19:40 -0700 Subject: [PATCH 4/9] refactor(x/ecocredit): update core supply and basket field names --- proto/regen/ecocredit/basket/v1/tx.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/regen/ecocredit/basket/v1/tx.proto b/proto/regen/ecocredit/basket/v1/tx.proto index f4ac18757d..e1ee638b56 100644 --- a/proto/regen/ecocredit/basket/v1/tx.proto +++ b/proto/regen/ecocredit/basket/v1/tx.proto @@ -128,8 +128,8 @@ message MsgTake { // credits which will be used only if retire_on_take is true for this basket. // // Deprecated (Since Revision 1): This field is will be removed in the next - // version in favor of retirement_jurisdiction. If retirement_jurisdiction is - // set, this field will be ignored. + // version in favor of retirement_jurisdiction. Only one of these need to be + // set and retirement_jurisdiction will be used if both are set. string retirement_location = 4; // retire_on_take is a boolean that dictates whether the ecocredits From 04a1ca6324cc62ac2d1f53187aaba786422f4cb5 Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 11:20:00 -0700 Subject: [PATCH 5/9] refactor(x/ecocredit): update core supply and basket field names --- api/regen/ecocredit/basket/v1/tx.pulsar.go | 4 ++-- x/ecocredit/basket/tx.pb.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/regen/ecocredit/basket/v1/tx.pulsar.go b/api/regen/ecocredit/basket/v1/tx.pulsar.go index 92efcb8811..98425e4f38 100644 --- a/api/regen/ecocredit/basket/v1/tx.pulsar.go +++ b/api/regen/ecocredit/basket/v1/tx.pulsar.go @@ -4055,8 +4055,8 @@ type MsgTake struct { // credits which will be used only if retire_on_take is true for this basket. // // Deprecated (Since Revision 1): This field is will be removed in the next - // version in favor of retirement_jurisdiction. If retirement_jurisdiction is - // set, this field will be ignored. + // version in favor of retirement_jurisdiction. Only one of these need to be + // set and retirement_jurisdiction will be used if both are set. RetirementLocation string `protobuf:"bytes,4,opt,name=retirement_location,json=retirementLocation,proto3" json:"retirement_location,omitempty"` // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as diff --git a/x/ecocredit/basket/tx.pb.go b/x/ecocredit/basket/tx.pb.go index bd06d5a171..2414775942 100644 --- a/x/ecocredit/basket/tx.pb.go +++ b/x/ecocredit/basket/tx.pb.go @@ -347,8 +347,8 @@ type MsgTake struct { // credits which will be used only if retire_on_take is true for this basket. // // Deprecated (Since Revision 1): This field is will be removed in the next - // version in favor of retirement_jurisdiction. If retirement_jurisdiction is - // set, this field will be ignored. + // version in favor of retirement_jurisdiction. Only one of these need to be + // set and retirement_jurisdiction will be used if both are set. RetirementLocation string `protobuf:"bytes,4,opt,name=retirement_location,json=retirementLocation,proto3" json:"retirement_location,omitempty"` // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as From 7c00c34cb906c1f2e3b2ef80dd1b7df401c241fd Mon Sep 17 00:00:00 2001 From: Ryan Christoffersen <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 13:26:02 -0700 Subject: [PATCH 6/9] Update proto/regen/ecocredit/basket/v1/tx.proto Co-authored-by: Tyler <48813565+technicallyty@users.noreply.github.com> --- proto/regen/ecocredit/basket/v1/tx.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto/regen/ecocredit/basket/v1/tx.proto b/proto/regen/ecocredit/basket/v1/tx.proto index e1ee638b56..ff747bffc4 100644 --- a/proto/regen/ecocredit/basket/v1/tx.proto +++ b/proto/regen/ecocredit/basket/v1/tx.proto @@ -130,7 +130,7 @@ message MsgTake { // Deprecated (Since Revision 1): This field is will be removed in the next // version in favor of retirement_jurisdiction. Only one of these need to be // set and retirement_jurisdiction will be used if both are set. - string retirement_location = 4; + string retirement_location = 4 [ deprecated = true ]; // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as From a175eadfd9eb4f23120eb415ec14bba80decdb93 Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 13:56:11 -0700 Subject: [PATCH 7/9] fix comments and gen proto --- api/regen/ecocredit/basket/v1/tx.pulsar.go | 97 +++++++++++----------- proto/regen/ecocredit/basket/v1/tx.proto | 2 +- x/ecocredit/basket/tx.pb.go | 97 +++++++++++----------- 3 files changed, 100 insertions(+), 96 deletions(-) diff --git a/api/regen/ecocredit/basket/v1/tx.pulsar.go b/api/regen/ecocredit/basket/v1/tx.pulsar.go index 98425e4f38..8092709352 100644 --- a/api/regen/ecocredit/basket/v1/tx.pulsar.go +++ b/api/regen/ecocredit/basket/v1/tx.pulsar.go @@ -4054,9 +4054,11 @@ type MsgTake struct { // retirement_location is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. // - // Deprecated (Since Revision 1): This field is will be removed in the next + // Deprecated (Since Revision 1): This field will be removed in the next // version in favor of retirement_jurisdiction. Only one of these need to be // set and retirement_jurisdiction will be used if both are set. + // + // Deprecated: Do not use. RetirementLocation string `protobuf:"bytes,4,opt,name=retirement_location,json=retirementLocation,proto3" json:"retirement_location,omitempty"` // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as @@ -4110,6 +4112,7 @@ func (x *MsgTake) GetAmount() string { return "" } +// Deprecated: Do not use. func (x *MsgTake) GetRetirementLocation() string { if x != nil { return x.RetirementLocation @@ -4223,61 +4226,61 @@ var file_regen_ecocredit_basket_v1_tx_proto_rawDesc = []byte{ 0x0e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, 0xea, 0x01, 0x0a, 0x07, 0x4d, 0x73, 0x67, + 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, 0xee, 0x01, 0x0a, 0x07, 0x4d, 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2f, 0x0a, 0x13, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, + 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x33, 0x0a, 0x13, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x12, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x6f, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, - 0x5f, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x6b, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, - 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x4f, 0x6e, 0x54, 0x61, 0x6b, 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, 0x54, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, - 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, - 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x43, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x32, 0x90, 0x02, 0x0a, 0x03, - 0x4d, 0x73, 0x67, 0x12, 0x5c, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x24, 0x2e, + 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x12, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x6d, 0x65, + 0x6e, 0x74, 0x4c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x72, 0x65, + 0x74, 0x69, 0x72, 0x65, 0x5f, 0x6f, 0x6e, 0x5f, 0x74, 0x61, 0x6b, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x0c, 0x72, 0x65, 0x74, 0x69, 0x72, 0x65, 0x4f, 0x6e, 0x54, 0x61, 0x6b, 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, 0x54, 0x0a, 0x0f, 0x4d, 0x73, 0x67, + 0x54, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x07, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, - 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x1a, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, - 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x53, 0x0a, 0x03, 0x50, 0x75, 0x74, 0x12, 0x21, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, - 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, - 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x1a, 0x29, 0x2e, 0x72, 0x65, - 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, - 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x04, 0x54, 0x61, 0x6b, 0x65, 0x12, 0x22, - 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, - 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x61, - 0x6b, 0x65, 0x1a, 0x2a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, + 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, + 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x52, 0x07, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x73, 0x32, + 0x90, 0x02, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x5c, 0x0a, 0x06, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x12, 0x24, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, + 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x1a, 0x2c, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, + 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x03, 0x50, 0x75, 0x74, 0x12, 0x21, 0x2e, 0x72, + 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, + 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, 0x75, 0x74, 0x1a, + 0x29, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x50, + 0x75, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x56, 0x0a, 0x04, 0x54, 0x61, + 0x6b, 0x65, 0x12, 0x22, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0xfd, - 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, 0x63, 0x6f, - 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, - 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4c, 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, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2f, 0x76, 0x31, - 0x3b, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x52, 0x45, 0x42, 0xaa, - 0x02, 0x19, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, - 0x74, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x19, 0x52, 0x65, + 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, 0x1a, 0x2a, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x65, + 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x54, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x42, 0xfd, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x72, 0x65, 0x67, 0x65, 0x6e, + 0x2e, 0x65, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x62, 0x61, 0x73, 0x6b, 0x65, + 0x74, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x4c, 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, 0x62, 0x61, 0x73, 0x6b, 0x65, + 0x74, 0x2f, 0x76, 0x31, 0x3b, 0x62, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x76, 0x31, 0xa2, 0x02, 0x03, + 0x52, 0x45, 0x42, 0xaa, 0x02, 0x19, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x2e, 0x45, 0x63, 0x6f, 0x63, + 0x72, 0x65, 0x64, 0x69, 0x74, 0x2e, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x2e, 0x56, 0x31, 0xca, + 0x02, 0x19, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, + 0x74, 0x5c, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x25, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x42, 0x61, - 0x73, 0x6b, 0x65, 0x74, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x25, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x5c, - 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x5c, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, - 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, - 0x02, 0x1c, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, 0x63, 0x72, 0x65, 0x64, - 0x69, 0x74, 0x3a, 0x3a, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x6b, 0x65, 0x74, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, + 0x61, 0x74, 0x61, 0xea, 0x02, 0x1c, 0x52, 0x65, 0x67, 0x65, 0x6e, 0x3a, 0x3a, 0x45, 0x63, 0x6f, + 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x3a, 0x3a, 0x42, 0x61, 0x73, 0x6b, 0x65, 0x74, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/regen/ecocredit/basket/v1/tx.proto b/proto/regen/ecocredit/basket/v1/tx.proto index ff747bffc4..fd17ce3a15 100644 --- a/proto/regen/ecocredit/basket/v1/tx.proto +++ b/proto/regen/ecocredit/basket/v1/tx.proto @@ -127,7 +127,7 @@ message MsgTake { // retirement_location is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. // - // Deprecated (Since Revision 1): This field is will be removed in the next + // Deprecated (Since Revision 1): This field will be removed in the next // version in favor of retirement_jurisdiction. Only one of these need to be // set and retirement_jurisdiction will be used if both are set. string retirement_location = 4 [ deprecated = true ]; diff --git a/x/ecocredit/basket/tx.pb.go b/x/ecocredit/basket/tx.pb.go index 2414775942..de3f0d3e0a 100644 --- a/x/ecocredit/basket/tx.pb.go +++ b/x/ecocredit/basket/tx.pb.go @@ -346,10 +346,10 @@ type MsgTake struct { // retirement_location is the optional retirement jurisdiction for the // credits which will be used only if retire_on_take is true for this basket. // - // Deprecated (Since Revision 1): This field is will be removed in the next + // Deprecated (Since Revision 1): This field will be removed in the next // version in favor of retirement_jurisdiction. Only one of these need to be // set and retirement_jurisdiction will be used if both are set. - RetirementLocation string `protobuf:"bytes,4,opt,name=retirement_location,json=retirementLocation,proto3" json:"retirement_location,omitempty"` + RetirementLocation string `protobuf:"bytes,4,opt,name=retirement_location,json=retirementLocation,proto3" json:"retirement_location,omitempty"` // Deprecated: Do not use. // retire_on_take is a boolean that dictates whether the ecocredits // received in exchange for the basket tokens will be received as // retired or tradable credits. @@ -415,6 +415,7 @@ func (m *MsgTake) GetAmount() string { return "" } +// Deprecated: Do not use. func (m *MsgTake) GetRetirementLocation() string { if m != nil { return m.RetirementLocation @@ -496,52 +497,52 @@ func init() { } var fileDescriptor_a60f962a3c61f018 = []byte{ - // 710 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x4f, 0xe3, 0x46, - 0x18, 0x8e, 0xe3, 0x90, 0x90, 0x09, 0x84, 0x32, 0x20, 0x6a, 0x72, 0x30, 0xc1, 0xa2, 0x22, 0xad, - 0xc0, 0x6e, 0xa8, 0xd4, 0x8f, 0x23, 0x09, 0xa7, 0x8a, 0xa8, 0xc8, 0x45, 0x3d, 0x54, 0xad, 0xac, - 0x89, 0xfd, 0xd6, 0x75, 0x93, 0x78, 0xa2, 0x99, 0x71, 0x80, 0x7b, 0x7f, 0x00, 0xbf, 0xa3, 0x97, - 0xfe, 0x0d, 0x8e, 0x1c, 0xf7, 0xb4, 0xbb, 0x82, 0xdb, 0xfe, 0x8a, 0x95, 0x67, 0x26, 0x26, 0x12, - 0xda, 0xb0, 0xe2, 0x14, 0xbf, 0xcf, 0xf3, 0xbc, 0x4f, 0xde, 0x2f, 0x1b, 0x39, 0x0c, 0x62, 0x48, - 0x3d, 0x08, 0x69, 0xc8, 0x20, 0x4a, 0x84, 0x37, 0x24, 0x7c, 0x04, 0xc2, 0x9b, 0x75, 0x3d, 0x71, - 0xed, 0x4e, 0x19, 0x15, 0x14, 0xef, 0x4a, 0x8d, 0x5b, 0x68, 0x5c, 0xa5, 0x71, 0x67, 0xdd, 0xd6, - 0x76, 0x4c, 0x63, 0x2a, 0x55, 0x5e, 0xfe, 0xa4, 0x12, 0x5a, 0x5f, 0x2d, 0x31, 0xbd, 0x99, 0x02, - 0xd7, 0x32, 0x3b, 0xa4, 0x7c, 0x42, 0x79, 0xce, 0x82, 0x37, 0xeb, 0x0e, 0x41, 0x90, 0xae, 0x17, - 0xd2, 0x24, 0x55, 0xbc, 0xf3, 0xbf, 0x89, 0xea, 0x03, 0x1e, 0xf7, 0x19, 0x10, 0x01, 0xd8, 0x42, - 0xb5, 0x30, 0x63, 0x44, 0x50, 0x66, 0x19, 0x6d, 0xa3, 0x53, 0xf7, 0xe7, 0x21, 0xc6, 0xa8, 0x92, - 0x92, 0x09, 0x58, 0x65, 0x09, 0xcb, 0x67, 0xdc, 0x46, 0x8d, 0x08, 0x78, 0xc8, 0x92, 0xa9, 0x48, - 0x68, 0x6a, 0x99, 0x92, 0x5a, 0x84, 0xb0, 0x8d, 0x56, 0xe1, 0x7a, 0x4a, 0x53, 0x48, 0x85, 0x55, - 0x69, 0x1b, 0x9d, 0xf5, 0x5e, 0xd9, 0x32, 0xfc, 0x02, 0xc3, 0x2e, 0xda, 0x8a, 0x12, 0x4e, 0x86, - 0x63, 0x08, 0x48, 0x26, 0x68, 0xc0, 0x40, 0x24, 0x0c, 0xac, 0x95, 0xb6, 0xd1, 0x59, 0xf5, 0x37, - 0x35, 0x75, 0x9a, 0x09, 0xea, 0x4b, 0x02, 0x1f, 0x21, 0xac, 0xba, 0x0d, 0xf2, 0x1e, 0x03, 0x32, - 0x1c, 0x32, 0x98, 0x59, 0x55, 0xf9, 0xc7, 0x5f, 0x28, 0xe6, 0xf2, 0x66, 0x0a, 0xa7, 0x12, 0xc7, - 0x87, 0x68, 0x83, 0x8c, 0xc7, 0xf4, 0x0a, 0xa2, 0x20, 0x1c, 0x13, 0xce, 0x81, 0x5b, 0xb5, 0xb6, - 0xd9, 0xa9, 0xfb, 0x4d, 0x0d, 0xf7, 0x15, 0x8a, 0xcf, 0xd1, 0x7a, 0x44, 0x04, 0x04, 0x21, 0x4b, - 0x04, 0xb0, 0x84, 0x58, 0xab, 0x6d, 0xa3, 0xd3, 0x38, 0x39, 0x74, 0x3f, 0xb9, 0x14, 0xf7, 0x8c, - 0x08, 0xe8, 0x6b, 0xb9, 0xbf, 0x16, 0x2d, 0x44, 0xf8, 0x4f, 0x64, 0xfe, 0x05, 0x60, 0xd5, 0xdb, - 0x66, 0xa7, 0x71, 0xb2, 0xeb, 0xaa, 0x05, 0xe4, 0xa9, 0xe0, 0xea, 0x05, 0xb8, 0x7d, 0x9a, 0xa4, - 0xbd, 0x6f, 0xef, 0xde, 0xee, 0x95, 0xfe, 0x7b, 0xb7, 0xd7, 0x89, 0x13, 0xf1, 0x77, 0x36, 0x74, - 0x43, 0x3a, 0xf1, 0xf4, 0xb6, 0xd4, 0xcf, 0x31, 0x8f, 0x46, 0x7a, 0x99, 0x79, 0x02, 0xf7, 0x73, - 0x5f, 0xe7, 0x7b, 0xb4, 0x59, 0x2c, 0xcc, 0x07, 0x3e, 0xa5, 0x29, 0x07, 0xbc, 0x8f, 0xd6, 0x54, - 0x6d, 0x41, 0x04, 0x29, 0x9d, 0xe8, 0xed, 0x35, 0x14, 0x76, 0x96, 0x43, 0xce, 0xbf, 0x06, 0xaa, - 0x0e, 0x78, 0x7c, 0x91, 0x09, 0xbc, 0x8d, 0x56, 0xe8, 0x55, 0x0a, 0xf3, 0x25, 0xab, 0xe0, 0x99, - 0x47, 0xf9, 0x99, 0x07, 0x3e, 0x45, 0x35, 0x35, 0x09, 0x6e, 0x99, 0xb2, 0xbd, 0x65, 0x23, 0xea, - 0xc9, 0xa7, 0xbe, 0x84, 0xfd, 0x79, 0x9e, 0xf3, 0x13, 0x6a, 0xaa, 0x2a, 0x8a, 0xda, 0xf3, 0x35, - 0x4d, 0x68, 0x96, 0x8a, 0x80, 0x41, 0x08, 0xc9, 0x0c, 0x22, 0x5d, 0x57, 0x53, 0xc1, 0xbe, 0x46, - 0x9d, 0x0f, 0x06, 0xaa, 0x0d, 0x78, 0x7c, 0x49, 0x46, 0xf0, 0xfa, 0x16, 0x76, 0x50, 0x55, 0xd9, - 0xea, 0x7b, 0xd5, 0x11, 0xf6, 0xd0, 0x96, 0xba, 0xbe, 0x09, 0xa4, 0x22, 0x18, 0xd3, 0x90, 0xc8, - 0xa3, 0xae, 0x48, 0x11, 0x7e, 0xa2, 0xce, 0x35, 0x83, 0x0f, 0x50, 0x53, 0xa1, 0x01, 0x4d, 0x03, - 0x41, 0x46, 0xf3, 0xb3, 0x5d, 0x53, 0xe8, 0x2f, 0xa9, 0xac, 0xf3, 0x07, 0xf4, 0xe5, 0x82, 0xed, - 0x3f, 0x19, 0x4b, 0x78, 0x94, 0x84, 0xd2, 0x5a, 0x9d, 0xed, 0xce, 0x13, 0xfd, 0xf3, 0x02, 0xeb, - 0x5c, 0xa2, 0x0d, 0xdd, 0x6b, 0x31, 0xa8, 0x85, 0xe9, 0x1b, 0xaf, 0x9b, 0xfe, 0xc9, 0x6d, 0x19, - 0x99, 0x03, 0x1e, 0xe3, 0x3f, 0x50, 0x55, 0xbf, 0xf2, 0x07, 0x4b, 0x3c, 0x8a, 0x3b, 0x6b, 0x1d, - 0x7d, 0x8e, 0xaa, 0x28, 0xf4, 0x57, 0x64, 0xe6, 0x67, 0xb6, 0xbf, 0x3c, 0xe9, 0x22, 0x13, 0xad, - 0xaf, 0x5f, 0x94, 0x14, 0xa6, 0xbf, 0xa1, 0x8a, 0x9c, 0xa8, 0xb3, 0x3c, 0x25, 0xd7, 0xb4, 0xbe, - 0x79, 0x59, 0x33, 0xf7, 0xed, 0xf9, 0x77, 0x0f, 0xb6, 0x71, 0xff, 0x60, 0x1b, 0xef, 0x1f, 0x6c, - 0xe3, 0xf6, 0xd1, 0x2e, 0xdd, 0x3f, 0xda, 0xa5, 0x37, 0x8f, 0x76, 0xe9, 0xf7, 0x1f, 0x17, 0x5e, - 0x4c, 0xe9, 0x77, 0x9c, 0x82, 0xb8, 0xa2, 0x6c, 0xa4, 0xa3, 0x31, 0x44, 0x31, 0x30, 0xef, 0xfa, - 0xd9, 0x47, 0x78, 0x58, 0x95, 0x1f, 0xd7, 0xef, 0x3e, 0x06, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x14, - 0x16, 0x50, 0xfa, 0x05, 0x00, 0x00, + // 714 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x4f, 0xeb, 0x46, + 0x14, 0x8d, 0x63, 0x48, 0xc8, 0x04, 0x42, 0x19, 0x10, 0x35, 0x59, 0x98, 0x60, 0x51, 0x91, 0x56, + 0x60, 0x37, 0x20, 0xf5, 0x63, 0x49, 0xc2, 0xaa, 0x22, 0x2a, 0x72, 0x51, 0x17, 0x55, 0x2b, 0x6b, + 0x62, 0xdf, 0xba, 0x6e, 0x12, 0x4f, 0x34, 0x33, 0x0e, 0xb0, 0xef, 0x0f, 0xe0, 0x77, 0x74, 0xf3, + 0xfe, 0x06, 0x4b, 0x96, 0x6f, 0xf5, 0xde, 0x13, 0xec, 0xdf, 0x6f, 0x78, 0xf2, 0xcc, 0xc4, 0x44, + 0x42, 0x2f, 0x3c, 0xb1, 0x8a, 0xe7, 0x9c, 0x73, 0x4f, 0xee, 0x9d, 0x73, 0x6d, 0xe4, 0x30, 0x88, + 0x21, 0xf5, 0x20, 0xa4, 0x21, 0x83, 0x28, 0x11, 0xde, 0x80, 0xf0, 0x21, 0x08, 0x6f, 0xda, 0xf1, + 0xc4, 0xb5, 0x3b, 0x61, 0x54, 0x50, 0xbc, 0x23, 0x35, 0x6e, 0xa1, 0x71, 0x95, 0xc6, 0x9d, 0x76, + 0x9a, 0x5b, 0x31, 0x8d, 0xa9, 0x54, 0x79, 0xf9, 0x93, 0x2a, 0x68, 0x7e, 0xb3, 0xc0, 0xf4, 0x66, + 0x02, 0x5c, 0xcb, 0xec, 0x90, 0xf2, 0x31, 0xe5, 0x39, 0x0b, 0xde, 0xb4, 0x33, 0x00, 0x41, 0x3a, + 0x5e, 0x48, 0x93, 0x54, 0xf1, 0xce, 0x1b, 0x13, 0xd5, 0xfa, 0x3c, 0xee, 0x31, 0x20, 0x02, 0xb0, + 0x85, 0xaa, 0x61, 0xc6, 0x88, 0xa0, 0xcc, 0x32, 0x5a, 0x46, 0xbb, 0xe6, 0xcf, 0x8e, 0x18, 0xa3, + 0xa5, 0x94, 0x8c, 0xc1, 0x2a, 0x4b, 0x58, 0x3e, 0xe3, 0x16, 0xaa, 0x47, 0xc0, 0x43, 0x96, 0x4c, + 0x44, 0x42, 0x53, 0xcb, 0x94, 0xd4, 0x3c, 0x84, 0x6d, 0xb4, 0x02, 0xd7, 0x13, 0x9a, 0x42, 0x2a, + 0xac, 0xa5, 0x96, 0xd1, 0x5e, 0xeb, 0x96, 0x2d, 0xc3, 0x2f, 0x30, 0xec, 0xa2, 0xcd, 0x28, 0xe1, + 0x64, 0x30, 0x82, 0x80, 0x64, 0x82, 0x06, 0x0c, 0x44, 0xc2, 0xc0, 0x5a, 0x6e, 0x19, 0xed, 0x15, + 0x7f, 0x43, 0x53, 0xa7, 0x99, 0xa0, 0xbe, 0x24, 0xf0, 0x21, 0xc2, 0x6a, 0xda, 0x20, 0x9f, 0x31, + 0x20, 0x83, 0x01, 0x83, 0xa9, 0x55, 0x91, 0x7f, 0xfc, 0x95, 0x62, 0x2e, 0x6f, 0x26, 0x70, 0x2a, + 0x71, 0x7c, 0x80, 0xd6, 0xc9, 0x68, 0x44, 0xaf, 0x20, 0x0a, 0xc2, 0x11, 0xe1, 0x1c, 0xb8, 0x55, + 0x6d, 0x99, 0xed, 0x9a, 0xdf, 0xd0, 0x70, 0x4f, 0xa1, 0xf8, 0x1c, 0xad, 0x45, 0x44, 0x40, 0x10, + 0xb2, 0x44, 0x00, 0x4b, 0x88, 0xb5, 0xd2, 0x32, 0xda, 0xf5, 0xe3, 0x03, 0xf7, 0xb3, 0xa1, 0xb8, + 0x67, 0x44, 0x40, 0x4f, 0xcb, 0xfd, 0xd5, 0x68, 0xee, 0x84, 0xff, 0x42, 0xe6, 0xdf, 0x00, 0x56, + 0xad, 0x65, 0xb6, 0xeb, 0xc7, 0x3b, 0xae, 0x0a, 0x20, 0x2f, 0x05, 0x57, 0x07, 0xe0, 0xf6, 0x68, + 0x92, 0x76, 0xbf, 0xbf, 0x7b, 0xb7, 0x5b, 0xfa, 0xff, 0xfd, 0x6e, 0x3b, 0x4e, 0xc4, 0x3f, 0xd9, + 0xc0, 0x0d, 0xe9, 0xd8, 0xd3, 0x69, 0xa9, 0x9f, 0x23, 0x1e, 0x0d, 0x75, 0x98, 0x79, 0x01, 0xf7, + 0x73, 0x5f, 0xe7, 0x07, 0xb4, 0x51, 0x04, 0xe6, 0x03, 0x9f, 0xd0, 0x94, 0x03, 0xde, 0x43, 0xab, + 0xaa, 0xb7, 0x20, 0x82, 0x94, 0x8e, 0x75, 0x7a, 0x75, 0x85, 0x9d, 0xe5, 0x90, 0xf3, 0x9f, 0x81, + 0x2a, 0x7d, 0x1e, 0x5f, 0x64, 0x02, 0x6f, 0xa1, 0x65, 0x7a, 0x95, 0xc2, 0x2c, 0x64, 0x75, 0x78, + 0xe6, 0x51, 0x7e, 0xe6, 0x81, 0x4f, 0x51, 0x55, 0xdd, 0x04, 0xb7, 0x4c, 0x39, 0xde, 0xa2, 0x2b, + 0xea, 0xca, 0xa7, 0x9e, 0x84, 0xfd, 0x59, 0x9d, 0xf3, 0x33, 0x6a, 0xa8, 0x2e, 0x8a, 0xde, 0xf3, + 0x98, 0xc6, 0x34, 0x4b, 0x45, 0xc0, 0x20, 0x84, 0x64, 0x0a, 0x91, 0xee, 0xab, 0xa1, 0x60, 0x5f, + 0xa3, 0xce, 0x47, 0x03, 0x55, 0xfb, 0x3c, 0xbe, 0x24, 0x43, 0x78, 0xfd, 0x08, 0xdb, 0xa8, 0xa2, + 0x6c, 0xf5, 0xbe, 0xea, 0x13, 0x3e, 0x41, 0x9b, 0x6a, 0xfb, 0xc6, 0x90, 0x8a, 0x60, 0x44, 0x43, + 0x22, 0x97, 0x3a, 0xdf, 0xda, 0x9a, 0xdc, 0x5a, 0xfc, 0x44, 0x9f, 0x6b, 0x16, 0xef, 0xa3, 0x86, + 0x42, 0x03, 0x9a, 0x06, 0x82, 0x0c, 0x67, 0xab, 0xbb, 0xaa, 0xd0, 0x5f, 0x53, 0xd9, 0xeb, 0x8f, + 0xe8, 0xeb, 0x39, 0xeb, 0x7f, 0x33, 0x96, 0xf0, 0x28, 0x09, 0xa5, 0xbd, 0x5a, 0xdd, 0xed, 0x27, + 0xfa, 0x97, 0x39, 0xd6, 0xb9, 0x44, 0xeb, 0x7a, 0xde, 0xe2, 0xb2, 0xe6, 0x12, 0x30, 0x5e, 0x97, + 0xc0, 0xf1, 0x6d, 0x19, 0x99, 0x7d, 0x1e, 0xe3, 0x3f, 0x51, 0x45, 0xbf, 0xf6, 0xfb, 0x0b, 0x3c, + 0x8a, 0x5d, 0x6b, 0x1e, 0x7e, 0x89, 0xaa, 0x68, 0xf4, 0x37, 0x64, 0xe6, 0xab, 0xb6, 0xb7, 0xb8, + 0xe8, 0x22, 0x13, 0xcd, 0x6f, 0x5f, 0x94, 0x14, 0xa6, 0xbf, 0xa3, 0x25, 0x79, 0xa3, 0xce, 0xe2, + 0x92, 0x5c, 0xd3, 0xfc, 0xee, 0x65, 0xcd, 0xcc, 0xb7, 0xeb, 0xdf, 0x3d, 0xd8, 0xc6, 0xfd, 0x83, + 0x6d, 0x7c, 0x78, 0xb0, 0x8d, 0xdb, 0x47, 0xbb, 0x74, 0xff, 0x68, 0x97, 0xde, 0x3e, 0xda, 0xa5, + 0x3f, 0x7e, 0x9a, 0x7b, 0x39, 0xa5, 0xdf, 0x51, 0x0a, 0xe2, 0x8a, 0xb2, 0xa1, 0x3e, 0x8d, 0x20, + 0x8a, 0x81, 0x79, 0xd7, 0xcf, 0x3e, 0xc4, 0x83, 0x8a, 0xfc, 0xc0, 0x9e, 0x7c, 0x0a, 0x00, 0x00, + 0xff, 0xff, 0xa0, 0x1d, 0xb1, 0x16, 0xfe, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. From c574509cb9a7d4265cd19843699cb83b85a14988 Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 16 Jun 2022 15:36:11 -0700 Subject: [PATCH 8/9] update deprecated event field comments --- proto/regen/ecocredit/basket/v1/events.proto | 25 ++++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/proto/regen/ecocredit/basket/v1/events.proto b/proto/regen/ecocredit/basket/v1/events.proto index 8b7c09a60d..b30d99c1ab 100644 --- a/proto/regen/ecocredit/basket/v1/events.proto +++ b/proto/regen/ecocredit/basket/v1/events.proto @@ -14,8 +14,9 @@ message EventCreate { // curator is the address of the basket curator who is able to change certain // basket settings. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. string curator = 2 [ deprecated = true ]; } @@ -30,13 +31,15 @@ message EventPut { string basket_denom = 2; // credits are the credits that were added to the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. repeated BasketCredit credits = 3 [ deprecated = true ]; // amount is the integer number of basket tokens converted from credits. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. string amount = 4 [ deprecated = true ]; } @@ -51,12 +54,14 @@ message EventTake { string basket_denom = 2; // credits are the credits that were taken from the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. repeated BasketCredit credits = 3 [ deprecated = true ]; // amount is the integer number of basket tokens converted to credits. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. string amount = 4 [ deprecated = true ]; } From 1ac4ede07744f0a7258157a1da1d3e78ca37cf8c Mon Sep 17 00:00:00 2001 From: ryanchristo <12519942+ryanchristo@users.noreply.github.com> Date: Thu, 23 Jun 2022 07:51:20 -0700 Subject: [PATCH 9/9] make proto gen --- .../ecocredit/basket/v1/events.pulsar.go | 25 +++++++++++-------- x/ecocredit/basket/events.pb.go | 25 +++++++++++-------- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/api/regen/ecocredit/basket/v1/events.pulsar.go b/api/regen/ecocredit/basket/v1/events.pulsar.go index 8b576b0ea0..b0cac7dde8 100644 --- a/api/regen/ecocredit/basket/v1/events.pulsar.go +++ b/api/regen/ecocredit/basket/v1/events.pulsar.go @@ -1891,8 +1891,9 @@ type EventCreate struct { BasketDenom string `protobuf:"bytes,1,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // curator is the address of the basket curator who is able to change certain // basket settings. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. // // Deprecated: Do not use. Curator string `protobuf:"bytes,2,opt,name=curator,proto3" json:"curator,omitempty"` @@ -1945,14 +1946,16 @@ type EventPut struct { // basket_denom is the basket bank denom that the credits were added to. BasketDenom string `protobuf:"bytes,2,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // credits are the credits that were added to the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. // // Deprecated: Do not use. Credits []*BasketCredit `protobuf:"bytes,3,rep,name=credits,proto3" json:"credits,omitempty"` // amount is the integer number of basket tokens converted from credits. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. // // Deprecated: Do not use. Amount string `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"` @@ -2020,14 +2023,16 @@ type EventTake struct { // basket_denom is the basket bank denom that credits were taken from. BasketDenom string `protobuf:"bytes,2,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // credits are the credits that were taken from the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. // // Deprecated: Do not use. Credits []*BasketCredit `protobuf:"bytes,3,rep,name=credits,proto3" json:"credits,omitempty"` // amount is the integer number of basket tokens converted to credits. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. // // Deprecated: Do not use. Amount string `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"` diff --git a/x/ecocredit/basket/events.pb.go b/x/ecocredit/basket/events.pb.go index 1485e5e9cf..c2ccb4765f 100644 --- a/x/ecocredit/basket/events.pb.go +++ b/x/ecocredit/basket/events.pb.go @@ -28,8 +28,9 @@ type EventCreate struct { BasketDenom string `protobuf:"bytes,1,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // curator is the address of the basket curator who is able to change certain // basket settings. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. Curator string `protobuf:"bytes,2,opt,name=curator,proto3" json:"curator,omitempty"` // Deprecated: Do not use. } @@ -89,12 +90,14 @@ type EventPut struct { // basket_denom is the basket bank denom that the credits were added to. BasketDenom string `protobuf:"bytes,2,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // credits are the credits that were added to the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. Credits []*BasketCredit `protobuf:"bytes,3,rep,name=credits,proto3" json:"credits,omitempty"` // Deprecated: Do not use. // amount is the integer number of basket tokens converted from credits. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. Amount string `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"` // Deprecated: Do not use. } @@ -169,12 +172,14 @@ type EventTake struct { // basket_denom is the basket bank denom that credits were taken from. BasketDenom string `protobuf:"bytes,2,opt,name=basket_denom,json=basketDenom,proto3" json:"basket_denom,omitempty"` // credits are the credits that were taken from the basket. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. Credits []*BasketCredit `protobuf:"bytes,3,rep,name=credits,proto3" json:"credits,omitempty"` // Deprecated: Do not use. // amount is the integer number of basket tokens converted to credits. - // Deprecated: This field is still populated and will be removed in the - // next version. + // + // Deprecated (Since Revision 1): This field is still populated and will be + // removed in the next version. Amount string `protobuf:"bytes,4,opt,name=amount,proto3" json:"amount,omitempty"` // Deprecated: Do not use. }