Browse Source

-print

pull/4/head
jl777 6 years ago
parent
commit
d1bc3a75e9
  1. 8
      src/cc/faucet.cpp
  2. 4
      src/main.cpp
  3. 4
      src/miner.cpp

8
src/cc/faucet.cpp

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

4
src/main.cpp

@ -4538,7 +4538,7 @@ bool ProcessNewBlock(bool from_miner,int32_t height,CValidationState &state, CNo
bool checked; uint256 hash; int32_t futureblock=0;
auto verifier = libzcash::ProofVerifier::Disabled();
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 )
komodo_currentheight_set(chainActive.LastTip()->nHeight);
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))
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;
}

4
src/miner.cpp

@ -678,12 +678,12 @@ static bool ProcessBlockFound(CBlock* pblock)
// Track how many getdata requests this block gets
//if ( 0 )
{
fprintf(stderr,"lock cs_wallet\n");
//fprintf(stderr,"lock cs_wallet\n");
LOCK(wallet.cs_wallet);
wallet.mapRequestCount[pblock->GetHash()] = 0;
}
#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
CValidationState state;

Loading…
Cancel
Save