From 096cfeb8a32b3e65466a39f831cabcc2f6e78a91 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 2 Aug 2018 04:33:18 -1100 Subject: [PATCH] Test --- src/cc/dice.cpp | 6 +++++- src/wallet/rpcwallet.cpp | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp index 15742c280..dd5beae98 100644 --- a/src/cc/dice.cpp +++ b/src/cc/dice.cpp @@ -1001,7 +1001,7 @@ std::string DiceBetFinish(int32_t *resultp,uint64_t txfee,char *planstr,uint256 double DiceStatus(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettxid) { - CScript fundingPubKey,scriptPubKey; CTransaction spenttx,betTx; uint256 hash,proof,txid,hashBlock,spenttxid; CPubKey mypk,dicepk,fundingpk; struct CCcontract_info *cp,C; int32_t result,vout; int64_t minbet,maxbet,maxodds,timeoutblocks; uint64_t sbits; char coinaddr[64]; std::string res; + CScript fundingPubKey,scriptPubKey; CTransaction spenttx,betTx; uint256 hash,proof,txid,hashBlock,spenttxid; CPubKey mypk,dicepk,fundingpk; struct CCcontract_info *cp,C; int32_t result,vout,n=0; int64_t minbet,maxbet,maxodds,timeoutblocks; uint64_t sbits; char coinaddr[64]; std::string res; if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) { fprintf(stderr,"Diceinit error\n"); @@ -1024,10 +1024,14 @@ double DiceStatus(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettx { res = DiceBetFinish(&result,txfee,planstr,fundingtxid,txid,1); if ( result > 0 ) + { mySendrawtransaction(res); + n++; + } } } } + return(n); } else { diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 0de4a4ae8..07100e53e 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -5279,8 +5279,16 @@ UniValue dicestatus(const UniValue& params, bool fHelp) { if ( winnings > 0. ) { - result.push_back(Pair("status", "win")); - result.push_back(Pair("won", winnings)); + if ( params.size() == 3 ) + { + result.push_back(Pair("status", "win")); + result.push_back(Pair("won", winnings)); + } + else + { + result.push_back(Pair("status", "finalized")); + result.push_back(Pair("n", (int64_t)winnings)); + } } else result.push_back(Pair("status", "loss")); } else result.push_back(Pair("status", "invalid bet txid")); return(result);