From b19a3d5217f4f7e823732ee3f9019e2e4ca5dba2 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Sun, 28 Oct 2018 19:11:23 +0800
Subject: [PATCH] try

---
 src/cc/dice.cpp | 17 ++---------------
 src/cc/eval.cpp | 13 +++++++++++--
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp
index d1b207ce0..d914be251 100644
--- a/src/cc/dice.cpp
+++ b/src/cc/dice.cpp
@@ -440,17 +440,6 @@ bool DiceVerifyTimeout(CTransaction &betTx,int32_t timeoutblocks)
     return(numblocks >= timeoutblocks);
 }
 
-bool GetBlock(uint256 hash, CBlockIndex& blockIdx)
-{
-    auto r = mapBlockIndex.find(hash);
-    if (r != mapBlockIndex.end()) {
-        blockIdx = *r->second;
-        return true;
-    }
-    fprintf(stderr, "CC Eval Error: Can't get block from index\n");
-    return false;
-}
-
 bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
 {
     uint256 txid,fundingtxid,vinfundingtxid,vinhentropy,vinproof,hashBlock,hash,proof,entropy; int64_t minbet,maxbet,maxodds,timeoutblocks,odds,winnings; uint64_t vinsbits,sbits,amount,inputs,outputs,txfee=10000; int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,iswin; uint8_t funcid; CScript fundingPubKey; CTransaction fundingTx,vinTx,vinofvinTx; char CCaddr[64];
@@ -558,10 +547,8 @@ bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx)
                         return eval->Invalid("vin0 or vin1 normal vin for bet");
                     else if ( tx.vin[1].prevout.hash != tx.vin[2].prevout.hash )
                         return eval->Invalid("vin0 != vin1 prevout.hash for bet");
-                    else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 ) {
-                        if (hashBlock.IsNull() || !GetBlock(hashBlock, block))
+                    else if ( eval->GetTxConfirmedDICE(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 )
                           return eval->Invalid("always should find vin.0, but didnt for wlt");
-                    }
                     else if ( vinTx.vout.size() < 3 || DecodeDiceOpRet(tx.vin[1].prevout.hash,vinTx.vout[vinTx.vout.size()-1].scriptPubKey,vinsbits,vinfundingtxid,vinhentropy,vinproof) != 'B' )
                         return eval->Invalid("not betTx for vin0/1 for wlt");
                     else if ( sbits != vinsbits || fundingtxid != vinfundingtxid )
@@ -968,7 +955,7 @@ std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet
     int32_t entropytxs;
     if ( (funding= DicePlanFunds(entropyval,entropytxid,sbits,cp,dicepk,fundingtxid,entropytxs)) >= 2*bet*odds+txfee && entropyval != 0 )
     {
-        if ( entropytxs < 2 ) {
+        if ( entropytxs < 10 ) {
             error = "Your dealer is broke, find a new casino.";
             return("");
         }
diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index b6fcf57dd..b2bc80d9e 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -76,11 +76,11 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn)
         case EVAL_IMPORTPAYOUT:
             return ImportPayout(vparams, txTo, nIn);
             break;
-            
+
         case EVAL_IMPORTCOIN:
             return ImportCoin(vparams, txTo, nIn);
             break;
-            
+
         default:
             return(ProcessCC(cp,this, vparams, txTo, nIn));
             break;
@@ -115,6 +115,15 @@ bool Eval::GetTxConfirmed(const uint256 &hash, CTransaction &txOut, CBlockIndex
     return true;
 }
 
+bool Eval::GetTxConfirmedDICE(const uint256 &hash, CTransaction &txOut,uint256 &hashBlock) const
+{
+    CBlockIndex block;
+    if (!GetTxUnconfirmed(hash, txOut, hashBlock))
+        return false;
+    if (hashBlock.IsNull() || !GetBlock(hashBlock, block))
+        return false;
+    return true;
+}
 
 unsigned int Eval::GetCurrentHeight() const
 {