hush
/
hush
8
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Change logs from stderr to debug.log (if 'dpow' logging is enabled)

pull/142/merge
FireMartZ 6 years ago
parent
f13e334afc
commit
01a05b57a8
1 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      src/komodo_validation011.h

36
src/komodo_validation011.h
View File

@ -90,7 +90,7 @@ int32_t gettxout_scriptPubKey(int32_t height,uint8_t *scriptPubKey,int32_t maxsi
{ {
if ( GetTransaction(txid,tx,hashBlock,false) == 0 ) 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); return(-1);
} }
} }
@ -104,7 +104,7 @@ int32_t gettxout_scriptPubKey(int32_t height,uint8_t *scriptPubKey,int32_t maxsi
{ {
const CWalletTx& wtx = it->second; const CWalletTx& wtx = it->second;
tx = *wtx.tx; 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<maxsize&&i<m; i++) { for (i=0; i<maxsize&&i<m; i++) {
scriptPubKey[i] = ptr[i]; scriptPubKey[i] = ptr[i];
} }
fprintf(stderr,"got scriptPubKey[%d] via rawtransaction ht.%d %s\n",m,height,txid.GetHex().c_str()); LogPrint("dpow","got scriptPubKey[%d] via rawtransaction ht.%d %s\n",m,height,txid.GetHex().c_str());
return(i); return(i);
} }
else if ( !tx.IsNull() ) else if ( !tx.IsNull() )
fprintf(stderr,"gettxout_scriptPubKey ht.%d n.%d > 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); return(-1);
} }
@ -578,9 +578,9 @@ CBlockIndex *komodo_chainactive(int32_t height)
{ {
if ( height <= tipindex->nHeight ) if ( height <= tipindex->nHeight )
return(chainActive[height]); 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); return(0);
} }
@ -589,7 +589,7 @@ uint32_t komodo_heightstamp(int32_t height)
CBlockIndex *ptr; CBlockIndex *ptr;
if ( height > 0 && (ptr= komodo_chainactive(height)) != 0 ) if ( height > 0 && (ptr= komodo_chainactive(height)) != 0 )
return(ptr->nTime); 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); return(0);
} }
@ -766,7 +766,7 @@ void komodo_importpubkeys()
} }
} }
if ( dispflag != 0 ) if ( dispflag != 0 )
fprintf(stderr,"%d Notary pubkeys imported\n",dispflag); LogPrint("dpow","%d Notary pubkeys imported\n",dispflag);
} }
int32_t komodo_init() 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); memcpy(pubkeys,elected_pubkeys0,n0 * 33);
if ( ASSETCHAINS_SYMBOL[0] != 0 ) 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); return(n0);
} }
else //if ( (timestamp != 0 && timestamp <= KOMODO_NOTARIES_TIMESTAMP2) || height <= KOMODO_NOTARIES_HEIGHT2 ) 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; i<n1; i++) for (i=0; i<n1; i++)
decode_hex(elected_pubkeys1[i],33,(char *)Notaries_elected1[i][1]); decode_hex(elected_pubkeys1[i],33,(char *)Notaries_elected1[i][1]);
if ( ASSETCHAINS_SYMBOL[0] != 0 ) if ( ASSETCHAINS_SYMBOL[0] != 0 )
fprintf(stderr,"%s height.%d t.%u elected.%d notaries2\n",ASSETCHAINS_SYMBOL,height,timestamp,n1); LogPrint("dpow","%s height.%d t.%u elected.%d notaries2\n",ASSETCHAINS_SYMBOL,height,timestamp,n1);
did1 = 1; did1 = 1;
} }
memcpy(pubkeys,elected_pubkeys1,n1 * 33); memcpy(pubkeys,elected_pubkeys1,n1 * 33);
@ -884,7 +884,7 @@ void komodo_disconnect(CBlockIndex *pindex,CBlock *block)
{ {
if ( (int32_t)pindex->nHeight <= NOTARIZED_HEIGHT ) if ( (int32_t)pindex->nHeight <= 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 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 != 0 )
{ {
if ( np->nHeight >= nHeight || (i < NUM_NPOINTS && np[1].nHeight < nHeight) ) 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_hashp = np->notarized_hash;
*notarized_desttxidp = np->notarized_desttxid; *notarized_desttxidp = np->notarized_desttxid;
return(np->notarized_height); 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 ) 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); return(-1);
} }
else if ( nHeight == notarized_height && memcmp(&hash,&notarized_hash,sizeof(hash)) != 0 ) else if ( nHeight == notarized_height && memcmp(&hash,&notarized_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); 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 ) } 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); return(0);
} }
@ -1223,7 +1223,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
} }
} }
} else if ( block.vtx[i].vin[j].prevout.hash != zero ) { } 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); 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); 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");
} }

Write Preview
Loading…
Cancel
Save