From 28d47d9a388bc0f93d142e90cf6e319fa86d94df Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Sun, 16 Oct 2022 18:53:39 +0300 Subject: [PATCH] update msg types --- abci/example/orderbook/msgs.pb.go | 444 ++---------------- abci/example/orderbook/msgs.proto | 12 +- abci/example/orderbook/wire.pb.go | 739 +++++++----------------------- abci/example/orderbook/wire.proto | 32 +- 4 files changed, 206 insertions(+), 1021 deletions(-) diff --git a/abci/example/orderbook/msgs.pb.go b/abci/example/orderbook/msgs.pb.go index b2e5e7c50..92d2f62d9 100644 --- a/abci/example/orderbook/msgs.pb.go +++ b/abci/example/orderbook/msgs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.21.7 +// protoc v3.18.1 // source: msgs.proto package orderbook @@ -25,24 +25,8 @@ type MsgBid struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields -<<<<<<< Updated upstream - Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` - MaxPrice float64 `protobuf:"fixed64,2,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` - Quantity uint64 `protobuf:"varint,3,opt,name=quantity,proto3" json:"quantity,omitempty"` - AccountId uint64 `protobuf:"varint,4,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` - Signature [][]byte `protobuf:"bytes,5,rep,name=signature,proto3" json:"signature,omitempty"` -||||||| constructed merge base - Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` - Order *Order `protobuf:"bytes,2,opt,name=order,proto3" json:"order,omitempty"` - Signature [][]byte `protobuf:"bytes,3,rep,name=signature,proto3" json:"signature,omitempty"` -======= - Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` - MaxPrice uint64 `protobuf:"varint,2,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` - Quantity uint64 `protobuf:"varint,3,opt,name=quantity,proto3" json:"quantity,omitempty"` - AccountId uint64 `protobuf:"varint,4,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` - Signature [][]byte `protobuf:"bytes,5,rep,name=signature,proto3" json:"signature,omitempty"` - Order *OrderBid `protobuf:"bytes,6,opt,name=order,proto3" json:"order,omitempty"` ->>>>>>> Stashed changes + Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` + BidOrder *OrderBid `protobuf:"bytes,2,opt,name=bid_order,json=bidOrder,proto3" json:"bid_order,omitempty"` } func (x *MsgBid) Reset() { @@ -84,79 +68,20 @@ func (x *MsgBid) GetPair() *Pair { return nil } -<<<<<<< Updated upstream -func (x *MsgBid) GetMaxPrice() float64 { -||||||| constructed merge base -func (x *MsgPlaceOrder) GetOrder() *Order { -======= -func (x *MsgBid) GetMaxPrice() uint64 { +func (x *MsgBid) GetBidOrder() *OrderBid { if x != nil { - return x.MaxPrice - } - return 0 -} - -func (x *MsgBid) GetQuantity() uint64 { - if x != nil { - return x.Quantity - } - return 0 -} - -func (x *MsgBid) GetAccountId() uint64 { - if x != nil { - return x.AccountId - } - return 0 -} - -func (x *MsgBid) GetSignature() [][]byte { - if x != nil { - return x.Signature + return x.BidOrder } return nil } -func (x *MsgBid) GetOrder() *OrderBid { ->>>>>>> Stashed changes - if x != nil { - return x.MaxPrice - } - return 0 -} - -func (x *MsgBid) GetQuantity() uint64 { - if x != nil { - return x.Quantity - } - return 0 -} - -func (x *MsgBid) GetAccountId() uint64 { - if x != nil { - return x.AccountId - } - return 0 -} - -func (x *MsgBid) GetSignature() [][]byte { - if x != nil { - return x.Signature - } - return nil -} - -<<<<<<< Updated upstream type MsgAsk struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` - Price float64 `protobuf:"fixed64,2,opt,name=price,proto3" json:"price,omitempty"` - Quantity uint64 `protobuf:"varint,3,opt,name=quantity,proto3" json:"quantity,omitempty"` - AccountId uint64 `protobuf:"varint,4,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` - Signature [][]byte `protobuf:"bytes,5,rep,name=signature,proto3" json:"signature,omitempty"` + Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` + AskOrder *OrderAsk `protobuf:"bytes,2,opt,name=ask_order,json=askOrder,proto3" json:"ask_order,omitempty"` } func (x *MsgAsk) Reset() { @@ -198,115 +123,9 @@ func (x *MsgAsk) GetPair() *Pair { return nil } -func (x *MsgAsk) GetPrice() float64 { +func (x *MsgAsk) GetAskOrder() *OrderAsk { if x != nil { - return x.Price - } - return 0 -} - -func (x *MsgAsk) GetQuantity() uint64 { - if x != nil { - return x.Quantity - } - return 0 -} - -func (x *MsgAsk) GetAccountId() uint64 { - if x != nil { - return x.AccountId - } - return 0 -} - -func (x *MsgAsk) GetSignature() [][]byte { -||||||| constructed merge base -func (x *MsgPlaceOrder) GetSignature() [][]byte { -======= -type MsgAsk struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` - MinPrice uint64 `protobuf:"varint,2,opt,name=min_price,json=minPrice,proto3" json:"min_price,omitempty"` - Quantity uint64 `protobuf:"varint,3,opt,name=quantity,proto3" json:"quantity,omitempty"` - AccountId uint64 `protobuf:"varint,4,opt,name=account_id,json=accountId,proto3" json:"account_id,omitempty"` - Signature [][]byte `protobuf:"bytes,5,rep,name=signature,proto3" json:"signature,omitempty"` - Order *OrderAsk `protobuf:"bytes,6,opt,name=order,proto3" json:"order,omitempty"` -} - -func (x *MsgAsk) Reset() { - *x = MsgAsk{} - if protoimpl.UnsafeEnabled { - mi := &file_msgs_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MsgAsk) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MsgAsk) ProtoMessage() {} - -func (x *MsgAsk) ProtoReflect() protoreflect.Message { - mi := &file_msgs_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MsgAsk.ProtoReflect.Descriptor instead. -func (*MsgAsk) Descriptor() ([]byte, []int) { - return file_msgs_proto_rawDescGZIP(), []int{1} -} - -func (x *MsgAsk) GetPair() *Pair { - if x != nil { - return x.Pair - } - return nil -} - -func (x *MsgAsk) GetMinPrice() uint64 { - if x != nil { - return x.MinPrice - } - return 0 -} - -func (x *MsgAsk) GetQuantity() uint64 { - if x != nil { - return x.Quantity - } - return 0 -} - -func (x *MsgAsk) GetAccountId() uint64 { - if x != nil { - return x.AccountId - } - return 0 -} - -func (x *MsgAsk) GetSignature() [][]byte { ->>>>>>> Stashed changes - if x != nil { - return x.Signature - } - return nil -} - -func (x *MsgAsk) GetOrder() *OrderAsk { - if x != nil { - return x.Order + return x.AskOrder } return nil } @@ -418,18 +237,12 @@ type Msg struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - //a Msg has to be one of the below + // a Msg has to be one of the below // // Types that are assignable to Sum: -<<<<<<< Updated upstream + // // *Msg_MsgBid // *Msg_MsgAsk -||||||| constructed merge base - // *Msg_MsgPlaceOrder -======= - // *Msg_MsgAsk - // *Msg_MsgBid ->>>>>>> Stashed changes // *Msg_MsgRegisterPair // *Msg_MsgCreateAccount Sum isMsg_Sum `protobuf_oneof:"sum"` @@ -474,7 +287,6 @@ func (m *Msg) GetSum() isMsg_Sum { return nil } -<<<<<<< Updated upstream func (x *Msg) GetMsgBid() *MsgBid { if x, ok := x.GetSum().(*Msg_MsgBid); ok { return x.MsgBid @@ -485,22 +297,6 @@ func (x *Msg) GetMsgBid() *MsgBid { func (x *Msg) GetMsgAsk() *MsgAsk { if x, ok := x.GetSum().(*Msg_MsgAsk); ok { return x.MsgAsk -||||||| constructed merge base -func (x *Msg) GetMsgPlaceOrder() *MsgPlaceOrder { - if x, ok := x.GetSum().(*Msg_MsgPlaceOrder); ok { - return x.MsgPlaceOrder -======= -func (x *Msg) GetMsgAsk() *MsgAsk { - if x, ok := x.GetSum().(*Msg_MsgAsk); ok { - return x.MsgAsk - } - return nil -} - -func (x *Msg) GetMsgBid() *MsgBid { - if x, ok := x.GetSum().(*Msg_MsgBid); ok { - return x.MsgBid ->>>>>>> Stashed changes } return nil } @@ -523,24 +319,12 @@ type isMsg_Sum interface { isMsg_Sum() } -<<<<<<< Updated upstream type Msg_MsgBid struct { MsgBid *MsgBid `protobuf:"bytes,1,opt,name=msg_bid,json=msgBid,proto3,oneof"` } type Msg_MsgAsk struct { MsgAsk *MsgAsk `protobuf:"bytes,2,opt,name=msg_ask,json=msgAsk,proto3,oneof"` -||||||| constructed merge base -type Msg_MsgPlaceOrder struct { - MsgPlaceOrder *MsgPlaceOrder `protobuf:"bytes,1,opt,name=msg_place_order,json=msgPlaceOrder,proto3,oneof"` -======= -type Msg_MsgAsk struct { - MsgAsk *MsgAsk `protobuf:"bytes,1,opt,name=msg_ask,json=msgAsk,proto3,oneof"` -} - -type Msg_MsgBid struct { - MsgBid *MsgBid `protobuf:"bytes,2,opt,name=msg_bid,json=msgBid,proto3,oneof"` ->>>>>>> Stashed changes } type Msg_MsgRegisterPair struct { @@ -551,17 +335,9 @@ type Msg_MsgCreateAccount struct { MsgCreateAccount *MsgCreateAccount `protobuf:"bytes,4,opt,name=msg_create_account,json=msgCreateAccount,proto3,oneof"` } -<<<<<<< Updated upstream func (*Msg_MsgBid) isMsg_Sum() {} func (*Msg_MsgAsk) isMsg_Sum() {} -||||||| constructed merge base -func (*Msg_MsgPlaceOrder) isMsg_Sum() {} -======= -func (*Msg_MsgAsk) isMsg_Sum() {} - -func (*Msg_MsgBid) isMsg_Sum() {} ->>>>>>> Stashed changes func (*Msg_MsgRegisterPair) isMsg_Sum() {} @@ -572,124 +348,19 @@ var File_msgs_proto protoreflect.FileDescriptor var file_msgs_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x6d, 0x73, 0x67, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x1a, 0x0a, 0x77, 0x69, 0x72, 0x65, 0x2e, 0x70, 0x72, -<<<<<<< Updated upstream - 0x6f, 0x74, 0x6f, 0x22, 0xa3, 0x01, 0x0a, 0x06, 0x4d, 0x73, 0x67, 0x42, 0x69, 0x64, 0x12, 0x23, - 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, - 0x61, 0x69, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x50, 0x72, 0x69, 0x63, 0x65, - 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1d, 0x0a, 0x0a, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, - 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x9c, 0x01, 0x0a, 0x06, 0x4d, 0x73, - 0x67, 0x41, 0x73, 0x6b, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, - 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, 0x61, 0x69, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, - 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, - 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, 0x69, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, - 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, - 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x0b, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x14, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x43, 0x6f, 0x6d, - 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, - 0x69, 0x65, 0x73, 0x22, 0x36, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x50, 0x61, 0x69, 0x72, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, - 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, 0x61, 0x69, 0x72, 0x22, 0xff, 0x01, 0x0a, 0x03, - 0x4d, 0x73, 0x67, 0x12, 0x2c, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, - 0x2e, 0x4d, 0x73, 0x67, 0x42, 0x69, 0x64, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x73, 0x67, 0x42, 0x69, - 0x64, 0x12, 0x2c, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x5f, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, - 0x73, 0x67, 0x41, 0x73, 0x6b, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x73, 0x67, 0x41, 0x73, 0x6b, 0x12, - 0x48, 0x0a, 0x11, 0x6d, 0x73, 0x67, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x5f, - 0x70, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x50, 0x61, 0x69, 0x72, 0x48, 0x00, 0x52, 0x0f, 0x6d, 0x73, 0x67, 0x52, 0x65, 0x67, - 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x69, 0x72, 0x12, 0x4b, 0x0a, 0x12, 0x6d, 0x73, 0x67, - 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, - 0x6b, 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x48, 0x00, 0x52, 0x10, 0x6d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x42, 0x39, 0x5a, - 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x65, 0x6e, 0x64, - 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, - 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -||||||| constructed merge base - 0x6f, 0x74, 0x6f, 0x22, 0x7a, 0x0a, 0x0d, 0x4d, 0x73, 0x67, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x4f, - 0x72, 0x64, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, - 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, 0x61, 0x69, 0x72, 0x12, 0x26, 0x0a, 0x05, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x03, - 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x22, - 0x69, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, - 0x65, 0x79, 0x12, 0x36, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, - 0x6f, 0x6f, 0x6b, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x36, 0x0a, 0x0f, 0x4d, 0x73, - 0x67, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x69, 0x72, 0x12, 0x23, 0x0a, + 0x6f, 0x74, 0x6f, 0x22, 0x5f, 0x0a, 0x06, 0x4d, 0x73, 0x67, 0x42, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, 0x61, - 0x69, 0x72, 0x22, 0xe7, 0x01, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x42, 0x0a, 0x0f, 0x6d, 0x73, - 0x67, 0x5f, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, - 0x4d, 0x73, 0x67, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, - 0x0d, 0x6d, 0x73, 0x67, 0x50, 0x6c, 0x61, 0x63, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x48, - 0x0a, 0x11, 0x6d, 0x73, 0x67, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x70, - 0x61, 0x69, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, - 0x72, 0x50, 0x61, 0x69, 0x72, 0x48, 0x00, 0x52, 0x0f, 0x6d, 0x73, 0x67, 0x52, 0x65, 0x67, 0x69, - 0x73, 0x74, 0x65, 0x72, 0x50, 0x61, 0x69, 0x72, 0x12, 0x4b, 0x0a, 0x12, 0x6d, 0x73, 0x67, 0x5f, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, - 0x2e, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x48, 0x00, 0x52, 0x10, 0x6d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x05, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x42, 0x39, 0x5a, 0x37, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, - 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -======= - 0x6f, 0x74, 0x6f, 0x22, 0xce, 0x01, 0x0a, 0x06, 0x4d, 0x73, 0x67, 0x42, 0x69, 0x64, 0x12, 0x23, + 0x69, 0x72, 0x12, 0x30, 0x0a, 0x09, 0x62, 0x69, 0x64, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, + 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, 0x52, 0x08, 0x62, 0x69, 0x64, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x22, 0x5f, 0x0a, 0x06, 0x4d, 0x73, 0x67, 0x41, 0x73, 0x6b, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, - 0x61, 0x69, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x50, 0x72, 0x69, 0x63, 0x65, - 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1d, 0x0a, 0x0a, - 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, - 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, - 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x29, 0x0a, 0x05, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, 0x52, 0x05, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x22, 0xce, 0x01, 0x0a, 0x06, 0x4d, 0x73, 0x67, 0x41, 0x73, 0x6b, 0x12, - 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, - 0x70, 0x61, 0x69, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x50, 0x72, 0x69, 0x63, - 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1d, 0x0a, - 0x0a, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x09, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, - 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0c, 0x52, - 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x29, 0x0a, 0x05, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x73, 0x6b, 0x52, 0x05, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x69, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, + 0x61, 0x69, 0x72, 0x12, 0x30, 0x0a, 0x09, 0x61, 0x73, 0x6b, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, + 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x73, 0x6b, 0x52, 0x08, 0x61, 0x73, 0x6b, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x69, 0x0a, 0x10, 0x4d, 0x73, 0x67, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, @@ -700,12 +371,12 @@ var file_msgs_proto_rawDesc = []byte{ 0x61, 0x69, 0x72, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, 0x61, 0x69, 0x72, 0x22, 0xff, 0x01, 0x0a, 0x03, 0x4d, 0x73, 0x67, - 0x12, 0x2c, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x5f, 0x61, 0x73, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x12, 0x2c, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x73, - 0x67, 0x41, 0x73, 0x6b, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x73, 0x67, 0x41, 0x73, 0x6b, 0x12, 0x2c, - 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x5f, 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x11, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x73, 0x67, 0x42, - 0x69, 0x64, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x73, 0x67, 0x42, 0x69, 0x64, 0x12, 0x48, 0x0a, 0x11, + 0x67, 0x42, 0x69, 0x64, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x73, 0x67, 0x42, 0x69, 0x64, 0x12, 0x2c, + 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x5f, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x11, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x73, 0x67, 0x41, + 0x73, 0x6b, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x73, 0x67, 0x41, 0x73, 0x6b, 0x12, 0x48, 0x0a, 0x11, 0x6d, 0x73, 0x67, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x70, 0x61, 0x69, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x50, @@ -720,7 +391,6 @@ var file_msgs_proto_rawDesc = []byte{ 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, ->>>>>>> Stashed changes } var ( @@ -737,23 +407,6 @@ func file_msgs_proto_rawDescGZIP() []byte { var file_msgs_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_msgs_proto_goTypes = []interface{}{ -<<<<<<< Updated upstream - (*MsgBid)(nil), // 0: orderbook.MsgBid - (*MsgAsk)(nil), // 1: orderbook.MsgAsk - (*MsgCreateAccount)(nil), // 2: orderbook.MsgCreateAccount - (*MsgRegisterPair)(nil), // 3: orderbook.MsgRegisterPair - (*Msg)(nil), // 4: orderbook.Msg - (*Pair)(nil), // 5: orderbook.Pair - (*Commodity)(nil), // 6: orderbook.Commodity -||||||| constructed merge base - (*MsgPlaceOrder)(nil), // 0: orderbook.MsgPlaceOrder - (*MsgCreateAccount)(nil), // 1: orderbook.MsgCreateAccount - (*MsgRegisterPair)(nil), // 2: orderbook.MsgRegisterPair - (*Msg)(nil), // 3: orderbook.Msg - (*Pair)(nil), // 4: orderbook.Pair - (*Order)(nil), // 5: orderbook.Order - (*Commodity)(nil), // 6: orderbook.Commodity -======= (*MsgBid)(nil), // 0: orderbook.MsgBid (*MsgAsk)(nil), // 1: orderbook.MsgAsk (*MsgCreateAccount)(nil), // 2: orderbook.MsgCreateAccount @@ -763,45 +416,16 @@ var file_msgs_proto_goTypes = []interface{}{ (*OrderBid)(nil), // 6: orderbook.OrderBid (*OrderAsk)(nil), // 7: orderbook.OrderAsk (*Commodity)(nil), // 8: orderbook.Commodity ->>>>>>> Stashed changes } var file_msgs_proto_depIdxs = []int32{ -<<<<<<< Updated upstream - 5, // 0: orderbook.MsgBid.pair:type_name -> orderbook.Pair - 5, // 1: orderbook.MsgAsk.pair:type_name -> orderbook.Pair - 6, // 2: orderbook.MsgCreateAccount.commodities:type_name -> orderbook.Commodity - 5, // 3: orderbook.MsgRegisterPair.pair:type_name -> orderbook.Pair - 0, // 4: orderbook.Msg.msg_bid:type_name -> orderbook.MsgBid - 1, // 5: orderbook.Msg.msg_ask:type_name -> orderbook.MsgAsk - 3, // 6: orderbook.Msg.msg_register_pair:type_name -> orderbook.MsgRegisterPair - 2, // 7: orderbook.Msg.msg_create_account:type_name -> orderbook.MsgCreateAccount - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name -||||||| constructed merge base - 4, // 0: orderbook.MsgPlaceOrder.pair:type_name -> orderbook.Pair - 5, // 1: orderbook.MsgPlaceOrder.order:type_name -> orderbook.Order - 6, // 2: orderbook.MsgCreateAccount.commodities:type_name -> orderbook.Commodity - 4, // 3: orderbook.MsgRegisterPair.pair:type_name -> orderbook.Pair - 0, // 4: orderbook.Msg.msg_place_order:type_name -> orderbook.MsgPlaceOrder - 2, // 5: orderbook.Msg.msg_register_pair:type_name -> orderbook.MsgRegisterPair - 1, // 6: orderbook.Msg.msg_create_account:type_name -> orderbook.MsgCreateAccount - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name -======= 5, // 0: orderbook.MsgBid.pair:type_name -> orderbook.Pair - 6, // 1: orderbook.MsgBid.order:type_name -> orderbook.OrderBid + 6, // 1: orderbook.MsgBid.bid_order:type_name -> orderbook.OrderBid 5, // 2: orderbook.MsgAsk.pair:type_name -> orderbook.Pair - 7, // 3: orderbook.MsgAsk.order:type_name -> orderbook.OrderAsk + 7, // 3: orderbook.MsgAsk.ask_order:type_name -> orderbook.OrderAsk 8, // 4: orderbook.MsgCreateAccount.commodities:type_name -> orderbook.Commodity 5, // 5: orderbook.MsgRegisterPair.pair:type_name -> orderbook.Pair - 1, // 6: orderbook.Msg.msg_ask:type_name -> orderbook.MsgAsk - 0, // 7: orderbook.Msg.msg_bid:type_name -> orderbook.MsgBid + 0, // 6: orderbook.Msg.msg_bid:type_name -> orderbook.MsgBid + 1, // 7: orderbook.Msg.msg_ask:type_name -> orderbook.MsgAsk 3, // 8: orderbook.Msg.msg_register_pair:type_name -> orderbook.MsgRegisterPair 2, // 9: orderbook.Msg.msg_create_account:type_name -> orderbook.MsgCreateAccount 10, // [10:10] is the sub-list for method output_type @@ -809,7 +433,6 @@ var file_msgs_proto_depIdxs = []int32{ 10, // [10:10] is the sub-list for extension type_name 10, // [10:10] is the sub-list for extension extendee 0, // [0:10] is the sub-list for field type_name ->>>>>>> Stashed changes } func init() { file_msgs_proto_init() } @@ -880,18 +503,9 @@ func file_msgs_proto_init() { } } } -<<<<<<< Updated upstream file_msgs_proto_msgTypes[4].OneofWrappers = []interface{}{ (*Msg_MsgBid)(nil), (*Msg_MsgAsk)(nil), -||||||| constructed merge base - file_msgs_proto_msgTypes[3].OneofWrappers = []interface{}{ - (*Msg_MsgPlaceOrder)(nil), -======= - file_msgs_proto_msgTypes[4].OneofWrappers = []interface{}{ - (*Msg_MsgAsk)(nil), - (*Msg_MsgBid)(nil), ->>>>>>> Stashed changes (*Msg_MsgRegisterPair)(nil), (*Msg_MsgCreateAccount)(nil), } diff --git a/abci/example/orderbook/msgs.proto b/abci/example/orderbook/msgs.proto index 43e3db013..89e82d709 100644 --- a/abci/example/orderbook/msgs.proto +++ b/abci/example/orderbook/msgs.proto @@ -7,20 +7,12 @@ import "wire.proto"; message MsgBid { Pair pair = 1; - double max_price = 2; - uint64 quantity = 3; - uint64 account_id = 4; - repeated bytes signature = 5; - OrderBid order = 6; + OrderBid bid_order = 2; } message MsgAsk { Pair pair = 1; - double min_price = 2; - uint64 quantity = 3; - uint64 account_id = 4; - repeated bytes signature = 5; - OrderAsk order = 6; + OrderAsk ask_order = 2; } message MsgCreateAccount { diff --git a/abci/example/orderbook/wire.pb.go b/abci/example/orderbook/wire.pb.go index 08eb7d4a9..bb5003a22 100644 --- a/abci/example/orderbook/wire.pb.go +++ b/abci/example/orderbook/wire.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.21.7 +// protoc v3.18.1 // source: wire.proto package orderbook @@ -20,43 +20,19 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -<<<<<<< Updated upstream -type Pair struct { -||||||| constructed merge base -type Order struct { -======= type OrderAsk struct { ->>>>>>> Stashed changes state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields -<<<<<<< Updated upstream - // the denomination that the buyer receives i.e. EUR - BuyersDenomination string `protobuf:"bytes,1,opt,name=buyers_denomination,json=buyersDenomination,proto3" json:"buyers_denomination,omitempty"` - // the denomination that the seller receives i.e. USD - SellersDenomination string `protobuf:"bytes,2,opt,name=sellers_denomination,json=sellersDenomination,proto3" json:"sellers_denomination,omitempty"` -||||||| constructed merge base - QuantityOutbound uint64 `protobuf:"varint,1,opt,name=quantity_outbound,json=quantityOutbound,proto3" json:"quantity_outbound,omitempty"` - MinPrice float64 `protobuf:"fixed64,2,opt,name=min_price,json=minPrice,proto3" json:"min_price,omitempty"` - Owner uint64 `protobuf:"varint,3,opt,name=owner,proto3" json:"owner,omitempty"` -======= - Quantity uint64 `protobuf:"varint,1,opt,name=quantity,proto3" json:"quantity,omitempty"` - AskPrice uint64 `protobuf:"varint,2,opt,name=ask_price,json=askPrice,proto3" json:"ask_price,omitempty"` - Owner *Account `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` ->>>>>>> Stashed changes + Quantity float64 `protobuf:"fixed64,1,opt,name=quantity,proto3" json:"quantity,omitempty"` + AskPrice float64 `protobuf:"fixed64,2,opt,name=ask_price,json=askPrice,proto3" json:"ask_price,omitempty"` + Owner uint64 `protobuf:"varint,3,opt,name=owner,proto3" json:"owner,omitempty"` + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` } -<<<<<<< Updated upstream -func (x *Pair) Reset() { - *x = Pair{} -||||||| constructed merge base -func (x *Order) Reset() { - *x = Order{} -======= func (x *OrderAsk) Reset() { *x = OrderAsk{} ->>>>>>> Stashed changes if protoimpl.UnsafeEnabled { mi := &file_wire_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -64,31 +40,13 @@ func (x *OrderAsk) Reset() { } } -<<<<<<< Updated upstream -func (x *Pair) String() string { -||||||| constructed merge base -func (x *Order) String() string { -======= func (x *OrderAsk) String() string { ->>>>>>> Stashed changes return protoimpl.X.MessageStringOf(x) } -<<<<<<< Updated upstream -func (*Pair) ProtoMessage() {} -||||||| constructed merge base -func (*Order) ProtoMessage() {} -======= func (*OrderAsk) ProtoMessage() {} ->>>>>>> Stashed changes -<<<<<<< Updated upstream -func (x *Pair) ProtoReflect() protoreflect.Message { -||||||| constructed merge base -func (x *Order) ProtoReflect() protoreflect.Message { -======= func (x *OrderAsk) ProtoReflect() protoreflect.Message { ->>>>>>> Stashed changes mi := &file_wire_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -100,73 +58,36 @@ func (x *OrderAsk) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -<<<<<<< Updated upstream -// Deprecated: Use Pair.ProtoReflect.Descriptor instead. -func (*Pair) Descriptor() ([]byte, []int) { -||||||| constructed merge base -// Deprecated: Use Order.ProtoReflect.Descriptor instead. -func (*Order) Descriptor() ([]byte, []int) { -======= // Deprecated: Use OrderAsk.ProtoReflect.Descriptor instead. func (*OrderAsk) Descriptor() ([]byte, []int) { ->>>>>>> Stashed changes return file_wire_proto_rawDescGZIP(), []int{0} } -<<<<<<< Updated upstream -func (x *Pair) GetBuyersDenomination() string { -||||||| constructed merge base -func (x *Order) GetQuantityOutbound() uint64 { -======= -func (x *OrderAsk) GetQuantity() uint64 { ->>>>>>> Stashed changes +func (x *OrderAsk) GetQuantity() float64 { if x != nil { -<<<<<<< Updated upstream - return x.BuyersDenomination -||||||| constructed merge base - return x.QuantityOutbound -======= return x.Quantity ->>>>>>> Stashed changes } -<<<<<<< Updated upstream - return "" -||||||| constructed merge base return 0 } -func (x *Order) GetMinPrice() float64 { - if x != nil { - return x.MinPrice - } - return 0 -======= - return 0 -} - -func (x *OrderAsk) GetAskPrice() uint64 { +func (x *OrderAsk) GetAskPrice() float64 { if x != nil { return x.AskPrice } return 0 ->>>>>>> Stashed changes } -<<<<<<< Updated upstream -func (x *Pair) GetSellersDenomination() string { -||||||| constructed merge base -func (x *Order) GetOwner() uint64 { -======= -func (x *OrderAsk) GetOwner() *Account { ->>>>>>> Stashed changes +func (x *OrderAsk) GetOwner() uint64 { if x != nil { - return x.SellersDenomination + return x.Owner } -<<<<<<< Updated upstream - return "" -||||||| constructed merge base return 0 -======= +} + +func (x *OrderAsk) GetSignature() []byte { + if x != nil { + return x.Signature + } return nil } @@ -175,9 +96,10 @@ type OrderBid struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Quantity uint64 `protobuf:"varint,1,opt,name=quantity,proto3" json:"quantity,omitempty"` - MaxPrice uint64 `protobuf:"varint,2,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` - Owner *Account `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` + MaxQuantity float64 `protobuf:"fixed64,1,opt,name=max_quantity,json=maxQuantity,proto3" json:"max_quantity,omitempty"` + MaxPrice float64 `protobuf:"fixed64,2,opt,name=max_price,json=maxPrice,proto3" json:"max_price,omitempty"` + Owner uint64 `protobuf:"varint,3,opt,name=owner,proto3" json:"owner,omitempty"` + Signature []byte `protobuf:"bytes,4,opt,name=signature,proto3" json:"signature,omitempty"` } func (x *OrderBid) Reset() { @@ -212,47 +134,104 @@ func (*OrderBid) Descriptor() ([]byte, []int) { return file_wire_proto_rawDescGZIP(), []int{1} } -func (x *OrderBid) GetQuantity() uint64 { +func (x *OrderBid) GetMaxQuantity() float64 { if x != nil { - return x.Quantity + return x.MaxQuantity } return 0 ->>>>>>> Stashed changes } -<<<<<<< Updated upstream -type Commodity struct { -||||||| constructed merge base -type Pair struct { -======= -func (x *OrderBid) GetMaxPrice() uint64 { +func (x *OrderBid) GetMaxPrice() float64 { if x != nil { return x.MaxPrice } return 0 } -func (x *OrderBid) GetOwner() *Account { +func (x *OrderBid) GetOwner() uint64 { if x != nil { return x.Owner } + return 0 +} + +func (x *OrderBid) GetSignature() []byte { + if x != nil { + return x.Signature + } return nil } type Pair struct { ->>>>>>> Stashed changes state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` - Quantity uint64 `protobuf:"varint,2,opt,name=quantity,proto3" json:"quantity,omitempty"` + // the denomination that the buyer receives i.e. EUR + BuyersDenomination string `protobuf:"bytes,1,opt,name=buyers_denomination,json=buyersDenomination,proto3" json:"buyers_denomination,omitempty"` + // the denomination that the seller receives i.e. USD + SellersDenomination string `protobuf:"bytes,2,opt,name=sellers_denomination,json=sellersDenomination,proto3" json:"sellers_denomination,omitempty"` +} + +func (x *Pair) Reset() { + *x = Pair{} + if protoimpl.UnsafeEnabled { + mi := &file_wire_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Pair) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Pair) ProtoMessage() {} + +func (x *Pair) ProtoReflect() protoreflect.Message { + mi := &file_wire_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Pair.ProtoReflect.Descriptor instead. +func (*Pair) Descriptor() ([]byte, []int) { + return file_wire_proto_rawDescGZIP(), []int{2} +} + +func (x *Pair) GetBuyersDenomination() string { + if x != nil { + return x.BuyersDenomination + } + return "" +} + +func (x *Pair) GetSellersDenomination() string { + if x != nil { + return x.SellersDenomination + } + return "" +} + +type Commodity struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` + Quantity float64 `protobuf:"fixed64,2,opt,name=quantity,proto3" json:"quantity,omitempty"` } func (x *Commodity) Reset() { *x = Commodity{} if protoimpl.UnsafeEnabled { - mi := &file_wire_proto_msgTypes[2] + mi := &file_wire_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -264,16 +243,8 @@ func (x *Commodity) String() string { func (*Commodity) ProtoMessage() {} -<<<<<<< Updated upstream func (x *Commodity) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[1] -||||||| constructed merge base -func (x *Pair) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[1] -======= -func (x *Pair) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[2] ->>>>>>> Stashed changes + mi := &file_wire_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -284,19 +255,9 @@ func (x *Pair) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -<<<<<<< Updated upstream // Deprecated: Use Commodity.ProtoReflect.Descriptor instead. func (*Commodity) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{1} -||||||| constructed merge base -// Deprecated: Use Pair.ProtoReflect.Descriptor instead. -func (*Pair) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{1} -======= -// Deprecated: Use Pair.ProtoReflect.Descriptor instead. -func (*Pair) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{2} ->>>>>>> Stashed changes + return file_wire_proto_rawDescGZIP(), []int{3} } func (x *Commodity) GetDenom() string { @@ -306,7 +267,7 @@ func (x *Commodity) GetDenom() string { return "" } -func (x *Commodity) GetQuantity() uint64 { +func (x *Commodity) GetQuantity() float64 { if x != nil { return x.Quantity } @@ -327,7 +288,7 @@ type Account struct { func (x *Account) Reset() { *x = Account{} if protoimpl.UnsafeEnabled { - mi := &file_wire_proto_msgTypes[3] + mi := &file_wire_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -339,16 +300,8 @@ func (x *Account) String() string { func (*Account) ProtoMessage() {} -<<<<<<< Updated upstream func (x *Account) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[2] -||||||| constructed merge base -func (x *Commodity) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[2] -======= -func (x *Commodity) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[3] ->>>>>>> Stashed changes + mi := &file_wire_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -359,19 +312,9 @@ func (x *Commodity) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -<<<<<<< Updated upstream // Deprecated: Use Account.ProtoReflect.Descriptor instead. func (*Account) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{2} -||||||| constructed merge base -// Deprecated: Use Commodity.ProtoReflect.Descriptor instead. -func (*Commodity) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{2} -======= -// Deprecated: Use Commodity.ProtoReflect.Descriptor instead. -func (*Commodity) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{3} ->>>>>>> Stashed changes + return file_wire_proto_rawDescGZIP(), []int{4} } func (x *Account) GetIndex() uint64 { @@ -407,180 +350,6 @@ type TradeSet struct { MatchedOrders []*MatchedOrder `protobuf:"bytes,2,rep,name=matched_orders,json=matchedOrders,proto3" json:"matched_orders,omitempty"` } -func (x *TradeSet) Reset() { - *x = TradeSet{} - if protoimpl.UnsafeEnabled { - mi := &file_wire_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *TradeSet) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*TradeSet) ProtoMessage() {} - -<<<<<<< Updated upstream -func (x *TradeSet) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[3] -||||||| constructed merge base -func (x *Account) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[3] -======= -func (x *Account) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[4] ->>>>>>> Stashed changes - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -<<<<<<< Updated upstream -// Deprecated: Use TradeSet.ProtoReflect.Descriptor instead. -func (*TradeSet) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{3} -||||||| constructed merge base -// Deprecated: Use Account.ProtoReflect.Descriptor instead. -func (*Account) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{3} -======= -// Deprecated: Use Account.ProtoReflect.Descriptor instead. -func (*Account) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{4} ->>>>>>> Stashed changes -} - -func (x *TradeSet) GetPair() *Pair { - if x != nil { - return x.Pair - } - return nil -} - -func (x *TradeSet) GetMatchedOrders() []*MatchedOrder { - if x != nil { - return x.MatchedOrders - } - return nil -} - -type MatchedOrder struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // the quantity the buyer receives and the seller gives - Quantity uint64 `protobuf:"varint,1,opt,name=quantity,proto3" json:"quantity,omitempty"` - // the price the buyer pays for the quantity. The seller receives - // price * quantity of the sellers denomination (i.e. USD) - Price float64 `protobuf:"fixed64,2,opt,name=price,proto3" json:"price,omitempty"` - BuyerId uint64 `protobuf:"varint,3,opt,name=buyer_id,json=buyerId,proto3" json:"buyer_id,omitempty"` - // the limit the buyer was willing to pay for. This must be more or - // equal to the price. We use this to prove with the signature that - // the buyer actually wanted to pay that much for the commodity - BuyerLimit float64 `protobuf:"fixed64,4,opt,name=buyer_limit,json=buyerLimit,proto3" json:"buyer_limit,omitempty"` - BuyerSignature [][]byte `protobuf:"bytes,5,rep,name=buyer_signature,json=buyerSignature,proto3" json:"buyer_signature,omitempty"` - SellerId uint64 `protobuf:"varint,6,opt,name=seller_id,json=sellerId,proto3" json:"seller_id,omitempty"` - SellerSignature [][]byte `protobuf:"bytes,7,rep,name=seller_signature,json=sellerSignature,proto3" json:"seller_signature,omitempty"` -} - -func (x *MatchedOrder) Reset() { - *x = MatchedOrder{} - if protoimpl.UnsafeEnabled { - mi := &file_wire_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *MatchedOrder) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*MatchedOrder) ProtoMessage() {} - -func (x *MatchedOrder) ProtoReflect() protoreflect.Message { - mi := &file_wire_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use MatchedOrder.ProtoReflect.Descriptor instead. -func (*MatchedOrder) Descriptor() ([]byte, []int) { - return file_wire_proto_rawDescGZIP(), []int{4} -} - -func (x *MatchedOrder) GetQuantity() uint64 { - if x != nil { - return x.Quantity - } - return 0 -} - -func (x *MatchedOrder) GetPrice() float64 { - if x != nil { - return x.Price - } - return 0 -} - -func (x *MatchedOrder) GetBuyerId() uint64 { - if x != nil { - return x.BuyerId - } - return 0 -} - -func (x *MatchedOrder) GetBuyerLimit() float64 { - if x != nil { - return x.BuyerLimit - } - return 0 -} - -func (x *MatchedOrder) GetBuyerSignature() [][]byte { - if x != nil { - return x.BuyerSignature - } - return nil -} - -func (x *MatchedOrder) GetSellerId() uint64 { - if x != nil { - return x.SellerId - } - return 0 -} - -func (x *MatchedOrder) GetSellerSignature() [][]byte { - if x != nil { - return x.SellerSignature - } - return nil -} - -type TradeSet struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Pair *Pair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` // ATOM/USDC - MatchedOrders []*MatchedOrder `protobuf:"bytes,2,rep,name=matched_orders,json=matchedOrders,proto3" json:"matched_orders,omitempty"` -} - func (x *TradeSet) Reset() { *x = TradeSet{} if protoimpl.UnsafeEnabled { @@ -632,10 +401,8 @@ type MatchedOrder struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BuyOrder *OrderBid `protobuf:"bytes,1,opt,name=buy_order,json=buyOrder,proto3" json:"buy_order,omitempty"` - BuyerSignature [][]byte `protobuf:"bytes,2,rep,name=buyer_signature,json=buyerSignature,proto3" json:"buyer_signature,omitempty"` - SellOrder *OrderAsk `protobuf:"bytes,3,opt,name=sell_order,json=sellOrder,proto3" json:"sell_order,omitempty"` - SellerSignature [][]byte `protobuf:"bytes,4,rep,name=seller_signature,json=sellerSignature,proto3" json:"seller_signature,omitempty"` + OrderAsk *OrderAsk `protobuf:"bytes,1,opt,name=order_ask,json=orderAsk,proto3" json:"order_ask,omitempty"` + OrderBid *OrderBid `protobuf:"bytes,2,opt,name=order_bid,json=orderBid,proto3" json:"order_bid,omitempty"` } func (x *MatchedOrder) Reset() { @@ -670,30 +437,16 @@ func (*MatchedOrder) Descriptor() ([]byte, []int) { return file_wire_proto_rawDescGZIP(), []int{6} } -func (x *MatchedOrder) GetBuyOrder() *OrderBid { +func (x *MatchedOrder) GetOrderAsk() *OrderAsk { if x != nil { - return x.BuyOrder + return x.OrderAsk } return nil } -func (x *MatchedOrder) GetBuyerSignature() [][]byte { +func (x *MatchedOrder) GetOrderBid() *OrderBid { if x != nil { - return x.BuyerSignature - } - return nil -} - -func (x *MatchedOrder) GetSellOrder() *OrderAsk { - if x != nil { - return x.SellOrder - } - return nil -} - -func (x *MatchedOrder) GetSellerSignature() [][]byte { - if x != nil { - return x.SellerSignature + return x.OrderBid } return nil } @@ -702,144 +455,59 @@ var File_wire_proto protoreflect.FileDescriptor var file_wire_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x77, 0x69, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x6f, 0x72, -<<<<<<< Updated upstream - 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x6a, 0x0a, 0x04, 0x50, 0x61, 0x69, 0x72, 0x12, - 0x2f, 0x0a, 0x13, 0x62, 0x75, 0x79, 0x65, 0x72, 0x73, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x62, 0x75, - 0x79, 0x65, 0x72, 0x73, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x12, 0x31, 0x0a, 0x14, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x64, 0x65, 0x6e, 0x6f, - 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, - 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3d, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, - 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, - 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, - 0x74, 0x79, 0x22, 0x76, 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, - 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x69, 0x6e, - 0x64, 0x65, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, - 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, - 0x65, 0x79, 0x12, 0x36, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, - 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, - 0x6f, 0x6f, 0x6b, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x08, 0x54, 0x72, - 0x61, 0x64, 0x65, 0x53, 0x65, 0x74, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, - 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, 0x70, 0x61, 0x69, 0x72, 0x12, 0x3e, 0x0a, 0x0e, 0x6d, - 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, - 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x0d, 0x6d, 0x61, - 0x74, 0x63, 0x68, 0x65, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x22, 0xed, 0x01, 0x0a, 0x0c, - 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, - 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, - 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x19, - 0x0a, 0x08, 0x62, 0x75, 0x79, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x07, 0x62, 0x75, 0x79, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x75, 0x79, - 0x65, 0x72, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0a, - 0x62, 0x75, 0x79, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x62, 0x75, - 0x79, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x05, 0x20, - 0x03, 0x28, 0x0c, 0x52, 0x0e, 0x62, 0x75, 0x79, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x69, 0x64, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x49, 0x64, - 0x12, 0x29, 0x0a, 0x10, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, - 0x74, 0x75, 0x72, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0f, 0x73, 0x65, 0x6c, 0x6c, - 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x42, 0x39, 0x5a, 0x37, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, - 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, - 0x61, 0x62, 0x63, 0x69, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -||||||| constructed merge base - 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x67, 0x0a, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x12, 0x2b, 0x0a, 0x11, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x5f, 0x6f, 0x75, 0x74, - 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x10, 0x71, 0x75, 0x61, - 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1b, 0x0a, - 0x09, 0x6d, 0x69, 0x6e, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, - 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x77, - 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, - 0x22, 0x78, 0x0a, 0x04, 0x50, 0x61, 0x69, 0x72, 0x12, 0x36, 0x0a, 0x17, 0x69, 0x6e, 0x62, 0x6f, - 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x64, 0x65, - 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x69, 0x6e, 0x62, 0x6f, 0x75, - 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, - 0x12, 0x38, 0x0a, 0x18, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x16, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x6d, - 0x6f, 0x64, 0x69, 0x74, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x22, 0x3d, 0x0a, 0x09, 0x43, 0x6f, - 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1a, 0x0a, - 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x76, 0x0a, 0x07, 0x41, 0x63, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x75, - 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x09, - 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, - 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, - 0x64, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, - 0x73, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, - 0x6c, 0x65, 0x2f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, -======= - 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x6d, 0x0a, 0x08, 0x4f, 0x72, 0x64, 0x65, 0x72, + 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x22, 0x77, 0x0a, 0x08, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x73, 0x6b, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, + 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1b, 0x0a, 0x09, 0x61, 0x73, 0x6b, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x04, 0x52, 0x08, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x28, 0x0a, 0x05, - 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, - 0x05, 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, 0x6d, 0x0a, 0x08, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x42, - 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x1b, - 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x04, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x6f, - 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x05, - 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x22, 0x78, 0x0a, 0x04, 0x50, 0x61, 0x69, 0x72, 0x12, 0x36, 0x0a, - 0x17, 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, - 0x74, 0x79, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, - 0x69, 0x6e, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, - 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x38, 0x0a, 0x18, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, - 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x5f, 0x64, 0x65, 0x6e, 0x6f, - 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x6f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, - 0x64, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x22, - 0x3d, 0x0a, 0x09, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, - 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x64, 0x65, 0x6e, - 0x6f, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x76, - 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, - 0x1d, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0c, 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x36, - 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, - 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x64, 0x69, 0x74, 0x69, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x08, 0x54, 0x72, 0x61, 0x64, 0x65, 0x53, - 0x65, 0x74, 0x12, 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0f, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, 0x61, 0x69, - 0x72, 0x52, 0x04, 0x70, 0x61, 0x69, 0x72, 0x12, 0x3e, 0x0a, 0x0e, 0x6d, 0x61, 0x74, 0x63, 0x68, - 0x65, 0x64, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x17, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x61, 0x74, 0x63, - 0x68, 0x65, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, - 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x22, 0xc8, 0x01, 0x0a, 0x0c, 0x4d, 0x61, 0x74, 0x63, - 0x68, 0x65, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x30, 0x0a, 0x09, 0x62, 0x75, 0x79, 0x5f, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, - 0x52, 0x08, 0x62, 0x75, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x27, 0x0a, 0x0f, 0x62, 0x75, - 0x79, 0x65, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0c, 0x52, 0x0e, 0x62, 0x75, 0x79, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, - 0x75, 0x72, 0x65, 0x12, 0x32, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x6c, 0x5f, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, - 0x6f, 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x73, 0x6b, 0x52, 0x09, 0x73, 0x65, - 0x6c, 0x6c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x29, 0x0a, 0x10, 0x73, 0x65, 0x6c, 0x6c, 0x65, - 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, - 0x0c, 0x52, 0x0f, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, - 0x72, 0x65, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, - 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x74, 0x65, 0x6e, 0x64, - 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x61, 0x62, 0x63, 0x69, 0x2f, 0x65, 0x78, 0x61, 0x6d, - 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, ->>>>>>> Stashed changes + 0x28, 0x01, 0x52, 0x08, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6f, 0x77, 0x6e, + 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x22, 0x7e, 0x0a, 0x08, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x0c, + 0x6d, 0x61, 0x78, 0x5f, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x01, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x51, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, + 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x6f, 0x77, 0x6e, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6f, 0x77, 0x6e, + 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, + 0x22, 0x6a, 0x0a, 0x04, 0x50, 0x61, 0x69, 0x72, 0x12, 0x2f, 0x0a, 0x13, 0x62, 0x75, 0x79, 0x65, + 0x72, 0x73, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x62, 0x75, 0x79, 0x65, 0x72, 0x73, 0x44, 0x65, 0x6e, + 0x6f, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x31, 0x0a, 0x14, 0x73, 0x65, 0x6c, + 0x6c, 0x65, 0x72, 0x73, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x73, 0x65, 0x6c, 0x6c, 0x65, 0x72, 0x73, + 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3d, 0x0a, 0x09, + 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x6e, + 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x12, + 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x01, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x22, 0x76, 0x0a, 0x07, 0x41, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1d, 0x0a, 0x0a, + 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, + 0x52, 0x09, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x4b, 0x65, 0x79, 0x12, 0x36, 0x0a, 0x0b, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x43, 0x6f, 0x6d, + 0x6d, 0x6f, 0x64, 0x69, 0x74, 0x79, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x64, 0x69, 0x74, + 0x69, 0x65, 0x73, 0x22, 0x6f, 0x0a, 0x08, 0x54, 0x72, 0x61, 0x64, 0x65, 0x53, 0x65, 0x74, 0x12, + 0x23, 0x0a, 0x04, 0x70, 0x61, 0x69, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x50, 0x61, 0x69, 0x72, 0x52, 0x04, + 0x70, 0x61, 0x69, 0x72, 0x12, 0x3e, 0x0a, 0x0e, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x5f, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, + 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x0d, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x4f, 0x72, + 0x64, 0x65, 0x72, 0x73, 0x22, 0x72, 0x0a, 0x0c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x4f, + 0x72, 0x64, 0x65, 0x72, 0x12, 0x30, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x61, 0x73, + 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, + 0x6f, 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x41, 0x73, 0x6b, 0x52, 0x08, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x41, 0x73, 0x6b, 0x12, 0x30, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, + 0x62, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x62, 0x6f, 0x6f, 0x6b, 0x2e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, 0x52, 0x08, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x69, 0x64, 0x42, 0x39, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, + 0x74, 0x2f, 0x74, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x74, 0x2f, 0x61, 0x62, 0x63, + 0x69, 0x2f, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x62, + 0x6f, 0x6f, 0x6b, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -854,26 +522,8 @@ func file_wire_proto_rawDescGZIP() []byte { return file_wire_proto_rawDescData } -<<<<<<< Updated upstream -var file_wire_proto_msgTypes = make([]protoimpl.MessageInfo, 5) -||||||| constructed merge base -var file_wire_proto_msgTypes = make([]protoimpl.MessageInfo, 4) -======= var file_wire_proto_msgTypes = make([]protoimpl.MessageInfo, 7) ->>>>>>> Stashed changes var file_wire_proto_goTypes = []interface{}{ -<<<<<<< Updated upstream - (*Pair)(nil), // 0: orderbook.Pair - (*Commodity)(nil), // 1: orderbook.Commodity - (*Account)(nil), // 2: orderbook.Account - (*TradeSet)(nil), // 3: orderbook.TradeSet - (*MatchedOrder)(nil), // 4: orderbook.MatchedOrder -||||||| constructed merge base - (*Order)(nil), // 0: orderbook.Order - (*Pair)(nil), // 1: orderbook.Pair - (*Commodity)(nil), // 2: orderbook.Commodity - (*Account)(nil), // 3: orderbook.Account -======= (*OrderAsk)(nil), // 0: orderbook.OrderAsk (*OrderBid)(nil), // 1: orderbook.OrderBid (*Pair)(nil), // 2: orderbook.Pair @@ -881,39 +531,18 @@ var file_wire_proto_goTypes = []interface{}{ (*Account)(nil), // 4: orderbook.Account (*TradeSet)(nil), // 5: orderbook.TradeSet (*MatchedOrder)(nil), // 6: orderbook.MatchedOrder ->>>>>>> Stashed changes } var file_wire_proto_depIdxs = []int32{ -<<<<<<< Updated upstream - 1, // 0: orderbook.Account.commodities:type_name -> orderbook.Commodity - 0, // 1: orderbook.TradeSet.pair:type_name -> orderbook.Pair - 4, // 2: orderbook.TradeSet.matched_orders:type_name -> orderbook.MatchedOrder - 3, // [3:3] is the sub-list for method output_type - 3, // [3:3] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name -||||||| constructed merge base - 2, // 0: orderbook.Account.commodities:type_name -> orderbook.Commodity - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name -======= - 4, // 0: orderbook.OrderAsk.owner:type_name -> orderbook.Account - 4, // 1: orderbook.OrderBid.owner:type_name -> orderbook.Account - 3, // 2: orderbook.Account.commodities:type_name -> orderbook.Commodity - 2, // 3: orderbook.TradeSet.pair:type_name -> orderbook.Pair - 6, // 4: orderbook.TradeSet.matched_orders:type_name -> orderbook.MatchedOrder - 1, // 5: orderbook.MatchedOrder.buy_order:type_name -> orderbook.OrderBid - 0, // 6: orderbook.MatchedOrder.sell_order:type_name -> orderbook.OrderAsk - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name ->>>>>>> Stashed changes + 3, // 0: orderbook.Account.commodities:type_name -> orderbook.Commodity + 2, // 1: orderbook.TradeSet.pair:type_name -> orderbook.Pair + 6, // 2: orderbook.TradeSet.matched_orders:type_name -> orderbook.MatchedOrder + 0, // 3: orderbook.MatchedOrder.order_ask:type_name -> orderbook.OrderAsk + 1, // 4: orderbook.MatchedOrder.order_bid:type_name -> orderbook.OrderBid + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_wire_proto_init() } @@ -923,13 +552,7 @@ func file_wire_proto_init() { } if !protoimpl.UnsafeEnabled { file_wire_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { -<<<<<<< Updated upstream - switch v := v.(*Pair); i { -||||||| constructed merge base - switch v := v.(*Order); i { -======= switch v := v.(*OrderAsk); i { ->>>>>>> Stashed changes case 0: return &v.state case 1: @@ -941,13 +564,7 @@ func file_wire_proto_init() { } } file_wire_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { -<<<<<<< Updated upstream - switch v := v.(*Commodity); i { -||||||| constructed merge base - switch v := v.(*Pair); i { -======= switch v := v.(*OrderBid); i { ->>>>>>> Stashed changes case 0: return &v.state case 1: @@ -959,13 +576,7 @@ func file_wire_proto_init() { } } file_wire_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { -<<<<<<< Updated upstream - switch v := v.(*Account); i { -||||||| constructed merge base - switch v := v.(*Commodity); i { -======= switch v := v.(*Pair); i { ->>>>>>> Stashed changes case 0: return &v.state case 1: @@ -977,23 +588,6 @@ func file_wire_proto_init() { } } file_wire_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { -<<<<<<< Updated upstream - switch v := v.(*TradeSet); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_wire_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MatchedOrder); i { -||||||| constructed merge base - switch v := v.(*Account); i { -======= switch v := v.(*Commodity); i { case 0: return &v.state @@ -1007,7 +601,6 @@ func file_wire_proto_init() { } file_wire_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Account); i { ->>>>>>> Stashed changes case 0: return &v.state case 1: @@ -1049,13 +642,7 @@ func file_wire_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_wire_proto_rawDesc, NumEnums: 0, -<<<<<<< Updated upstream - NumMessages: 5, -||||||| constructed merge base - NumMessages: 4, -======= NumMessages: 7, ->>>>>>> Stashed changes NumExtensions: 0, NumServices: 0, }, diff --git a/abci/example/orderbook/wire.proto b/abci/example/orderbook/wire.proto index 07b032571..813547d20 100644 --- a/abci/example/orderbook/wire.proto +++ b/abci/example/orderbook/wire.proto @@ -5,15 +5,17 @@ option go_package = "github.com/tendermint/tendermint/abci/example/orderbook"; message OrderAsk { - uint64 quantity = 1; - uint64 ask_price = 2; - Account owner = 3; + double quantity = 1; + double ask_price = 2; + uint64 owner = 3; + bytes signature = 4; } message OrderBid { - uint64 quantity = 1; - uint64 max_price = 2; - Account owner = 3; + double max_quantity = 1; + double max_price = 2; + uint64 owner = 3; + bytes signature = 4; } message Pair { @@ -25,7 +27,7 @@ message Pair { message Commodity { string denom = 1; - uint64 quantity = 2; + double quantity = 2; } message Account { @@ -44,16 +46,6 @@ message TradeSet { } message MatchedOrder { - // the quantity the buyer receives and the seller gives - uint64 quantity = 1; - // the price the buyer pays for the quantity. The seller receives - // price * quantity of the sellers denomination (i.e. USD) - double price = 2; - uint64 buyer_id = 3; - // the limit the buyer was willing to pay for. This must be more or - // equal to the price. We use this to prove with the signature that - // the buyer actually wanted to pay that much for the commodity - double buyer_limit = 4; - repeated bytes buyer_signature = 5; - uint64 seller_id = 6; - repeated bytes seller_signature = 7; + OrderAsk order_ask = 1; + OrderBid order_bid = 2; +}