Commit ac538ec8 authored by vipwzw's avatar vipwzw

auto ci

parent b3e4a93e
...@@ -151,7 +151,6 @@ func calcOnesOrderPrefixStatus(addr string, status int32) []byte { ...@@ -151,7 +151,6 @@ func calcOnesOrderPrefixStatus(addr string, status int32) []byte {
// return []byte(fmt.Sprintf(buyOrderSHTAS+"%d", status)) // return []byte(fmt.Sprintf(buyOrderSHTAS+"%d", status))
//} //}
func genSellMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptSellBase, status int32, func genSellMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptSellBase, status int32,
height int64, value []byte) []*types.KeyValue { height int64, value []byte) []*types.KeyValue {
...@@ -195,5 +194,3 @@ func genSellMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptSellBa ...@@ -195,5 +194,3 @@ func genSellMarketOrderKeyValue(kv []*types.KeyValue, receipt *pty.ReceiptSellBa
func calcPriceOfToken(priceBoardlot, AmountPerBoardlot int64) int64 { func calcPriceOfToken(priceBoardlot, AmountPerBoardlot int64) int64 {
return 1e8 * priceBoardlot / AmountPerBoardlot return 1e8 * priceBoardlot / AmountPerBoardlot
} }
...@@ -49,7 +49,7 @@ func (m *Trade) Reset() { *m = Trade{} } ...@@ -49,7 +49,7 @@ func (m *Trade) Reset() { *m = Trade{} }
func (m *Trade) String() string { return proto.CompactTextString(m) } func (m *Trade) String() string { return proto.CompactTextString(m) }
func (*Trade) ProtoMessage() {} func (*Trade) ProtoMessage() {}
func (*Trade) Descriptor() ([]byte, []int) { func (*Trade) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{0} return fileDescriptor_trade_05e36a4efd974a28, []int{0}
} }
func (m *Trade) XXX_Unmarshal(b []byte) error { func (m *Trade) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_Trade.Unmarshal(m, b) return xxx_messageInfo_Trade.Unmarshal(m, b)
...@@ -331,6 +331,9 @@ type TradeForSell struct { ...@@ -331,6 +331,9 @@ type TradeForSell struct {
Crowdfund bool `protobuf:"varint,8,opt,name=crowdfund,proto3" json:"crowdfund,omitempty"` Crowdfund bool `protobuf:"varint,8,opt,name=crowdfund,proto3" json:"crowdfund,omitempty"`
// 资产来源 // 资产来源
AssetExec string `protobuf:"bytes,9,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,9,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
// 定价资产
PriceExec string `protobuf:"bytes,10,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,11,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -340,7 +343,7 @@ func (m *TradeForSell) Reset() { *m = TradeForSell{} } ...@@ -340,7 +343,7 @@ func (m *TradeForSell) Reset() { *m = TradeForSell{} }
func (m *TradeForSell) String() string { return proto.CompactTextString(m) } func (m *TradeForSell) String() string { return proto.CompactTextString(m) }
func (*TradeForSell) ProtoMessage() {} func (*TradeForSell) ProtoMessage() {}
func (*TradeForSell) Descriptor() ([]byte, []int) { func (*TradeForSell) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{1} return fileDescriptor_trade_05e36a4efd974a28, []int{1}
} }
func (m *TradeForSell) XXX_Unmarshal(b []byte) error { func (m *TradeForSell) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TradeForSell.Unmarshal(m, b) return xxx_messageInfo_TradeForSell.Unmarshal(m, b)
...@@ -423,6 +426,20 @@ func (m *TradeForSell) GetAssetExec() string { ...@@ -423,6 +426,20 @@ func (m *TradeForSell) GetAssetExec() string {
return "" return ""
} }
func (m *TradeForSell) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *TradeForSell) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
// 购买者发起交易用来购买token持有者之前挂单出售的token // 购买者发起交易用来购买token持有者之前挂单出售的token
// 其中的hash为token出售者发起出售交易的hash // 其中的hash为token出售者发起出售交易的hash
type TradeForBuy struct { type TradeForBuy struct {
...@@ -437,7 +454,7 @@ func (m *TradeForBuy) Reset() { *m = TradeForBuy{} } ...@@ -437,7 +454,7 @@ func (m *TradeForBuy) Reset() { *m = TradeForBuy{} }
func (m *TradeForBuy) String() string { return proto.CompactTextString(m) } func (m *TradeForBuy) String() string { return proto.CompactTextString(m) }
func (*TradeForBuy) ProtoMessage() {} func (*TradeForBuy) ProtoMessage() {}
func (*TradeForBuy) Descriptor() ([]byte, []int) { func (*TradeForBuy) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{2} return fileDescriptor_trade_05e36a4efd974a28, []int{2}
} }
func (m *TradeForBuy) XXX_Unmarshal(b []byte) error { func (m *TradeForBuy) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TradeForBuy.Unmarshal(m, b) return xxx_messageInfo_TradeForBuy.Unmarshal(m, b)
...@@ -483,7 +500,7 @@ func (m *TradeForRevokeSell) Reset() { *m = TradeForRevokeSell{} } ...@@ -483,7 +500,7 @@ func (m *TradeForRevokeSell) Reset() { *m = TradeForRevokeSell{} }
func (m *TradeForRevokeSell) String() string { return proto.CompactTextString(m) } func (m *TradeForRevokeSell) String() string { return proto.CompactTextString(m) }
func (*TradeForRevokeSell) ProtoMessage() {} func (*TradeForRevokeSell) ProtoMessage() {}
func (*TradeForRevokeSell) Descriptor() ([]byte, []int) { func (*TradeForRevokeSell) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{3} return fileDescriptor_trade_05e36a4efd974a28, []int{3}
} }
func (m *TradeForRevokeSell) XXX_Unmarshal(b []byte) error { func (m *TradeForRevokeSell) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TradeForRevokeSell.Unmarshal(m, b) return xxx_messageInfo_TradeForRevokeSell.Unmarshal(m, b)
...@@ -518,6 +535,9 @@ type TradeForBuyLimit struct { ...@@ -518,6 +535,9 @@ type TradeForBuyLimit struct {
PricePerBoardlot int64 `protobuf:"varint,4,opt,name=pricePerBoardlot,proto3" json:"pricePerBoardlot,omitempty"` PricePerBoardlot int64 `protobuf:"varint,4,opt,name=pricePerBoardlot,proto3" json:"pricePerBoardlot,omitempty"`
TotalBoardlot int64 `protobuf:"varint,5,opt,name=totalBoardlot,proto3" json:"totalBoardlot,omitempty"` TotalBoardlot int64 `protobuf:"varint,5,opt,name=totalBoardlot,proto3" json:"totalBoardlot,omitempty"`
AssetExec string `protobuf:"bytes,6,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,6,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
// 定价资产
PriceExec string `protobuf:"bytes,7,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,8,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -527,7 +547,7 @@ func (m *TradeForBuyLimit) Reset() { *m = TradeForBuyLimit{} } ...@@ -527,7 +547,7 @@ func (m *TradeForBuyLimit) Reset() { *m = TradeForBuyLimit{} }
func (m *TradeForBuyLimit) String() string { return proto.CompactTextString(m) } func (m *TradeForBuyLimit) String() string { return proto.CompactTextString(m) }
func (*TradeForBuyLimit) ProtoMessage() {} func (*TradeForBuyLimit) ProtoMessage() {}
func (*TradeForBuyLimit) Descriptor() ([]byte, []int) { func (*TradeForBuyLimit) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{4} return fileDescriptor_trade_05e36a4efd974a28, []int{4}
} }
func (m *TradeForBuyLimit) XXX_Unmarshal(b []byte) error { func (m *TradeForBuyLimit) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TradeForBuyLimit.Unmarshal(m, b) return xxx_messageInfo_TradeForBuyLimit.Unmarshal(m, b)
...@@ -589,6 +609,20 @@ func (m *TradeForBuyLimit) GetAssetExec() string { ...@@ -589,6 +609,20 @@ func (m *TradeForBuyLimit) GetAssetExec() string {
return "" return ""
} }
func (m *TradeForBuyLimit) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *TradeForBuyLimit) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
// 现价卖单 // 现价卖单
type TradeForSellMarket struct { type TradeForSellMarket struct {
BuyID string `protobuf:"bytes,1,opt,name=buyID,proto3" json:"buyID,omitempty"` BuyID string `protobuf:"bytes,1,opt,name=buyID,proto3" json:"buyID,omitempty"`
...@@ -602,7 +636,7 @@ func (m *TradeForSellMarket) Reset() { *m = TradeForSellMarket{} } ...@@ -602,7 +636,7 @@ func (m *TradeForSellMarket) Reset() { *m = TradeForSellMarket{} }
func (m *TradeForSellMarket) String() string { return proto.CompactTextString(m) } func (m *TradeForSellMarket) String() string { return proto.CompactTextString(m) }
func (*TradeForSellMarket) ProtoMessage() {} func (*TradeForSellMarket) ProtoMessage() {}
func (*TradeForSellMarket) Descriptor() ([]byte, []int) { func (*TradeForSellMarket) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{5} return fileDescriptor_trade_05e36a4efd974a28, []int{5}
} }
func (m *TradeForSellMarket) XXX_Unmarshal(b []byte) error { func (m *TradeForSellMarket) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TradeForSellMarket.Unmarshal(m, b) return xxx_messageInfo_TradeForSellMarket.Unmarshal(m, b)
...@@ -648,7 +682,7 @@ func (m *TradeForRevokeBuy) Reset() { *m = TradeForRevokeBuy{} } ...@@ -648,7 +682,7 @@ func (m *TradeForRevokeBuy) Reset() { *m = TradeForRevokeBuy{} }
func (m *TradeForRevokeBuy) String() string { return proto.CompactTextString(m) } func (m *TradeForRevokeBuy) String() string { return proto.CompactTextString(m) }
func (*TradeForRevokeBuy) ProtoMessage() {} func (*TradeForRevokeBuy) ProtoMessage() {}
func (*TradeForRevokeBuy) Descriptor() ([]byte, []int) { func (*TradeForRevokeBuy) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{6} return fileDescriptor_trade_05e36a4efd974a28, []int{6}
} }
func (m *TradeForRevokeBuy) XXX_Unmarshal(b []byte) error { func (m *TradeForRevokeBuy) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_TradeForRevokeBuy.Unmarshal(m, b) return xxx_messageInfo_TradeForRevokeBuy.Unmarshal(m, b)
...@@ -695,6 +729,8 @@ type SellOrder struct { ...@@ -695,6 +729,8 @@ type SellOrder struct {
Status int32 `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"` Status int32 `protobuf:"varint,12,opt,name=status,proto3" json:"status,omitempty"`
Height int64 `protobuf:"varint,13,opt,name=height,proto3" json:"height,omitempty"` Height int64 `protobuf:"varint,13,opt,name=height,proto3" json:"height,omitempty"`
AssetExec string `protobuf:"bytes,14,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,14,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
PriceExec string `protobuf:"bytes,15,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,16,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -704,7 +740,7 @@ func (m *SellOrder) Reset() { *m = SellOrder{} } ...@@ -704,7 +740,7 @@ func (m *SellOrder) Reset() { *m = SellOrder{} }
func (m *SellOrder) String() string { return proto.CompactTextString(m) } func (m *SellOrder) String() string { return proto.CompactTextString(m) }
func (*SellOrder) ProtoMessage() {} func (*SellOrder) ProtoMessage() {}
func (*SellOrder) Descriptor() ([]byte, []int) { func (*SellOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{7} return fileDescriptor_trade_05e36a4efd974a28, []int{7}
} }
func (m *SellOrder) XXX_Unmarshal(b []byte) error { func (m *SellOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_SellOrder.Unmarshal(m, b) return xxx_messageInfo_SellOrder.Unmarshal(m, b)
...@@ -822,6 +858,20 @@ func (m *SellOrder) GetAssetExec() string { ...@@ -822,6 +858,20 @@ func (m *SellOrder) GetAssetExec() string {
return "" return ""
} }
func (m *SellOrder) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *SellOrder) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
// 限价买单数据库记录 // 限价买单数据库记录
type BuyLimitOrder struct { type BuyLimitOrder struct {
TokenSymbol string `protobuf:"bytes,1,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"` TokenSymbol string `protobuf:"bytes,1,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"`
...@@ -835,6 +885,8 @@ type BuyLimitOrder struct { ...@@ -835,6 +885,8 @@ type BuyLimitOrder struct {
Status int32 `protobuf:"varint,9,opt,name=status,proto3" json:"status,omitempty"` Status int32 `protobuf:"varint,9,opt,name=status,proto3" json:"status,omitempty"`
Height int64 `protobuf:"varint,10,opt,name=height,proto3" json:"height,omitempty"` Height int64 `protobuf:"varint,10,opt,name=height,proto3" json:"height,omitempty"`
AssetExec string `protobuf:"bytes,11,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,11,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
PriceExec string `protobuf:"bytes,12,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,13,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -844,7 +896,7 @@ func (m *BuyLimitOrder) Reset() { *m = BuyLimitOrder{} } ...@@ -844,7 +896,7 @@ func (m *BuyLimitOrder) Reset() { *m = BuyLimitOrder{} }
func (m *BuyLimitOrder) String() string { return proto.CompactTextString(m) } func (m *BuyLimitOrder) String() string { return proto.CompactTextString(m) }
func (*BuyLimitOrder) ProtoMessage() {} func (*BuyLimitOrder) ProtoMessage() {}
func (*BuyLimitOrder) Descriptor() ([]byte, []int) { func (*BuyLimitOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{8} return fileDescriptor_trade_05e36a4efd974a28, []int{8}
} }
func (m *BuyLimitOrder) XXX_Unmarshal(b []byte) error { func (m *BuyLimitOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_BuyLimitOrder.Unmarshal(m, b) return xxx_messageInfo_BuyLimitOrder.Unmarshal(m, b)
...@@ -941,6 +993,20 @@ func (m *BuyLimitOrder) GetAssetExec() string { ...@@ -941,6 +993,20 @@ func (m *BuyLimitOrder) GetAssetExec() string {
return "" return ""
} }
func (m *BuyLimitOrder) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *BuyLimitOrder) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
// 执行器日志部分 // 执行器日志部分
type ReceiptBuyBase struct { type ReceiptBuyBase struct {
TokenSymbol string `protobuf:"bytes,1,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"` TokenSymbol string `protobuf:"bytes,1,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"`
...@@ -956,6 +1022,8 @@ type ReceiptBuyBase struct { ...@@ -956,6 +1022,8 @@ type ReceiptBuyBase struct {
TxHash string `protobuf:"bytes,11,opt,name=txHash,proto3" json:"txHash,omitempty"` TxHash string `protobuf:"bytes,11,opt,name=txHash,proto3" json:"txHash,omitempty"`
Height int64 `protobuf:"varint,12,opt,name=height,proto3" json:"height,omitempty"` Height int64 `protobuf:"varint,12,opt,name=height,proto3" json:"height,omitempty"`
AssetExec string `protobuf:"bytes,13,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,13,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
PriceExec string `protobuf:"bytes,14,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,15,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -965,7 +1033,7 @@ func (m *ReceiptBuyBase) Reset() { *m = ReceiptBuyBase{} } ...@@ -965,7 +1033,7 @@ func (m *ReceiptBuyBase) Reset() { *m = ReceiptBuyBase{} }
func (m *ReceiptBuyBase) String() string { return proto.CompactTextString(m) } func (m *ReceiptBuyBase) String() string { return proto.CompactTextString(m) }
func (*ReceiptBuyBase) ProtoMessage() {} func (*ReceiptBuyBase) ProtoMessage() {}
func (*ReceiptBuyBase) Descriptor() ([]byte, []int) { func (*ReceiptBuyBase) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{9} return fileDescriptor_trade_05e36a4efd974a28, []int{9}
} }
func (m *ReceiptBuyBase) XXX_Unmarshal(b []byte) error { func (m *ReceiptBuyBase) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptBuyBase.Unmarshal(m, b) return xxx_messageInfo_ReceiptBuyBase.Unmarshal(m, b)
...@@ -1076,6 +1144,20 @@ func (m *ReceiptBuyBase) GetAssetExec() string { ...@@ -1076,6 +1144,20 @@ func (m *ReceiptBuyBase) GetAssetExec() string {
return "" return ""
} }
func (m *ReceiptBuyBase) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *ReceiptBuyBase) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
type ReceiptSellBase struct { type ReceiptSellBase struct {
TokenSymbol string `protobuf:"bytes,1,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"` TokenSymbol string `protobuf:"bytes,1,opt,name=tokenSymbol,proto3" json:"tokenSymbol,omitempty"`
Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"` Owner string `protobuf:"bytes,2,opt,name=owner,proto3" json:"owner,omitempty"`
...@@ -1098,6 +1180,8 @@ type ReceiptSellBase struct { ...@@ -1098,6 +1180,8 @@ type ReceiptSellBase struct {
TxHash string `protobuf:"bytes,14,opt,name=txHash,proto3" json:"txHash,omitempty"` TxHash string `protobuf:"bytes,14,opt,name=txHash,proto3" json:"txHash,omitempty"`
Height int64 `protobuf:"varint,15,opt,name=height,proto3" json:"height,omitempty"` Height int64 `protobuf:"varint,15,opt,name=height,proto3" json:"height,omitempty"`
AssetExec string `protobuf:"bytes,16,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,16,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
PriceExec string `protobuf:"bytes,17,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,18,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -1107,7 +1191,7 @@ func (m *ReceiptSellBase) Reset() { *m = ReceiptSellBase{} } ...@@ -1107,7 +1191,7 @@ func (m *ReceiptSellBase) Reset() { *m = ReceiptSellBase{} }
func (m *ReceiptSellBase) String() string { return proto.CompactTextString(m) } func (m *ReceiptSellBase) String() string { return proto.CompactTextString(m) }
func (*ReceiptSellBase) ProtoMessage() {} func (*ReceiptSellBase) ProtoMessage() {}
func (*ReceiptSellBase) Descriptor() ([]byte, []int) { func (*ReceiptSellBase) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{10} return fileDescriptor_trade_05e36a4efd974a28, []int{10}
} }
func (m *ReceiptSellBase) XXX_Unmarshal(b []byte) error { func (m *ReceiptSellBase) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptSellBase.Unmarshal(m, b) return xxx_messageInfo_ReceiptSellBase.Unmarshal(m, b)
...@@ -1239,6 +1323,20 @@ func (m *ReceiptSellBase) GetAssetExec() string { ...@@ -1239,6 +1323,20 @@ func (m *ReceiptSellBase) GetAssetExec() string {
return "" return ""
} }
func (m *ReceiptSellBase) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *ReceiptSellBase) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
type ReceiptTradeBuyMarket struct { type ReceiptTradeBuyMarket struct {
Base *ReceiptBuyBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"` Base *ReceiptBuyBase `protobuf:"bytes,1,opt,name=base,proto3" json:"base,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
...@@ -1250,7 +1348,7 @@ func (m *ReceiptTradeBuyMarket) Reset() { *m = ReceiptTradeBuyMarket{} } ...@@ -1250,7 +1348,7 @@ func (m *ReceiptTradeBuyMarket) Reset() { *m = ReceiptTradeBuyMarket{} }
func (m *ReceiptTradeBuyMarket) String() string { return proto.CompactTextString(m) } func (m *ReceiptTradeBuyMarket) String() string { return proto.CompactTextString(m) }
func (*ReceiptTradeBuyMarket) ProtoMessage() {} func (*ReceiptTradeBuyMarket) ProtoMessage() {}
func (*ReceiptTradeBuyMarket) Descriptor() ([]byte, []int) { func (*ReceiptTradeBuyMarket) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{11} return fileDescriptor_trade_05e36a4efd974a28, []int{11}
} }
func (m *ReceiptTradeBuyMarket) XXX_Unmarshal(b []byte) error { func (m *ReceiptTradeBuyMarket) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptTradeBuyMarket.Unmarshal(m, b) return xxx_messageInfo_ReceiptTradeBuyMarket.Unmarshal(m, b)
...@@ -1288,7 +1386,7 @@ func (m *ReceiptTradeBuyLimit) Reset() { *m = ReceiptTradeBuyLimit{} } ...@@ -1288,7 +1386,7 @@ func (m *ReceiptTradeBuyLimit) Reset() { *m = ReceiptTradeBuyLimit{} }
func (m *ReceiptTradeBuyLimit) String() string { return proto.CompactTextString(m) } func (m *ReceiptTradeBuyLimit) String() string { return proto.CompactTextString(m) }
func (*ReceiptTradeBuyLimit) ProtoMessage() {} func (*ReceiptTradeBuyLimit) ProtoMessage() {}
func (*ReceiptTradeBuyLimit) Descriptor() ([]byte, []int) { func (*ReceiptTradeBuyLimit) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{12} return fileDescriptor_trade_05e36a4efd974a28, []int{12}
} }
func (m *ReceiptTradeBuyLimit) XXX_Unmarshal(b []byte) error { func (m *ReceiptTradeBuyLimit) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptTradeBuyLimit.Unmarshal(m, b) return xxx_messageInfo_ReceiptTradeBuyLimit.Unmarshal(m, b)
...@@ -1326,7 +1424,7 @@ func (m *ReceiptTradeBuyRevoke) Reset() { *m = ReceiptTradeBuyRevoke{} } ...@@ -1326,7 +1424,7 @@ func (m *ReceiptTradeBuyRevoke) Reset() { *m = ReceiptTradeBuyRevoke{} }
func (m *ReceiptTradeBuyRevoke) String() string { return proto.CompactTextString(m) } func (m *ReceiptTradeBuyRevoke) String() string { return proto.CompactTextString(m) }
func (*ReceiptTradeBuyRevoke) ProtoMessage() {} func (*ReceiptTradeBuyRevoke) ProtoMessage() {}
func (*ReceiptTradeBuyRevoke) Descriptor() ([]byte, []int) { func (*ReceiptTradeBuyRevoke) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{13} return fileDescriptor_trade_05e36a4efd974a28, []int{13}
} }
func (m *ReceiptTradeBuyRevoke) XXX_Unmarshal(b []byte) error { func (m *ReceiptTradeBuyRevoke) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptTradeBuyRevoke.Unmarshal(m, b) return xxx_messageInfo_ReceiptTradeBuyRevoke.Unmarshal(m, b)
...@@ -1364,7 +1462,7 @@ func (m *ReceiptTradeSellLimit) Reset() { *m = ReceiptTradeSellLimit{} } ...@@ -1364,7 +1462,7 @@ func (m *ReceiptTradeSellLimit) Reset() { *m = ReceiptTradeSellLimit{} }
func (m *ReceiptTradeSellLimit) String() string { return proto.CompactTextString(m) } func (m *ReceiptTradeSellLimit) String() string { return proto.CompactTextString(m) }
func (*ReceiptTradeSellLimit) ProtoMessage() {} func (*ReceiptTradeSellLimit) ProtoMessage() {}
func (*ReceiptTradeSellLimit) Descriptor() ([]byte, []int) { func (*ReceiptTradeSellLimit) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{14} return fileDescriptor_trade_05e36a4efd974a28, []int{14}
} }
func (m *ReceiptTradeSellLimit) XXX_Unmarshal(b []byte) error { func (m *ReceiptTradeSellLimit) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptTradeSellLimit.Unmarshal(m, b) return xxx_messageInfo_ReceiptTradeSellLimit.Unmarshal(m, b)
...@@ -1402,7 +1500,7 @@ func (m *ReceiptSellMarket) Reset() { *m = ReceiptSellMarket{} } ...@@ -1402,7 +1500,7 @@ func (m *ReceiptSellMarket) Reset() { *m = ReceiptSellMarket{} }
func (m *ReceiptSellMarket) String() string { return proto.CompactTextString(m) } func (m *ReceiptSellMarket) String() string { return proto.CompactTextString(m) }
func (*ReceiptSellMarket) ProtoMessage() {} func (*ReceiptSellMarket) ProtoMessage() {}
func (*ReceiptSellMarket) Descriptor() ([]byte, []int) { func (*ReceiptSellMarket) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{15} return fileDescriptor_trade_05e36a4efd974a28, []int{15}
} }
func (m *ReceiptSellMarket) XXX_Unmarshal(b []byte) error { func (m *ReceiptSellMarket) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptSellMarket.Unmarshal(m, b) return xxx_messageInfo_ReceiptSellMarket.Unmarshal(m, b)
...@@ -1440,7 +1538,7 @@ func (m *ReceiptTradeSellRevoke) Reset() { *m = ReceiptTradeSellRevoke{} ...@@ -1440,7 +1538,7 @@ func (m *ReceiptTradeSellRevoke) Reset() { *m = ReceiptTradeSellRevoke{}
func (m *ReceiptTradeSellRevoke) String() string { return proto.CompactTextString(m) } func (m *ReceiptTradeSellRevoke) String() string { return proto.CompactTextString(m) }
func (*ReceiptTradeSellRevoke) ProtoMessage() {} func (*ReceiptTradeSellRevoke) ProtoMessage() {}
func (*ReceiptTradeSellRevoke) Descriptor() ([]byte, []int) { func (*ReceiptTradeSellRevoke) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{16} return fileDescriptor_trade_05e36a4efd974a28, []int{16}
} }
func (m *ReceiptTradeSellRevoke) XXX_Unmarshal(b []byte) error { func (m *ReceiptTradeSellRevoke) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReceiptTradeSellRevoke.Unmarshal(m, b) return xxx_messageInfo_ReceiptTradeSellRevoke.Unmarshal(m, b)
...@@ -1484,7 +1582,7 @@ func (m *ReqAddrAssets) Reset() { *m = ReqAddrAssets{} } ...@@ -1484,7 +1582,7 @@ func (m *ReqAddrAssets) Reset() { *m = ReqAddrAssets{} }
func (m *ReqAddrAssets) String() string { return proto.CompactTextString(m) } func (m *ReqAddrAssets) String() string { return proto.CompactTextString(m) }
func (*ReqAddrAssets) ProtoMessage() {} func (*ReqAddrAssets) ProtoMessage() {}
func (*ReqAddrAssets) Descriptor() ([]byte, []int) { func (*ReqAddrAssets) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{17} return fileDescriptor_trade_05e36a4efd974a28, []int{17}
} }
func (m *ReqAddrAssets) XXX_Unmarshal(b []byte) error { func (m *ReqAddrAssets) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqAddrAssets.Unmarshal(m, b) return xxx_messageInfo_ReqAddrAssets.Unmarshal(m, b)
...@@ -1566,7 +1664,7 @@ func (m *ReqTokenSellOrder) Reset() { *m = ReqTokenSellOrder{} } ...@@ -1566,7 +1664,7 @@ func (m *ReqTokenSellOrder) Reset() { *m = ReqTokenSellOrder{} }
func (m *ReqTokenSellOrder) String() string { return proto.CompactTextString(m) } func (m *ReqTokenSellOrder) String() string { return proto.CompactTextString(m) }
func (*ReqTokenSellOrder) ProtoMessage() {} func (*ReqTokenSellOrder) ProtoMessage() {}
func (*ReqTokenSellOrder) Descriptor() ([]byte, []int) { func (*ReqTokenSellOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{18} return fileDescriptor_trade_05e36a4efd974a28, []int{18}
} }
func (m *ReqTokenSellOrder) XXX_Unmarshal(b []byte) error { func (m *ReqTokenSellOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqTokenSellOrder.Unmarshal(m, b) return xxx_messageInfo_ReqTokenSellOrder.Unmarshal(m, b)
...@@ -1636,7 +1734,7 @@ func (m *ReqTokenBuyOrder) Reset() { *m = ReqTokenBuyOrder{} } ...@@ -1636,7 +1734,7 @@ func (m *ReqTokenBuyOrder) Reset() { *m = ReqTokenBuyOrder{} }
func (m *ReqTokenBuyOrder) String() string { return proto.CompactTextString(m) } func (m *ReqTokenBuyOrder) String() string { return proto.CompactTextString(m) }
func (*ReqTokenBuyOrder) ProtoMessage() {} func (*ReqTokenBuyOrder) ProtoMessage() {}
func (*ReqTokenBuyOrder) Descriptor() ([]byte, []int) { func (*ReqTokenBuyOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{19} return fileDescriptor_trade_05e36a4efd974a28, []int{19}
} }
func (m *ReqTokenBuyOrder) XXX_Unmarshal(b []byte) error { func (m *ReqTokenBuyOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqTokenBuyOrder.Unmarshal(m, b) return xxx_messageInfo_ReqTokenBuyOrder.Unmarshal(m, b)
...@@ -1715,7 +1813,7 @@ func (m *ReplyBuyOrder) Reset() { *m = ReplyBuyOrder{} } ...@@ -1715,7 +1813,7 @@ func (m *ReplyBuyOrder) Reset() { *m = ReplyBuyOrder{} }
func (m *ReplyBuyOrder) String() string { return proto.CompactTextString(m) } func (m *ReplyBuyOrder) String() string { return proto.CompactTextString(m) }
func (*ReplyBuyOrder) ProtoMessage() {} func (*ReplyBuyOrder) ProtoMessage() {}
func (*ReplyBuyOrder) Descriptor() ([]byte, []int) { func (*ReplyBuyOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{20} return fileDescriptor_trade_05e36a4efd974a28, []int{20}
} }
func (m *ReplyBuyOrder) XXX_Unmarshal(b []byte) error { func (m *ReplyBuyOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyBuyOrder.Unmarshal(m, b) return xxx_messageInfo_ReplyBuyOrder.Unmarshal(m, b)
...@@ -1857,7 +1955,7 @@ func (m *ReplySellOrder) Reset() { *m = ReplySellOrder{} } ...@@ -1857,7 +1955,7 @@ func (m *ReplySellOrder) Reset() { *m = ReplySellOrder{} }
func (m *ReplySellOrder) String() string { return proto.CompactTextString(m) } func (m *ReplySellOrder) String() string { return proto.CompactTextString(m) }
func (*ReplySellOrder) ProtoMessage() {} func (*ReplySellOrder) ProtoMessage() {}
func (*ReplySellOrder) Descriptor() ([]byte, []int) { func (*ReplySellOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{21} return fileDescriptor_trade_05e36a4efd974a28, []int{21}
} }
func (m *ReplySellOrder) XXX_Unmarshal(b []byte) error { func (m *ReplySellOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplySellOrder.Unmarshal(m, b) return xxx_messageInfo_ReplySellOrder.Unmarshal(m, b)
...@@ -1986,7 +2084,7 @@ func (m *ReplySellOrders) Reset() { *m = ReplySellOrders{} } ...@@ -1986,7 +2084,7 @@ func (m *ReplySellOrders) Reset() { *m = ReplySellOrders{} }
func (m *ReplySellOrders) String() string { return proto.CompactTextString(m) } func (m *ReplySellOrders) String() string { return proto.CompactTextString(m) }
func (*ReplySellOrders) ProtoMessage() {} func (*ReplySellOrders) ProtoMessage() {}
func (*ReplySellOrders) Descriptor() ([]byte, []int) { func (*ReplySellOrders) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{22} return fileDescriptor_trade_05e36a4efd974a28, []int{22}
} }
func (m *ReplySellOrders) XXX_Unmarshal(b []byte) error { func (m *ReplySellOrders) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplySellOrders.Unmarshal(m, b) return xxx_messageInfo_ReplySellOrders.Unmarshal(m, b)
...@@ -2024,7 +2122,7 @@ func (m *ReplyBuyOrders) Reset() { *m = ReplyBuyOrders{} } ...@@ -2024,7 +2122,7 @@ func (m *ReplyBuyOrders) Reset() { *m = ReplyBuyOrders{} }
func (m *ReplyBuyOrders) String() string { return proto.CompactTextString(m) } func (m *ReplyBuyOrders) String() string { return proto.CompactTextString(m) }
func (*ReplyBuyOrders) ProtoMessage() {} func (*ReplyBuyOrders) ProtoMessage() {}
func (*ReplyBuyOrders) Descriptor() ([]byte, []int) { func (*ReplyBuyOrders) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{23} return fileDescriptor_trade_05e36a4efd974a28, []int{23}
} }
func (m *ReplyBuyOrders) XXX_Unmarshal(b []byte) error { func (m *ReplyBuyOrders) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyBuyOrders.Unmarshal(m, b) return xxx_messageInfo_ReplyBuyOrders.Unmarshal(m, b)
...@@ -2068,6 +2166,8 @@ type ReplyTradeOrder struct { ...@@ -2068,6 +2166,8 @@ type ReplyTradeOrder struct {
BlockTime int64 `protobuf:"varint,14,opt,name=blockTime,proto3" json:"blockTime,omitempty"` BlockTime int64 `protobuf:"varint,14,opt,name=blockTime,proto3" json:"blockTime,omitempty"`
IsSellOrder bool `protobuf:"varint,15,opt,name=isSellOrder,proto3" json:"isSellOrder,omitempty"` IsSellOrder bool `protobuf:"varint,15,opt,name=isSellOrder,proto3" json:"isSellOrder,omitempty"`
AssetExec string `protobuf:"bytes,16,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,16,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
PriceExec string `protobuf:"bytes,17,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,18,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2077,7 +2177,7 @@ func (m *ReplyTradeOrder) Reset() { *m = ReplyTradeOrder{} } ...@@ -2077,7 +2177,7 @@ func (m *ReplyTradeOrder) Reset() { *m = ReplyTradeOrder{} }
func (m *ReplyTradeOrder) String() string { return proto.CompactTextString(m) } func (m *ReplyTradeOrder) String() string { return proto.CompactTextString(m) }
func (*ReplyTradeOrder) ProtoMessage() {} func (*ReplyTradeOrder) ProtoMessage() {}
func (*ReplyTradeOrder) Descriptor() ([]byte, []int) { func (*ReplyTradeOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{24} return fileDescriptor_trade_05e36a4efd974a28, []int{24}
} }
func (m *ReplyTradeOrder) XXX_Unmarshal(b []byte) error { func (m *ReplyTradeOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyTradeOrder.Unmarshal(m, b) return xxx_messageInfo_ReplyTradeOrder.Unmarshal(m, b)
...@@ -2209,6 +2309,20 @@ func (m *ReplyTradeOrder) GetAssetExec() string { ...@@ -2209,6 +2309,20 @@ func (m *ReplyTradeOrder) GetAssetExec() string {
return "" return ""
} }
func (m *ReplyTradeOrder) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *ReplyTradeOrder) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
type ReplyTradeOrders struct { type ReplyTradeOrders struct {
Orders []*ReplyTradeOrder `protobuf:"bytes,1,rep,name=orders,proto3" json:"orders,omitempty"` Orders []*ReplyTradeOrder `protobuf:"bytes,1,rep,name=orders,proto3" json:"orders,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
...@@ -2220,7 +2334,7 @@ func (m *ReplyTradeOrders) Reset() { *m = ReplyTradeOrders{} } ...@@ -2220,7 +2334,7 @@ func (m *ReplyTradeOrders) Reset() { *m = ReplyTradeOrders{} }
func (m *ReplyTradeOrders) String() string { return proto.CompactTextString(m) } func (m *ReplyTradeOrders) String() string { return proto.CompactTextString(m) }
func (*ReplyTradeOrders) ProtoMessage() {} func (*ReplyTradeOrders) ProtoMessage() {}
func (*ReplyTradeOrders) Descriptor() ([]byte, []int) { func (*ReplyTradeOrders) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{25} return fileDescriptor_trade_05e36a4efd974a28, []int{25}
} }
func (m *ReplyTradeOrders) XXX_Unmarshal(b []byte) error { func (m *ReplyTradeOrders) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReplyTradeOrders.Unmarshal(m, b) return xxx_messageInfo_ReplyTradeOrders.Unmarshal(m, b)
...@@ -2259,7 +2373,7 @@ func (m *ReqSellToken) Reset() { *m = ReqSellToken{} } ...@@ -2259,7 +2373,7 @@ func (m *ReqSellToken) Reset() { *m = ReqSellToken{} }
func (m *ReqSellToken) String() string { return proto.CompactTextString(m) } func (m *ReqSellToken) String() string { return proto.CompactTextString(m) }
func (*ReqSellToken) ProtoMessage() {} func (*ReqSellToken) ProtoMessage() {}
func (*ReqSellToken) Descriptor() ([]byte, []int) { func (*ReqSellToken) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{26} return fileDescriptor_trade_05e36a4efd974a28, []int{26}
} }
func (m *ReqSellToken) XXX_Unmarshal(b []byte) error { func (m *ReqSellToken) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqSellToken.Unmarshal(m, b) return xxx_messageInfo_ReqSellToken.Unmarshal(m, b)
...@@ -2305,7 +2419,7 @@ func (m *ReqRevokeSell) Reset() { *m = ReqRevokeSell{} } ...@@ -2305,7 +2419,7 @@ func (m *ReqRevokeSell) Reset() { *m = ReqRevokeSell{} }
func (m *ReqRevokeSell) String() string { return proto.CompactTextString(m) } func (m *ReqRevokeSell) String() string { return proto.CompactTextString(m) }
func (*ReqRevokeSell) ProtoMessage() {} func (*ReqRevokeSell) ProtoMessage() {}
func (*ReqRevokeSell) Descriptor() ([]byte, []int) { func (*ReqRevokeSell) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{27} return fileDescriptor_trade_05e36a4efd974a28, []int{27}
} }
func (m *ReqRevokeSell) XXX_Unmarshal(b []byte) error { func (m *ReqRevokeSell) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqRevokeSell.Unmarshal(m, b) return xxx_messageInfo_ReqRevokeSell.Unmarshal(m, b)
...@@ -2351,7 +2465,7 @@ func (m *ReqBuyToken) Reset() { *m = ReqBuyToken{} } ...@@ -2351,7 +2465,7 @@ func (m *ReqBuyToken) Reset() { *m = ReqBuyToken{} }
func (m *ReqBuyToken) String() string { return proto.CompactTextString(m) } func (m *ReqBuyToken) String() string { return proto.CompactTextString(m) }
func (*ReqBuyToken) ProtoMessage() {} func (*ReqBuyToken) ProtoMessage() {}
func (*ReqBuyToken) Descriptor() ([]byte, []int) { func (*ReqBuyToken) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{28} return fileDescriptor_trade_05e36a4efd974a28, []int{28}
} }
func (m *ReqBuyToken) XXX_Unmarshal(b []byte) error { func (m *ReqBuyToken) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_ReqBuyToken.Unmarshal(m, b) return xxx_messageInfo_ReqBuyToken.Unmarshal(m, b)
...@@ -2404,6 +2518,8 @@ type LocalOrder struct { ...@@ -2404,6 +2518,8 @@ type LocalOrder struct {
AssetExec string `protobuf:"bytes,16,opt,name=assetExec,proto3" json:"assetExec,omitempty"` AssetExec string `protobuf:"bytes,16,opt,name=assetExec,proto3" json:"assetExec,omitempty"`
TxIndex string `protobuf:"bytes,17,opt,name=txIndex,proto3" json:"txIndex,omitempty"` TxIndex string `protobuf:"bytes,17,opt,name=txIndex,proto3" json:"txIndex,omitempty"`
IsFinished bool `protobuf:"varint,18,opt,name=isFinished,proto3" json:"isFinished,omitempty"` IsFinished bool `protobuf:"varint,18,opt,name=isFinished,proto3" json:"isFinished,omitempty"`
PriceExec string `protobuf:"bytes,19,opt,name=priceExec,proto3" json:"priceExec,omitempty"`
PriceSymbol string `protobuf:"bytes,20,opt,name=priceSymbol,proto3" json:"priceSymbol,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
...@@ -2413,7 +2529,7 @@ func (m *LocalOrder) Reset() { *m = LocalOrder{} } ...@@ -2413,7 +2529,7 @@ func (m *LocalOrder) Reset() { *m = LocalOrder{} }
func (m *LocalOrder) String() string { return proto.CompactTextString(m) } func (m *LocalOrder) String() string { return proto.CompactTextString(m) }
func (*LocalOrder) ProtoMessage() {} func (*LocalOrder) ProtoMessage() {}
func (*LocalOrder) Descriptor() ([]byte, []int) { func (*LocalOrder) Descriptor() ([]byte, []int) {
return fileDescriptor_trade_005c53db9a88f80a, []int{29} return fileDescriptor_trade_05e36a4efd974a28, []int{29}
} }
func (m *LocalOrder) XXX_Unmarshal(b []byte) error { func (m *LocalOrder) XXX_Unmarshal(b []byte) error {
return xxx_messageInfo_LocalOrder.Unmarshal(m, b) return xxx_messageInfo_LocalOrder.Unmarshal(m, b)
...@@ -2559,6 +2675,20 @@ func (m *LocalOrder) GetIsFinished() bool { ...@@ -2559,6 +2675,20 @@ func (m *LocalOrder) GetIsFinished() bool {
return false return false
} }
func (m *LocalOrder) GetPriceExec() string {
if m != nil {
return m.PriceExec
}
return ""
}
func (m *LocalOrder) GetPriceSymbol() string {
if m != nil {
return m.PriceSymbol
}
return ""
}
func init() { func init() {
proto.RegisterType((*Trade)(nil), "types.Trade") proto.RegisterType((*Trade)(nil), "types.Trade")
proto.RegisterType((*TradeForSell)(nil), "types.TradeForSell") proto.RegisterType((*TradeForSell)(nil), "types.TradeForSell")
...@@ -2829,90 +2959,94 @@ var _Trade_serviceDesc = grpc.ServiceDesc{ ...@@ -2829,90 +2959,94 @@ var _Trade_serviceDesc = grpc.ServiceDesc{
Metadata: "trade.proto", Metadata: "trade.proto",
} }
func init() { proto.RegisterFile("trade.proto", fileDescriptor_trade_005c53db9a88f80a) } func init() { proto.RegisterFile("trade.proto", fileDescriptor_trade_05e36a4efd974a28) }
var fileDescriptor_trade_005c53db9a88f80a = []byte{ var fileDescriptor_trade_05e36a4efd974a28 = []byte{
// 1306 bytes of a gzipped FileDescriptorProto // 1371 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x41, 0x6f, 0xe3, 0x44, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xdd, 0x8a, 0xdb, 0xc6,
0x14, 0x6e, 0xe2, 0x38, 0x8d, 0x5f, 0x9a, 0x34, 0x9d, 0xcd, 0x16, 0x6f, 0x85, 0x50, 0x64, 0xad, 0x17, 0x5f, 0x5b, 0x96, 0xd7, 0x3a, 0xfe, 0x58, 0xef, 0xc4, 0xd9, 0xbf, 0xb2, 0xfc, 0x29, 0x46,
0xa0, 0xbb, 0x5a, 0x55, 0xa2, 0xab, 0x95, 0x90, 0x40, 0xa0, 0xa6, 0xa5, 0xa4, 0xd0, 0x15, 0x68, 0x84, 0x36, 0x09, 0x61, 0xa1, 0x09, 0x81, 0x42, 0x4b, 0x4b, 0x9c, 0x34, 0x75, 0xda, 0x84, 0x96,
0x1a, 0x24, 0xae, 0x4e, 0x3c, 0xdb, 0x5a, 0x75, 0xec, 0xd4, 0x1e, 0x6f, 0xe3, 0xbf, 0x02, 0x07, 0x59, 0x17, 0x7a, 0x2b, 0x5b, 0x93, 0xac, 0x58, 0x59, 0xf2, 0x4a, 0xa3, 0xc4, 0x7a, 0x83, 0x42,
0x6e, 0x5c, 0x90, 0x38, 0x21, 0xf1, 0x17, 0x90, 0xf8, 0x3b, 0x7b, 0x59, 0x71, 0x41, 0x33, 0x9e, 0xdf, 0xa0, 0xbd, 0xe8, 0x03, 0xf4, 0x36, 0x50, 0x42, 0xdf, 0xa7, 0x97, 0xbd, 0xea, 0x03, 0x94,
0xd8, 0x63, 0xc7, 0xee, 0x26, 0xd2, 0x1e, 0xba, 0x5d, 0x6e, 0x99, 0x37, 0x6f, 0xbe, 0x79, 0xfe, 0x19, 0x8d, 0xa5, 0xd1, 0x97, 0x3f, 0x20, 0x85, 0x4d, 0xd2, 0x3b, 0xcf, 0x99, 0x33, 0x67, 0x8e,
0xbe, 0xf7, 0x66, 0x9e, 0x1d, 0x68, 0x52, 0xdf, 0xb4, 0xc8, 0xde, 0xd4, 0xf7, 0xa8, 0x87, 0x54, 0xce, 0xef, 0xf7, 0x9b, 0x2f, 0x43, 0x9b, 0xfa, 0xa6, 0x45, 0x4e, 0x16, 0xbe, 0x47, 0x3d, 0xa4,
0x1a, 0x4d, 0x49, 0xb0, 0xb3, 0x45, 0x7d, 0xd3, 0x0d, 0xcc, 0x31, 0xb5, 0x3d, 0x37, 0x9e, 0x31, 0xd2, 0x68, 0x41, 0x82, 0xe3, 0x43, 0xea, 0x9b, 0x6e, 0x60, 0xce, 0xa8, 0xed, 0xb9, 0x71, 0x8f,
0x5e, 0x55, 0x41, 0x1d, 0x32, 0x4f, 0xf4, 0x14, 0xb4, 0x80, 0x38, 0xce, 0xa9, 0x3d, 0xb1, 0xa9, 0xf1, 0x77, 0x1d, 0xd4, 0x09, 0xf3, 0x44, 0x77, 0x41, 0x0b, 0x88, 0xe3, 0x3c, 0xb1, 0xe7, 0x36,
0x5e, 0xe9, 0x55, 0x76, 0x9b, 0xfb, 0xf7, 0xf6, 0xf8, 0xba, 0x3d, 0xee, 0x70, 0xec, 0xf9, 0x67, 0xd5, 0x6b, 0xc3, 0xda, 0x8d, 0xf6, 0x9d, 0x2b, 0x27, 0x7c, 0xdc, 0x09, 0x77, 0x78, 0xe4, 0xf9,
0xc4, 0x71, 0x06, 0x6b, 0x38, 0xf5, 0x43, 0xfb, 0xa0, 0x8d, 0xc2, 0xe8, 0xb9, 0xe9, 0x5f, 0x12, 0xa7, 0xc4, 0x71, 0xc6, 0x7b, 0x38, 0xf5, 0x43, 0x77, 0x40, 0x9b, 0x86, 0xd1, 0x53, 0xd3, 0x3f,
0xaa, 0x57, 0xf9, 0x22, 0x94, 0x5b, 0xd4, 0x0f, 0x23, 0xb6, 0x26, 0x71, 0x43, 0x9f, 0x03, 0xf8, 0x27, 0x54, 0xaf, 0xf3, 0x41, 0x28, 0x37, 0x68, 0x14, 0x46, 0x6c, 0x4c, 0xe2, 0x86, 0x3e, 0x05,
0xe4, 0xa5, 0x77, 0x49, 0x18, 0x9c, 0xae, 0xf0, 0x45, 0x0f, 0x72, 0x8b, 0x70, 0xe2, 0x30, 0x58, 0xf0, 0xc9, 0x0b, 0xef, 0x9c, 0xb0, 0x70, 0xba, 0xc2, 0x07, 0x5d, 0xcb, 0x0d, 0xc2, 0x89, 0xc3,
0xc3, 0x92, 0x3b, 0x7a, 0x06, 0x8d, 0x51, 0x18, 0xc5, 0x41, 0xaa, 0x7c, 0xe9, 0x07, 0x8b, 0xfb, 0x78, 0x0f, 0x4b, 0xee, 0xe8, 0x1e, 0xb4, 0xa6, 0x61, 0x14, 0x27, 0xa9, 0xf2, 0xa1, 0xff, 0x2b,
0xf1, 0xe9, 0xc1, 0x1a, 0x4e, 0x5c, 0xd9, 0x9e, 0x2c, 0x68, 0x11, 0x68, 0xbd, 0x70, 0xcf, 0xb3, 0xce, 0xc7, 0xbb, 0xc7, 0x7b, 0x38, 0x71, 0x65, 0x73, 0xb2, 0xa4, 0x45, 0xa2, 0xcd, 0xd2, 0x39,
0xc4, 0x81, 0xed, 0x99, 0xba, 0xa3, 0xcf, 0x40, 0x8b, 0x23, 0xe8, 0x87, 0x91, 0xbe, 0xce, 0xd7, 0x4f, 0x13, 0x07, 0x36, 0x67, 0xea, 0x8e, 0x3e, 0x01, 0x2d, 0xce, 0x60, 0x14, 0x46, 0xfa, 0x3e,
0xea, 0x85, 0xf1, 0x8a, 0x47, 0x4d, 0x9c, 0x51, 0x1b, 0xaa, 0x34, 0xd2, 0x6b, 0xbd, 0xca, 0xae, 0x1f, 0xab, 0x97, 0xe6, 0x2b, 0x3e, 0x35, 0x71, 0x46, 0x3d, 0xa8, 0xd3, 0x48, 0x6f, 0x0c, 0x6b,
0x8a, 0xab, 0x34, 0xea, 0xaf, 0x83, 0xfa, 0xd2, 0x74, 0x42, 0x62, 0xfc, 0x5d, 0x85, 0x0d, 0x79, 0x37, 0x54, 0x5c, 0xa7, 0xd1, 0x68, 0x1f, 0xd4, 0x17, 0xa6, 0x13, 0x12, 0xe3, 0x47, 0x05, 0x3a,
0x5f, 0xd4, 0x83, 0x26, 0xf5, 0x2e, 0x89, 0x7b, 0x16, 0x4d, 0x46, 0x9e, 0xc3, 0xf9, 0xd7, 0xb0, 0xf2, 0xbc, 0x68, 0x08, 0x6d, 0xea, 0x9d, 0x13, 0xf7, 0x34, 0x9a, 0x4f, 0x3d, 0x87, 0xd7, 0x5f,
0x6c, 0x42, 0x4f, 0x60, 0xcb, 0x9c, 0x78, 0xa1, 0x4b, 0x7f, 0x20, 0x7e, 0xdf, 0x33, 0x7d, 0xcb, 0xc3, 0xb2, 0x09, 0xdd, 0x86, 0x43, 0x73, 0xee, 0x85, 0x2e, 0xfd, 0x8e, 0xf8, 0x23, 0xcf, 0xf4,
0xf1, 0x62, 0xca, 0x15, 0xbc, 0x38, 0xc1, 0xf0, 0x26, 0xb6, 0x9b, 0xf8, 0x29, 0xdc, 0x4f, 0x36, 0x2d, 0xc7, 0x8b, 0x4b, 0xae, 0xe0, 0x62, 0x07, 0x8b, 0x37, 0xb7, 0xdd, 0xc4, 0x4f, 0xe1, 0x7e,
0xa1, 0xc7, 0xd0, 0x99, 0xfa, 0xf6, 0x98, 0xc8, 0x70, 0x35, 0xee, 0xb6, 0x60, 0x47, 0x0f, 0xa1, 0xb2, 0x09, 0xdd, 0x82, 0xfe, 0xc2, 0xb7, 0x67, 0x44, 0x0e, 0xd7, 0xe0, 0x6e, 0x05, 0x3b, 0xba,
0x45, 0x3d, 0x6a, 0x3a, 0x89, 0xa3, 0xca, 0x1d, 0xb3, 0x46, 0xf4, 0x21, 0x68, 0x01, 0x35, 0x7d, 0x0e, 0x5d, 0xea, 0x51, 0xd3, 0x49, 0x1c, 0x55, 0xee, 0x98, 0x35, 0xa2, 0xff, 0x83, 0x16, 0x50,
0x4a, 0xed, 0x09, 0xe1, 0x1c, 0x2b, 0x38, 0x35, 0xa0, 0x1d, 0x68, 0x04, 0xd4, 0x9b, 0xf2, 0xc9, 0xd3, 0xa7, 0xd4, 0x9e, 0x13, 0x5e, 0x63, 0x05, 0xa7, 0x06, 0x74, 0x0c, 0xad, 0x80, 0x7a, 0x0b,
0x75, 0x3e, 0x99, 0x8c, 0xd9, 0xca, 0xb1, 0xef, 0x5d, 0x5b, 0x2f, 0x42, 0xd7, 0xd2, 0x1b, 0xbd, 0xde, 0xb9, 0xcf, 0x3b, 0x93, 0x36, 0x1b, 0x39, 0xf3, 0xbd, 0x97, 0xd6, 0xb3, 0xd0, 0xb5, 0xf4,
0xca, 0x6e, 0x03, 0xa7, 0x06, 0x36, 0x6b, 0x06, 0x01, 0xa1, 0x5f, 0xcf, 0xc8, 0x58, 0xd7, 0x38, 0xd6, 0xb0, 0x76, 0xa3, 0x85, 0x53, 0x03, 0xeb, 0x35, 0x83, 0x80, 0xd0, 0x2f, 0x97, 0x64, 0xa6,
0x33, 0xa9, 0xc1, 0xf8, 0x06, 0x9a, 0x92, 0xf4, 0x68, 0x1b, 0xea, 0x4c, 0xba, 0x93, 0x23, 0xc1, 0x6b, 0xbc, 0x32, 0xa9, 0x81, 0xf5, 0xf2, 0x7c, 0x79, 0x2f, 0xc4, 0xbd, 0x89, 0x81, 0xd5, 0x81,
0xa1, 0x18, 0x31, 0x42, 0x46, 0x22, 0xd0, 0x43, 0x77, 0x4e, 0x9c, 0x6c, 0x32, 0x9e, 0x00, 0x5a, 0x37, 0x44, 0x5d, 0xdb, 0x71, 0x5d, 0x25, 0x93, 0xf1, 0x15, 0xb4, 0x25, 0xea, 0xa0, 0x23, 0x68,
0x4c, 0xbf, 0x32, 0x3c, 0xe3, 0x55, 0x05, 0x3a, 0xf9, 0x94, 0xbb, 0x2b, 0x2a, 0xa6, 0x6c, 0xd7, 0x32, 0xe8, 0x1f, 0x3f, 0x14, 0x18, 0x88, 0x16, 0x0b, 0x34, 0x15, 0x1f, 0xfa, 0xc0, 0x5d, 0x15,
0xf3, 0x6c, 0x9f, 0xa6, 0x24, 0xa5, 0xf5, 0x82, 0xba, 0xa0, 0x8e, 0xc2, 0x28, 0xe1, 0x28, 0x1e, 0x5e, 0x36, 0x19, 0xb7, 0x01, 0x15, 0xe9, 0x5b, 0x15, 0xcf, 0x78, 0x55, 0x87, 0x7e, 0x9e, 0xb2,
0x2c, 0x41, 0xf9, 0x23, 0xd8, 0x5a, 0xa8, 0xa0, 0x62, 0x30, 0xe3, 0x1f, 0x05, 0x34, 0xb6, 0xe3, 0xef, 0x0a, 0x0b, 0x52, 0xb4, 0x9a, 0x6b, 0xd1, 0xda, 0xdf, 0x80, 0x56, 0xab, 0x88, 0xd6, 0x93,
0xf7, 0xbe, 0x45, 0xfc, 0x25, 0x88, 0xd6, 0x61, 0xdd, 0xb4, 0x2c, 0x9f, 0x04, 0x01, 0xdf, 0x58, 0xb4, 0xc8, 0xa9, 0x5e, 0xd1, 0x00, 0xd4, 0x69, 0x18, 0x25, 0x35, 0x8e, 0x1b, 0x5b, 0x40, 0x76,
0xc3, 0xf3, 0x61, 0xb1, 0x04, 0xca, 0x92, 0x12, 0xd4, 0x96, 0x93, 0x40, 0x5d, 0x56, 0x82, 0x7a, 0x13, 0x0e, 0x0b, 0x0a, 0x2e, 0x0f, 0x66, 0xfc, 0xd4, 0x00, 0x8d, 0xcd, 0xf8, 0xad, 0x6f, 0x11,
0x91, 0x04, 0x06, 0x6c, 0x04, 0x9e, 0x63, 0x25, 0x4e, 0x71, 0xb9, 0x64, 0x6c, 0xd9, 0x62, 0x6b, 0x7f, 0x0b, 0xa0, 0x74, 0xd8, 0x37, 0x2d, 0xcb, 0x27, 0x41, 0xc0, 0x27, 0xd6, 0xf0, 0xaa, 0x59,
0xdc, 0x54, 0x6c, 0xda, 0x4d, 0xc5, 0x06, 0xf9, 0x62, 0x4b, 0xf3, 0xbd, 0x99, 0xa9, 0x1f, 0x66, 0x0e, 0xa1, 0xb2, 0x25, 0x84, 0x8d, 0xed, 0x20, 0x54, 0xb7, 0x85, 0xb0, 0x59, 0x06, 0xa1, 0x01,
0xa7, 0x26, 0x0d, 0x03, 0x7d, 0x83, 0x1f, 0x67, 0x62, 0xc4, 0xec, 0x17, 0xc4, 0x3e, 0xbf, 0xa0, 0x9d, 0xc0, 0x73, 0xac, 0xc4, 0x29, 0x96, 0x6b, 0xc6, 0x96, 0x15, 0x7b, 0x6b, 0x9d, 0xd8, 0xb5,
0x7a, 0x8b, 0xef, 0x23, 0x46, 0xd9, 0x34, 0x6a, 0xe7, 0xd3, 0xe8, 0x75, 0x15, 0x5a, 0xf3, 0xaa, 0x75, 0x62, 0x87, 0xbc, 0xd8, 0x53, 0xbd, 0xb4, 0x33, 0xfa, 0x63, 0x76, 0x6a, 0xd2, 0x30, 0xd0,
0x79, 0x1f, 0x14, 0xfd, 0x18, 0xda, 0x23, 0x2f, 0x3c, 0xbf, 0xa0, 0x39, 0x4d, 0x73, 0xd6, 0x34, 0x3b, 0x7c, 0x39, 0x15, 0x2d, 0x66, 0x3f, 0x23, 0xf6, 0xf3, 0x33, 0xaa, 0x77, 0xf9, 0x3c, 0xa2,
0xf7, 0x1b, 0x72, 0x21, 0xa5, 0xdc, 0x6b, 0x25, 0xdc, 0x43, 0x39, 0xf7, 0xcd, 0x3c, 0xf7, 0xbf, 0x95, 0xa5, 0x61, 0x6f, 0x2d, 0x0d, 0x0f, 0x36, 0xd0, 0xb0, 0x5f, 0xa4, 0xe1, 0x6b, 0x05, 0xba,
0x29, 0xd0, 0xc6, 0x64, 0x4c, 0xec, 0x29, 0xed, 0x87, 0x51, 0xdf, 0x0c, 0xc8, 0x12, 0xe4, 0x77, 0x2b, 0xd5, 0xbe, 0x0f, 0x8c, 0xf8, 0x10, 0x7a, 0x53, 0x2f, 0x7c, 0x7e, 0x46, 0x73, 0x9c, 0xc8,
0x41, 0xf5, 0xae, 0x5d, 0xe2, 0x0b, 0xea, 0xe3, 0x41, 0x39, 0xf1, 0xda, 0xdb, 0x25, 0x5e, 0xbb, 0x59, 0x53, 0xed, 0xb4, 0x64, 0x21, 0xa6, 0xd8, 0x69, 0x15, 0xd8, 0x41, 0x35, 0x76, 0xed, 0xb5,
0x15, 0xc4, 0x6b, 0x32, 0xf1, 0xa2, 0x48, 0x20, 0x5f, 0x24, 0x74, 0x36, 0x30, 0x83, 0x8b, 0x79, 0xd8, 0x75, 0x36, 0x60, 0xd7, 0x2d, 0x62, 0xf7, 0xa7, 0x02, 0x3d, 0x4c, 0x66, 0xc4, 0x5e, 0xd0,
0xf1, 0xc4, 0x23, 0x49, 0xa8, 0x8d, 0x72, 0xa1, 0x5a, 0x79, 0xa1, 0xfe, 0x55, 0x60, 0x53, 0x08, 0x51, 0x18, 0x8d, 0xcc, 0x80, 0x6c, 0x01, 0xde, 0x00, 0x54, 0xef, 0xa5, 0x4b, 0x7c, 0x01, 0x5d,
0xc5, 0x4e, 0xbe, 0x3b, 0xae, 0xd4, 0xed, 0x3f, 0xf4, 0x52, 0xfd, 0x93, 0x6c, 0x69, 0xe5, 0xb2, 0xdc, 0xa8, 0x06, 0x4e, 0x7b, 0xb3, 0xc0, 0x69, 0x97, 0x02, 0x38, 0x4d, 0x06, 0x4e, 0x88, 0x14,
0x45, 0xa8, 0xdf, 0x2e, 0x51, 0x7f, 0xb3, 0x5c, 0xfd, 0x4e, 0x5e, 0xfd, 0x3e, 0xdc, 0x17, 0xe2, 0xf2, 0x22, 0xa5, 0xcb, 0xb1, 0x19, 0x9c, 0xad, 0xc4, 0x1b, 0xb7, 0x24, 0xa0, 0x3b, 0xd5, 0x40,
0xf3, 0x2b, 0xb2, 0x9f, 0xf4, 0xcf, 0x8f, 0xa0, 0x36, 0x32, 0x03, 0x22, 0x7a, 0xf4, 0xfb, 0xa2, 0x77, 0xd7, 0x02, 0xdd, 0xdb, 0x00, 0xf4, 0x41, 0x11, 0xe8, 0x3f, 0x1a, 0x70, 0x20, 0x80, 0x66,
0x13, 0xcd, 0x56, 0x34, 0xe6, 0x2e, 0xc6, 0x01, 0x74, 0x73, 0x18, 0x71, 0x9f, 0xb2, 0x02, 0xc4, 0x2b, 0xf7, 0x3b, 0x8e, 0xf4, 0xe5, 0x5f, 0xb4, 0x53, 0xfe, 0x24, 0x6c, 0xeb, 0xe6, 0xd8, 0x26,
0x62, 0x18, 0xf1, 0x4d, 0xbd, 0x0a, 0xc6, 0x61, 0x16, 0xe3, 0x2c, 0x79, 0x7d, 0x78, 0x9c, 0xc1, 0xd8, 0xd3, 0xab, 0x60, 0xcf, 0x41, 0x35, 0x7b, 0xfa, 0x6b, 0xd9, 0x73, 0xb8, 0x81, 0x3d, 0xa8,
0xd8, 0xce, 0x62, 0xcc, 0x73, 0x5e, 0x80, 0x7c, 0x05, 0x5b, 0xd2, 0x84, 0xe0, 0x62, 0x15, 0x80, 0xc8, 0x9e, 0x11, 0x5c, 0x15, 0xe4, 0xe1, 0x47, 0x84, 0x51, 0x72, 0x7f, 0xb9, 0x09, 0x8d, 0xa9,
0x23, 0xd8, 0xce, 0x47, 0x21, 0x1e, 0x65, 0x15, 0x94, 0x5f, 0x2b, 0xd0, 0xc2, 0xe4, 0xea, 0xc0, 0x19, 0x10, 0x71, 0x47, 0xba, 0x2a, 0x6e, 0x02, 0xd9, 0x15, 0x05, 0x73, 0x17, 0xe3, 0x3e, 0x0c,
0xb2, 0xfc, 0x03, 0xa6, 0x55, 0x80, 0x10, 0xd4, 0xd8, 0x45, 0x24, 0x6a, 0x91, 0xff, 0x96, 0x12, 0x72, 0x31, 0xe2, 0x73, 0xde, 0x0e, 0x21, 0x8a, 0x69, 0xc4, 0x27, 0x95, 0x5d, 0x62, 0x3c, 0xc8,
0xa7, 0x9a, 0x39, 0xb1, 0xbb, 0xa0, 0xf2, 0x5a, 0xd5, 0x95, 0x9e, 0xc2, 0x12, 0x87, 0x0f, 0x58, 0xc6, 0x38, 0x4d, 0xae, 0x6f, 0xb7, 0x32, 0x31, 0x8e, 0xb2, 0x31, 0x56, 0x9a, 0x11, 0x41, 0xbe,
0x22, 0x58, 0xb6, 0x4f, 0xf8, 0x7b, 0x99, 0x78, 0x5b, 0x48, 0x0d, 0x6c, 0xcd, 0x98, 0x15, 0x28, 0x80, 0x43, 0xa9, 0x43, 0xd4, 0x62, 0x97, 0x00, 0x0f, 0xe1, 0x28, 0x9f, 0x85, 0xf8, 0x94, 0x5d,
0xaf, 0x2f, 0x15, 0xc7, 0x03, 0x76, 0x1b, 0xbe, 0xf0, 0xbd, 0xc9, 0x77, 0x24, 0x12, 0x4d, 0xda, 0xa2, 0xfc, 0x5a, 0x83, 0x2e, 0x26, 0x17, 0xf7, 0x2d, 0xcb, 0xbf, 0xcf, 0xb0, 0x0e, 0x10, 0x82,
0x7c, 0x68, 0xfc, 0x52, 0x61, 0x4c, 0x5d, 0x0d, 0xf9, 0x99, 0xb0, 0x5a, 0xc7, 0x34, 0x47, 0xac, 0x06, 0xdb, 0x48, 0x85, 0x96, 0xf9, 0x6f, 0x89, 0x78, 0xf5, 0xcc, 0x8e, 0x33, 0x00, 0x95, 0x6b,
0x66, 0x10, 0xd3, 0x08, 0x14, 0x39, 0x82, 0x9b, 0xa3, 0x4e, 0x19, 0x50, 0x65, 0x06, 0x8c, 0x9f, 0x5d, 0x57, 0x86, 0x0a, 0x23, 0x1e, 0x6f, 0x30, 0xaa, 0x58, 0xb6, 0x4f, 0xf8, 0xbd, 0x58, 0xdc,
0x2b, 0xd0, 0x99, 0x47, 0xd7, 0x0f, 0xa3, 0xdb, 0x15, 0xdc, 0x5f, 0x0a, 0x13, 0x77, 0xea, 0x44, 0xd6, 0x52, 0x03, 0x1b, 0x33, 0x63, 0x02, 0xe7, 0xfa, 0x54, 0x71, 0xdc, 0x60, 0xbb, 0xf9, 0x33,
0x2b, 0x44, 0xb6, 0xe2, 0x79, 0x7b, 0xf7, 0x5b, 0x92, 0xb7, 0x72, 0x33, 0x76, 0x40, 0xb9, 0x24, 0xdf, 0x9b, 0x7f, 0x43, 0x22, 0x71, 0xc8, 0x5d, 0x35, 0x8d, 0x5f, 0x6a, 0xac, 0x52, 0x17, 0x13,
0x91, 0x38, 0x5f, 0xd9, 0xcf, 0x37, 0x34, 0x94, 0x7f, 0xf2, 0xa6, 0x66, 0xea, 0x44, 0xab, 0x64, 0xbe, 0xa6, 0xec, 0x76, 0x62, 0x5c, 0x45, 0xac, 0x67, 0x22, 0xa6, 0x19, 0x28, 0x72, 0x06, 0xeb,
0xfc, 0xbb, 0x2a, 0xdd, 0x32, 0x57, 0xe5, 0xbb, 0x21, 0xdb, 0x80, 0x75, 0x38, 0xb2, 0x6a, 0x01, 0xb3, 0x4e, 0x2b, 0xa0, 0xca, 0x15, 0x30, 0x7e, 0xae, 0x41, 0x7f, 0x95, 0xdd, 0x28, 0x8c, 0x2e,
0x7a, 0x16, 0x7f, 0xaa, 0x89, 0x47, 0x7a, 0xa5, 0xa7, 0x64, 0x6e, 0x17, 0xd9, 0x17, 0x4b, 0x8e, 0x57, 0x72, 0xbf, 0x2b, 0x0c, 0xdc, 0x85, 0x13, 0xed, 0x90, 0xd9, 0x8e, 0xeb, 0xf5, 0xbb, 0x7f,
0xc6, 0x91, 0xd0, 0x7f, 0x5e, 0xb9, 0x81, 0xf8, 0x36, 0x95, 0xc1, 0xe9, 0xca, 0x38, 0x73, 0x4f, 0xa4, 0x7a, 0x23, 0x3b, 0x73, 0x1f, 0x94, 0x73, 0x12, 0x89, 0xf5, 0x99, 0xfd, 0x5c, 0x7f, 0xa0,
0x9c, 0xba, 0x19, 0xaf, 0x15, 0x11, 0x10, 0xbf, 0x22, 0xde, 0x83, 0x23, 0x80, 0x7f, 0x25, 0xcc, 0x36, 0x5e, 0xf1, 0x43, 0xd5, 0xc2, 0x89, 0x76, 0x61, 0xfc, 0xdb, 0x0a, 0xdd, 0x36, 0x5b, 0xed,
0x67, 0x52, 0xce, 0x7a, 0x9b, 0x72, 0x69, 0xe4, 0x78, 0xe3, 0xcb, 0x21, 0xeb, 0xf0, 0xda, 0x71, 0xdb, 0x01, 0xdb, 0x98, 0x9d, 0x90, 0x64, 0xd4, 0x02, 0x74, 0x2f, 0x7e, 0x2a, 0x8b, 0x5b, 0x7a,
0xfb, 0x97, 0x18, 0x18, 0x83, 0x76, 0x90, 0x24, 0x07, 0xef, 0xb5, 0x1a, 0x58, 0x36, 0xbd, 0xb1, 0x6d, 0xa8, 0x64, 0x76, 0x17, 0xd9, 0x17, 0x4b, 0x8e, 0xc6, 0x43, 0x81, 0xff, 0x4a, 0xb9, 0x81,
0xe1, 0xea, 0xe4, 0xa4, 0x0f, 0xd0, 0x1e, 0xd4, 0x3d, 0x39, 0x81, 0xb6, 0xe5, 0x04, 0x4a, 0x1d, 0x78, 0x1b, 0xcc, 0xc4, 0x19, 0xc8, 0x71, 0x56, 0x9e, 0x38, 0x75, 0x33, 0x5e, 0x37, 0x44, 0x42,
0xb1, 0xf0, 0x32, 0x9e, 0xc3, 0x06, 0x26, 0x57, 0x6c, 0x47, 0x7e, 0xc1, 0xa1, 0x4f, 0xa0, 0xc6, 0x7c, 0x8b, 0x78, 0x0f, 0x96, 0x00, 0xfe, 0x4a, 0x9b, 0x67, 0x52, 0xce, 0x7a, 0x99, 0xb8, 0x34,
0x9e, 0xfe, 0x86, 0xef, 0xa9, 0x98, 0x3b, 0x14, 0xa7, 0x90, 0xf1, 0x13, 0xef, 0x35, 0xa4, 0xaf, 0x75, 0xbc, 0xd9, 0xf9, 0x84, 0x9d, 0x10, 0x7b, 0xf1, 0xf1, 0x31, 0x31, 0xb0, 0x0a, 0xda, 0x41,
0x51, 0x9f, 0x42, 0x3d, 0xfe, 0xba, 0x28, 0x10, 0xcb, 0xbf, 0x9b, 0x62, 0xe1, 0x58, 0x82, 0x7c, 0x42, 0x0e, 0x7e, 0x56, 0x6b, 0x61, 0xd9, 0xf4, 0xaf, 0x1f, 0xd8, 0xfa, 0x39, 0xea, 0x04, 0xe8,
0x02, 0x4d, 0x4c, 0xae, 0xfa, 0x61, 0x14, 0xc7, 0xf9, 0x10, 0x94, 0x51, 0x18, 0x09, 0xd0, 0x82, 0x04, 0x9a, 0x9e, 0x4c, 0xc0, 0x23, 0x99, 0x80, 0xa9, 0x23, 0x16, 0x5e, 0xc6, 0x53, 0xe8, 0x60,
0x2f, 0xb8, 0x98, 0x4d, 0x8b, 0x3c, 0x48, 0xa1, 0xf8, 0xc0, 0xf8, 0xa3, 0x06, 0x70, 0xea, 0x8d, 0x72, 0xc1, 0x32, 0xe6, 0x1b, 0x24, 0xfa, 0x08, 0x1a, 0xac, 0x7a, 0x6b, 0xde, 0xc3, 0x31, 0x77,
0xcd, 0xf4, 0xd8, 0xe5, 0x9c, 0x66, 0xcb, 0x45, 0x32, 0xfd, 0x5f, 0x2e, 0x2b, 0x97, 0x8b, 0x72, 0x28, 0xa7, 0xa0, 0xf1, 0x03, 0x3f, 0xab, 0x48, 0xaf, 0x81, 0x1f, 0x43, 0x33, 0x7e, 0x1d, 0x16,
0xfb, 0xca, 0x85, 0x75, 0x64, 0x74, 0x76, 0xe2, 0x5a, 0x64, 0xa6, 0x6f, 0xc5, 0x1d, 0x99, 0x18, 0x11, 0xab, 0xdf, 0xbd, 0xb1, 0x70, 0xac, 0x88, 0xfc, 0x18, 0xda, 0x98, 0x5c, 0x8c, 0xc2, 0x28,
0xa2, 0x8f, 0x00, 0xec, 0xe0, 0xd8, 0x76, 0xed, 0xe0, 0x82, 0x58, 0x3a, 0xe2, 0xc0, 0x92, 0x65, 0xce, 0xf3, 0x3a, 0x28, 0xd3, 0x30, 0x12, 0x41, 0x4b, 0x5e, 0xe0, 0x31, 0xeb, 0x16, 0x3c, 0x4a,
0xff, 0x77, 0x05, 0x54, 0x4e, 0x19, 0xfa, 0x12, 0xba, 0x87, 0x3e, 0x31, 0x29, 0xc1, 0xe6, 0x75, 0x43, 0xf1, 0x86, 0xf1, 0x57, 0x03, 0xe0, 0x89, 0x37, 0x33, 0xd3, 0x65, 0x9b, 0x63, 0x92, 0x95,
0xd2, 0x94, 0x0f, 0x67, 0xa8, 0xa8, 0x50, 0x76, 0x36, 0x85, 0xf1, 0x47, 0x37, 0xb0, 0xcf, 0xdd, 0x9b, 0x64, 0xfa, 0x4f, 0x6e, 0x3b, 0xcb, 0x4d, 0xb9, 0x84, 0x72, 0xd3, 0x61, 0x9f, 0x2e, 0x1f,
0xe1, 0xcc, 0x58, 0x43, 0x5f, 0xc0, 0xbd, 0xec, 0x7a, 0x96, 0xd0, 0x33, 0x54, 0x90, 0xc0, 0x45, 0xbb, 0x16, 0x59, 0x0a, 0xb1, 0xad, 0x9a, 0xe8, 0x03, 0x00, 0x3b, 0x78, 0x64, 0xbb, 0x76, 0x70,
0xab, 0x8f, 0x61, 0x3b, 0xbb, 0x3a, 0xae, 0x9e, 0xe1, 0x0c, 0x95, 0x97, 0x55, 0x31, 0x8e, 0xbe, 0x46, 0x2c, 0xae, 0xb4, 0x16, 0x96, 0x2c, 0x59, 0xa1, 0x5e, 0xd9, 0x20, 0xd4, 0x41, 0x41, 0xa8,
0x10, 0x05, 0x7f, 0xbf, 0x19, 0xce, 0x50, 0xd9, 0xbf, 0x13, 0x45, 0x38, 0xdf, 0xc2, 0xce, 0x22, 0x77, 0x7e, 0x53, 0x40, 0xe5, 0x25, 0x47, 0x9f, 0xc3, 0xe0, 0x81, 0x4f, 0x4c, 0x4a, 0xb0, 0xf9,
0x1b, 0xf1, 0x8b, 0x4e, 0x41, 0x4c, 0xe9, 0x64, 0x11, 0xd6, 0x00, 0x1e, 0x14, 0x3d, 0x5b, 0xcc, 0x32, 0xb9, 0x14, 0x4c, 0x96, 0xa8, 0x4c, 0x68, 0xc7, 0x07, 0xc2, 0xf8, 0xbd, 0x1b, 0xd8, 0xcf,
0x4f, 0xe9, 0xbf, 0x17, 0x05, 0x48, 0xa3, 0x3a, 0xff, 0xa3, 0xe8, 0xe9, 0x7f, 0x01, 0x00, 0x00, 0xdd, 0xc9, 0xd2, 0xd8, 0x43, 0x9f, 0xc1, 0x95, 0xec, 0x78, 0x26, 0x88, 0x25, 0x2a, 0x11, 0x40,
0xff, 0xff, 0xe7, 0xe7, 0x49, 0x74, 0x51, 0x1a, 0x00, 0x00, 0xd9, 0xe8, 0x47, 0x70, 0x94, 0x1d, 0x1d, 0xab, 0x6f, 0xb2, 0x44, 0xd5, 0xb2, 0x2c, 0x8f, 0xa3,
0x17, 0xb2, 0xe0, 0xf7, 0xab, 0xc9, 0x12, 0x55, 0xfd, 0x3b, 0x55, 0x16, 0xe7, 0x6b, 0x38, 0x2e,
0x56, 0x23, 0xbe, 0x68, 0x95, 0xe4, 0x94, 0x76, 0x96, 0xc5, 0x1a, 0xc3, 0xb5, 0xb2, 0x6f, 0x8b,
0xeb, 0x53, 0xf9, 0xef, 0x55, 0x49, 0xa4, 0x69, 0x93, 0xff, 0x51, 0x78, 0xf7, 0x9f, 0x00, 0x00,
0x00, 0xff, 0xff, 0xe0, 0xb9, 0xad, 0xb0, 0x51, 0x1c, 0x00, 0x00,
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment