From 01a05b57a89aa6fe2ae2d5e2ed4caa7579c45095 Mon Sep 17 00:00:00 2001 From: FireMartZ Date: Sun, 7 Oct 2018 15:40:03 -0400 Subject: [PATCH 1/2] Change logs from stderr to debug.log (if 'dpow' logging is enabled) --- src/komodo_validation011.h | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/komodo_validation011.h b/src/komodo_validation011.h index d640331af..cb5a9c6d9 100644 --- a/src/komodo_validation011.h +++ b/src/komodo_validation011.h @@ -90,7 +90,7 @@ int32_t gettxout_scriptPubKey(int32_t height,uint8_t *scriptPubKey,int32_t maxsi { if ( GetTransaction(txid,tx,hashBlock,false) == 0 ) { - fprintf(stderr,"ht.%d couldnt get txid.%s !\n",height,txid.GetHex().c_str()); + LogPrint("dpow","ht.%d couldnt get txid.%s !\n",height,txid.GetHex().c_str()); return(-1); } } @@ -104,7 +104,7 @@ int32_t gettxout_scriptPubKey(int32_t height,uint8_t *scriptPubKey,int32_t maxsi { const CWalletTx& wtx = it->second; tx = *wtx.tx; - fprintf(stderr,"found tx in wallet\n"); + LogPrint("dpow","found tx in wallet\n"); } } } @@ -117,11 +117,11 @@ int32_t gettxout_scriptPubKey(int32_t height,uint8_t *scriptPubKey,int32_t maxsi for (i=0; i voutsize.%d\n",height,n,(int32_t)tx.vout.size()); + LogPrint("dpow","gettxout_scriptPubKey ht.%d n.%d > voutsize.%d\n",height,n,(int32_t)tx.vout.size()); return(-1); } @@ -578,9 +578,9 @@ CBlockIndex *komodo_chainactive(int32_t height) { if ( height <= tipindex->nHeight ) return(chainActive[height]); - else fprintf(stderr,"komodo_chainactive height %d > active.%d\n",height,chainActive.Tip()->nHeight); + else LogPrint("dpow","komodo_chainactive height %d > active.%d\n",height,chainActive.Tip()->nHeight); } - fprintf(stderr,"komodo_chainactive null chainActive.Tip() height %d\n",height); + LogPrint("dpow","komodo_chainactive null chainActive.Tip() height %d\n",height); return(0); } @@ -589,7 +589,7 @@ uint32_t komodo_heightstamp(int32_t height) CBlockIndex *ptr; if ( height > 0 && (ptr= komodo_chainactive(height)) != 0 ) return(ptr->nTime); - else fprintf(stderr,"komodo_heightstamp null ptr for block.%d\n",height); + else LogPrint("dpow","komodo_heightstamp null ptr for block.%d\n",height); return(0); } @@ -766,7 +766,7 @@ void komodo_importpubkeys() } } if ( dispflag != 0 ) - fprintf(stderr,"%d Notary pubkeys imported\n",dispflag); + LogPrint("dpow","%d Notary pubkeys imported\n",dispflag); } int32_t komodo_init() @@ -847,7 +847,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestam } memcpy(pubkeys,elected_pubkeys0,n0 * 33); if ( ASSETCHAINS_SYMBOL[0] != 0 ) - fprintf(stderr,"%s height.%d t.%u elected.%d notaries\n",ASSETCHAINS_SYMBOL,height,timestamp,n0); + LogPrint("dpow","%s height.%d t.%u elected.%d notaries\n",ASSETCHAINS_SYMBOL,height,timestamp,n0); return(n0); } else //if ( (timestamp != 0 && timestamp <= KOMODO_NOTARIES_TIMESTAMP2) || height <= KOMODO_NOTARIES_HEIGHT2 ) @@ -858,7 +858,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height,uint32_t timestam for (i=0; inHeight <= NOTARIZED_HEIGHT ) { - fprintf(stderr,"komodo_disconnect unexpected reorg pindex->nHeight.%d vs %d\n",(int32_t)pindex->nHeight,NOTARIZED_HEIGHT); + LogPrint("dpow","komodo_disconnect unexpected reorg pindex->nHeight.%d vs %d\n",(int32_t)pindex->nHeight,NOTARIZED_HEIGHT); komodo_clearstate(); // bruteforce shortcut. on any reorg, no active notarization until next one is seen } } @@ -987,7 +987,7 @@ int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *n if ( np != 0 ) { if ( np->nHeight >= nHeight || (i < NUM_NPOINTS && np[1].nHeight < nHeight) ) - fprintf(stderr,"warning: flag.%d i.%d np->ht %d [1].ht %d >= nHeight.%d\n",flag,i,np->nHeight,np[1].nHeight,nHeight); + LogPrint("dpow","warning: flag.%d i.%d np->ht %d [1].ht %d >= nHeight.%d\n",flag,i,np->nHeight,np[1].nHeight,nHeight); *notarized_hashp = np->notarized_hash; *notarized_desttxidp = np->notarized_desttxid; return(np->notarized_height); @@ -1103,17 +1103,17 @@ int32_t komodo_checkpoint(int32_t *notarized_heightp,int32_t nHeight,uint256 has { if ( nHeight < notarized_height ) { - fprintf(stderr,"nHeight.%d < NOTARIZED_HEIGHT.%d\n",nHeight,notarized_height); + LogPrint("dpow","nHeight.%d < NOTARIZED_HEIGHT.%d\n",nHeight,notarized_height); return(-1); } else if ( nHeight == notarized_height && memcmp(&hash,¬arized_hash,sizeof(hash)) != 0 ) { - fprintf(stderr,"nHeight.%d == NOTARIZED_HEIGHT.%d, diff hash\n",nHeight,notarized_height); + LogPrint("dpow","nHeight.%d == NOTARIZED_HEIGHT.%d, diff hash\n",nHeight,notarized_height); return(-1); } - } else fprintf(stderr,"unexpected error notary_hash %s ht.%d at ht.%d\n",notarized_hash.ToString().c_str(),notarized_height,notary->nHeight); + } else LogPrint("dpow","unexpected error notary_hash %s ht.%d at ht.%d\n",notarized_hash.ToString().c_str(),notarized_height,notary->nHeight); } else if ( notarized_height > 0 ) - fprintf(stderr,"%s couldnt find notarized.(%s %d) ht.%d\n",ASSETCHAINS_SYMBOL,notarized_hash.ToString().c_str(),notarized_height,pindex->nHeight); + LogPrint("dpow","%s couldnt find notarized.(%s %d) ht.%d\n",ASSETCHAINS_SYMBOL,notarized_hash.ToString().c_str(),notarized_height,pindex->nHeight); return(0); } @@ -1223,7 +1223,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) } } } else if ( block.vtx[i].vin[j].prevout.hash != zero ) { - fprintf(stderr,"%s cant get scriptPubKey for ht.%d txi.%d vin.%d\n",ASSETCHAINS_SYMBOL,height,i,j); + LogPrint("dpow","%s cant get scriptPubKey for ht.%d txi.%d vin.%d\n",ASSETCHAINS_SYMBOL,height,i,j); } } @@ -1249,6 +1249,6 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) printf("%s ht.%d\n",ASSETCHAINS_SYMBOL,height); LogPrintf("dpow: [%s] ht.%d txi.%d signedmask.%llx numvins.%d numvouts.%d notarized.%d special.%d\n",ASSETCHAINS_SYMBOL,height,i,(long long)signedmask,numvins,numvouts,notarized,specialtx); } - } else fprintf(stderr,"komodo_connectblock: unexpected null pindex\n"); + } else LogPrint("dpow","komodo_connectblock: unexpected null pindex\n"); } From 217f2084f66cb5959df1e8c1631248d6692ba8e4 Mon Sep 17 00:00:00 2001 From: FireMartZ Date: Sun, 7 Oct 2018 18:43:41 -0400 Subject: [PATCH 2/2] Update proton download path. --- depends/packages/proton.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/depends/packages/proton.mk b/depends/packages/proton.mk index aa49f380f..39428f54b 100644 --- a/depends/packages/proton.mk +++ b/depends/packages/proton.mk @@ -1,6 +1,6 @@ package=proton $(package)_version=0.17.0 -$(package)_download_path=http://apache.cs.utah.edu/qpid/proton/$($(package)_version) +$(package)_download_path=https://archive.apache.org/dist/qpid/proton/$($(package)_version) $(package)_file_name=qpid-proton-$($(package)_version).tar.gz $(package)_sha256_hash=6ffd26d3d0e495bfdb5d9fefc5349954e6105ea18cc4bb191161d27742c5a01a $(package)_patches=minimal-build.patch @@ -21,4 +21,3 @@ endef define $(package)_stage_cmds cd build; $(MAKE) VERBOSE=1 DESTDIR=$($(package)_staging_prefix_dir) install endef -