From e27f1c7737aa4fd12d7459d5a9e62906fbbc11b4 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Thu, 1 Sep 2022 05:52:22 +0000 Subject: [PATCH] add ceiling to auction structure --- docs/static/openapi.yml | 10 ++++ proto/cosmostest/auction.proto | 5 +- proto/cosmostest/tx.proto | 3 +- x/cosmostest/types/auction.pb.go | 92 +++++++++++++++++++++++++------- 4 files changed, 87 insertions(+), 23 deletions(-) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 0d178aa..4af0c77 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -20153,6 +20153,8 @@ paths: deadline: type: string format: uint64 + ceiling: + type: string denom: type: string owner: @@ -20290,6 +20292,8 @@ paths: deadline: type: string format: uint64 + ceiling: + type: string denom: type: string owner: @@ -47474,6 +47478,8 @@ definitions: deadline: type: string format: uint64 + ceiling: + type: string denom: type: string owner: @@ -47525,6 +47531,8 @@ definitions: deadline: type: string format: uint64 + ceiling: + type: string denom: type: string owner: @@ -47588,6 +47596,8 @@ definitions: deadline: type: string format: uint64 + ceiling: + type: string denom: type: string owner: diff --git a/proto/cosmostest/auction.proto b/proto/cosmostest/auction.proto index 7262157..6188a39 100644 --- a/proto/cosmostest/auction.proto +++ b/proto/cosmostest/auction.proto @@ -11,6 +11,7 @@ message Auction { string description = 3; Bid best = 4; uint64 deadline = 5; - string denom = 6; - string owner = 7; + string ceiling = 6; + string denom = 7; + string owner = 8; } diff --git a/proto/cosmostest/tx.proto b/proto/cosmostest/tx.proto index d1f9d58..cd3dc9f 100644 --- a/proto/cosmostest/tx.proto +++ b/proto/cosmostest/tx.proto @@ -16,7 +16,8 @@ message MsgNewAuction { string creator = 1; string name = 2; string description = 3; - string denom = 4; + string ceiling = 4; + string denom = 5; } message MsgNewAuctionResponse { diff --git a/x/cosmostest/types/auction.pb.go b/x/cosmostest/types/auction.pb.go index 07e74cb..a3a8399 100644 --- a/x/cosmostest/types/auction.pb.go +++ b/x/cosmostest/types/auction.pb.go @@ -28,8 +28,9 @@ type Auction struct { Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` Best *Bid `protobuf:"bytes,4,opt,name=best,proto3" json:"best,omitempty"` Deadline uint64 `protobuf:"varint,5,opt,name=deadline,proto3" json:"deadline,omitempty"` - Denom string `protobuf:"bytes,6,opt,name=denom,proto3" json:"denom,omitempty"` - Owner string `protobuf:"bytes,7,opt,name=owner,proto3" json:"owner,omitempty"` + Ceiling string `protobuf:"bytes,6,opt,name=ceiling,proto3" json:"ceiling,omitempty"` + Denom string `protobuf:"bytes,7,opt,name=denom,proto3" json:"denom,omitempty"` + Owner string `protobuf:"bytes,8,opt,name=owner,proto3" json:"owner,omitempty"` } func (m *Auction) Reset() { *m = Auction{} } @@ -100,6 +101,13 @@ func (m *Auction) GetDeadline() uint64 { return 0 } +func (m *Auction) GetCeiling() string { + if m != nil { + return m.Ceiling + } + return "" +} + func (m *Auction) GetDenom() string { if m != nil { return m.Denom @@ -121,23 +129,24 @@ func init() { func init() { proto.RegisterFile("cosmostest/auction.proto", fileDescriptor_631f6f59914101d9) } var fileDescriptor_631f6f59914101d9 = []byte{ - // 244 bytes of a gzipped FileDescriptorProto + // 257 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, - 0x10, 0x86, 0x63, 0x48, 0x5b, 0x70, 0x37, 0xab, 0x48, 0xa7, 0x0c, 0x96, 0xc5, 0x94, 0x05, 0x57, - 0x82, 0x85, 0x95, 0x3e, 0x42, 0x46, 0xb6, 0x24, 0xbe, 0xc1, 0x12, 0xb1, 0xa3, 0xd8, 0x88, 0xf2, - 0x16, 0x3c, 0x16, 0x0b, 0x52, 0x47, 0x46, 0x94, 0xbc, 0x08, 0xca, 0x59, 0xa2, 0x19, 0xd8, 0xee, - 0xff, 0xee, 0x7e, 0xdd, 0xaf, 0x9f, 0x43, 0xeb, 0x43, 0xe7, 0x43, 0xc4, 0x10, 0xf7, 0xf5, 0x6b, - 0x1b, 0xad, 0x77, 0xba, 0x1f, 0x7c, 0xf4, 0xe2, 0xe6, 0xbc, 0xd1, 0xe7, 0xb1, 0xd8, 0x2d, 0x0c, - 0x8d, 0x35, 0xe9, 0xf8, 0xf6, 0x8b, 0xf1, 0xcd, 0x53, 0xb2, 0x8b, 0x1d, 0x5f, 0x59, 0x67, 0xf0, - 0x08, 0x4c, 0xb1, 0xf2, 0xba, 0x4a, 0x42, 0x08, 0x9e, 0xbb, 0xba, 0x43, 0xb8, 0x20, 0x48, 0xb3, - 0x50, 0x7c, 0x6b, 0x30, 0xb4, 0x83, 0xed, 0x67, 0x23, 0x5c, 0xd2, 0x6a, 0x89, 0x84, 0xe6, 0x79, - 0x83, 0x21, 0x42, 0xae, 0x58, 0xb9, 0xbd, 0x2f, 0xf4, 0xbf, 0x99, 0xf4, 0xc1, 0x9a, 0x8a, 0xee, - 0x44, 0xc1, 0xaf, 0x0c, 0xd6, 0xe6, 0xc5, 0x3a, 0x84, 0x95, 0x62, 0x65, 0x5e, 0xfd, 0xe9, 0x39, - 0x97, 0x41, 0xe7, 0x3b, 0x58, 0xa7, 0x5c, 0x24, 0x66, 0xea, 0xdf, 0x1c, 0x0e, 0xb0, 0x49, 0x94, - 0xc4, 0xe1, 0xf1, 0x73, 0x94, 0xec, 0x34, 0x4a, 0xf6, 0x33, 0x4a, 0xf6, 0x31, 0xc9, 0xec, 0x34, - 0xc9, 0xec, 0x7b, 0x92, 0xd9, 0xb3, 0x4c, 0x7f, 0xef, 0xa8, 0x80, 0xe3, 0x7e, 0xd1, 0x46, 0x7c, - 0xef, 0x31, 0x34, 0x6b, 0x2a, 0xe4, 0xe1, 0x37, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x3e, 0xfb, 0xb2, - 0x59, 0x01, 0x00, 0x00, + 0x10, 0x86, 0x6b, 0x48, 0x9b, 0xe2, 0x6e, 0x56, 0x91, 0x4e, 0x19, 0xac, 0x88, 0x29, 0x0b, 0xae, + 0x04, 0x0b, 0x2b, 0x7d, 0x84, 0x8c, 0x6c, 0x49, 0x7c, 0x42, 0x96, 0x1a, 0x3b, 0x8a, 0x8d, 0x28, + 0x6f, 0xc1, 0x63, 0x31, 0x76, 0x64, 0x44, 0xc9, 0xc0, 0x6b, 0xa0, 0x9c, 0x05, 0xcd, 0xc0, 0x76, + 0xdf, 0x7f, 0xf7, 0xeb, 0x7e, 0xfd, 0x1c, 0x1a, 0xe7, 0x5b, 0xe7, 0x03, 0xfa, 0xb0, 0xab, 0x5e, + 0x9a, 0x60, 0x9c, 0x55, 0x5d, 0xef, 0x82, 0x13, 0xd7, 0xe7, 0x8d, 0x3a, 0x8f, 0xd9, 0x76, 0x66, + 0xa8, 0x8d, 0x8e, 0xc7, 0x37, 0xdf, 0x8c, 0xa7, 0x8f, 0xd1, 0x2e, 0xb6, 0x7c, 0x69, 0xac, 0xc6, + 0x23, 0xb0, 0x9c, 0x15, 0x57, 0x65, 0x04, 0x21, 0x78, 0x62, 0xab, 0x16, 0xe1, 0x82, 0x44, 0x9a, + 0x45, 0xce, 0x37, 0x1a, 0x7d, 0xd3, 0x9b, 0x6e, 0x32, 0xc2, 0x25, 0xad, 0xe6, 0x92, 0x50, 0x3c, + 0xa9, 0xd1, 0x07, 0x48, 0x72, 0x56, 0x6c, 0xee, 0x32, 0xf5, 0x6f, 0x26, 0xb5, 0x37, 0xba, 0xa4, + 0x3b, 0x91, 0xf1, 0xb5, 0xc6, 0x4a, 0x1f, 0x8c, 0x45, 0x58, 0xe6, 0xac, 0x48, 0xca, 0x3f, 0x16, + 0xc0, 0xd3, 0x06, 0xcd, 0xc1, 0xd8, 0x67, 0x58, 0xd1, 0xa7, 0x5f, 0x9c, 0x12, 0x6b, 0xb4, 0xae, + 0x85, 0x34, 0x26, 0x26, 0x98, 0x54, 0xf7, 0x6a, 0xb1, 0x87, 0x75, 0x54, 0x09, 0xf6, 0x0f, 0x1f, + 0x83, 0x64, 0xa7, 0x41, 0xb2, 0xaf, 0x41, 0xb2, 0xf7, 0x51, 0x2e, 0x4e, 0xa3, 0x5c, 0x7c, 0x8e, + 0x72, 0xf1, 0x24, 0x63, 0xa2, 0x5b, 0xaa, 0xe6, 0xb8, 0x9b, 0xf5, 0x14, 0xde, 0x3a, 0xf4, 0xf5, + 0x8a, 0xaa, 0xba, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x52, 0x64, 0x71, 0x0b, 0x73, 0x01, 0x00, + 0x00, } func (m *Auction) Marshal() (dAtA []byte, err error) { @@ -165,13 +174,20 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Owner) i = encodeVarintAuction(dAtA, i, uint64(len(m.Owner))) i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 } if len(m.Denom) > 0 { i -= len(m.Denom) copy(dAtA[i:], m.Denom) i = encodeVarintAuction(dAtA, i, uint64(len(m.Denom))) i-- + dAtA[i] = 0x3a + } + if len(m.Ceiling) > 0 { + i -= len(m.Ceiling) + copy(dAtA[i:], m.Ceiling) + i = encodeVarintAuction(dAtA, i, uint64(len(m.Ceiling))) + i-- dAtA[i] = 0x32 } if m.Deadline != 0 { @@ -251,6 +267,10 @@ func (m *Auction) Size() (n int) { if m.Deadline != 0 { n += 1 + sovAuction(uint64(m.Deadline)) } + l = len(m.Ceiling) + if l > 0 { + n += 1 + l + sovAuction(uint64(l)) + } l = len(m.Denom) if l > 0 { n += 1 + l + sovAuction(uint64(l)) @@ -449,6 +469,38 @@ func (m *Auction) Unmarshal(dAtA []byte) error { } } case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ceiling", 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.Ceiling = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } @@ -480,7 +532,7 @@ func (m *Auction) Unmarshal(dAtA []byte) error { } m.Denom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 7: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) }