From ed2061213e48d9b56c3ae58dbaf0acfca0c63a08 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Thu, 1 Sep 2022 04:49:24 +0000 Subject: [PATCH] upgrade auction structure ton include denom + no owner in tx --- docs/static/openapi.yml | 20 +++ proto/cosmostest/auction.proto | 3 +- proto/cosmostest/tx.proto | 6 +- x/cosmostest/client/cli/tx_new_auction.go | 11 +- x/cosmostest/client/cli/tx_new_bid.go | 1 + x/cosmostest/keeper/msg_server_new_auction.go | 6 +- x/cosmostest/types/auction.pb.go | 134 +++++++++++++++-- x/cosmostest/types/message_new_auction.go | 4 +- x/cosmostest/types/tx.pb.go | 140 +++++++++--------- 9 files changed, 227 insertions(+), 98 deletions(-) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 3f98501..0d178aa 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -20153,6 +20153,10 @@ paths: deadline: type: string format: uint64 + denom: + type: string + owner: + type: string pagination: type: object properties: @@ -20286,6 +20290,10 @@ paths: deadline: type: string format: uint64 + denom: + type: string + owner: + type: string default: description: An unexpected error response. schema: @@ -47466,6 +47474,10 @@ definitions: deadline: type: string format: uint64 + denom: + type: string + owner: + type: string cosmostest.cosmostest.Bid: type: object properties: @@ -47513,6 +47525,10 @@ definitions: deadline: type: string format: uint64 + denom: + type: string + owner: + type: string pagination: type: object properties: @@ -47572,6 +47588,10 @@ definitions: deadline: type: string format: uint64 + denom: + type: string + owner: + type: string cosmostest.cosmostest.QueryGetNextAuctionResponse: type: object properties: diff --git a/proto/cosmostest/auction.proto b/proto/cosmostest/auction.proto index c411553..7262157 100644 --- a/proto/cosmostest/auction.proto +++ b/proto/cosmostest/auction.proto @@ -11,5 +11,6 @@ message Auction { string description = 3; Bid best = 4; uint64 deadline = 5; + string denom = 6; + string owner = 7; } - diff --git a/proto/cosmostest/tx.proto b/proto/cosmostest/tx.proto index a768653..d1f9d58 100644 --- a/proto/cosmostest/tx.proto +++ b/proto/cosmostest/tx.proto @@ -14,9 +14,9 @@ service Msg { message MsgNewAuction { string creator = 1; - string owner = 2; - string name = 3; - string description = 4; + string name = 2; + string description = 3; + string denom = 4; } message MsgNewAuctionResponse { diff --git a/x/cosmostest/client/cli/tx_new_auction.go b/x/cosmostest/client/cli/tx_new_auction.go index 4aca8bb..158e889 100644 --- a/x/cosmostest/client/cli/tx_new_auction.go +++ b/x/cosmostest/client/cli/tx_new_auction.go @@ -4,6 +4,7 @@ import ( "strconv" "cosmos-test/x/cosmostest/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" @@ -14,13 +15,13 @@ var _ = strconv.Itoa(0) func CmdNewAuction() *cobra.Command { cmd := &cobra.Command{ - Use: "new-auction [owner] [name] [description]", + Use: "new-auction [name] [description] [denom]", Short: "Broadcast message newAuction", Args: cobra.ExactArgs(3), RunE: func(cmd *cobra.Command, args []string) (err error) { - argOwner := args[0] - argName := args[1] - argDescription := args[2] + argName := args[0] + argDescription := args[1] + argDenom := args[2] clientCtx, err := client.GetClientTxContext(cmd) if err != nil { @@ -29,9 +30,9 @@ func CmdNewAuction() *cobra.Command { msg := types.NewMsgNewAuction( clientCtx.GetFromAddress().String(), - argOwner, argName, argDescription, + argDenom, ) if err := msg.ValidateBasic(); err != nil { return err diff --git a/x/cosmostest/client/cli/tx_new_bid.go b/x/cosmostest/client/cli/tx_new_bid.go index bcaadb5..5070dec 100644 --- a/x/cosmostest/client/cli/tx_new_bid.go +++ b/x/cosmostest/client/cli/tx_new_bid.go @@ -4,6 +4,7 @@ import ( "strconv" "cosmos-test/x/cosmostest/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" diff --git a/x/cosmostest/keeper/msg_server_new_auction.go b/x/cosmostest/keeper/msg_server_new_auction.go index 386de62..2bf0733 100644 --- a/x/cosmostest/keeper/msg_server_new_auction.go +++ b/x/cosmostest/keeper/msg_server_new_auction.go @@ -24,8 +24,10 @@ func (k msgServer) NewAuction(goCtx context.Context, msg *types.MsgNewAuction) ( Index: index, Name: msg.Name, Description: msg.Description, - Best: new(types.Bid), - Deadline: uint64(ctx.BlockHeight()) + auctionconfig.AuctionTime, + // Best: new(types.Bid), + Deadline: uint64(ctx.BlockHeight()) + auctionconfig.AuctionTime, + Denom: msg.Denom, + Owner: msg.Creator, } k.Keeper.SetAuction(ctx, auction) diff --git a/x/cosmostest/types/auction.pb.go b/x/cosmostest/types/auction.pb.go index f00f31f..07e74cb 100644 --- a/x/cosmostest/types/auction.pb.go +++ b/x/cosmostest/types/auction.pb.go @@ -28,6 +28,8 @@ 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"` } func (m *Auction) Reset() { *m = Auction{} } @@ -98,6 +100,20 @@ func (m *Auction) GetDeadline() uint64 { return 0 } +func (m *Auction) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + +func (m *Auction) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + func init() { proto.RegisterType((*Auction)(nil), "cosmostest.cosmostest.Auction") } @@ -105,21 +121,23 @@ func init() { func init() { proto.RegisterFile("cosmostest/auction.proto", fileDescriptor_631f6f59914101d9) } var fileDescriptor_631f6f59914101d9 = []byte{ - // 221 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x48, 0xce, 0x2f, 0xce, - 0xcd, 0x2f, 0x2e, 0x49, 0x2d, 0x2e, 0xd1, 0x4f, 0x2c, 0x4d, 0x2e, 0xc9, 0xcc, 0xcf, 0xd3, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, 0xc8, 0xe8, 0x21, 0x98, 0x52, 0x22, 0x48, 0x1a, 0x92, - 0x32, 0x53, 0x20, 0x8a, 0x95, 0x16, 0x32, 0x72, 0xb1, 0x3b, 0x42, 0xb4, 0x0b, 0x89, 0x70, 0xb1, - 0x66, 0xe6, 0xa5, 0xa4, 0x56, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x41, 0x38, 0x42, 0x42, - 0x5c, 0x2c, 0x79, 0x89, 0xb9, 0xa9, 0x12, 0x4c, 0x60, 0x41, 0x30, 0x5b, 0x48, 0x81, 0x8b, 0x3b, - 0x25, 0xb5, 0x38, 0xb9, 0x28, 0xb3, 0x00, 0xa4, 0x51, 0x82, 0x19, 0x2c, 0x85, 0x2c, 0x24, 0xa4, - 0xc7, 0xc5, 0x92, 0x94, 0x5a, 0x5c, 0x22, 0xc1, 0xa2, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa5, 0x87, - 0xd5, 0x4d, 0x7a, 0x4e, 0x99, 0x29, 0x41, 0x60, 0x75, 0x42, 0x52, 0x5c, 0x1c, 0x29, 0xa9, 0x89, - 0x29, 0x39, 0x99, 0x79, 0xa9, 0x12, 0xac, 0x0a, 0x8c, 0x1a, 0x2c, 0x41, 0x70, 0xbe, 0x93, 0xc5, - 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, - 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xc9, 0x41, 0xcc, 0xd2, 0x05, 0x7b, - 0xaa, 0x42, 0x1f, 0xc9, 0x87, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x4f, 0x1a, 0x03, - 0x02, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xb0, 0xd9, 0xd2, 0x2d, 0x01, 0x00, 0x00, + // 244 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, } func (m *Auction) Marshal() (dAtA []byte, err error) { @@ -142,6 +160,20 @@ func (m *Auction) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintAuction(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0x3a + } + 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] = 0x32 + } if m.Deadline != 0 { i = encodeVarintAuction(dAtA, i, uint64(m.Deadline)) i-- @@ -219,6 +251,14 @@ func (m *Auction) Size() (n int) { if m.Deadline != 0 { n += 1 + sovAuction(uint64(m.Deadline)) } + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovAuction(uint64(l)) + } + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovAuction(uint64(l)) + } return n } @@ -408,6 +448,70 @@ func (m *Auction) Unmarshal(dAtA []byte) error { break } } + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", 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.Denom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipAuction(dAtA[iNdEx:]) diff --git a/x/cosmostest/types/message_new_auction.go b/x/cosmostest/types/message_new_auction.go index 991ee2e..2bf4409 100644 --- a/x/cosmostest/types/message_new_auction.go +++ b/x/cosmostest/types/message_new_auction.go @@ -9,12 +9,12 @@ const TypeMsgNewAuction = "new_auction" var _ sdk.Msg = &MsgNewAuction{} -func NewMsgNewAuction(creator string, owner string, name string, description string) *MsgNewAuction { +func NewMsgNewAuction(creator string, name string, description string, denom string) *MsgNewAuction { return &MsgNewAuction{ Creator: creator, - Owner: owner, Name: name, Description: description, + Denom: denom, } } diff --git a/x/cosmostest/types/tx.pb.go b/x/cosmostest/types/tx.pb.go index 7efb30d..5cf77b3 100644 --- a/x/cosmostest/types/tx.pb.go +++ b/x/cosmostest/types/tx.pb.go @@ -29,9 +29,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type MsgNewAuction struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` - Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` - Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"` - Description string `protobuf:"bytes,4,opt,name=description,proto3" json:"description,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"` + Denom string `protobuf:"bytes,4,opt,name=denom,proto3" json:"denom,omitempty"` } func (m *MsgNewAuction) Reset() { *m = MsgNewAuction{} } @@ -74,13 +74,6 @@ func (m *MsgNewAuction) GetCreator() string { return "" } -func (m *MsgNewAuction) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - func (m *MsgNewAuction) GetName() string { if m != nil { return m.Name @@ -95,6 +88,13 @@ func (m *MsgNewAuction) GetDescription() string { return "" } +func (m *MsgNewAuction) GetDenom() string { + if m != nil { + return m.Denom + } + return "" +} + type MsgNewAuctionResponse struct { AuctionId string `protobuf:"bytes,1,opt,name=auctionId,proto3" json:"auctionId,omitempty"` } @@ -250,21 +250,21 @@ var fileDescriptor_2fcd5aa4ac15d93c = []byte{ 0xcd, 0x2f, 0x2e, 0x49, 0x2d, 0x2e, 0xd1, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, 0x08, 0xea, 0x21, 0x98, 0x4a, 0xa5, 0x5c, 0xbc, 0xbe, 0xc5, 0xe9, 0x7e, 0xa9, 0xe5, 0x8e, 0xa5, 0xc9, 0x25, 0x99, 0xf9, 0x79, 0x42, 0x12, 0x5c, 0xec, 0xc9, 0x45, 0xa9, 0x89, 0x25, - 0xf9, 0x45, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x30, 0xae, 0x90, 0x08, 0x17, 0x6b, 0x7e, - 0x79, 0x5e, 0x6a, 0x91, 0x04, 0x13, 0x58, 0x1c, 0xc2, 0x11, 0x12, 0xe2, 0x62, 0xc9, 0x4b, 0xcc, - 0x4d, 0x95, 0x60, 0x06, 0x0b, 0x82, 0xd9, 0x42, 0x0a, 0x5c, 0xdc, 0x29, 0xa9, 0xc5, 0xc9, 0x45, - 0x99, 0x05, 0x20, 0x23, 0x25, 0x58, 0xc0, 0x52, 0xc8, 0x42, 0x4a, 0xa6, 0x5c, 0xa2, 0x28, 0xd6, - 0x06, 0xa5, 0x16, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x0a, 0xc9, 0x70, 0x71, 0x26, 0x42, 0x84, 0x3c, - 0x53, 0xa0, 0x0e, 0x40, 0x08, 0x28, 0x25, 0x72, 0x71, 0x42, 0xb4, 0x39, 0x65, 0xa6, 0xe0, 0x71, - 0xa9, 0x12, 0x17, 0x0f, 0x4c, 0x4f, 0x5e, 0x4a, 0x6a, 0x05, 0xd4, 0xc1, 0x28, 0x62, 0x42, 0x62, - 0x5c, 0x6c, 0x89, 0xb9, 0xf9, 0xa5, 0x79, 0x25, 0x50, 0x97, 0x43, 0x79, 0x4a, 0xc2, 0x5c, 0x82, - 0x70, 0x2b, 0x60, 0xae, 0x32, 0xda, 0xcb, 0xc8, 0xc5, 0xec, 0x5b, 0x9c, 0x2e, 0x94, 0xc0, 0xc5, - 0x85, 0x14, 0x54, 0x2a, 0x7a, 0x58, 0xc3, 0x54, 0x0f, 0xc5, 0x67, 0x52, 0x3a, 0xc4, 0xa8, 0x82, - 0xfb, 0x3f, 0x84, 0x8b, 0x0d, 0xea, 0x3d, 0x05, 0xbc, 0xfa, 0x9c, 0x32, 0x53, 0xa4, 0x34, 0x08, - 0xa9, 0x80, 0x99, 0xea, 0x64, 0x71, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, - 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, - 0x72, 0x10, 0x7d, 0xba, 0xe0, 0xc4, 0x52, 0xa1, 0x8f, 0x9c, 0x72, 0x2a, 0x0b, 0x52, 0x8b, 0x93, - 0xd8, 0xc0, 0xa9, 0xc7, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x5f, 0xf4, 0xdf, 0xab, 0x54, 0x02, + 0xf9, 0x45, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x30, 0xae, 0x90, 0x10, 0x17, 0x4b, 0x5e, + 0x62, 0x6e, 0xaa, 0x04, 0x13, 0x58, 0x18, 0xcc, 0x16, 0x52, 0xe0, 0xe2, 0x4e, 0x49, 0x2d, 0x4e, + 0x2e, 0xca, 0x2c, 0x00, 0x69, 0x96, 0x60, 0x06, 0x4b, 0x21, 0x0b, 0x09, 0x89, 0x70, 0xb1, 0xa6, + 0xa4, 0xe6, 0xe5, 0xe7, 0x4a, 0xb0, 0x80, 0xe5, 0x20, 0x1c, 0x25, 0x53, 0x2e, 0x51, 0x14, 0x6b, + 0x83, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0x64, 0xb8, 0x38, 0x13, 0x21, 0x42, 0x9e, + 0x29, 0x50, 0x07, 0x20, 0x04, 0x94, 0x12, 0xb9, 0x38, 0x21, 0xda, 0x9c, 0x32, 0x53, 0xf0, 0xb8, + 0x54, 0x89, 0x8b, 0x07, 0xa6, 0x27, 0x2f, 0x25, 0xb5, 0x02, 0xea, 0x62, 0x14, 0x31, 0x21, 0x31, + 0x2e, 0xb6, 0xc4, 0xdc, 0xfc, 0xd2, 0xbc, 0x12, 0xa8, 0xa3, 0xa1, 0x3c, 0x25, 0x61, 0x2e, 0x41, + 0xb8, 0x15, 0x30, 0x57, 0x19, 0xed, 0x65, 0xe4, 0x62, 0xf6, 0x2d, 0x4e, 0x17, 0x4a, 0xe0, 0xe2, + 0x42, 0x0a, 0x2a, 0x15, 0x3d, 0xac, 0x61, 0xaa, 0x87, 0xe2, 0x33, 0x29, 0x1d, 0x62, 0x54, 0xc1, + 0xfd, 0x1f, 0xc2, 0xc5, 0x06, 0xf5, 0x9e, 0x02, 0x5e, 0x7d, 0x4e, 0x99, 0x29, 0x52, 0x1a, 0x84, + 0x54, 0xc0, 0x4c, 0x75, 0xb2, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, + 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, + 0x39, 0x88, 0x3e, 0x5d, 0x70, 0x62, 0xa9, 0xd0, 0x47, 0x4e, 0x39, 0x95, 0x05, 0xa9, 0xc5, 0x49, + 0x6c, 0xe0, 0xd4, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x30, 0x36, 0x68, 0x3f, 0x54, 0x02, 0x00, 0x00, } @@ -404,25 +404,25 @@ func (m *MsgNewAuction) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Denom) > 0 { + i -= len(m.Denom) + copy(dAtA[i:], m.Denom) + i = encodeVarintTx(dAtA, i, uint64(len(m.Denom))) + i-- + dAtA[i] = 0x22 + } if len(m.Description) > 0 { i -= len(m.Description) copy(dAtA[i:], m.Description) i = encodeVarintTx(dAtA, i, uint64(len(m.Description))) i-- - dAtA[i] = 0x22 + dAtA[i] = 0x1a } if len(m.Name) > 0 { i -= len(m.Name) copy(dAtA[i:], m.Name) i = encodeVarintTx(dAtA, i, uint64(len(m.Name))) i-- - dAtA[i] = 0x1a - } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintTx(dAtA, i, uint64(len(m.Owner))) - i-- dAtA[i] = 0x12 } if len(m.Creator) > 0 { @@ -553,10 +553,6 @@ func (m *MsgNewAuction) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovTx(uint64(l)) - } l = len(m.Name) if l > 0 { n += 1 + l + sovTx(uint64(l)) @@ -565,6 +561,10 @@ func (m *MsgNewAuction) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } + l = len(m.Denom) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } return n } @@ -679,38 +679,6 @@ func (m *MsgNewAuction) Unmarshal(dAtA []byte) error { m.Creator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", 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.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } @@ -742,7 +710,7 @@ func (m *MsgNewAuction) Unmarshal(dAtA []byte) error { } m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Description", wireType) } @@ -774,6 +742,38 @@ func (m *MsgNewAuction) Unmarshal(dAtA []byte) error { } m.Description = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", 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.Denom = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:])