Commit 4ce5f73b authored by gitlab's avatar gitlab

auto ci

parent 5837bf24
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
package main package main
import ( import (
_ "gitlab.33.cn/chain33/plugin/plugin"
_ "gitlab.33.cn/chain33/chain33/system" _ "gitlab.33.cn/chain33/chain33/system"
"gitlab.33.cn/chain33/chain33/util/cli" "gitlab.33.cn/chain33/chain33/util/cli"
_ "gitlab.33.cn/chain33/plugin/plugin"
) )
func main() { func main() {
......
...@@ -74,14 +74,10 @@ message BlackwhiteShow { ...@@ -74,14 +74,10 @@ message BlackwhiteShow {
string secret = 2; string secret = 2;
} }
message BlackwhiteTimeoutDone { message BlackwhiteTimeoutDone { string gameID = 1; }
string gameID = 1;
}
// logs // logs
message ReceiptBlackwhite { message ReceiptBlackwhite { BlackwhiteRound round = 1; }
BlackwhiteRound round = 1;
}
message ReceiptBlackwhiteStatus { message ReceiptBlackwhiteStatus {
string gameID = 1; string gameID = 1;
...@@ -92,13 +88,9 @@ message ReceiptBlackwhiteStatus { ...@@ -92,13 +88,9 @@ message ReceiptBlackwhiteStatus {
int64 index = 5; int64 index = 5;
} }
message ReqBlackwhiteRoundInfo { message ReqBlackwhiteRoundInfo { string gameID = 1; }
string gameID = 1;
}
message ReplyBlackwhiteRoundInfo { message ReplyBlackwhiteRoundInfo { BlackwhiteRoundResult round = 1; }
BlackwhiteRoundResult round = 1;
}
message ReqBlackwhiteRoundList { message ReqBlackwhiteRoundList {
//优先根据status查询,status不可为空 //优先根据status查询,status不可为空
...@@ -110,9 +102,7 @@ message ReqBlackwhiteRoundList { ...@@ -110,9 +102,7 @@ message ReqBlackwhiteRoundList {
int64 index = 5; int64 index = 5;
} }
message ReplyBlackwhiteRoundList { message ReplyBlackwhiteRoundList { repeated BlackwhiteRoundResult round = 1; }
repeated BlackwhiteRoundResult round = 1;
}
message ReqLoopResult { message ReqLoopResult {
string gameID = 1; string gameID = 1;
......
...@@ -89,9 +89,7 @@ message ReceiptEVMContractCmd { ...@@ -89,9 +89,7 @@ message ReceiptEVMContractCmd {
string ret = 5; string ret = 5;
} }
message CheckEVMAddrReq { message CheckEVMAddrReq { string addr = 1; }
string addr = 1;
}
message CheckEVMAddrResp { message CheckEVMAddrResp {
bool contract = 1; bool contract = 1;
string contractAddr = 2; string contractAddr = 2;
...@@ -105,15 +103,11 @@ message EstimateEVMGasReq { ...@@ -105,15 +103,11 @@ message EstimateEVMGasReq {
string caller = 3; string caller = 3;
uint64 amount = 4; uint64 amount = 4;
} }
message EstimateEVMGasResp { message EstimateEVMGasResp { uint64 gas = 1; }
uint64 gas = 1;
}
message EvmDebugReq { message EvmDebugReq {
// 0 query, 1 set, -1 clear // 0 query, 1 set, -1 clear
int32 optype = 1; int32 optype = 1;
} }
message EvmDebugResp { message EvmDebugResp { string debugStatus = 1; }
string debugStatus = 1; \ No newline at end of file
}
\ No newline at end of file
...@@ -25,7 +25,8 @@ message Game { ...@@ -25,7 +25,8 @@ message Game {
bytes hashValue = 10; bytes hashValue = 10;
//用来公布庄家出拳结果的私钥 //用来公布庄家出拳结果的私钥
string secret = 11; string secret = 11;
// 1 平局,2 庄家获胜,3 matcher获胜,4 庄家开奖超时,matcher获胜,并获得本局所有赌资 // 1 平局,2 庄家获胜,3 matcher获胜,4
// 庄家开奖超时,matcher获胜,并获得本局所有赌资
int32 result = 12; int32 result = 12;
// matcher 出拳结果 // matcher 出拳结果
int32 matcherGuess = 13; int32 matcherGuess = 13;
...@@ -58,9 +59,7 @@ message GameMatch { ...@@ -58,9 +59,7 @@ message GameMatch {
int32 guess = 2; int32 guess = 2;
} }
message GameCancel { message GameCancel { string gameId = 1; }
string gameId = 1;
}
message GameClose { message GameClose {
string gameId = 1; string gameId = 1;
...@@ -101,25 +100,15 @@ message GameRecord { ...@@ -101,25 +100,15 @@ message GameRecord {
int64 index = 2; int64 index = 2;
} }
message QueryGameInfo { message QueryGameInfo { string gameId = 1; }
string gameId = 1;
}
message QueryGameInfos { message QueryGameInfos { repeated string gameIds = 1; }
repeated string gameIds = 1;
}
message ReplyGameList { message ReplyGameList { repeated Game games = 1; }
repeated Game games = 1;
}
message ReplyGameListCount { message ReplyGameListCount { int64 count = 1; }
int64 count = 1;
}
message ReplyGame { message ReplyGame { Game game = 1; }
Game game = 1;
}
message ReceiptGame { message ReceiptGame {
string gameId = 1; string gameId = 1;
......
...@@ -35,9 +35,7 @@ message Lottery { ...@@ -35,9 +35,7 @@ message Lottery {
repeated MissingRecord missingRecords = 17; repeated MissingRecord missingRecords = 17;
} }
message MissingRecord { message MissingRecord { repeated int32 times = 1; }
repeated int32 times = 1;
}
message LotteryAction { message LotteryAction {
oneof value { oneof value {
...@@ -61,13 +59,9 @@ message LotteryBuy { ...@@ -61,13 +59,9 @@ message LotteryBuy {
int64 way = 4; int64 way = 4;
} }
message LotteryDraw { message LotteryDraw { string lotteryId = 1; }
string lotteryId = 1;
}
message LotteryClose { message LotteryClose { string lotteryId = 1; }
string lotteryId = 1;
}
message ReceiptLottery { message ReceiptLottery {
string lotteryId = 1; string lotteryId = 1;
...@@ -85,9 +79,7 @@ message ReceiptLottery { ...@@ -85,9 +79,7 @@ message ReceiptLottery {
int64 index = 13; int64 index = 13;
} }
message ReqLotteryInfo { message ReqLotteryInfo { string lotteryId = 1; }
string lotteryId = 1;
}
message ReqLotteryBuyInfo { message ReqLotteryBuyInfo {
string lotteryId = 1; string lotteryId = 1;
...@@ -138,13 +130,9 @@ message ReplyLotteryCurrentInfo { ...@@ -138,13 +130,9 @@ message ReplyLotteryCurrentInfo {
repeated MissingRecord missingRecords = 12; repeated MissingRecord missingRecords = 12;
} }
message ReplyLotteryHistoryLuckyNumber { message ReplyLotteryHistoryLuckyNumber { repeated int64 luckyNumber = 1; }
repeated int64 luckyNumber = 1;
}
message ReplyLotteryShowInfo { message ReplyLotteryShowInfo { repeated LotteryBuyRecord records = 1; }
repeated LotteryBuyRecord records = 1;
}
message LotteryNumberRecord { message LotteryNumberRecord {
int64 number = 1; int64 number = 1;
...@@ -163,9 +151,7 @@ message LotteryBuyRecord { ...@@ -163,9 +151,7 @@ message LotteryBuyRecord {
string txHash = 8; string txHash = 8;
} }
message LotteryBuyRecords { message LotteryBuyRecords { repeated LotteryBuyRecord records = 1; }
repeated LotteryBuyRecord records = 1;
}
message LotteryDrawRecord { message LotteryDrawRecord {
int64 number = 1; int64 number = 1;
...@@ -174,23 +160,15 @@ message LotteryDrawRecord { ...@@ -174,23 +160,15 @@ message LotteryDrawRecord {
string txHash = 4; string txHash = 4;
} }
message LotteryDrawRecords { message LotteryDrawRecords { repeated LotteryDrawRecord records = 1; }
repeated LotteryDrawRecord records = 1;
}
message LotteryUpdateRec { message LotteryUpdateRec {
int64 index = 1; int64 index = 1;
int64 type = 2; int64 type = 2;
} }
message LotteryUpdateRecs { message LotteryUpdateRecs { repeated LotteryUpdateRec records = 1; }
repeated LotteryUpdateRec records = 1;
}
message LotteryUpdateBuyInfo { message LotteryUpdateBuyInfo { map<string, LotteryUpdateRecs> buyInfo = 1; }
map<string, LotteryUpdateRecs> buyInfo = 1;
}
message ReplyLotteryPurchaseAddr { message ReplyLotteryPurchaseAddr { repeated string address = 1; }
repeated string address = 1;
}
...@@ -9,9 +9,7 @@ message Norm { ...@@ -9,9 +9,7 @@ message Norm {
} }
message NormAction { message NormAction {
oneof value { oneof value { NormPut nput = 1; }
NormPut nput = 1;
}
int32 ty = 5; int32 ty = 5;
} }
...@@ -20,6 +18,4 @@ message NormPut { ...@@ -20,6 +18,4 @@ message NormPut {
bytes value = 2; bytes value = 2;
} }
message NormGetKey { message NormGetKey { string key = 1; }
string key = 1; \ No newline at end of file
}
\ No newline at end of file
...@@ -42,13 +42,9 @@ message ParacrossNodeStatus { ...@@ -42,13 +42,9 @@ message ParacrossNodeStatus {
repeated bytes crossTxHashs = 13; repeated bytes crossTxHashs = 13;
} }
message ParacrossCommitAction { message ParacrossCommitAction { ParacrossNodeStatus status = 1; }
ParacrossNodeStatus status = 1;
}
message ParacrossMinerAction { message ParacrossMinerAction { ParacrossNodeStatus status = 1; }
ParacrossNodeStatus status = 1;
}
message ParacrossAction { message ParacrossAction {
oneof value { oneof value {
...@@ -71,9 +67,7 @@ message ReceiptParacrossCommit { ...@@ -71,9 +67,7 @@ message ReceiptParacrossCommit {
ParacrossHeightStatus current = 4; ParacrossHeightStatus current = 4;
} }
message ReceiptParacrossMiner { message ReceiptParacrossMiner { ParacrossNodeStatus status = 1; }
ParacrossNodeStatus status = 1;
}
message ReceiptParacrossDone { message ReceiptParacrossDone {
int32 totalNodes = 1; int32 totalNodes = 1;
...@@ -93,9 +87,7 @@ message ReceiptParacrossRecord { ...@@ -93,9 +87,7 @@ message ReceiptParacrossRecord {
// LocalDB // LocalDB
// title-height-addr : txHash // title-height-addr : txHash
message ParacrossTx { message ParacrossTx { string txHash = 1; }
string txHash = 1;
}
// query // query
message ReqParacrossTitleHeight { message ReqParacrossTitleHeight {
...@@ -103,9 +95,7 @@ message ReqParacrossTitleHeight { ...@@ -103,9 +95,7 @@ message ReqParacrossTitleHeight {
int64 height = 2; int64 height = 2;
} }
message RespParacrossTitles { message RespParacrossTitles { repeated ReceiptParacrossDone titles = 1; }
repeated ReceiptParacrossDone titles = 1;
}
// 跨链转账相关 // 跨链转账相关
message ParacrossAsset { message ParacrossAsset {
......
...@@ -74,19 +74,13 @@ message PBGameStart { ...@@ -74,19 +74,13 @@ message PBGameStart {
} }
//游戏继续 //游戏继续
message PBGameContinue { message PBGameContinue { string gameId = 1; }
string gameId = 1;
}
//游戏结束 //游戏结束
message PBGameQuit { message PBGameQuit { string gameId = 1; }
string gameId = 1;
}
//查询游戏结果 //查询游戏结果
message PBGameQuery { message PBGameQuery { string gameId = 1; }
string gameId = 1;
}
//根据状态和游戏人数查找 //根据状态和游戏人数查找
message QueryPBGameListByStatusAndPlayerNum { message QueryPBGameListByStatusAndPlayerNum {
...@@ -107,9 +101,7 @@ message PBGameIndexRecord { ...@@ -107,9 +101,7 @@ message PBGameIndexRecord {
int64 index = 2; int64 index = 2;
} }
message PBGameRecords { message PBGameRecords { repeated PBGameRecord records = 1; }
repeated PBGameRecord records = 1;
}
message QueryPBGameInfo { message QueryPBGameInfo {
string gameId = 1; string gameId = 1;
...@@ -118,17 +110,11 @@ message QueryPBGameInfo { ...@@ -118,17 +110,11 @@ message QueryPBGameInfo {
int64 index = 4; int64 index = 4;
} }
message ReplyPBGame { message ReplyPBGame { PokerBull game = 1; }
PokerBull game = 1;
}
message QueryPBGameInfos { message QueryPBGameInfos { repeated string gameIds = 1; }
repeated string gameIds = 1;
}
message ReplyPBGameList { message ReplyPBGameList { repeated PokerBull games = 1; }
repeated PokerBull games = 1;
}
message ReceiptPBGame { message ReceiptPBGame {
string gameId = 1; string gameId = 1;
......
...@@ -7,7 +7,8 @@ import "transaction.proto"; ...@@ -7,7 +7,8 @@ import "transaction.proto";
import "wallet.proto"; import "wallet.proto";
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// message for Privacy start///////////////////////////////////////////////////// // message for Privacy
// start/////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
message PrivacyAction { message PrivacyAction {
oneof value { oneof value {
...@@ -55,9 +56,7 @@ message KeyInput { ...@@ -55,9 +56,7 @@ message KeyInput {
bytes keyImage = 3; bytes keyImage = 3;
} }
message PrivacyInput { message PrivacyInput { repeated KeyInput keyinput = 1; }
repeated KeyInput keyinput = 1;
}
// privacy output // privacy output
message keyOutput { message keyOutput {
...@@ -89,9 +88,7 @@ message ReqUTXOPubKeys { ...@@ -89,9 +88,7 @@ message ReqUTXOPubKeys {
} }
// 一个公钥信息 // 一个公钥信息
message PublicKeyData { message PublicKeyData { repeated bytes data = 1; }
repeated bytes data = 1;
}
message GroupUTXOPubKey { message GroupUTXOPubKey {
int64 amount = 1; int64 amount = 1;
...@@ -99,9 +96,7 @@ message GroupUTXOPubKey { ...@@ -99,9 +96,7 @@ message GroupUTXOPubKey {
repeated bytes pubkey = 2; repeated bytes pubkey = 2;
} }
message ResUTXOPubKeys { message ResUTXOPubKeys { repeated GroupUTXOPubKey groupUTXOPubKeys = 1; }
repeated GroupUTXOPubKey groupUTXOPubKeys = 1;
}
message ReqPrivacyToken { message ReqPrivacyToken {
string token = 1; string token = 1;
...@@ -113,26 +108,18 @@ message AmountDetail { ...@@ -113,26 +108,18 @@ message AmountDetail {
int64 count = 2; int64 count = 2;
} }
message ReplyPrivacyAmounts { message ReplyPrivacyAmounts { repeated AmountDetail amountDetail = 1; }
repeated AmountDetail amountDetail = 1;
}
message replyUTXOsOfAmount { message replyUTXOsOfAmount { repeated LocalUTXOItem localUTXOItems = 1; }
repeated LocalUTXOItem localUTXOItems = 1;
}
message ReceiptPrivacyOutput { message ReceiptPrivacyOutput {
string token = 1; string token = 1;
repeated keyOutput keyoutput = 2; repeated keyOutput keyoutput = 2;
} }
//各种amount额度的UTXO在链上的数量 //各种amount额度的UTXO在链上的数量
message AmountsOfUTXO { message AmountsOfUTXO { map<int64, int64> amountMap = 1; }
map<int64, int64> amountMap = 1;
}
message TokenNamesOfUTXO { message TokenNamesOfUTXO { map<string, string> tokensMap = 1; }
map<string, string> tokensMap = 1;
}
// 用以转换成json后继续可见的结构 // 用以转换成json后继续可见的结构
message UTXOGlobalIndex4Print { message UTXOGlobalIndex4Print {
...@@ -151,9 +138,7 @@ message keyOutput4Print { ...@@ -151,9 +138,7 @@ message keyOutput4Print {
string onetimepubkey = 2; string onetimepubkey = 2;
} }
message PrivacyInput4Print { message PrivacyInput4Print { repeated KeyInput4Print keyinput = 1; }
repeated KeyInput4Print keyinput = 1;
}
message PrivacyOutput4Print { message PrivacyOutput4Print {
string RpubKeytx = 1; string RpubKeytx = 1;
...@@ -287,13 +272,9 @@ message UTXOHaveTxHash { ...@@ -287,13 +272,9 @@ message UTXOHaveTxHash {
UTXOBasic utxoBasic = 3; UTXOBasic utxoBasic = 3;
} }
message UTXOs { message UTXOs { repeated UTXO utxos = 1; }
repeated UTXO utxos = 1;
}
message UTXOHaveTxHashs { message UTXOHaveTxHashs { repeated UTXOHaveTxHash utxoHaveTxHashs = 1; }
repeated UTXOHaveTxHash utxoHaveTxHashs = 1;
}
message ReqUTXOGlobalIndex { message ReqUTXOGlobalIndex {
string tokenname = 1; string tokenname = 1;
...@@ -331,9 +312,7 @@ message RealKeyInput { ...@@ -331,9 +312,7 @@ message RealKeyInput {
bytes onetimeprivkey = 2; bytes onetimeprivkey = 2;
} }
message UTXOBasics { message UTXOBasics { repeated UTXOBasic utxos = 1; }
repeated UTXOBasic utxos = 1;
}
message CreateTransactionCache { message CreateTransactionCache {
bytes key = 1; bytes key = 1;
...@@ -359,9 +338,7 @@ message ReqCacheTxList { ...@@ -359,9 +338,7 @@ message ReqCacheTxList {
string tokenname = 2; string tokenname = 2;
} }
message ReplyCacheTxList { message ReplyCacheTxList { repeated Transaction txs = 1; }
repeated Transaction txs = 1;
}
message ReqPrivacyAccount { message ReqPrivacyAccount {
string tokenname = 1; string tokenname = 1;
...@@ -421,9 +398,7 @@ message RepRescanUtxos { ...@@ -421,9 +398,7 @@ message RepRescanUtxos {
repeated RepRescanResult repRescanResults = 2; repeated RepRescanResult repRescanResults = 2;
} }
message ReqEnablePrivacy { message ReqEnablePrivacy { repeated string addrs = 2; }
repeated string addrs = 2;
}
message PriAddrResult { message PriAddrResult {
string addr = 1; string addr = 1;
...@@ -431,9 +406,7 @@ message PriAddrResult { ...@@ -431,9 +406,7 @@ message PriAddrResult {
string msg = 3; string msg = 3;
} }
message RepEnablePrivacy { message RepEnablePrivacy { repeated PriAddrResult results = 1; }
repeated PriAddrResult results = 1;
}
// 隐私交易三步发送时,临时存储签名需要的数据信息结构 // 隐私交易三步发送时,临时存储签名需要的数据信息结构
message PrivacySignatureParam { message PrivacySignatureParam {
......
...@@ -100,12 +100,11 @@ message BtcHeader { ...@@ -100,12 +100,11 @@ message BtcHeader {
int64 difficulty = 9; int64 difficulty = 9;
string previousHash = 10; string previousHash = 10;
string nextHash = 11; string nextHash = 11;
bool isReset = 12; // 0: nomal btc headers sync (default), 1: set the base head (may not from 1) bool isReset = 12; // 0: nomal btc headers sync (default), 1: set the base
// head (may not from 1)
} }
message BtcHeaders { message BtcHeaders { repeated BtcHeader btcHeader = 1; }
repeated BtcHeader btcHeader = 1;
}
message BtcTransaction { message BtcTransaction {
string hash = 1; // txhash string hash = 1; // txhash
...@@ -178,18 +177,14 @@ message ReqRelayAddrCoins { ...@@ -178,18 +177,14 @@ message ReqRelayAddrCoins {
int32 pageSize = 5; int32 pageSize = 5;
} }
message ReplyRelayOrders { message ReplyRelayOrders { repeated RelayOrder relayorders = 1; }
repeated RelayOrder relayorders = 1;
}
message QueryRelayOrderParam { message QueryRelayOrderParam {
RelayOrderStatus status = 1; RelayOrderStatus status = 1;
string orderId = 2; string orderId = 2;
} }
message QueryRelayOrderResult { message QueryRelayOrderResult { repeated RelayOrder orders = 1; }
repeated RelayOrder orders = 1;
}
message ReqRelayBtcHeaderHeightList { message ReqRelayBtcHeaderHeightList {
int64 reqHeight = 1; int64 reqHeight = 1;
...@@ -197,9 +192,7 @@ message ReqRelayBtcHeaderHeightList { ...@@ -197,9 +192,7 @@ message ReqRelayBtcHeaderHeightList {
int32 direction = 3; // 0: desc, 1: asc int32 direction = 3; // 0: desc, 1: asc
} }
message ReplyRelayBtcHeadHeightList { message ReplyRelayBtcHeadHeightList { repeated int64 heights = 1; }
repeated int64 heights = 1;
}
message ReqRelayQryBTCHeadHeight { message ReqRelayQryBTCHeadHeight {
int64 baseHeight = 1; // from the baseHeight begin, if any int64 baseHeight = 1; // from the baseHeight begin, if any
...@@ -207,5 +200,6 @@ message ReqRelayQryBTCHeadHeight { ...@@ -207,5 +200,6 @@ message ReqRelayQryBTCHeadHeight {
message ReplayRelayQryBTCHeadHeight { message ReplayRelayQryBTCHeadHeight {
int64 curHeight = 1; // current height in chain int64 curHeight = 1; // current height in chain
int64 baseHeight = 2; // base height means the the 1st head record in chain db (base height can be change) int64 baseHeight = 2; // base height means the the 1st head record in chain db
// (base height can be change)
} }
\ No newline at end of file
...@@ -77,22 +77,16 @@ message TicketGenesis { ...@@ -77,22 +77,16 @@ message TicketGenesis {
int32 count = 3; int32 count = 3;
} }
message TicketClose { message TicketClose { repeated string ticketId = 1; }
repeated string ticketId = 1;
}
message TicketList { message TicketList {
string addr = 1; string addr = 1;
int32 status = 3; int32 status = 3;
} }
message TicketInfos { message TicketInfos { repeated string ticketIds = 1; }
repeated string ticketIds = 1;
}
message ReplyTicketList { message ReplyTicketList { repeated Ticket tickets = 1; }
repeated Ticket tickets = 1;
}
message ReplyWalletTickets { message ReplyWalletTickets {
repeated Ticket tickets = 1; repeated Ticket tickets = 1;
...@@ -119,9 +113,7 @@ message ReqBindMiner { ...@@ -119,9 +113,7 @@ message ReqBindMiner {
bool checkBalance = 4; bool checkBalance = 4;
} }
message ReplyBindMiner { message ReplyBindMiner { string txHex = 1; }
string txHex = 1;
}
service ticket { service ticket {
//创建绑定挖矿 //创建绑定挖矿
......
...@@ -87,17 +87,13 @@ message ReqTokens { ...@@ -87,17 +87,13 @@ message ReqTokens {
bool symbolOnly = 4; bool symbolOnly = 4;
} }
message ReplyTokens { message ReplyTokens { repeated LocalToken tokens = 1; }
repeated LocalToken tokens = 1;
}
message TokenRecv { message TokenRecv {
string token = 1; string token = 1;
int64 recv = 2; int64 recv = 2;
} }
message ReplyAddrRecvForTokens { message ReplyAddrRecvForTokens { repeated TokenRecv tokenRecvs = 1; }
repeated TokenRecv tokenRecvs = 1;
}
message ReqTokenBalance { message ReqTokenBalance {
repeated string addresses = 1; repeated string addresses = 1;
...@@ -115,9 +111,7 @@ message TokenAsset { ...@@ -115,9 +111,7 @@ message TokenAsset {
Account account = 2; Account account = 2;
} }
message ReplyAccountTokenAssets { message ReplyAccountTokenAssets { repeated TokenAsset tokenAssets = 1; }
repeated TokenAsset tokenAssets = 1;
}
message ReqAddrTokens { message ReqAddrTokens {
string addr = 1; string addr = 1;
......
...@@ -44,9 +44,7 @@ message TradeForBuy { ...@@ -44,9 +44,7 @@ message TradeForBuy {
} }
// 允许token的持有者撤销之前未成交出售token的挂单 // 允许token的持有者撤销之前未成交出售token的挂单
message TradeForRevokeSell { message TradeForRevokeSell { string sellID = 1; }
string sellID = 1;
}
// 限价买单构造请求 // 限价买单构造请求
message TradeForBuyLimit { message TradeForBuyLimit {
...@@ -65,9 +63,7 @@ message TradeForSellMarket { ...@@ -65,9 +63,7 @@ message TradeForSellMarket {
} }
// 撤销买单 // 撤销买单
message TradeForRevokeBuy { message TradeForRevokeBuy { string buyID = 1; }
string buyID = 1;
}
// 数据库部分 // 数据库部分
message SellOrder { message SellOrder {
...@@ -147,29 +143,17 @@ message ReceiptSellBase { ...@@ -147,29 +143,17 @@ message ReceiptSellBase {
string assetExec = 16; string assetExec = 16;
} }
message ReceiptTradeBuyMarket { message ReceiptTradeBuyMarket { ReceiptBuyBase base = 1; }
ReceiptBuyBase base = 1;
}
message ReceiptTradeBuyLimit { message ReceiptTradeBuyLimit { ReceiptBuyBase base = 1; }
ReceiptBuyBase base = 1;
}
message ReceiptTradeBuyRevoke { message ReceiptTradeBuyRevoke { ReceiptBuyBase base = 1; }
ReceiptBuyBase base = 1;
}
message ReceiptTradeSellLimit { message ReceiptTradeSellLimit { ReceiptSellBase base = 1; }
ReceiptSellBase base = 1;
}
message ReceiptSellMarket { message ReceiptSellMarket { ReceiptSellBase base = 1; }
ReceiptSellBase base = 1;
}
message ReceiptTradeSellRevoke { message ReceiptTradeSellRevoke { ReceiptSellBase base = 1; }
ReceiptSellBase base = 1;
}
// 查询部分 // 查询部分
...@@ -184,9 +168,10 @@ message ReqAddrAssets { ...@@ -184,9 +168,10 @@ message ReqAddrAssets {
} }
// 获取Token未完成卖单的交易列表 // 获取Token未完成卖单的交易列表
// fromKey : 第一次传参为空,获取卖单单价最低的列表。 当要获得下一页时, 传当前页最后一个;当要获得上一页时, 传当前页第一个。 // fromKey : 第一次传参为空,获取卖单单价最低的列表。 当要获得下一页时,
// count :获取交易列表的个数。 // 传当前页最后一个;当要获得上一页时, 传当前页第一个。 count
// direction :查找方式;0,上一页;1,下一页。 越靠后的也单价越贵 // :获取交易列表的个数。 direction :查找方式;0,上一页;1,下一页。
// 越靠后的也单价越贵
message ReqTokenSellOrder { message ReqTokenSellOrder {
string tokenSymbol = 1; string tokenSymbol = 1;
string fromKey = 2; string fromKey = 2;
...@@ -237,13 +222,9 @@ message ReplySellOrder { ...@@ -237,13 +222,9 @@ message ReplySellOrder {
string assetExec = 14; string assetExec = 14;
} }
message ReplySellOrders { message ReplySellOrders { repeated ReplySellOrder sellOrders = 1; }
repeated ReplySellOrder sellOrders = 1;
}
message ReplyBuyOrders { message ReplyBuyOrders { repeated ReplyBuyOrder buyOrders = 1; }
repeated ReplyBuyOrder buyOrders = 1;
}
message ReplyTradeOrder { message ReplyTradeOrder {
string tokenSymbol = 1; string tokenSymbol = 1;
...@@ -264,9 +245,7 @@ message ReplyTradeOrder { ...@@ -264,9 +245,7 @@ message ReplyTradeOrder {
string assetExec = 16; string assetExec = 16;
} }
message ReplyTradeOrders { message ReplyTradeOrders { repeated ReplyTradeOrder orders = 1; }
repeated ReplyTradeOrder orders = 1;
}
message ReqSellToken { message ReqSellToken {
TradeForSell sell = 1; TradeForSell sell = 1;
......
...@@ -4,9 +4,7 @@ import "transaction.proto"; ...@@ -4,9 +4,7 @@ import "transaction.proto";
package types; package types;
message BlockID { message BlockID { bytes Hash = 1; }
bytes Hash = 1;
}
message TendermintBitArray { message TendermintBitArray {
int32 Bits = 1; int32 Bits = 1;
...@@ -48,13 +46,9 @@ message TxSize { ...@@ -48,13 +46,9 @@ message TxSize {
int64 MaxGas = 2; int64 MaxGas = 2;
} }
message BlockGossip { message BlockGossip { int32 BlockPartSizeBytes = 1; }
int32 BlockPartSizeBytes = 1;
}
message EvidenceParams { message EvidenceParams { int64 MaxAge = 1; }
int64 MaxAge = 1;
}
message ConsensusParams { message ConsensusParams {
BlockSize BlockSize = 1; BlockSize BlockSize = 1;
TxSize TxSize = 2; TxSize TxSize = 2;
...@@ -100,9 +94,7 @@ message EvidenceEnvelope { ...@@ -100,9 +94,7 @@ message EvidenceEnvelope {
bytes data = 2; bytes data = 2;
} }
message EvidenceData { message EvidenceData { repeated EvidenceEnvelope evidence = 1; }
repeated EvidenceEnvelope evidence = 1;
}
message TendermintBlockHeader { message TendermintBlockHeader {
string chainID = 1; string chainID = 1;
...@@ -146,9 +138,7 @@ message NewRoundStepMsg { ...@@ -146,9 +138,7 @@ message NewRoundStepMsg {
int32 lastCommitRound = 5; int32 lastCommitRound = 5;
} }
message CommitStepMsg { message CommitStepMsg { int64 height = 1; }
int64 height = 1;
}
message ProposalPOLMsg { message ProposalPOLMsg {
int64 height = 1; int64 height = 1;
......
...@@ -8,9 +8,7 @@ message ValNode { ...@@ -8,9 +8,7 @@ message ValNode {
int64 power = 2; int64 power = 2;
} }
message ValNodes { message ValNodes { repeated ValNode nodes = 1; }
repeated ValNode nodes = 1;
}
message ValNodeAction { message ValNodeAction {
oneof value { oneof value {
...@@ -20,10 +18,6 @@ message ValNodeAction { ...@@ -20,10 +18,6 @@ message ValNodeAction {
int32 Ty = 3; int32 Ty = 3;
} }
message ReqNodeInfo { message ReqNodeInfo { int64 height = 1; }
int64 height = 1;
}
message ReqBlockInfo { message ReqBlockInfo { int64 height = 1; }
int64 height = 1; \ No newline at end of file
}
\ No newline at end of file
...@@ -13,19 +13,13 @@ message Node { ...@@ -13,19 +13,13 @@ message Node {
int32 index = 6; int32 index = 6;
} }
message FullNode { message FullNode { repeated Node nodes = 1; }
repeated Node nodes = 1;
}
message ShortNode { message ShortNode {
bytes key = 1; bytes key = 1;
Node val = 2; Node val = 2;
} }
message HashNode { message HashNode { bytes hash = 1; }
bytes hash = 1;
}
message ValueNode { message ValueNode { bytes value = 1; }
bytes value = 1;
}
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