DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

-print

Browse Source
This commit is contained in:
jl777
2018-07-23 20:35:32 -11:00
parent 6629184408
commit d1bc3a75e9
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cc/faucet.cpp
View File

@@ -63,15 +63,15 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
numvouts = tx.vout.size(); numvouts = tx.vout.size();
for (i=0; i<numvins; i++) for (i=0; i<numvins; i++)
{ {
fprintf(stderr,"vini.%d\n",i); //fprintf(stderr,"vini.%d\n",i);
if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 ) if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
{ {
fprintf(stderr,"vini.%d check mempool\n",i); //fprintf(stderr,"vini.%d check mempool\n",i);
if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
return eval->Invalid("cant faucet mempool tx"); return eval->Invalid("cant find vinTx");
else else
{ {
fprintf(stderr,"vini.%d check hash and vout\n",i); //fprintf(stderr,"vini.%d check hash and vout\n",i);
if ( hashBlock == zerohash ) if ( hashBlock == zerohash )
return eval->Invalid("cant faucet from mempool"); return eval->Invalid("cant faucet from mempool");
if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 ) if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )

4
src/main.cpp
View File

@@ -4538,7 +4538,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
bool checked; uint256 hash; int32_t futureblock=0; bool checked; uint256 hash; int32_t futureblock=0;
auto verifier = libzcash::ProofVerifier::Disabled(); auto verifier = libzcash::ProofVerifier::Disabled();
hash = pblock->GetHash(); hash = pblock->GetHash();
fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight); //fprintf(stderr,"ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
if ( chainActive.LastTip() != 0 ) if ( chainActive.LastTip() != 0 )
komodo_currentheight_set(chainActive.LastTip()->nHeight); komodo_currentheight_set(chainActive.LastTip()->nHeight);
checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0); checked = CheckBlock(&futureblock,height!=0?height:komodo_block2height(pblock),0,*pblock, state, verifier,0);
@@ -4578,7 +4578,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
if (futureblock == 0 && !ActivateBestChain(state, pblock)) if (futureblock == 0 && !ActivateBestChain(state, pblock))
return error("%s: ActivateBestChain failed", __func__); return error("%s: ActivateBestChain failed", __func__);
fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight); //fprintf(stderr,"finished ProcessBlock %d\n",(int32_t)chainActive.LastTip()->nHeight);
return true; return true;
} }

4
src/miner.cpp
View File

@@ -678,12 +678,12 @@ static bool ProcessBlockFound(CBlock* pblock)
// Track how many getdata requests this block gets // Track how many getdata requests this block gets
//if ( 0 ) //if ( 0 )
{ {
fprintf(stderr,"lock cs_wallet\n"); //fprintf(stderr,"lock cs_wallet\n");
LOCK(wallet.cs_wallet); LOCK(wallet.cs_wallet);
wallet.mapRequestCount[pblock->GetHash()] = 0; wallet.mapRequestCount[pblock->GetHash()] = 0;
} }
#endif #endif
fprintf(stderr,"process new block\n"); //fprintf(stderr,"process new block\n");
// Process this block the same as if we had received it from another node // Process this block the same as if we had received it from another node
CValidationState state; CValidationState state;