diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp index c327def68..ea82a9861 100644 --- a/src/bitcoind.cpp +++ b/src/bitcoind.cpp @@ -72,7 +72,7 @@ void WaitForShutdown(boost::thread_group* threadGroup) { int32_t i,height; CBlockIndex *pindex; bool fShutdown = ShutdownRequested(); const uint256 zeroid; fprintf(stderr,"%s: fShutdown=%d, KOMODO_EARLYTXID_HEIGHT=%d\n", __FUNCTION__, fShutdown, KOMODO_EARLYTXID_HEIGHT); - fprintf(stderr,"%s: earlytxid=%s, tx_height=%d\n", __FUNCTION__, KOMODO_EARLYTXID.GetHex(), tx_height(KOMODO_EARLYTXID) ); + //fprintf(stderr,"%s: earlytxid=%s, tx_height=%d\n", __FUNCTION__, KOMODO_EARLYTXID.GetHex(), tx_height(KOMODO_EARLYTXID) ); height=tx_height(KOMODO_EARLYTXID); // Tell the main threads to shutdown. @@ -87,7 +87,7 @@ void WaitForShutdown(boost::thread_group* threadGroup) } */ fprintf(stderr,"%s: komodo_currentheight=%d\n", __FUNCTION__, komodo_currentheight() ); - fprintf(stderr,"%s: earlytx height=%d, ASSETCHAINS_CBOPRET=%li\n", __FUNCTION__, height, ASSETCHAINS_CBOPRET); + //fprintf(stderr,"%s: earlytx height=%d, ASSETCHAINS_CBOPRET=%li\n", __FUNCTION__, height, ASSETCHAINS_CBOPRET); /*if ( ASSETCHAINS_STAKED == 0 && ASSETCHAINS_ADAPTIVEPOW == 0 && (pindex= komodo_chainactive(1)) != 0 ) { diff --git a/src/init.cpp b/src/init.cpp index b96324981..0f17098e3 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -835,14 +835,13 @@ static void ZC_LoadParams( } else { fprintf(stderr,"Found sapling params in PWD\n"); } - } else { - fprintf(stderr,"Found sapling params in /usr/share/hush\n"); - } + } else { + fprintf(stderr,"Found sapling params in /usr/share/hush\n"); + } } else { fprintf(stderr,"Found sapling params in %s\n", ZC_GetParamsDir().string().c_str() ); } - //LogPrintf("Loading verifying key from %s\n", vk_path.string().c_str()); gettimeofday(&tv_start, 0); diff --git a/src/main.cpp b/src/main.cpp index 2dc174380..be0da83fe 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2089,6 +2089,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa } } } + //SyncWithWallets(tx,NULL); return true; } @@ -4358,6 +4359,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * komodo_broadcast(pblock,4);*/ if ( KOMODO_NSPV_FULLNODE ) { + fprintf(stderr,"%s: KOMODO_NSPV_FULLNODE\n", __FUNCTION__); if ( ASSETCHAINS_CBOPRET != 0 ) komodo_pricesupdate(pindexNew->GetHeight(),pblock); if ( ASSETCHAINS_SAPLING <= 0 && pindexNew->nTime > KOMODO_SAPLING_ACTIVATION - 24*3600 ) @@ -4373,6 +4375,7 @@ bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew, CBlock * fprintf(stderr, "snapshot completed in: %d seconds\n", (int32_t)(time(NULL)-start)); } } + fprintf(stderr,"%s: returning true\n", __FUNCTION__); return true; }