diff --git a/api/cerc/auction/v1/auction.pulsar.go b/api/cerc/auction/v1/auction.pulsar.go index dc9a22e98..43b545615 100644 --- a/api/cerc/auction/v1/auction.pulsar.go +++ b/api/cerc/auction/v1/auction.pulsar.go @@ -767,56 +767,10 @@ func (x *fastReflection_Params) ProtoMethods() *protoiface.Methods { } } -var _ protoreflect.List = (*_Auction_10_list)(nil) - -type _Auction_10_list struct { - list *[]string -} - -func (x *_Auction_10_list) Len() int { - if x.list == nil { - return 0 - } - return len(*x.list) -} - -func (x *_Auction_10_list) Get(i int) protoreflect.Value { - return protoreflect.ValueOfString((*x.list)[i]) -} - -func (x *_Auction_10_list) Set(i int, value protoreflect.Value) { - valueUnwrapped := value.String() - concreteValue := valueUnwrapped - (*x.list)[i] = concreteValue -} - -func (x *_Auction_10_list) Append(value protoreflect.Value) { - valueUnwrapped := value.String() - concreteValue := valueUnwrapped - *x.list = append(*x.list, concreteValue) -} - -func (x *_Auction_10_list) AppendMutable() protoreflect.Value { - panic(fmt.Errorf("AppendMutable can not be called on message Auction at list field WinnerAddresses as it is not of Message kind")) -} - -func (x *_Auction_10_list) Truncate(n int) { - *x.list = (*x.list)[:n] -} - -func (x *_Auction_10_list) NewElement() protoreflect.Value { - v := "" - return protoreflect.ValueOfString(v) -} - -func (x *_Auction_10_list) IsValid() bool { - return x.list != nil -} - var _ protoreflect.List = (*_Auction_11_list)(nil) type _Auction_11_list struct { - list *[]*v1beta1.Coin + list *[]string } func (x *_Auction_11_list) Len() int { @@ -827,46 +781,93 @@ func (x *_Auction_11_list) Len() int { } func (x *_Auction_11_list) Get(i int) protoreflect.Value { - return protoreflect.ValueOfMessage((*x.list)[i].ProtoReflect()) + return protoreflect.ValueOfString((*x.list)[i]) } func (x *_Auction_11_list) Set(i int, value protoreflect.Value) { - valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v1beta1.Coin) + valueUnwrapped := value.String() + concreteValue := valueUnwrapped (*x.list)[i] = concreteValue } func (x *_Auction_11_list) Append(value protoreflect.Value) { - valueUnwrapped := value.Message() - concreteValue := valueUnwrapped.Interface().(*v1beta1.Coin) + valueUnwrapped := value.String() + concreteValue := valueUnwrapped *x.list = append(*x.list, concreteValue) } func (x *_Auction_11_list) AppendMutable() protoreflect.Value { - v := new(v1beta1.Coin) - *x.list = append(*x.list, v) - return protoreflect.ValueOfMessage(v.ProtoReflect()) + panic(fmt.Errorf("AppendMutable can not be called on message Auction at list field WinnerAddresses as it is not of Message kind")) } func (x *_Auction_11_list) Truncate(n int) { - for i := n; i < len(*x.list); i++ { - (*x.list)[i] = nil - } *x.list = (*x.list)[:n] } func (x *_Auction_11_list) NewElement() protoreflect.Value { - v := new(v1beta1.Coin) - return protoreflect.ValueOfMessage(v.ProtoReflect()) + v := "" + return protoreflect.ValueOfString(v) } func (x *_Auction_11_list) IsValid() bool { return x.list != nil } +var _ protoreflect.List = (*_Auction_12_list)(nil) + +type _Auction_12_list struct { + list *[]*v1beta1.Coin +} + +func (x *_Auction_12_list) Len() int { + if x.list == nil { + return 0 + } + return len(*x.list) +} + +func (x *_Auction_12_list) Get(i int) protoreflect.Value { + return protoreflect.ValueOfMessage((*x.list)[i].ProtoReflect()) +} + +func (x *_Auction_12_list) Set(i int, value protoreflect.Value) { + valueUnwrapped := value.Message() + concreteValue := valueUnwrapped.Interface().(*v1beta1.Coin) + (*x.list)[i] = concreteValue +} + +func (x *_Auction_12_list) Append(value protoreflect.Value) { + valueUnwrapped := value.Message() + concreteValue := valueUnwrapped.Interface().(*v1beta1.Coin) + *x.list = append(*x.list, concreteValue) +} + +func (x *_Auction_12_list) AppendMutable() protoreflect.Value { + v := new(v1beta1.Coin) + *x.list = append(*x.list, v) + return protoreflect.ValueOfMessage(v.ProtoReflect()) +} + +func (x *_Auction_12_list) Truncate(n int) { + for i := n; i < len(*x.list); i++ { + (*x.list)[i] = nil + } + *x.list = (*x.list)[:n] +} + +func (x *_Auction_12_list) NewElement() protoreflect.Value { + v := new(v1beta1.Coin) + return protoreflect.ValueOfMessage(v.ProtoReflect()) +} + +func (x *_Auction_12_list) IsValid() bool { + return x.list != nil +} + var ( md_Auction protoreflect.MessageDescriptor fd_Auction_id protoreflect.FieldDescriptor + fd_Auction_kind protoreflect.FieldDescriptor fd_Auction_status protoreflect.FieldDescriptor fd_Auction_owner_address protoreflect.FieldDescriptor fd_Auction_create_time protoreflect.FieldDescriptor @@ -879,7 +880,6 @@ var ( fd_Auction_winning_bids protoreflect.FieldDescriptor fd_Auction_winning_price protoreflect.FieldDescriptor fd_Auction_max_price protoreflect.FieldDescriptor - fd_Auction_kind protoreflect.FieldDescriptor fd_Auction_num_providers protoreflect.FieldDescriptor ) @@ -887,6 +887,7 @@ func init() { file_cerc_auction_v1_auction_proto_init() md_Auction = File_cerc_auction_v1_auction_proto.Messages().ByName("Auction") fd_Auction_id = md_Auction.Fields().ByName("id") + fd_Auction_kind = md_Auction.Fields().ByName("kind") fd_Auction_status = md_Auction.Fields().ByName("status") fd_Auction_owner_address = md_Auction.Fields().ByName("owner_address") fd_Auction_create_time = md_Auction.Fields().ByName("create_time") @@ -899,7 +900,6 @@ func init() { fd_Auction_winning_bids = md_Auction.Fields().ByName("winning_bids") fd_Auction_winning_price = md_Auction.Fields().ByName("winning_price") fd_Auction_max_price = md_Auction.Fields().ByName("max_price") - fd_Auction_kind = md_Auction.Fields().ByName("kind") fd_Auction_num_providers = md_Auction.Fields().ByName("num_providers") } @@ -974,6 +974,12 @@ func (x *fastReflection_Auction) Range(f func(protoreflect.FieldDescriptor, prot return } } + if x.Kind != "" { + value := protoreflect.ValueOfString(x.Kind) + if !f(fd_Auction_kind, value) { + return + } + } if x.Status != "" { value := protoreflect.ValueOfString(x.Status) if !f(fd_Auction_status, value) { @@ -1023,13 +1029,13 @@ func (x *fastReflection_Auction) Range(f func(protoreflect.FieldDescriptor, prot } } if len(x.WinnerAddresses) != 0 { - value := protoreflect.ValueOfList(&_Auction_10_list{list: &x.WinnerAddresses}) + value := protoreflect.ValueOfList(&_Auction_11_list{list: &x.WinnerAddresses}) if !f(fd_Auction_winner_addresses, value) { return } } if len(x.WinningBids) != 0 { - value := protoreflect.ValueOfList(&_Auction_11_list{list: &x.WinningBids}) + value := protoreflect.ValueOfList(&_Auction_12_list{list: &x.WinningBids}) if !f(fd_Auction_winning_bids, value) { return } @@ -1046,12 +1052,6 @@ func (x *fastReflection_Auction) Range(f func(protoreflect.FieldDescriptor, prot return } } - if x.Kind != "" { - value := protoreflect.ValueOfString(x.Kind) - if !f(fd_Auction_kind, value) { - return - } - } if x.NumProviders != int32(0) { value := protoreflect.ValueOfInt32(x.NumProviders) if !f(fd_Auction_num_providers, value) { @@ -1075,6 +1075,8 @@ func (x *fastReflection_Auction) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { case "cerc.auction.v1.Auction.id": return x.Id != "" + case "cerc.auction.v1.Auction.kind": + return x.Kind != "" case "cerc.auction.v1.Auction.status": return x.Status != "" case "cerc.auction.v1.Auction.owner_address": @@ -1099,8 +1101,6 @@ func (x *fastReflection_Auction) Has(fd protoreflect.FieldDescriptor) bool { return x.WinningPrice != nil case "cerc.auction.v1.Auction.max_price": return x.MaxPrice != nil - case "cerc.auction.v1.Auction.kind": - return x.Kind != "" case "cerc.auction.v1.Auction.num_providers": return x.NumProviders != int32(0) default: @@ -1121,6 +1121,8 @@ func (x *fastReflection_Auction) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { case "cerc.auction.v1.Auction.id": x.Id = "" + case "cerc.auction.v1.Auction.kind": + x.Kind = "" case "cerc.auction.v1.Auction.status": x.Status = "" case "cerc.auction.v1.Auction.owner_address": @@ -1145,8 +1147,6 @@ func (x *fastReflection_Auction) Clear(fd protoreflect.FieldDescriptor) { x.WinningPrice = nil case "cerc.auction.v1.Auction.max_price": x.MaxPrice = nil - case "cerc.auction.v1.Auction.kind": - x.Kind = "" case "cerc.auction.v1.Auction.num_providers": x.NumProviders = int32(0) default: @@ -1168,6 +1168,9 @@ func (x *fastReflection_Auction) Get(descriptor protoreflect.FieldDescriptor) pr case "cerc.auction.v1.Auction.id": value := x.Id return protoreflect.ValueOfString(value) + case "cerc.auction.v1.Auction.kind": + value := x.Kind + return protoreflect.ValueOfString(value) case "cerc.auction.v1.Auction.status": value := x.Status return protoreflect.ValueOfString(value) @@ -1194,15 +1197,15 @@ func (x *fastReflection_Auction) Get(descriptor protoreflect.FieldDescriptor) pr return protoreflect.ValueOfMessage(value.ProtoReflect()) case "cerc.auction.v1.Auction.winner_addresses": if len(x.WinnerAddresses) == 0 { - return protoreflect.ValueOfList(&_Auction_10_list{}) + return protoreflect.ValueOfList(&_Auction_11_list{}) } - listValue := &_Auction_10_list{list: &x.WinnerAddresses} + listValue := &_Auction_11_list{list: &x.WinnerAddresses} return protoreflect.ValueOfList(listValue) case "cerc.auction.v1.Auction.winning_bids": if len(x.WinningBids) == 0 { - return protoreflect.ValueOfList(&_Auction_11_list{}) + return protoreflect.ValueOfList(&_Auction_12_list{}) } - listValue := &_Auction_11_list{list: &x.WinningBids} + listValue := &_Auction_12_list{list: &x.WinningBids} return protoreflect.ValueOfList(listValue) case "cerc.auction.v1.Auction.winning_price": value := x.WinningPrice @@ -1210,9 +1213,6 @@ func (x *fastReflection_Auction) Get(descriptor protoreflect.FieldDescriptor) pr case "cerc.auction.v1.Auction.max_price": value := x.MaxPrice return protoreflect.ValueOfMessage(value.ProtoReflect()) - case "cerc.auction.v1.Auction.kind": - value := x.Kind - return protoreflect.ValueOfString(value) case "cerc.auction.v1.Auction.num_providers": value := x.NumProviders return protoreflect.ValueOfInt32(value) @@ -1238,6 +1238,8 @@ func (x *fastReflection_Auction) Set(fd protoreflect.FieldDescriptor, value prot switch fd.FullName() { case "cerc.auction.v1.Auction.id": x.Id = value.Interface().(string) + case "cerc.auction.v1.Auction.kind": + x.Kind = value.Interface().(string) case "cerc.auction.v1.Auction.status": x.Status = value.Interface().(string) case "cerc.auction.v1.Auction.owner_address": @@ -1256,18 +1258,16 @@ func (x *fastReflection_Auction) Set(fd protoreflect.FieldDescriptor, value prot x.MinimumBid = value.Message().Interface().(*v1beta1.Coin) case "cerc.auction.v1.Auction.winner_addresses": lv := value.List() - clv := lv.(*_Auction_10_list) + clv := lv.(*_Auction_11_list) x.WinnerAddresses = *clv.list case "cerc.auction.v1.Auction.winning_bids": lv := value.List() - clv := lv.(*_Auction_11_list) + clv := lv.(*_Auction_12_list) x.WinningBids = *clv.list case "cerc.auction.v1.Auction.winning_price": x.WinningPrice = value.Message().Interface().(*v1beta1.Coin) case "cerc.auction.v1.Auction.max_price": x.MaxPrice = value.Message().Interface().(*v1beta1.Coin) - case "cerc.auction.v1.Auction.kind": - x.Kind = value.Interface().(string) case "cerc.auction.v1.Auction.num_providers": x.NumProviders = int32(value.Int()) default: @@ -1324,13 +1324,13 @@ func (x *fastReflection_Auction) Mutable(fd protoreflect.FieldDescriptor) protor if x.WinnerAddresses == nil { x.WinnerAddresses = []string{} } - value := &_Auction_10_list{list: &x.WinnerAddresses} + value := &_Auction_11_list{list: &x.WinnerAddresses} return protoreflect.ValueOfList(value) case "cerc.auction.v1.Auction.winning_bids": if x.WinningBids == nil { x.WinningBids = []*v1beta1.Coin{} } - value := &_Auction_11_list{list: &x.WinningBids} + value := &_Auction_12_list{list: &x.WinningBids} return protoreflect.ValueOfList(value) case "cerc.auction.v1.Auction.winning_price": if x.WinningPrice == nil { @@ -1344,12 +1344,12 @@ func (x *fastReflection_Auction) Mutable(fd protoreflect.FieldDescriptor) protor return protoreflect.ValueOfMessage(x.MaxPrice.ProtoReflect()) case "cerc.auction.v1.Auction.id": panic(fmt.Errorf("field id of message cerc.auction.v1.Auction is not mutable")) + case "cerc.auction.v1.Auction.kind": + panic(fmt.Errorf("field kind of message cerc.auction.v1.Auction is not mutable")) case "cerc.auction.v1.Auction.status": panic(fmt.Errorf("field status of message cerc.auction.v1.Auction is not mutable")) case "cerc.auction.v1.Auction.owner_address": panic(fmt.Errorf("field owner_address of message cerc.auction.v1.Auction is not mutable")) - case "cerc.auction.v1.Auction.kind": - panic(fmt.Errorf("field kind of message cerc.auction.v1.Auction is not mutable")) case "cerc.auction.v1.Auction.num_providers": panic(fmt.Errorf("field num_providers of message cerc.auction.v1.Auction is not mutable")) default: @@ -1367,6 +1367,8 @@ func (x *fastReflection_Auction) NewField(fd protoreflect.FieldDescriptor) proto switch fd.FullName() { case "cerc.auction.v1.Auction.id": return protoreflect.ValueOfString("") + case "cerc.auction.v1.Auction.kind": + return protoreflect.ValueOfString("") case "cerc.auction.v1.Auction.status": return protoreflect.ValueOfString("") case "cerc.auction.v1.Auction.owner_address": @@ -1391,18 +1393,16 @@ func (x *fastReflection_Auction) NewField(fd protoreflect.FieldDescriptor) proto return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cerc.auction.v1.Auction.winner_addresses": list := []string{} - return protoreflect.ValueOfList(&_Auction_10_list{list: &list}) + return protoreflect.ValueOfList(&_Auction_11_list{list: &list}) case "cerc.auction.v1.Auction.winning_bids": list := []*v1beta1.Coin{} - return protoreflect.ValueOfList(&_Auction_11_list{list: &list}) + return protoreflect.ValueOfList(&_Auction_12_list{list: &list}) case "cerc.auction.v1.Auction.winning_price": m := new(v1beta1.Coin) return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cerc.auction.v1.Auction.max_price": m := new(v1beta1.Coin) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cerc.auction.v1.Auction.kind": - return protoreflect.ValueOfString("") case "cerc.auction.v1.Auction.num_providers": return protoreflect.ValueOfInt32(int32(0)) default: @@ -1478,6 +1478,10 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.Kind) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } l = len(x.Status) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) @@ -1530,10 +1534,6 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { l = options.Size(x.MaxPrice) n += 1 + l + runtime.Sov(uint64(l)) } - l = len(x.Kind) - if l > 0 { - n += 1 + l + runtime.Sov(uint64(l)) - } if x.NumProviders != 0 { n += 1 + runtime.Sov(uint64(x.NumProviders)) } @@ -1571,13 +1571,6 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { i-- dAtA[i] = 0x78 } - if len(x.Kind) > 0 { - i -= len(x.Kind) - copy(dAtA[i:], x.Kind) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Kind))) - i-- - dAtA[i] = 0x72 - } if x.MaxPrice != nil { encoded, err := options.Marshal(x.MaxPrice) if err != nil { @@ -1590,7 +1583,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x6a + dAtA[i] = 0x72 } if x.WinningPrice != nil { encoded, err := options.Marshal(x.WinningPrice) @@ -1604,7 +1597,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x62 + dAtA[i] = 0x6a } if len(x.WinningBids) > 0 { for iNdEx := len(x.WinningBids) - 1; iNdEx >= 0; iNdEx-- { @@ -1619,7 +1612,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x5a + dAtA[i] = 0x62 } } if len(x.WinnerAddresses) > 0 { @@ -1628,7 +1621,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], x.WinnerAddresses[iNdEx]) i = runtime.EncodeVarint(dAtA, i, uint64(len(x.WinnerAddresses[iNdEx]))) i-- - dAtA[i] = 0x52 + dAtA[i] = 0x5a } } if x.MinimumBid != nil { @@ -1643,7 +1636,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x4a + dAtA[i] = 0x52 } if x.RevealFee != nil { encoded, err := options.Marshal(x.RevealFee) @@ -1657,7 +1650,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x42 + dAtA[i] = 0x4a } if x.CommitFee != nil { encoded, err := options.Marshal(x.CommitFee) @@ -1671,7 +1664,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 } if x.RevealsEndTime != nil { encoded, err := options.Marshal(x.RevealsEndTime) @@ -1685,7 +1678,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x32 + dAtA[i] = 0x3a } if x.CommitsEndTime != nil { encoded, err := options.Marshal(x.CommitsEndTime) @@ -1699,7 +1692,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 } if x.CreateTime != nil { encoded, err := options.Marshal(x.CreateTime) @@ -1713,20 +1706,27 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } if len(x.OwnerAddress) > 0 { i -= len(x.OwnerAddress) copy(dAtA[i:], x.OwnerAddress) i = runtime.EncodeVarint(dAtA, i, uint64(len(x.OwnerAddress))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } if len(x.Status) > 0 { i -= len(x.Status) copy(dAtA[i:], x.Status) i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Status))) i-- + dAtA[i] = 0x1a + } + if len(x.Kind) > 0 { + i -= len(x.Kind) + copy(dAtA[i:], x.Kind) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Kind))) + i-- dAtA[i] = 0x12 } if len(x.Id) > 0 { @@ -1818,6 +1818,38 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { x.Id = 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 Kind", 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.Kind = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) } @@ -1849,7 +1881,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { } x.Status = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field OwnerAddress", wireType) } @@ -1881,7 +1913,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { } x.OwnerAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field CreateTime", wireType) } @@ -1917,7 +1949,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field CommitsEndTime", wireType) } @@ -1953,7 +1985,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 6: + case 7: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RevealsEndTime", wireType) } @@ -1989,7 +2021,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 7: + case 8: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field CommitFee", wireType) } @@ -2025,7 +2057,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 8: + case 9: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field RevealFee", wireType) } @@ -2061,7 +2093,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 9: + case 10: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field MinimumBid", wireType) } @@ -2097,7 +2129,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 10: + case 11: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field WinnerAddresses", wireType) } @@ -2129,7 +2161,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { } x.WinnerAddresses = append(x.WinnerAddresses, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 11: + case 12: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field WinningBids", wireType) } @@ -2163,7 +2195,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 12: + case 13: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field WinningPrice", wireType) } @@ -2199,7 +2231,7 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 13: + case 14: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field MaxPrice", wireType) } @@ -2235,38 +2267,6 @@ func (x *fastReflection_Auction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 14: - if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Kind", 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.Kind = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 15: if wireType != 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NumProviders", wireType) @@ -3914,32 +3914,32 @@ type Auction struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + // Auction's kind (vickrey | service_provider) + Kind string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"` + Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` // Address of the creator of the auction - OwnerAddress string `protobuf:"bytes,3,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` + OwnerAddress string `protobuf:"bytes,4,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` // Timestamp at which the auction was created - CreateTime *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` + CreateTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3" json:"create_time,omitempty"` // Timestamp at which the commits phase concluded - CommitsEndTime *timestamppb.Timestamp `protobuf:"bytes,5,opt,name=commits_end_time,json=commitsEndTime,proto3" json:"commits_end_time,omitempty"` + CommitsEndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=commits_end_time,json=commitsEndTime,proto3" json:"commits_end_time,omitempty"` // Timestamp at which the reveals phase concluded - RevealsEndTime *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=reveals_end_time,json=revealsEndTime,proto3" json:"reveals_end_time,omitempty"` + RevealsEndTime *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=reveals_end_time,json=revealsEndTime,proto3" json:"reveals_end_time,omitempty"` // Commit and reveal fees must both be paid when committing a bid // Reveal fee is returned only if the bid is revealed - CommitFee *v1beta1.Coin `protobuf:"bytes,7,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee,omitempty"` - RevealFee *v1beta1.Coin `protobuf:"bytes,8,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee,omitempty"` + CommitFee *v1beta1.Coin `protobuf:"bytes,8,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee,omitempty"` + RevealFee *v1beta1.Coin `protobuf:"bytes,9,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee,omitempty"` // Minimum acceptable bid amount for a valid commit - MinimumBid *v1beta1.Coin `protobuf:"bytes,9,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid,omitempty"` - // Addresses of the winners - WinnerAddresses []string `protobuf:"bytes,10,rep,name=winner_addresses,json=winnerAddresses,proto3" json:"winner_addresses,omitempty"` + MinimumBid *v1beta1.Coin `protobuf:"bytes,10,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid,omitempty"` + // Addresses of the winners (one for vickrey and can be multiple for service_provider) + WinnerAddresses []string `protobuf:"bytes,11,rep,name=winner_addresses,json=winnerAddresses,proto3" json:"winner_addresses,omitempty"` // Winning bids, i.e., the best bids - WinningBids []*v1beta1.Coin `protobuf:"bytes,11,rep,name=winning_bids,json=winningBids,proto3" json:"winning_bids,omitempty"` + WinningBids []*v1beta1.Coin `protobuf:"bytes,12,rep,name=winning_bids,json=winningBids,proto3" json:"winning_bids,omitempty"` // Amount the winner pays, i.e. the second best bid - WinningPrice *v1beta1.Coin `protobuf:"bytes,12,opt,name=winning_price,json=winningPrice,proto3" json:"winning_price,omitempty"` - // Maximum acceptable bid amount for a valid commit for reverse auctions - MaxPrice *v1beta1.Coin `protobuf:"bytes,13,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` - // Auction kind can be vickrey or service_provider - Kind string `protobuf:"bytes,14,opt,name=kind,proto3" json:"kind,omitempty"` + WinningPrice *v1beta1.Coin `protobuf:"bytes,13,opt,name=winning_price,json=winningPrice,proto3" json:"winning_price,omitempty"` + // Maximum acceptable bid amount for a valid commit for service provider auctions + MaxPrice *v1beta1.Coin `protobuf:"bytes,14,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` // Number of providers to be selected NumProviders int32 `protobuf:"varint,15,opt,name=num_providers,json=numProviders,proto3" json:"num_providers,omitempty"` } @@ -3971,6 +3971,13 @@ func (x *Auction) GetId() string { return "" } +func (x *Auction) GetKind() string { + if x != nil { + return x.Kind + } + return "" +} + func (x *Auction) GetStatus() string { if x != nil { return x.Status @@ -4055,13 +4062,6 @@ func (x *Auction) GetMaxPrice() *v1beta1.Coin { return nil } -func (x *Auction) GetKind() string { - if x != nil { - return x.Kind - } - return "" -} - func (x *Auction) GetNumProviders() int32 { if x != nil { return x.NumProviders @@ -4257,80 +4257,80 @@ var file_cerc_auction_v1_auction_proto_rawDesc = []byte{ 0x75, 0x6d, 0x5f, 0x62, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x42, 0x69, 0x64, 0x3a, 0x04, 0x98, 0xa0, 0x1f, 0x00, 0x22, 0xd3, 0x09, 0x0a, 0x07, 0x41, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x23, 0x0a, - 0x0d, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x6e, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x25, 0x6a, 0x73, 0x6f, - 0x6e, 0x3a, 0x22, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x20, - 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x22, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, - 0x6d, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x5f, 0x65, - 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x3b, 0xc8, 0xde, 0x1f, 0x00, 0xf2, - 0xde, 0x1f, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, - 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, - 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, - 0x65, 0x22, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x45, - 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x10, 0x72, 0x65, 0x76, 0x65, 0x61, - 0x6c, 0x73, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x3b, 0xc8, - 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x72, 0x65, 0x76, - 0x65, 0x61, 0x6c, 0x73, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x20, 0x79, - 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x73, 0x5f, 0x65, 0x6e, 0x64, - 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0e, 0x72, 0x65, 0x76, 0x65, - 0x61, 0x6c, 0x73, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x65, 0x0a, 0x0a, 0x63, 0x6f, - 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x66, 0x65, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2f, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x1b, 0xf2, 0xde, 0x1f, 0x17, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6b, + 0x69, 0x6e, 0x64, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x6b, 0x69, 0x6e, 0x64, 0x22, + 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x23, + 0x0a, 0x0d, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x12, 0x6e, 0x0a, 0x0b, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x25, 0x6a, 0x73, + 0x6f, 0x6e, 0x3a, 0x22, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, + 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x22, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x5f, + 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x3b, 0xc8, 0xde, 0x1f, 0x00, + 0xf2, 0xde, 0x1f, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, + 0x73, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, + 0x3a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x22, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x73, + 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x10, 0x72, 0x65, 0x76, 0x65, + 0x61, 0x6c, 0x73, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x3b, + 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x72, 0x65, + 0x76, 0x65, 0x61, 0x6c, 0x73, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x20, + 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x73, 0x5f, 0x65, 0x6e, + 0x64, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x90, 0xdf, 0x1f, 0x01, 0x52, 0x0e, 0x72, 0x65, 0x76, + 0x65, 0x61, 0x6c, 0x73, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x65, 0x0a, 0x0a, 0x63, + 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x66, 0x65, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, + 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x2b, 0xc8, 0xde, 0x1f, 0x00, + 0xf2, 0xde, 0x1f, 0x23, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, + 0x5f, 0x66, 0x65, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, + 0x69, 0x74, 0x5f, 0x66, 0x65, 0x65, 0x22, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x46, + 0x65, 0x65, 0x12, 0x65, 0x0a, 0x0a, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x5f, 0x66, 0x65, 0x65, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, + 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, + 0x6e, 0x42, 0x2b, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x23, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, + 0x22, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x5f, 0x66, 0x65, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, + 0x6c, 0x3a, 0x22, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x5f, 0x66, 0x65, 0x65, 0x22, 0x52, 0x09, + 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x46, 0x65, 0x65, 0x12, 0x69, 0x0a, 0x0b, 0x6d, 0x69, 0x6e, + 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x62, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x2b, 0xc8, 0xde, 0x1f, 0x00, 0xf2, - 0xde, 0x1f, 0x23, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, - 0x66, 0x65, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x69, - 0x74, 0x5f, 0x66, 0x65, 0x65, 0x22, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x46, 0x65, - 0x65, 0x12, 0x65, 0x0a, 0x0a, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x5f, 0x66, 0x65, 0x65, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, + 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x2d, 0xc8, 0xde, 0x1f, 0x00, 0xf2, + 0xde, 0x1f, 0x25, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, + 0x5f, 0x62, 0x69, 0x64, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x6d, 0x69, 0x6e, 0x69, + 0x6d, 0x75, 0x6d, 0x5f, 0x62, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, + 0x6d, 0x42, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, + 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, + 0x6d, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x73, 0x18, + 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, - 0x42, 0x2b, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x23, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, - 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x5f, 0x66, 0x65, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, - 0x3a, 0x22, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x5f, 0x66, 0x65, 0x65, 0x22, 0x52, 0x09, 0x72, - 0x65, 0x76, 0x65, 0x61, 0x6c, 0x46, 0x65, 0x65, 0x12, 0x69, 0x0a, 0x0b, 0x6d, 0x69, 0x6e, 0x69, - 0x6d, 0x75, 0x6d, 0x5f, 0x62, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, - 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x2d, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, - 0x1f, 0x25, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x5f, - 0x62, 0x69, 0x64, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x6d, 0x69, 0x6e, 0x69, 0x6d, - 0x75, 0x6d, 0x5f, 0x62, 0x69, 0x64, 0x22, 0x52, 0x0a, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, - 0x42, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x5f, 0x61, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0f, 0x77, - 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x6d, - 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x73, 0x18, 0x0b, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, - 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, - 0x2f, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x27, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x77, - 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x73, 0x22, 0x20, 0x79, 0x61, 0x6d, - 0x6c, 0x3a, 0x22, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x73, 0x22, - 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x42, 0x69, 0x64, 0x73, 0x12, 0x71, 0x0a, - 0x0d, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0c, + 0x42, 0x2f, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x27, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, + 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x73, 0x22, 0x20, 0x79, 0x61, + 0x6d, 0x6c, 0x3a, 0x22, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x73, + 0x22, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x42, 0x69, 0x64, 0x73, 0x12, 0x71, + 0x0a, 0x0d, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, + 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, + 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, + 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x29, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, + 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x20, 0x79, + 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x69, + 0x63, 0x65, 0x22, 0x52, 0x0c, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x63, + 0x65, 0x12, 0x61, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, - 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x29, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x77, - 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x20, 0x79, 0x61, - 0x6d, 0x6c, 0x3a, 0x22, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x22, 0x52, 0x0c, 0x77, 0x69, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x69, 0x63, 0x65, - 0x12, 0x61, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0d, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, - 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x29, - 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x21, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6d, 0x61, - 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x50, 0x72, - 0x69, 0x63, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x1b, 0xf2, 0xde, 0x1f, 0x17, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6b, 0x69, 0x6e, - 0x64, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0x52, 0x04, - 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x6e, 0x75, 0x6d, 0x5f, 0x70, 0x72, 0x6f, 0x76, + 0x29, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x21, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6d, + 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, + 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x50, + 0x72, 0x69, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x6e, 0x75, 0x6d, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6e, 0x75, 0x6d, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x3a, 0x04, 0x88, 0xa0, 0x1f, 0x00, 0x22, 0x4c, 0x0a, 0x08, 0x41, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x08, 0x61, diff --git a/api/cerc/auction/v1/tx.pulsar.go b/api/cerc/auction/v1/tx.pulsar.go index 281777245..0d4bb11ea 100644 --- a/api/cerc/auction/v1/tx.pulsar.go +++ b/api/cerc/auction/v1/tx.pulsar.go @@ -26,8 +26,8 @@ var ( fd_MsgCreateAuction_reveal_fee protoreflect.FieldDescriptor fd_MsgCreateAuction_minimum_bid protoreflect.FieldDescriptor fd_MsgCreateAuction_signer protoreflect.FieldDescriptor - fd_MsgCreateAuction_max_price protoreflect.FieldDescriptor fd_MsgCreateAuction_kind protoreflect.FieldDescriptor + fd_MsgCreateAuction_max_price protoreflect.FieldDescriptor fd_MsgCreateAuction_num_providers protoreflect.FieldDescriptor ) @@ -40,8 +40,8 @@ func init() { fd_MsgCreateAuction_reveal_fee = md_MsgCreateAuction.Fields().ByName("reveal_fee") fd_MsgCreateAuction_minimum_bid = md_MsgCreateAuction.Fields().ByName("minimum_bid") fd_MsgCreateAuction_signer = md_MsgCreateAuction.Fields().ByName("signer") - fd_MsgCreateAuction_max_price = md_MsgCreateAuction.Fields().ByName("max_price") fd_MsgCreateAuction_kind = md_MsgCreateAuction.Fields().ByName("kind") + fd_MsgCreateAuction_max_price = md_MsgCreateAuction.Fields().ByName("max_price") fd_MsgCreateAuction_num_providers = md_MsgCreateAuction.Fields().ByName("num_providers") } @@ -146,18 +146,18 @@ func (x *fastReflection_MsgCreateAuction) Range(f func(protoreflect.FieldDescrip return } } - if x.MaxPrice != nil { - value := protoreflect.ValueOfMessage(x.MaxPrice.ProtoReflect()) - if !f(fd_MsgCreateAuction_max_price, value) { - return - } - } if x.Kind != "" { value := protoreflect.ValueOfString(x.Kind) if !f(fd_MsgCreateAuction_kind, value) { return } } + if x.MaxPrice != nil { + value := protoreflect.ValueOfMessage(x.MaxPrice.ProtoReflect()) + if !f(fd_MsgCreateAuction_max_price, value) { + return + } + } if x.NumProviders != int32(0) { value := protoreflect.ValueOfInt32(x.NumProviders) if !f(fd_MsgCreateAuction_num_providers, value) { @@ -191,10 +191,10 @@ func (x *fastReflection_MsgCreateAuction) Has(fd protoreflect.FieldDescriptor) b return x.MinimumBid != nil case "cerc.auction.v1.MsgCreateAuction.signer": return x.Signer != "" - case "cerc.auction.v1.MsgCreateAuction.max_price": - return x.MaxPrice != nil case "cerc.auction.v1.MsgCreateAuction.kind": return x.Kind != "" + case "cerc.auction.v1.MsgCreateAuction.max_price": + return x.MaxPrice != nil case "cerc.auction.v1.MsgCreateAuction.num_providers": return x.NumProviders != int32(0) default: @@ -225,10 +225,10 @@ func (x *fastReflection_MsgCreateAuction) Clear(fd protoreflect.FieldDescriptor) x.MinimumBid = nil case "cerc.auction.v1.MsgCreateAuction.signer": x.Signer = "" - case "cerc.auction.v1.MsgCreateAuction.max_price": - x.MaxPrice = nil case "cerc.auction.v1.MsgCreateAuction.kind": x.Kind = "" + case "cerc.auction.v1.MsgCreateAuction.max_price": + x.MaxPrice = nil case "cerc.auction.v1.MsgCreateAuction.num_providers": x.NumProviders = int32(0) default: @@ -265,12 +265,12 @@ func (x *fastReflection_MsgCreateAuction) Get(descriptor protoreflect.FieldDescr case "cerc.auction.v1.MsgCreateAuction.signer": value := x.Signer return protoreflect.ValueOfString(value) - case "cerc.auction.v1.MsgCreateAuction.max_price": - value := x.MaxPrice - return protoreflect.ValueOfMessage(value.ProtoReflect()) case "cerc.auction.v1.MsgCreateAuction.kind": value := x.Kind return protoreflect.ValueOfString(value) + case "cerc.auction.v1.MsgCreateAuction.max_price": + value := x.MaxPrice + return protoreflect.ValueOfMessage(value.ProtoReflect()) case "cerc.auction.v1.MsgCreateAuction.num_providers": value := x.NumProviders return protoreflect.ValueOfInt32(value) @@ -306,10 +306,10 @@ func (x *fastReflection_MsgCreateAuction) Set(fd protoreflect.FieldDescriptor, v x.MinimumBid = value.Message().Interface().(*v1beta1.Coin) case "cerc.auction.v1.MsgCreateAuction.signer": x.Signer = value.Interface().(string) - case "cerc.auction.v1.MsgCreateAuction.max_price": - x.MaxPrice = value.Message().Interface().(*v1beta1.Coin) case "cerc.auction.v1.MsgCreateAuction.kind": x.Kind = value.Interface().(string) + case "cerc.auction.v1.MsgCreateAuction.max_price": + x.MaxPrice = value.Message().Interface().(*v1beta1.Coin) case "cerc.auction.v1.MsgCreateAuction.num_providers": x.NumProviders = int32(value.Int()) default: @@ -398,11 +398,11 @@ func (x *fastReflection_MsgCreateAuction) NewField(fd protoreflect.FieldDescript return protoreflect.ValueOfMessage(m.ProtoReflect()) case "cerc.auction.v1.MsgCreateAuction.signer": return protoreflect.ValueOfString("") + case "cerc.auction.v1.MsgCreateAuction.kind": + return protoreflect.ValueOfString("") case "cerc.auction.v1.MsgCreateAuction.max_price": m := new(v1beta1.Coin) return protoreflect.ValueOfMessage(m.ProtoReflect()) - case "cerc.auction.v1.MsgCreateAuction.kind": - return protoreflect.ValueOfString("") case "cerc.auction.v1.MsgCreateAuction.num_providers": return protoreflect.ValueOfInt32(int32(0)) default: @@ -498,14 +498,14 @@ func (x *fastReflection_MsgCreateAuction) ProtoMethods() *protoiface.Methods { if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } - if x.MaxPrice != nil { - l = options.Size(x.MaxPrice) - n += 1 + l + runtime.Sov(uint64(l)) - } l = len(x.Kind) if l > 0 { n += 1 + l + runtime.Sov(uint64(l)) } + if x.MaxPrice != nil { + l = options.Size(x.MaxPrice) + n += 1 + l + runtime.Sov(uint64(l)) + } if x.NumProviders != 0 { n += 1 + runtime.Sov(uint64(x.NumProviders)) } @@ -543,13 +543,6 @@ func (x *fastReflection_MsgCreateAuction) ProtoMethods() *protoiface.Methods { i-- dAtA[i] = 0x48 } - if len(x.Kind) > 0 { - i -= len(x.Kind) - copy(dAtA[i:], x.Kind) - i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Kind))) - i-- - dAtA[i] = 0x42 - } if x.MaxPrice != nil { encoded, err := options.Marshal(x.MaxPrice) if err != nil { @@ -562,6 +555,13 @@ func (x *fastReflection_MsgCreateAuction) ProtoMethods() *protoiface.Methods { copy(dAtA[i:], encoded) i = runtime.EncodeVarint(dAtA, i, uint64(len(encoded))) i-- + dAtA[i] = 0x42 + } + if len(x.Kind) > 0 { + i -= len(x.Kind) + copy(dAtA[i:], x.Kind) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Kind))) + i-- dAtA[i] = 0x3a } if len(x.Signer) > 0 { @@ -903,6 +903,38 @@ func (x *fastReflection_MsgCreateAuction) ProtoMethods() *protoiface.Methods { x.Signer = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 7: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Kind", 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.Kind = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 8: if wireType != 2 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field MaxPrice", wireType) } @@ -938,38 +970,6 @@ func (x *fastReflection_MsgCreateAuction) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex - case 8: - if wireType != 2 { - return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Kind", 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.Kind = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 9: if wireType != 0 { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field NumProviders", wireType) @@ -4311,10 +4311,10 @@ type MsgCreateAuction struct { MinimumBid *v1beta1.Coin `protobuf:"bytes,5,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid,omitempty"` // Address of the signer Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty"` - // Maximum acceptable bid amount (for reverse auctions) - MaxPrice *v1beta1.Coin `protobuf:"bytes,7,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` - // Auction kind can be vickrey or service_provider - Kind string `protobuf:"bytes,8,opt,name=kind,proto3" json:"kind,omitempty"` + // Auction's kind (vickrey | service_provider) + Kind string `protobuf:"bytes,7,opt,name=kind,proto3" json:"kind,omitempty"` + // Maximum acceptable bid amount (for service provider auctions) + MaxPrice *v1beta1.Coin `protobuf:"bytes,8,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` // Number of providers to be selected NumProviders int32 `protobuf:"varint,9,opt,name=num_providers,json=numProviders,proto3" json:"num_providers,omitempty"` } @@ -4381,13 +4381,6 @@ func (x *MsgCreateAuction) GetSigner() string { return "" } -func (x *MsgCreateAuction) GetMaxPrice() *v1beta1.Coin { - if x != nil { - return x.MaxPrice - } - return nil -} - func (x *MsgCreateAuction) GetKind() string { if x != nil { return x.Kind @@ -4395,6 +4388,13 @@ func (x *MsgCreateAuction) GetKind() string { return "" } +func (x *MsgCreateAuction) GetMaxPrice() *v1beta1.Coin { + if x != nil { + return x.MaxPrice + } + return nil +} + func (x *MsgCreateAuction) GetNumProviders() int32 { if x != nil { return x.NumProviders @@ -4759,16 +4759,16 @@ var file_cerc_auction_v1_tx_proto_rawDesc = []byte{ 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x1f, 0xf2, 0xde, 0x1f, 0x1b, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x22, 0x52, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x65, - 0x72, 0x12, 0x61, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, - 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, - 0x29, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x21, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6d, - 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, - 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x50, - 0x72, 0x69, 0x63, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x1b, 0xf2, 0xde, 0x1f, 0x17, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6b, 0x69, - 0x6e, 0x64, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0x52, - 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x6e, 0x75, 0x6d, 0x5f, 0x70, 0x72, 0x6f, + 0x72, 0x12, 0x2f, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x1b, 0xf2, 0xde, 0x1f, 0x17, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, 0x6b, 0x69, 0x6e, 0x64, 0x22, + 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x22, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0x52, 0x04, 0x6b, 0x69, + 0x6e, 0x64, 0x12, 0x61, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, + 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, + 0x42, 0x29, 0xc8, 0xde, 0x1f, 0x00, 0xf2, 0xde, 0x1f, 0x21, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x22, + 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x20, 0x79, 0x61, 0x6d, 0x6c, 0x3a, + 0x22, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x22, 0x52, 0x08, 0x6d, 0x61, 0x78, + 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x6e, 0x75, 0x6d, 0x5f, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x6e, 0x75, 0x6d, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x73, 0x3a, 0x0f, 0x88, 0xa0, 0x1f, 0x00, 0x82, 0xe7, 0xb0, 0x2a, 0x06, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x72, 0x22, 0x77, 0x0a, 0x18, 0x4d, diff --git a/proto/cerc/auction/v1/auction.proto b/proto/cerc/auction/v1/auction.proto index d7d6301f8..7de86476b 100644 --- a/proto/cerc/auction/v1/auction.proto +++ b/proto/cerc/auction/v1/auction.proto @@ -52,27 +52,33 @@ message Auction { option (gogoproto.goproto_getters) = false; string id = 1; - string status = 2; + + // Auction's kind (vickrey | service_provider) + string kind = 2 [ + (gogoproto.moretags) = "json:\"kind\" yaml:\"kind\"" + ]; + + string status = 3; // Address of the creator of the auction - string owner_address = 3; + string owner_address = 4; // Timestamp at which the auction was created - google.protobuf.Timestamp create_time = 4 [ + google.protobuf.Timestamp create_time = 5 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"create_time\" yaml:\"create_time\"" ]; // Timestamp at which the commits phase concluded - google.protobuf.Timestamp commits_end_time = 5 [ + google.protobuf.Timestamp commits_end_time = 6 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"commits_end_time\" yaml:\"commits_end_time\"" ]; // Timestamp at which the reveals phase concluded - google.protobuf.Timestamp reveals_end_time = 6 [ + google.protobuf.Timestamp reveals_end_time = 7 [ (gogoproto.stdtime) = true, (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"reveals_end_time\" yaml:\"reveals_end_time\"" @@ -80,47 +86,42 @@ message Auction { // Commit and reveal fees must both be paid when committing a bid // Reveal fee is returned only if the bid is revealed - cosmos.base.v1beta1.Coin commit_fee = 7 [ + cosmos.base.v1beta1.Coin commit_fee = 8 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"commit_fee\" yaml:\"commit_fee\"" ]; - cosmos.base.v1beta1.Coin reveal_fee = 8 [ + cosmos.base.v1beta1.Coin reveal_fee = 9 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"reveal_fee\" yaml:\"reveal_fee\"" ]; // Minimum acceptable bid amount for a valid commit - cosmos.base.v1beta1.Coin minimum_bid = 9 [ + cosmos.base.v1beta1.Coin minimum_bid = 10 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"minimum_bid\" yaml:\"minimum_bid\"" ]; - // Addresses of the winners - repeated string winner_addresses = 10; + // Addresses of the winners (one for vickrey and can be multiple for service_provider) + repeated string winner_addresses = 11; // Winning bids, i.e., the best bids - repeated cosmos.base.v1beta1.Coin winning_bids = 11 [ + repeated cosmos.base.v1beta1.Coin winning_bids = 12 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"winning_bids\" yaml:\"winning_bids\"" ]; // Amount the winner pays, i.e. the second best bid - cosmos.base.v1beta1.Coin winning_price = 12 [ + cosmos.base.v1beta1.Coin winning_price = 13 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"winning_price\" yaml:\"winning_price\"" ]; - // Maximum acceptable bid amount for a valid commit for reverse auctions - cosmos.base.v1beta1.Coin max_price = 13 [ + // Maximum acceptable bid amount for a valid commit for service provider auctions + cosmos.base.v1beta1.Coin max_price = 14 [ (gogoproto.nullable) = false, (gogoproto.moretags) = "json:\"max_price\" yaml:\"max_price\"" ]; - // Auction kind can be vickrey or service_provider - string kind = 14 [ - (gogoproto.moretags) = "json:\"kind\" yaml:\"kind\"" - ]; - // Number of providers to be selected int32 num_providers = 15; } diff --git a/proto/cerc/auction/v1/tx.proto b/proto/cerc/auction/v1/tx.proto index a469dcdf6..ec02f7719 100644 --- a/proto/cerc/auction/v1/tx.proto +++ b/proto/cerc/auction/v1/tx.proto @@ -77,15 +77,15 @@ message MsgCreateAuction { string signer = 6 [ (gogoproto.moretags) = "json:\"signer\" yaml:\"signer\"" ]; - // Maximum acceptable bid amount (for reverse auctions) - cosmos.base.v1beta1.Coin max_price = 7 [ - (gogoproto.nullable) = false, - (gogoproto.moretags) = "json:\"max_price\" yaml:\"max_price\"" + // Auction's kind (vickrey | service_provider) + string kind = 7 [ + (gogoproto.moretags) = "json:\"kind\" yaml:\"kind\"" ]; - // Auction kind can be vickrey or service_provider - string kind = 8 [ - (gogoproto.moretags) = "json:\"kind\" yaml:\"kind\"" + // Maximum acceptable bid amount (for service provider auctions) + cosmos.base.v1beta1.Coin max_price = 8 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "json:\"max_price\" yaml:\"max_price\"" ]; // Number of providers to be selected diff --git a/x/auction/auction.pb.go b/x/auction/auction.pb.go index 1612dede9..5f93c3c56 100644 --- a/x/auction/auction.pb.go +++ b/x/auction/auction.pb.go @@ -112,32 +112,32 @@ func (m *Params) GetMinimumBid() types.Coin { // Auction represents a sealed-bid on-chain auction type Auction struct { - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Status string `protobuf:"bytes,2,opt,name=status,proto3" json:"status,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + // Auction's kind (vickrey | service_provider) + Kind string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty" json:"kind" yaml:"kind"` + Status string `protobuf:"bytes,3,opt,name=status,proto3" json:"status,omitempty"` // Address of the creator of the auction - OwnerAddress string `protobuf:"bytes,3,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` + OwnerAddress string `protobuf:"bytes,4,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` // Timestamp at which the auction was created - CreateTime time.Time `protobuf:"bytes,4,opt,name=create_time,json=createTime,proto3,stdtime" json:"create_time" json:"create_time" yaml:"create_time"` + CreateTime time.Time `protobuf:"bytes,5,opt,name=create_time,json=createTime,proto3,stdtime" json:"create_time" json:"create_time" yaml:"create_time"` // Timestamp at which the commits phase concluded - CommitsEndTime time.Time `protobuf:"bytes,5,opt,name=commits_end_time,json=commitsEndTime,proto3,stdtime" json:"commits_end_time" json:"commits_end_time" yaml:"commits_end_time"` + CommitsEndTime time.Time `protobuf:"bytes,6,opt,name=commits_end_time,json=commitsEndTime,proto3,stdtime" json:"commits_end_time" json:"commits_end_time" yaml:"commits_end_time"` // Timestamp at which the reveals phase concluded - RevealsEndTime time.Time `protobuf:"bytes,6,opt,name=reveals_end_time,json=revealsEndTime,proto3,stdtime" json:"reveals_end_time" json:"reveals_end_time" yaml:"reveals_end_time"` + RevealsEndTime time.Time `protobuf:"bytes,7,opt,name=reveals_end_time,json=revealsEndTime,proto3,stdtime" json:"reveals_end_time" json:"reveals_end_time" yaml:"reveals_end_time"` // Commit and reveal fees must both be paid when committing a bid // Reveal fee is returned only if the bid is revealed - CommitFee types.Coin `protobuf:"bytes,7,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee" json:"commit_fee" yaml:"commit_fee"` - RevealFee types.Coin `protobuf:"bytes,8,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee" json:"reveal_fee" yaml:"reveal_fee"` + CommitFee types.Coin `protobuf:"bytes,8,opt,name=commit_fee,json=commitFee,proto3" json:"commit_fee" json:"commit_fee" yaml:"commit_fee"` + RevealFee types.Coin `protobuf:"bytes,9,opt,name=reveal_fee,json=revealFee,proto3" json:"reveal_fee" json:"reveal_fee" yaml:"reveal_fee"` // Minimum acceptable bid amount for a valid commit - MinimumBid types.Coin `protobuf:"bytes,9,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"` - // Addresses of the winners - WinnerAddresses []string `protobuf:"bytes,10,rep,name=winner_addresses,json=winnerAddresses,proto3" json:"winner_addresses,omitempty"` + MinimumBid types.Coin `protobuf:"bytes,10,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"` + // Addresses of the winners (one for vickrey and can be multiple for service_provider) + WinnerAddresses []string `protobuf:"bytes,11,rep,name=winner_addresses,json=winnerAddresses,proto3" json:"winner_addresses,omitempty"` // Winning bids, i.e., the best bids - WinningBids []types.Coin `protobuf:"bytes,11,rep,name=winning_bids,json=winningBids,proto3" json:"winning_bids" json:"winning_bids" yaml:"winning_bids"` + WinningBids []types.Coin `protobuf:"bytes,12,rep,name=winning_bids,json=winningBids,proto3" json:"winning_bids" json:"winning_bids" yaml:"winning_bids"` // Amount the winner pays, i.e. the second best bid - WinningPrice types.Coin `protobuf:"bytes,12,opt,name=winning_price,json=winningPrice,proto3" json:"winning_price" json:"winning_price" yaml:"winning_price"` - // Maximum acceptable bid amount for a valid commit for reverse auctions - MaxPrice types.Coin `protobuf:"bytes,13,opt,name=max_price,json=maxPrice,proto3" json:"max_price" json:"max_price" yaml:"max_price"` - // Auction kind can be vickrey or service_provider - Kind string `protobuf:"bytes,14,opt,name=kind,proto3" json:"kind,omitempty" json:"kind" yaml:"kind"` + WinningPrice types.Coin `protobuf:"bytes,13,opt,name=winning_price,json=winningPrice,proto3" json:"winning_price" json:"winning_price" yaml:"winning_price"` + // Maximum acceptable bid amount for a valid commit for service provider auctions + MaxPrice types.Coin `protobuf:"bytes,14,opt,name=max_price,json=maxPrice,proto3" json:"max_price" json:"max_price" yaml:"max_price"` // Number of providers to be selected NumProviders int32 `protobuf:"varint,15,opt,name=num_providers,json=numProviders,proto3" json:"num_providers,omitempty"` } @@ -269,63 +269,63 @@ func init() { func init() { proto.RegisterFile("cerc/auction/v1/auction.proto", fileDescriptor_34b162eb5b365523) } var fileDescriptor_34b162eb5b365523 = []byte{ - // 892 bytes of a gzipped FileDescriptorProto + // 888 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0x8e, 0x9b, 0x34, 0xad, 0x27, 0xfd, 0xb1, 0xb2, 0x10, 0x98, 0xa2, 0x4d, 0x42, 0x57, 0x15, - 0xad, 0xd0, 0xda, 0x0a, 0xdc, 0xca, 0x01, 0xc5, 0xfc, 0x10, 0x48, 0x1c, 0x2a, 0x8b, 0x13, 0x17, + 0x14, 0x8e, 0xdb, 0x34, 0x1b, 0x4f, 0x9a, 0x76, 0x65, 0x21, 0x30, 0x45, 0x9b, 0x84, 0x56, 0x15, + 0xad, 0xd0, 0xda, 0x0a, 0xdc, 0xc2, 0x01, 0xc5, 0xfc, 0x10, 0x48, 0x1c, 0x2a, 0x8b, 0x13, 0x17, 0x6b, 0xec, 0x99, 0x4d, 0x07, 0x32, 0x33, 0xc1, 0x63, 0x67, 0xcb, 0x91, 0x1b, 0xc7, 0x3d, 0xee, 0x0d, 0xfe, 0x9c, 0xbd, 0xb1, 0x12, 0x17, 0x4e, 0x05, 0xb5, 0xff, 0xc1, 0xfe, 0x05, 0x68, 0x7e, - 0x39, 0xb6, 0x77, 0x21, 0xe4, 0xd0, 0xde, 0x3c, 0x9f, 0xe7, 0xbd, 0xef, 0x7b, 0xcf, 0xef, 0x7d, - 0x09, 0x78, 0x98, 0xe1, 0x3c, 0x0b, 0x61, 0x99, 0x15, 0x84, 0xb3, 0x70, 0x39, 0xb1, 0x8f, 0xc1, - 0x22, 0xe7, 0x05, 0xf7, 0x0e, 0xe5, 0xeb, 0xc0, 0x62, 0xcb, 0xc9, 0xd1, 0x5b, 0x33, 0x3e, 0xe3, - 0xea, 0x5d, 0x28, 0x9f, 0xf4, 0xb5, 0xa3, 0xe1, 0x8c, 0xf3, 0xd9, 0x1c, 0x87, 0xea, 0x94, 0x96, - 0x4f, 0x42, 0x54, 0xe6, 0x70, 0x95, 0xe6, 0x68, 0xd4, 0x7e, 0x5f, 0x10, 0x8a, 0x45, 0x01, 0xe9, - 0xc2, 0x26, 0xc8, 0xb8, 0xa0, 0x5c, 0x84, 0x29, 0x14, 0x38, 0x5c, 0x4e, 0x52, 0x5c, 0xc0, 0x49, - 0x98, 0x71, 0x62, 0x12, 0x1c, 0xff, 0xde, 0x03, 0xfd, 0x0b, 0x98, 0x43, 0x2a, 0xbc, 0x9f, 0x1d, - 0xf0, 0x20, 0xe3, 0x94, 0x92, 0x42, 0x24, 0x96, 0xc6, 0x77, 0xc6, 0xce, 0xe9, 0xe0, 0xa3, 0x77, - 0x03, 0xcd, 0x13, 0x58, 0x9e, 0xe0, 0x73, 0x73, 0x21, 0xfa, 0xe4, 0xc5, 0xf5, 0xa8, 0xf3, 0xea, - 0x7a, 0x14, 0x7e, 0x2f, 0x38, 0x3b, 0x3f, 0x6e, 0x27, 0x38, 0x1e, 0xff, 0x04, 0xe9, 0xfc, 0x0d, - 0xf8, 0xf3, 0xbf, 0x46, 0x4e, 0x7c, 0x68, 0x60, 0x9b, 0x4d, 0x69, 0xc8, 0xf1, 0x12, 0xc3, 0x79, - 0x4d, 0xc3, 0xd6, 0x86, 0x1a, 0xda, 0x09, 0xac, 0x86, 0xd7, 0x70, 0xad, 0xc1, 0xc0, 0x95, 0x06, - 0x0c, 0x80, 0x96, 0x95, 0x3c, 0xc1, 0xd8, 0xef, 0x1a, 0x72, 0xdd, 0xc7, 0x40, 0xf6, 0x31, 0x30, - 0x7d, 0x0c, 0x3e, 0xe3, 0x84, 0x45, 0x1f, 0x1a, 0xf2, 0x47, 0xf5, 0x06, 0xc8, 0xd0, 0x66, 0xe9, - 0x0a, 0x89, 0x5d, 0x7d, 0xf8, 0x12, 0x63, 0x49, 0xa3, 0x99, 0x15, 0x4d, 0x6f, 0x43, 0x9a, 0x55, - 0x68, 0xb3, 0x3a, 0x43, 0xa3, 0x0f, 0x92, 0x86, 0x80, 0x01, 0x25, 0x8c, 0xd0, 0x92, 0x26, 0x29, - 0x41, 0xfe, 0xf6, 0x3a, 0x9e, 0xc7, 0x86, 0xe7, 0x44, 0xf3, 0xd4, 0x62, 0x2d, 0x51, 0x1d, 0x8a, - 0x81, 0x39, 0x45, 0x04, 0x9d, 0xf7, 0x9e, 0xff, 0x36, 0xea, 0x1c, 0xff, 0xe1, 0x82, 0x9d, 0xa9, - 0x9e, 0x6b, 0xef, 0x00, 0x6c, 0x11, 0xa4, 0x66, 0xc8, 0x8d, 0xb7, 0x08, 0xf2, 0xde, 0x06, 0x7d, - 0x51, 0xc0, 0xa2, 0x14, 0xea, 0x9b, 0xba, 0xb1, 0x39, 0x79, 0x8f, 0xc0, 0x3e, 0x7f, 0xca, 0x70, - 0x9e, 0x40, 0x84, 0x72, 0x2c, 0x84, 0xea, 0xba, 0x1b, 0xef, 0x29, 0x70, 0xaa, 0x31, 0x8f, 0x81, - 0x41, 0x96, 0x63, 0x58, 0xe0, 0x44, 0x0e, 0xb9, 0xe9, 0xd8, 0xd1, 0x6b, 0x53, 0xf1, 0xad, 0xdd, - 0x80, 0x68, 0xd2, 0x2c, 0xa5, 0x16, 0x5c, 0x7d, 0x9a, 0x1a, 0xf4, 0x4c, 0x0e, 0x03, 0xd0, 0x88, - 0xcc, 0xd1, 0xd8, 0x07, 0xcc, 0x90, 0x66, 0xdd, 0x5e, 0xcb, 0xfa, 0x2f, 0x0b, 0x61, 0x33, 0xb4, - 0x17, 0xa2, 0xc2, 0x15, 0xff, 0x81, 0x81, 0xbf, 0x60, 0xa8, 0xd2, 0x60, 0xc7, 0xb6, 0xd2, 0xd0, - 0xdf, 0x54, 0x43, 0x3b, 0x43, 0x7b, 0x21, 0x5a, 0x1a, 0x0c, 0x6c, 0x35, 0x34, 0xf7, 0x61, 0xe7, - 0x7e, 0xf6, 0x61, 0xf7, 0x9e, 0xf6, 0xc1, 0xbd, 0xbb, 0x7d, 0xf0, 0xce, 0xc0, 0x83, 0xa7, 0x84, - 0xd5, 0xc6, 0x1a, 0x0b, 0x1f, 0x8c, 0xbb, 0xa7, 0x6e, 0x7c, 0xa8, 0xf1, 0xa9, 0x85, 0x3d, 0x0a, - 0xf6, 0x24, 0x44, 0xd8, 0x4c, 0xa6, 0x11, 0xfe, 0x60, 0xdc, 0xfd, 0x6f, 0x59, 0xa1, 0x91, 0xf5, - 0x81, 0x96, 0x55, 0x0f, 0xb6, 0xba, 0x1a, 0x58, 0x3c, 0x30, 0xc7, 0x88, 0x20, 0xe1, 0xfd, 0x08, - 0xf6, 0xed, 0xdb, 0x45, 0x4e, 0x32, 0xec, 0xef, 0xad, 0x6b, 0x83, 0xdd, 0xa5, 0xb3, 0x26, 0x9f, - 0x8a, 0x6e, 0x13, 0x6a, 0x30, 0xb6, 0x15, 0x5d, 0xc8, 0xa3, 0x07, 0x81, 0x4b, 0xe1, 0x95, 0xa1, - 0xdb, 0x5f, 0x47, 0x77, 0x66, 0xe8, 0xde, 0x37, 0x5d, 0xb7, 0x91, 0x55, 0xcf, 0x2b, 0x20, 0xde, - 0xa5, 0xf0, 0x4a, 0x53, 0x84, 0xa0, 0xf7, 0x03, 0x61, 0xc8, 0x3f, 0x90, 0xe6, 0x11, 0xbd, 0xf7, - 0xea, 0x7a, 0xf4, 0x8e, 0x0e, 0x97, 0xa8, 0x8d, 0x54, 0xcf, 0xb1, 0xba, 0x28, 0x6d, 0x87, 0x95, - 0x34, 0x59, 0xe4, 0x7c, 0x49, 0x10, 0xce, 0x85, 0x7f, 0x38, 0x76, 0x4e, 0xb7, 0xe3, 0x3d, 0x56, - 0xd2, 0x0b, 0x8b, 0x9d, 0xf7, 0x7e, 0x91, 0xae, 0xf6, 0x0d, 0xd8, 0x35, 0xa6, 0x26, 0xbc, 0x73, - 0xb0, 0x6b, 0x7e, 0xb8, 0x85, 0xef, 0xa8, 0x0f, 0xe5, 0x07, 0xad, 0x9f, 0xf3, 0xc0, 0x5c, 0x8e, - 0x7a, 0xb2, 0x90, 0xb8, 0xba, 0x6f, 0xb2, 0xfd, 0xba, 0x0d, 0xba, 0x72, 0x42, 0x1e, 0x02, 0x60, - 0xde, 0x24, 0x95, 0x4f, 0xba, 0x06, 0xf9, 0x1a, 0x79, 0x27, 0xe0, 0x20, 0x25, 0x08, 0xd5, 0x7c, - 0x51, 0xdb, 0xe6, 0xbe, 0x46, 0xad, 0x31, 0xae, 0x5c, 0xb5, 0xdb, 0x70, 0xd5, 0x11, 0x18, 0x98, - 0x5d, 0xbb, 0x84, 0xe2, 0x52, 0x19, 0xa6, 0x1b, 0x9b, 0x5d, 0xfe, 0x0a, 0x8a, 0x4b, 0xe5, 0xa8, - 0xfa, 0xc2, 0xff, 0xf4, 0xb6, 0xb6, 0xa3, 0xae, 0x82, 0x5b, 0xcb, 0x5d, 0x77, 0x54, 0x85, 0xbc, - 0xc1, 0x49, 0xfa, 0x77, 0xe5, 0x24, 0x0c, 0x0c, 0xcc, 0xf2, 0xab, 0xb2, 0x76, 0x36, 0x2d, 0xab, - 0x16, 0xdc, 0x32, 0x93, 0x5a, 0x59, 0x1a, 0xb1, 0x65, 0xdd, 0x87, 0x73, 0x61, 0x00, 0x52, 0x82, - 0x12, 0x48, 0x79, 0xc9, 0x8a, 0xf5, 0xc6, 0xd5, 0xa2, 0x59, 0x85, 0x5a, 0x9a, 0x1a, 0x12, 0xbb, - 0x29, 0x41, 0x53, 0xf5, 0xac, 0x27, 0x34, 0xfa, 0xf4, 0xc5, 0xcd, 0xd0, 0x79, 0x79, 0x33, 0x74, - 0xfe, 0xbe, 0x19, 0x3a, 0xcf, 0x6e, 0x87, 0x9d, 0x97, 0xb7, 0xc3, 0xce, 0x9f, 0xb7, 0xc3, 0xce, - 0x77, 0x27, 0x33, 0x52, 0x04, 0x4b, 0x94, 0x06, 0x05, 0x0f, 0xe5, 0xd4, 0x3f, 0x26, 0x3c, 0x9c, - 0xc3, 0x8c, 0x33, 0x92, 0xa1, 0xf0, 0xca, 0xfe, 0xcd, 0x4d, 0xfb, 0xaa, 0xcf, 0x1f, 0xff, 0x13, - 0x00, 0x00, 0xff, 0xff, 0xac, 0x9f, 0x65, 0x0b, 0x08, 0x0b, 0x00, 0x00, + 0x39, 0x8e, 0x77, 0x97, 0x10, 0xa4, 0xee, 0xcd, 0xf3, 0xcd, 0xbc, 0xf7, 0x7d, 0xf3, 0xe6, 0xbd, + 0x2f, 0x01, 0x0f, 0x32, 0x9c, 0x67, 0x21, 0x2c, 0xb3, 0x82, 0x70, 0x16, 0x2e, 0xc7, 0xf6, 0x33, + 0x58, 0xe4, 0xbc, 0xe0, 0xde, 0xa1, 0xdc, 0x0e, 0x2c, 0xb6, 0x1c, 0x1f, 0xbd, 0x35, 0xe3, 0x33, + 0xae, 0xf6, 0x42, 0xf9, 0xa5, 0x8f, 0x1d, 0x0d, 0x66, 0x9c, 0xcf, 0xe6, 0x38, 0x54, 0xab, 0xb4, + 0x7c, 0x14, 0xa2, 0x32, 0x87, 0xab, 0x34, 0x47, 0xc3, 0xe6, 0x7e, 0x41, 0x28, 0x16, 0x05, 0xa4, + 0x0b, 0x9b, 0x20, 0xe3, 0x82, 0x72, 0x11, 0xa6, 0x50, 0xe0, 0x70, 0x39, 0x4e, 0x71, 0x01, 0xc7, + 0x61, 0xc6, 0x89, 0x49, 0x70, 0xfc, 0x7b, 0x1b, 0x74, 0x2e, 0x60, 0x0e, 0xa9, 0xf0, 0x7e, 0x76, + 0xc0, 0xfd, 0x8c, 0x53, 0x4a, 0x0a, 0x91, 0x58, 0x1a, 0xdf, 0x19, 0x39, 0x67, 0xbd, 0x8f, 0xde, + 0x0d, 0x34, 0x4f, 0x60, 0x79, 0x82, 0xcf, 0xcd, 0x81, 0xe8, 0x93, 0x67, 0xd7, 0xc3, 0xd6, 0x8b, + 0xeb, 0x61, 0xf8, 0xbd, 0xe0, 0x6c, 0x72, 0xdc, 0x4c, 0x70, 0x3c, 0xfa, 0x09, 0xd2, 0xf9, 0x2b, + 0xf0, 0xa7, 0x7f, 0x0d, 0x9d, 0xf8, 0xd0, 0xc0, 0x36, 0x9b, 0xd2, 0x90, 0xe3, 0x25, 0x86, 0xf3, + 0x9a, 0x86, 0x9d, 0x2d, 0x35, 0x34, 0x13, 0x58, 0x0d, 0x2f, 0xe1, 0x5a, 0x83, 0x81, 0x2b, 0x0d, + 0x18, 0x00, 0x2d, 0x2b, 0x79, 0x84, 0xb1, 0xbf, 0x6b, 0xc8, 0x75, 0x1d, 0x03, 0x59, 0xc7, 0xc0, + 0xd4, 0x31, 0xf8, 0x8c, 0x13, 0x16, 0x7d, 0x68, 0xc8, 0x4f, 0xea, 0x05, 0x90, 0xa1, 0xeb, 0x57, + 0x57, 0x48, 0xec, 0xea, 0xc5, 0x97, 0x18, 0x4b, 0x1a, 0xcd, 0xac, 0x68, 0xda, 0x5b, 0xd2, 0xac, + 0x42, 0xd7, 0x6f, 0x67, 0x68, 0xf4, 0x42, 0xd2, 0x10, 0xd0, 0xa3, 0x84, 0x11, 0x5a, 0xd2, 0x24, + 0x25, 0xc8, 0xdf, 0xdb, 0xc4, 0xf3, 0xd0, 0xf0, 0x9c, 0x6a, 0x9e, 0x5a, 0xac, 0x25, 0xaa, 0x43, + 0x31, 0x30, 0xab, 0x88, 0xa0, 0x49, 0xfb, 0xe9, 0x6f, 0xc3, 0xd6, 0xf1, 0x1f, 0x2e, 0xb8, 0x37, + 0xd5, 0x7d, 0xed, 0x1d, 0x80, 0x1d, 0x82, 0x54, 0x0f, 0xb9, 0xf1, 0x0e, 0x41, 0x5e, 0x08, 0xda, + 0x3f, 0x10, 0x86, 0xd4, 0x8b, 0xba, 0xd1, 0x7b, 0x2f, 0xae, 0x87, 0xef, 0x68, 0x1a, 0x89, 0xda, + 0xfc, 0xea, 0x3b, 0x56, 0x07, 0xbd, 0xb7, 0x41, 0x47, 0x14, 0xb0, 0x28, 0x85, 0x7a, 0x07, 0x37, + 0x36, 0x2b, 0xef, 0x04, 0xf4, 0xf9, 0x63, 0x86, 0xf3, 0x04, 0x22, 0x94, 0x63, 0x21, 0x54, 0xfd, + 0xdc, 0x78, 0x5f, 0x81, 0x53, 0x8d, 0x79, 0x0c, 0xf4, 0xb2, 0x1c, 0xc3, 0x02, 0x27, 0x72, 0x2a, + 0xcc, 0xd5, 0x8f, 0x5e, 0x6a, 0xa3, 0x6f, 0xed, 0xc8, 0x44, 0xe3, 0xf5, 0xbb, 0xd7, 0x82, 0xab, + 0xb7, 0xac, 0x41, 0x4f, 0x64, 0xf7, 0x00, 0x8d, 0xc8, 0x1c, 0x6b, 0x03, 0x84, 0x19, 0xd2, 0xac, + 0x9d, 0x8d, 0xac, 0xaf, 0x99, 0x20, 0x9b, 0xa1, 0x39, 0x41, 0x15, 0xae, 0xf8, 0x0f, 0x0c, 0xfc, + 0x05, 0x43, 0x95, 0x06, 0xdb, 0xe7, 0x95, 0x86, 0x7b, 0xdb, 0x6a, 0x68, 0x66, 0x68, 0x4e, 0x50, + 0x43, 0x83, 0x81, 0xad, 0x86, 0xf5, 0x01, 0xea, 0xbe, 0x99, 0x01, 0x72, 0xdf, 0xd0, 0x00, 0x81, + 0xbb, 0x1b, 0x20, 0xef, 0x1c, 0xdc, 0x7f, 0x4c, 0x58, 0xad, 0xad, 0xb1, 0xf0, 0x7b, 0xa3, 0xdd, + 0x33, 0x37, 0x3e, 0xd4, 0xf8, 0xd4, 0xc2, 0x1e, 0x05, 0xfb, 0x12, 0x22, 0x6c, 0x26, 0xd3, 0x08, + 0x7f, 0x7f, 0xb4, 0xfb, 0xef, 0xb2, 0x42, 0x23, 0xeb, 0x03, 0x2d, 0xab, 0x1e, 0x6c, 0x75, 0xad, + 0x61, 0x71, 0xcf, 0x2c, 0x23, 0x82, 0x84, 0xf7, 0x23, 0xe8, 0xdb, 0xdd, 0x45, 0x4e, 0x32, 0xec, + 0xf7, 0x37, 0x95, 0xc1, 0xce, 0xd2, 0xf9, 0x3a, 0x9f, 0x8a, 0x6e, 0x12, 0x6a, 0x30, 0xb6, 0x37, + 0xba, 0x90, 0x4b, 0x0f, 0x02, 0x97, 0xc2, 0x2b, 0x43, 0x77, 0xb0, 0x89, 0xee, 0xdc, 0xd0, 0xbd, + 0x6f, 0xaa, 0x6e, 0x23, 0xab, 0x9a, 0x57, 0x40, 0xdc, 0xa5, 0xf0, 0x4a, 0x53, 0x9c, 0x80, 0x3e, + 0x2b, 0x69, 0xb2, 0xc8, 0xf9, 0x92, 0x20, 0x9c, 0x0b, 0xff, 0x70, 0xe4, 0x9c, 0xed, 0xc5, 0xfb, + 0xac, 0xa4, 0x17, 0x16, 0x9b, 0xb4, 0x7f, 0x91, 0xae, 0xf6, 0x0d, 0xe8, 0x1a, 0x53, 0x13, 0xde, + 0x04, 0x74, 0xcd, 0x0f, 0xb7, 0xf0, 0x1d, 0x55, 0x77, 0x3f, 0x68, 0xfc, 0x9c, 0x07, 0xe6, 0x70, + 0xd4, 0x96, 0xba, 0xe2, 0xea, 0xbc, 0xc9, 0xf6, 0xeb, 0x1e, 0xd8, 0x95, 0x0f, 0xfe, 0x00, 0x00, + 0xb3, 0x93, 0x54, 0x3e, 0xe9, 0x1a, 0xe4, 0x6b, 0xe4, 0x9d, 0x82, 0x83, 0x94, 0x20, 0x54, 0xb3, + 0x39, 0x65, 0x9c, 0x71, 0x5f, 0xa3, 0xd6, 0xe7, 0x5e, 0x67, 0x92, 0x43, 0xd0, 0x33, 0xa3, 0x73, + 0x09, 0xc5, 0xa5, 0xb1, 0x48, 0x33, 0x9a, 0x5f, 0x41, 0x71, 0xa9, 0x0c, 0x52, 0x1f, 0xf8, 0x9f, + 0x06, 0xb9, 0x0a, 0x6e, 0xcc, 0x6a, 0xdd, 0x20, 0x15, 0xf2, 0x0a, 0x63, 0xe8, 0xdc, 0x95, 0x31, + 0x30, 0xd0, 0x33, 0xb3, 0xfc, 0x1f, 0xdd, 0xaf, 0x71, 0xad, 0x5a, 0x70, 0xc3, 0x1b, 0x6a, 0xd7, + 0xd2, 0x88, 0xbd, 0x56, 0xcd, 0x88, 0xba, 0x77, 0x65, 0x44, 0x18, 0x80, 0x94, 0xa0, 0x04, 0x52, + 0x5e, 0xb2, 0x62, 0x6b, 0xbf, 0x5b, 0x85, 0x5a, 0x9a, 0x1a, 0x12, 0xbb, 0x29, 0x41, 0x53, 0xf5, + 0xad, 0x3b, 0x34, 0xfa, 0xf4, 0xd9, 0xcd, 0xc0, 0x79, 0x7e, 0x33, 0x70, 0xfe, 0xbe, 0x19, 0x38, + 0x4f, 0x6e, 0x07, 0xad, 0xe7, 0xb7, 0x83, 0xd6, 0x9f, 0xb7, 0x83, 0xd6, 0x77, 0xa7, 0x33, 0x52, + 0x04, 0x4b, 0x94, 0x06, 0x05, 0x0f, 0x65, 0xd7, 0x3f, 0x24, 0x3c, 0x9c, 0xc3, 0x8c, 0x33, 0x92, + 0xa1, 0xf0, 0xca, 0xfe, 0xcd, 0x4d, 0x3b, 0xaa, 0xce, 0x1f, 0xff, 0x13, 0x00, 0x00, 0xff, 0xff, + 0x92, 0xcd, 0xec, 0xad, 0x08, 0x0b, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { @@ -422,13 +422,6 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x78 } - if len(m.Kind) > 0 { - i -= len(m.Kind) - copy(dAtA[i:], m.Kind) - i = encodeVarintAuction(dAtA, i, uint64(len(m.Kind))) - i-- - dAtA[i] = 0x72 - } { size, err := m.MaxPrice.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -438,7 +431,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x6a + dAtA[i] = 0x72 { size, err := m.WinningPrice.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -448,7 +441,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x62 + dAtA[i] = 0x6a if len(m.WinningBids) > 0 { for iNdEx := len(m.WinningBids) - 1; iNdEx >= 0; iNdEx-- { { @@ -460,7 +453,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x5a + dAtA[i] = 0x62 } } if len(m.WinnerAddresses) > 0 { @@ -469,7 +462,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.WinnerAddresses[iNdEx]) i = encodeVarintAuction(dAtA, i, uint64(len(m.WinnerAddresses[iNdEx]))) i-- - dAtA[i] = 0x52 + dAtA[i] = 0x5a } } { @@ -481,7 +474,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x4a + dAtA[i] = 0x52 { size, err := m.RevealFee.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -491,7 +484,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x42 + dAtA[i] = 0x4a { size, err := m.CommitFee.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -501,7 +494,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 n11, err11 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.RevealsEndTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.RevealsEndTime):]) if err11 != nil { return 0, err11 @@ -509,7 +502,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= n11 i = encodeVarintAuction(dAtA, i, uint64(n11)) i-- - dAtA[i] = 0x32 + dAtA[i] = 0x3a n12, err12 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CommitsEndTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CommitsEndTime):]) if err12 != nil { return 0, err12 @@ -517,7 +510,7 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= n12 i = encodeVarintAuction(dAtA, i, uint64(n12)) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.CreateTime, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.CreateTime):]) if err13 != nil { return 0, err13 @@ -525,19 +518,26 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= n13 i = encodeVarintAuction(dAtA, i, uint64(n13)) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a if len(m.OwnerAddress) > 0 { i -= len(m.OwnerAddress) copy(dAtA[i:], m.OwnerAddress) i = encodeVarintAuction(dAtA, i, uint64(len(m.OwnerAddress))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } if len(m.Status) > 0 { i -= len(m.Status) copy(dAtA[i:], m.Status) i = encodeVarintAuction(dAtA, i, uint64(len(m.Status))) i-- + dAtA[i] = 0x1a + } + if len(m.Kind) > 0 { + i -= len(m.Kind) + copy(dAtA[i:], m.Kind) + i = encodeVarintAuction(dAtA, i, uint64(len(m.Kind))) + i-- dAtA[i] = 0x12 } if len(m.Id) > 0 { @@ -724,6 +724,10 @@ func (m *Auction) Size() (n int) { if l > 0 { n += 1 + l + sovAuction(uint64(l)) } + l = len(m.Kind) + if l > 0 { + n += 1 + l + sovAuction(uint64(l)) + } l = len(m.Status) if l > 0 { n += 1 + l + sovAuction(uint64(l)) @@ -760,10 +764,6 @@ func (m *Auction) Size() (n int) { n += 1 + l + sovAuction(uint64(l)) l = m.MaxPrice.Size() n += 1 + l + sovAuction(uint64(l)) - l = len(m.Kind) - if l > 0 { - n += 1 + l + sovAuction(uint64(l)) - } if m.NumProviders != 0 { n += 1 + sovAuction(uint64(m.NumProviders)) } @@ -1103,6 +1103,38 @@ func (m *Auction) Unmarshal(dAtA []byte) error { m.Id = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Kind", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAuction + } + 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 ErrInvalidLengthAuction + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthAuction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Kind = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) } @@ -1134,7 +1166,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { } m.Status = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OwnerAddress", wireType) } @@ -1166,7 +1198,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { } m.OwnerAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CreateTime", wireType) } @@ -1199,7 +1231,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CommitsEndTime", wireType) } @@ -1232,7 +1264,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RevealsEndTime", wireType) } @@ -1265,7 +1297,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field CommitFee", wireType) } @@ -1298,7 +1330,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RevealFee", wireType) } @@ -1331,7 +1363,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 9: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MinimumBid", wireType) } @@ -1364,7 +1396,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 10: + case 11: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field WinnerAddresses", wireType) } @@ -1396,7 +1428,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { } m.WinnerAddresses = append(m.WinnerAddresses, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 11: + case 12: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field WinningBids", wireType) } @@ -1430,7 +1462,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 12: + case 13: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field WinningPrice", wireType) } @@ -1463,7 +1495,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 13: + case 14: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MaxPrice", wireType) } @@ -1496,38 +1528,6 @@ func (m *Auction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 14: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Kind", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAuction - } - 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 ErrInvalidLengthAuction - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthAuction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Kind = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 15: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NumProviders", wireType) diff --git a/x/auction/client/cli/tx.go b/x/auction/client/cli/tx.go index 3f0445569..a170b2870 100644 --- a/x/auction/client/cli/tx.go +++ b/x/auction/client/cli/tx.go @@ -132,9 +132,9 @@ func GetCmdRevealBid() *cobra.Command { func GetCmdCreateAuction() *cobra.Command { cmd := &cobra.Command{ - Use: "create [commits-duration] [reveals-duration] [commit-fee] [reveal-fee] [minimum-bid] [maximum-bid] [reverse]", + Use: "create [commits-duration] [reveals-duration] [commit-fee] [reveal-fee] [minimum-bid] [max-price] [kind] [num-providers]", Short: "Create auction.", - Args: cobra.ExactArgs(7), + Args: cobra.ExactArgs(8), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) if err != nil { @@ -166,20 +166,23 @@ func GetCmdCreateAuction() *cobra.Command { return err } - maximumBid, err := sdk.ParseCoinNormalized(args[5]) + maxPrice, err := sdk.ParseCoinNormalized(args[5]) if err != nil { return err } kind := args[6] + numProviders := args[7] + msg := auctiontypes.NewMsgCreateAuction( commitsDuration, revealsDuration, commitFee, revealFee, minimumBid, - maximumBid, + maxPrice, + numProviders, kind, clientCtx.GetFromAddress(), ) diff --git a/x/auction/keeper/keeper.go b/x/auction/keeper/keeper.go index a523f6370..13498505e 100644 --- a/x/auction/keeper/keeper.go +++ b/x/auction/keeper/keeper.go @@ -342,9 +342,9 @@ func (k Keeper) CreateAuction(ctx sdk.Context, msg auctiontypes.MsgCreateAuction revealsEndTime := now.Add(msg.CommitsDuration + msg.RevealsDuration) if msg.Kind == auctiontypes.AuctionKindServiceProvider { - totalMaxBidAmount := sdk.NewCoin(msg.MaxPrice.Denom, msg.MaxPrice.Amount.MulRaw(int64(msg.NumProviders))) + totalLockedAmount := sdk.NewCoin(msg.MaxPrice.Denom, msg.MaxPrice.Amount.MulRaw(int64(msg.NumProviders))) - sdkErr := k.bankKeeper.SendCoinsFromAccountToModule(ctx, signerAddress, auctiontypes.ModuleName, sdk.NewCoins(totalMaxBidAmount)) + sdkErr := k.bankKeeper.SendCoinsFromAccountToModule(ctx, signerAddress, auctiontypes.ModuleName, sdk.NewCoins(totalLockedAmount)) if sdkErr != nil { k.Logger(ctx).Error(fmt.Sprintf("Auction error transferring maximum_bid amount: %v", sdkErr)) panic(sdkErr) @@ -626,7 +626,7 @@ func (k Keeper) processAuctionPhases(ctx sdk.Context) error { return err } } else { - if err = k.pickServiceProviderAuctionWinner(ctx, auction); err != nil { + if err = k.pickServiceProviderAuctionWinners(ctx, auction); err != nil { return err } } @@ -750,7 +750,7 @@ func (k Keeper) pickAuctionWinner(ctx sdk.Context, auction *auctiontypes.Auction } } - // Process winner account (if nobody bids, there won't be a winner). + // Process winner accounts (if nobody bids, there won't be a winner). if len(auction.WinnerAddresses) == 0 { winnerAddress, err := sdk.AccAddressFromBech32(auction.WinnerAddresses[0]) if err != nil { @@ -796,7 +796,7 @@ func (k Keeper) pickAuctionWinner(ctx sdk.Context, auction *auctiontypes.Auction } // Pick winner for service_provider auction -func (k Keeper) pickServiceProviderAuctionWinner(ctx sdk.Context, auction *auctiontypes.Auction) error { +func (k Keeper) pickServiceProviderAuctionWinners(ctx sdk.Context, auction *auctiontypes.Auction) error { k.Logger(ctx).Info(fmt.Sprintf("Picking auction %s winners.", auction.Id)) bids, err := k.GetBids(ctx, auction.Id) @@ -879,11 +879,9 @@ func (k Keeper) pickServiceProviderAuctionWinner(ctx sdk.Context, auction *aucti } } - // Process winner account (if nobody bids, there won't be a winner). + // Process winner accounts (if nobody bids, there won't be a winner). if len(winnerBids) > 0 { - winnerAddresses := make([]string, len(winnerBids)) - for i, bid := range winnerBids { - winnerAddresses[i] = bid.BidderAddress + for _, bid := range winnerBids { winnerAddress, err := sdk.AccAddressFromBech32(bid.BidderAddress) if err != nil { k.Logger(ctx).Error(fmt.Sprintf("Invalid winner address. %v", err)) @@ -891,35 +889,37 @@ func (k Keeper) pickServiceProviderAuctionWinner(ctx sdk.Context, auction *aucti } // Send winning price to bidders - sdkErrWinner := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, auctiontypes.ModuleName, winnerAddress, sdk.NewCoins(auction.WinningPrice)) - if sdkErrWinner != nil { - k.Logger(ctx).Error(fmt.Sprintf("Auction error sending funds to winner: %v", sdkErrWinner)) - panic(sdkErrWinner) + sdkErr := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, auctiontypes.ModuleName, winnerAddress, sdk.NewCoins(auction.WinningPrice)) + if sdkErr != nil { + k.Logger(ctx).Error(fmt.Sprintf("Auction error sending funds to winner: %v", sdkErr)) + panic(sdkErr) } // Send back extra amount to auction creator - totalMaxBidAmount := auction.MaxPrice.Amount.MulRaw(int64(auction.NumProviders)) + totalLockedAmount := auction.MaxPrice.Amount.Mul(math.NewInt(int64(auction.NumProviders))) totalAmountPaid := auction.WinningPrice.Amount.Mul(math.NewInt(int64(auction.NumProviders))) - extraAmountCoin := sdk.NewCoin(auction.MaxPrice.Denom, totalMaxBidAmount.Sub(totalAmountPaid)) + extraAmountCoin := sdk.NewCoin(auction.MaxPrice.Denom, totalLockedAmount.Sub(totalAmountPaid)) - sdkErrCreator := k.bankKeeper.SendCoinsFromModuleToAccount( + sdkErr = k.bankKeeper.SendCoinsFromModuleToAccount( ctx, auctiontypes.ModuleName, sdk.AccAddress(auction.OwnerAddress), sdk.NewCoins(extraAmountCoin), ) - if sdkErrCreator != nil { - k.Logger(ctx).Error(fmt.Sprintf("Auction error returning bid amount: %v", sdkErrCreator)) - panic(sdkErrCreator) + if sdkErr != nil { + k.Logger(ctx).Error(fmt.Sprintf("Auction error returning extra locked amount: %v", sdkErr)) + panic(sdkErr) } } } else { + totalLockedAmount := sdk.NewCoin(auction.MaxPrice.Denom, auction.MaxPrice.Amount.Mul(math.NewInt(int64(auction.NumProviders)))) + sdkErr := k.bankKeeper.SendCoinsFromModuleToAccount( ctx, auctiontypes.ModuleName, sdk.AccAddress(auction.OwnerAddress), - sdk.NewCoins(auction.MaxPrice)) + sdk.NewCoins(totalLockedAmount)) if sdkErr != nil { k.Logger(ctx).Error(fmt.Sprintf("Auction error returning bid amount: %v", sdkErr)) panic(sdkErr) diff --git a/x/auction/msgs.go b/x/auction/msgs.go index 22522a018..db8888ea1 100644 --- a/x/auction/msgs.go +++ b/x/auction/msgs.go @@ -23,6 +23,7 @@ func NewMsgCreateAuction( revealFee sdk.Coin, minimumBid sdk.Coin, maxPrice sdk.Coin, + numProviders int32, kind string, signer sdk.AccAddress, ) MsgCreateAuction { @@ -35,6 +36,7 @@ func NewMsgCreateAuction( MinimumBid: minimumBid, MaxPrice: maxPrice, Kind: kind, + NumProviders: numProviders, Signer: signer.String(), } } diff --git a/x/auction/tx.pb.go b/x/auction/tx.pb.go index 14ef381c9..d52174159 100644 --- a/x/auction/tx.pb.go +++ b/x/auction/tx.pb.go @@ -50,10 +50,10 @@ type MsgCreateAuction struct { MinimumBid types.Coin `protobuf:"bytes,5,opt,name=minimum_bid,json=minimumBid,proto3" json:"minimum_bid" json:"minimum_bid" yaml:"minimum_bid"` // Address of the signer Signer string `protobuf:"bytes,6,opt,name=signer,proto3" json:"signer,omitempty" json:"signer" yaml:"signer"` - // Maximum acceptable bid amount (for reverse auctions) - MaxPrice types.Coin `protobuf:"bytes,7,opt,name=max_price,json=maxPrice,proto3" json:"max_price" json:"max_price" yaml:"max_price"` - // Auction kind can be vickrey or service_provider - Kind string `protobuf:"bytes,8,opt,name=kind,proto3" json:"kind,omitempty" json:"kind" yaml:"kind"` + // Auction's kind (vickrey | service_provider) + Kind string `protobuf:"bytes,7,opt,name=kind,proto3" json:"kind,omitempty" json:"kind" yaml:"kind"` + // Maximum acceptable bid amount (for service provider auctions) + MaxPrice types.Coin `protobuf:"bytes,8,opt,name=max_price,json=maxPrice,proto3" json:"max_price" json:"max_price" yaml:"max_price"` // Number of providers to be selected NumProviders int32 `protobuf:"varint,9,opt,name=num_providers,json=numProviders,proto3" json:"num_providers,omitempty"` } @@ -431,40 +431,40 @@ var fileDescriptor_70947cda59e835fd = []byte{ 0x68, 0x28, 0x5a, 0x48, 0x68, 0x4a, 0x93, 0x5e, 0xd2, 0xee, 0xd0, 0xc8, 0x9a, 0xbf, 0x8c, 0x67, 0x17, 0x78, 0xb6, 0x14, 0x4f, 0x21, 0x57, 0x13, 0x15, 0x5d, 0x01, 0x02, 0xcb, 0xa7, 0x91, 0x79, 0x1f, 0xd5, 0x38, 0x8d, 0x53, 0x92, 0x59, 0xb5, 0x96, 0xb1, 0x5d, 0xf7, 0xed, 0xe1, 0xc0, 0x5e, - 0x53, 0x65, 0x94, 0x5f, 0x57, 0x00, 0x2b, 0x80, 0x70, 0x13, 0xa3, 0x7a, 0x82, 0xcf, 0xda, 0xdd, - 0x8c, 0x86, 0xc4, 0xba, 0x79, 0x99, 0xc2, 0x1d, 0x50, 0xb8, 0x01, 0x0a, 0x75, 0xe6, 0x48, 0xdf, - 0xc8, 0x11, 0xdc, 0x4a, 0xf0, 0xd9, 0xb1, 0x78, 0x34, 0x3d, 0x34, 0xf7, 0x35, 0x4d, 0x23, 0xeb, - 0x96, 0x54, 0xb6, 0x36, 0x1c, 0xd8, 0x2b, 0x2a, 0x5d, 0x78, 0x75, 0xa6, 0x7c, 0x0e, 0x64, 0xa0, - 0xb9, 0x89, 0x6e, 0xa7, 0xbd, 0x44, 0xdc, 0x56, 0x9f, 0x46, 0x24, 0xe3, 0x56, 0xbd, 0x65, 0x6c, - 0xcf, 0x07, 0x8b, 0x69, 0x2f, 0x39, 0xd6, 0xbe, 0x83, 0xa5, 0x1f, 0x7e, 0xb6, 0x2b, 0xcf, 0x5e, - 0xbf, 0xb8, 0x07, 0x9d, 0x38, 0xdf, 0x20, 0xab, 0x7c, 0x57, 0x01, 0xe1, 0x5d, 0x96, 0x72, 0x62, - 0x3e, 0x42, 0x37, 0xe1, 0x0a, 0xe1, 0xaa, 0x2c, 0xb7, 0xf4, 0xf3, 0xe2, 0x42, 0x8a, 0xbf, 0x31, - 0x1c, 0xd8, 0xeb, 0x4a, 0x1f, 0xa0, 0x5a, 0xa2, 0x36, 0x03, 0x5d, 0xeb, 0x60, 0x4e, 0x68, 0x70, - 0xfe, 0x33, 0xd0, 0xa2, 0x60, 0x96, 0xeb, 0x25, 0x5e, 0xc6, 0x43, 0x84, 0x20, 0xa2, 0x4d, 0x23, - 0x49, 0x58, 0xf7, 0xef, 0x8e, 0xf7, 0x67, 0x8c, 0x95, 0x2a, 0x0b, 0x4f, 0x50, 0x07, 0xe3, 0xf3, - 0xc8, 0xfc, 0x02, 0x2d, 0xc0, 0x02, 0x9f, 0x60, 0x7e, 0x22, 0x6f, 0xb1, 0xee, 0xef, 0x8c, 0x17, - 0xa4, 0x00, 0x96, 0x16, 0x5e, 0xba, 0x02, 0xb8, 0xa5, 0xcf, 0x30, 0x3f, 0x29, 0x2c, 0x48, 0xf5, - 0x4a, 0x0b, 0x32, 0x3d, 0xe7, 0x36, 0x5a, 0x2e, 0x76, 0x3b, 0x9a, 0xf1, 0x21, 0xaa, 0x76, 0xa0, - 0xdd, 0x85, 0xfd, 0xe5, 0xa9, 0xf9, 0xfa, 0x34, 0xf2, 0x57, 0x87, 0x03, 0xfb, 0x5d, 0x45, 0x5a, - 0x58, 0x6a, 0xb9, 0xcc, 0x22, 0x17, 0xe6, 0xf9, 0xa7, 0x9a, 0x67, 0x20, 0xef, 0xe8, 0x3a, 0xe7, - 0x79, 0x1f, 0xd5, 0xd4, 0x71, 0xc2, 0x28, 0x0b, 0x33, 0x50, 0xfe, 0xc9, 0x7b, 0x76, 0x02, 0x08, - 0xbf, 0xc6, 0xe1, 0x71, 0x39, 0xbc, 0x51, 0x6b, 0x6f, 0x67, 0x41, 0x9f, 0x1b, 0x68, 0xe9, 0x88, - 0xc7, 0x8f, 0xba, 0x11, 0xce, 0xc9, 0x31, 0xce, 0x70, 0xc2, 0xcd, 0x8f, 0x50, 0x1d, 0xf7, 0xf2, - 0x13, 0x96, 0xd1, 0xfc, 0x29, 0x8c, 0xd4, 0xfa, 0xf5, 0x97, 0xdd, 0x65, 0x38, 0xfd, 0xc3, 0x28, - 0xca, 0x08, 0xe7, 0x5f, 0xe6, 0x19, 0x4d, 0xe3, 0x60, 0x1c, 0x6a, 0x7e, 0x88, 0x6a, 0x5d, 0x59, - 0x01, 0x3e, 0x0d, 0x2b, 0x53, 0x3a, 0x15, 0x81, 0x3f, 0x27, 0x7e, 0x2a, 0x02, 0x08, 0x3e, 0x78, - 0x47, 0x0c, 0x61, 0x5c, 0xc6, 0x59, 0x45, 0x2b, 0x25, 0x45, 0x7a, 0x14, 0xfb, 0xff, 0x54, 0x51, - 0xf5, 0x88, 0xc7, 0xe6, 0xf7, 0x06, 0xba, 0x3d, 0xf9, 0x95, 0xdc, 0x98, 0xe2, 0x2a, 0x1f, 0x7c, - 0x63, 0xe7, 0xd2, 0x10, 0xcd, 0xe3, 0xdc, 0x7d, 0xf6, 0xdb, 0xbf, 0x3f, 0xde, 0xd8, 0x70, 0x6c, - 0xaf, 0xfc, 0xc1, 0x0e, 0x65, 0x7c, 0x1b, 0x3c, 0x66, 0x1f, 0xd5, 0xc7, 0xb7, 0xbd, 0x3e, 0x93, - 0x40, 0xc3, 0x8d, 0xad, 0x37, 0xc2, 0x23, 0xee, 0x4d, 0xc9, 0xbd, 0xee, 0xac, 0x4d, 0x73, 0xab, - 0x03, 0xee, 0xd0, 0x48, 0xf0, 0x8e, 0x6f, 0x60, 0x26, 0xef, 0x08, 0x9e, 0xcd, 0x3b, 0xb5, 0x66, - 0x6f, 0xe0, 0x85, 0x4f, 0x98, 0xe0, 0x7d, 0x8c, 0x16, 0x27, 0x56, 0xa5, 0x35, 0xab, 0x76, 0x31, - 0xa2, 0xb1, 0x7d, 0x59, 0x84, 0x16, 0xd0, 0x98, 0xff, 0xf6, 0xf5, 0x8b, 0x7b, 0x86, 0xff, 0xc9, - 0xcb, 0xf3, 0xa6, 0xf1, 0xea, 0xbc, 0x69, 0xfc, 0x7d, 0xde, 0x34, 0x9e, 0x5f, 0x34, 0x2b, 0xaf, - 0x2e, 0x9a, 0x95, 0x3f, 0x2e, 0x9a, 0x95, 0xc7, 0x5b, 0x31, 0xcd, 0xdd, 0x7e, 0xd4, 0x71, 0xc5, - 0xdf, 0x2a, 0x92, 0x85, 0xbb, 0x94, 0x79, 0xa7, 0x38, 0x64, 0x29, 0x0d, 0x23, 0xef, 0x4c, 0x2b, - 0xee, 0xd4, 0xe4, 0x3f, 0x91, 0x0f, 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x19, 0xc5, 0xcc, 0xe1, + 0x53, 0x65, 0x94, 0x5f, 0x57, 0x00, 0x2b, 0x80, 0x70, 0xd3, 0x43, 0x73, 0x5f, 0xd3, 0x34, 0xb2, + 0x6e, 0xca, 0xb4, 0xb5, 0xe1, 0xc0, 0x5e, 0x51, 0x69, 0xc2, 0xab, 0x93, 0xe4, 0x73, 0x20, 0x03, + 0x4d, 0x8c, 0xea, 0x09, 0x3e, 0x6b, 0x77, 0x33, 0x1a, 0x12, 0xeb, 0xd6, 0x65, 0x2d, 0xed, 0x40, + 0x4b, 0x1b, 0xd0, 0x92, 0xce, 0x1c, 0x35, 0x34, 0x72, 0x04, 0xb7, 0x12, 0x7c, 0x76, 0x2c, 0x1e, + 0xcd, 0x4d, 0x74, 0x3b, 0xed, 0x25, 0xe2, 0xb6, 0xfa, 0x34, 0x22, 0x19, 0xb7, 0xea, 0x2d, 0x63, + 0x7b, 0x3e, 0x58, 0x4c, 0x7b, 0xc9, 0xb1, 0xf6, 0x1d, 0x2c, 0xfd, 0xf0, 0xb3, 0x5d, 0x79, 0xf6, + 0xfa, 0xc5, 0x3d, 0xe8, 0xc4, 0xf9, 0x06, 0x59, 0xe5, 0xbb, 0x0a, 0x08, 0xef, 0xb2, 0x94, 0x13, + 0xf3, 0x11, 0xba, 0x09, 0x57, 0x08, 0x57, 0x65, 0xb9, 0xa5, 0x9f, 0x17, 0x17, 0x52, 0xfc, 0x8d, + 0xe1, 0xc0, 0x5e, 0x57, 0x6a, 0x01, 0xd5, 0x5a, 0xb5, 0x19, 0xe8, 0x5a, 0x07, 0x73, 0x42, 0x83, + 0xf3, 0x9f, 0x81, 0x16, 0x05, 0xb3, 0x5c, 0x2f, 0xf1, 0x32, 0x1e, 0x22, 0x04, 0x11, 0x6d, 0x1a, + 0x49, 0xc2, 0xba, 0x7f, 0x77, 0xbc, 0x3f, 0x63, 0xac, 0x54, 0x59, 0x78, 0x82, 0x3a, 0x18, 0x9f, + 0x47, 0xe6, 0x17, 0x68, 0x01, 0x16, 0xf8, 0x04, 0xf3, 0x13, 0x79, 0x8b, 0x75, 0x7f, 0x67, 0xbc, + 0x20, 0x05, 0xb0, 0xb4, 0xf0, 0xd2, 0x15, 0xc0, 0x2d, 0x7d, 0x86, 0xf9, 0x49, 0x61, 0x41, 0xaa, + 0x57, 0x5a, 0x90, 0xe9, 0x39, 0xb7, 0xd1, 0x72, 0xb1, 0xdb, 0xd1, 0x8c, 0x0f, 0x51, 0xb5, 0x03, + 0xed, 0x2e, 0xec, 0x2f, 0x4f, 0xcd, 0xd7, 0xa7, 0x91, 0xbf, 0x3a, 0x1c, 0xd8, 0xef, 0x2a, 0xd2, + 0xc2, 0x52, 0xcb, 0x65, 0x16, 0xb9, 0x30, 0xcf, 0x3f, 0xd5, 0x3c, 0x03, 0x79, 0x47, 0xd7, 0x39, + 0xcf, 0xfb, 0xa8, 0xa6, 0x8e, 0x13, 0x46, 0x59, 0x98, 0x81, 0xf2, 0x4f, 0xde, 0xb3, 0x13, 0x40, + 0xf8, 0x35, 0x0e, 0x8f, 0xcb, 0xe1, 0x8d, 0x5a, 0x7b, 0x3b, 0x0b, 0xfa, 0xdc, 0x40, 0x4b, 0x47, + 0x3c, 0x7e, 0xd4, 0x8d, 0x70, 0x4e, 0x8e, 0x71, 0x86, 0x13, 0x6e, 0x7e, 0x84, 0xea, 0xb8, 0x97, + 0x9f, 0xb0, 0x8c, 0xe6, 0x4f, 0x61, 0xa4, 0xd6, 0xaf, 0xbf, 0xec, 0x2e, 0xc3, 0x25, 0x1f, 0x46, + 0x51, 0x46, 0x38, 0xff, 0x32, 0xcf, 0x68, 0x1a, 0x07, 0xe3, 0x50, 0xf3, 0x43, 0x54, 0xeb, 0xca, + 0x0a, 0xf0, 0x69, 0x58, 0x99, 0xd2, 0xa9, 0x08, 0xfc, 0x39, 0x71, 0xf9, 0x01, 0x04, 0x1f, 0xbc, + 0x23, 0x86, 0x30, 0x2e, 0xe3, 0xac, 0xa2, 0x95, 0x92, 0x22, 0x3d, 0x8a, 0xfd, 0x7f, 0xaa, 0xa8, + 0x7a, 0xc4, 0x63, 0xf3, 0x7b, 0x03, 0xdd, 0x9e, 0xfc, 0x4a, 0x6e, 0x4c, 0x71, 0x95, 0x0f, 0xbe, + 0xb1, 0x73, 0x69, 0x88, 0xe6, 0x71, 0xee, 0x3e, 0xfb, 0xed, 0xdf, 0x1f, 0x6f, 0x6c, 0x38, 0xb6, + 0x57, 0xfe, 0x60, 0x87, 0x32, 0xbe, 0x0d, 0x1e, 0xb3, 0x8f, 0xea, 0xe3, 0xdb, 0x5e, 0x9f, 0x49, + 0xa0, 0xe1, 0xc6, 0xd6, 0x1b, 0xe1, 0x11, 0xf7, 0xa6, 0xe4, 0x5e, 0x77, 0xd6, 0xa6, 0xb9, 0xd5, + 0x01, 0x77, 0x68, 0x24, 0x78, 0xc7, 0x37, 0x30, 0x93, 0x77, 0x04, 0xcf, 0xe6, 0x9d, 0x5a, 0xb3, + 0x37, 0xf0, 0xc2, 0x27, 0x4c, 0xf0, 0x3e, 0x46, 0x8b, 0x13, 0xab, 0xd2, 0x9a, 0x55, 0xbb, 0x18, + 0xd1, 0xd8, 0xbe, 0x2c, 0x42, 0x0b, 0x68, 0xcc, 0x7f, 0xfb, 0xfa, 0xc5, 0x3d, 0xc3, 0xff, 0xe4, + 0xe5, 0x79, 0xd3, 0x78, 0x75, 0xde, 0x34, 0xfe, 0x3e, 0x6f, 0x1a, 0xcf, 0x2f, 0x9a, 0x95, 0x57, + 0x17, 0xcd, 0xca, 0x1f, 0x17, 0xcd, 0xca, 0xe3, 0xad, 0x98, 0xe6, 0x6e, 0x3f, 0xea, 0xb8, 0xe2, + 0x6f, 0x15, 0xc9, 0xc2, 0x5d, 0xca, 0xbc, 0x53, 0x1c, 0xb2, 0x94, 0x86, 0x91, 0x77, 0xa6, 0x15, + 0x77, 0x6a, 0xf2, 0x9f, 0xc8, 0x07, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x91, 0xdf, 0x04, 0x3d, 0x40, 0x0a, 0x00, 0x00, } @@ -691,13 +691,6 @@ func (m *MsgCreateAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x48 } - if len(m.Kind) > 0 { - i -= len(m.Kind) - copy(dAtA[i:], m.Kind) - i = encodeVarintTx(dAtA, i, uint64(len(m.Kind))) - i-- - dAtA[i] = 0x42 - } { size, err := m.MaxPrice.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -707,7 +700,14 @@ func (m *MsgCreateAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTx(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 + if len(m.Kind) > 0 { + i -= len(m.Kind) + copy(dAtA[i:], m.Kind) + i = encodeVarintTx(dAtA, i, uint64(len(m.Kind))) + i-- + dAtA[i] = 0x3a + } if len(m.Signer) > 0 { i -= len(m.Signer) copy(dAtA[i:], m.Signer) @@ -1051,12 +1051,12 @@ func (m *MsgCreateAuction) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = m.MaxPrice.Size() - n += 1 + l + sovTx(uint64(l)) l = len(m.Kind) if l > 0 { n += 1 + l + sovTx(uint64(l)) } + l = m.MaxPrice.Size() + n += 1 + l + sovTx(uint64(l)) if m.NumProviders != 0 { n += 1 + sovTx(uint64(m.NumProviders)) } @@ -1401,6 +1401,38 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error { m.Signer = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Kind", 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.Kind = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MaxPrice", wireType) } @@ -1433,38 +1465,6 @@ func (m *MsgCreateAuction) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Kind", 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.Kind = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 9: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field NumProviders", wireType) diff --git a/x/registry/keeper/record_keeper.go b/x/registry/keeper/record_keeper.go index 0179fe2cf..db197cf18 100644 --- a/x/registry/keeper/record_keeper.go +++ b/x/registry/keeper/record_keeper.go @@ -94,7 +94,7 @@ func (rk RecordKeeper) OnAuctionWinnerSelected(ctx sdk.Context, auctionId string } if auctionObj.Status == auctiontypes.AuctionStatusCompleted { - if len(auctionObj.WinnerAddresses) == 1 { + if len(auctionObj.WinnerAddresses) != 0 { // Mark authority owner and change status to active. authority.OwnerAddress = auctionObj.WinnerAddresses[0] authority.Status = registrytypes.AuthorityActive