From ea5b152c583a07f04f823251e70895ebfe87894b Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 28 Nov 2018 00:40:11 -1100 Subject: [PATCH 1/2] Move print --- src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index 8586f5840..80819f296 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5623,9 +5623,11 @@ bool static LoadBlockIndexDB() CBlockIndex *pindex; if ( (pindex= chainActive.LastTip()) != 0 ) { - fprintf(stderr,"set sapling height, if possible from ht.%d %u\n",(int32_t)pindex->GetHeight(),(uint32_t)pindex->nTime); if ( ASSETCHAINS_SAPLING <= 0 ) + { + fprintf(stderr,"set sapling height, if possible from ht.%d %u\n",(int32_t)pindex->GetHeight(),(uint32_t)pindex->nTime); komodo_activate_sapling(pindex); + } } return true; } From b0abf90f699d5897b9da4ec6ecef61980656e6ef Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 28 Nov 2018 04:06:49 -1100 Subject: [PATCH 2/2] Fix null ptr in dice status --- src/cc/dice.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp index 37d6bfd41..8d750b1ed 100644 --- a/src/cc/dice.cpp +++ b/src/cc/dice.cpp @@ -245,9 +245,12 @@ bool mySenddicetransaction(std::string res,uint256 entropyused,int32_t entropyvo { RelayTransaction(tx); fprintf(stderr,"rebroadcast.%c and clear [%d] and broadcast entropyused.%s bettxid.%s -> %s\n",funcid,i,entropyused.GetHex().c_str(),bettxid.GetHex().c_str(),tx.GetHash().GetHex().c_str()); - if ( ptr->rawtx.empty() == 0 ) - ptr->rawtx.clear(); - ptr->txid = zeroid; + if ( ptr != 0 ) + { + if ( ptr->rawtx.empty() == 0 ) + ptr->rawtx.clear(); + ptr->txid = zeroid; + } //fprintf(stderr,"error adding funcid.%c E.%s bet.%s -> %s to mempool, probably Disable replacement feature size.%d\n",funcid,entropyused.GetHex().c_str(),bettxid.GetHex().c_str(),tx.GetHash().GetHex().c_str(),(int32_t)ptr->rawtx.size()); } } else fprintf(stderr,"error duplicate entropyused different bettxid\n");