From 7adbb3e3c1b4b7e2dd5e125d25b9c6afe5d9fb68 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 31 Jul 2018 03:56:20 -1100 Subject: [PATCH] Fix mining deadlock --- src/cc/CCutils.cpp | 6 +++--- src/miner.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index 622a50fe8..84be0dbf3 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -259,18 +259,18 @@ bool ProcessCC(struct CCcontract_info *cp,Eval* eval, std::vector param //txid = ctx.GetHash(); //if ( txid == cp->prevtxid ) // return(true); - fprintf(stderr,"process CC %02x\n",cp->evalcode); + //fprintf(stderr,"process CC %02x\n",cp->evalcode); if ( paramsNull.size() != 0 ) // Don't expect params return eval->Invalid("Cannot have params"); else if ( ctx.vout.size() == 0 ) return eval->Invalid("no-vouts"); else if ( (*cp->validate)(cp,eval,ctx) != 0 ) { - fprintf(stderr,"done CC %02x\n",cp->evalcode); + //fprintf(stderr,"done CC %02x\n",cp->evalcode); //cp->prevtxid = txid; return(true); } - fprintf(stderr,"invalid CC %02x\n",cp->evalcode); + //fprintf(stderr,"invalid CC %02x\n",cp->evalcode); return(false); } diff --git a/src/miner.cpp b/src/miner.cpp index 97034e72d..fb2eb2d05 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1018,7 +1018,7 @@ void static BitcoinMiner() fprintf(stderr," mined %s block %d!\n",ASSETCHAINS_SYMBOL,Mining_height); } CValidationState state; - if ( ASSETCHAINS_CC == 0 && !TestBlockValidity(state,B, chainActive.LastTip(), true, false)) + if ( !TestBlockValidity(state,B, chainActive.LastTip(), true, false)) { h = UintToArith256(B.GetHash()); for (z=31; z>=0; z--)