Post-fork with mining

This commit is contained in:
jl777
2017-03-23 07:25:53 +02:00
parent 253b7bc01d
commit 3fb7710470

View File

@@ -206,12 +206,12 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
{ {
if ( expired != 0 ) if ( expired != 0 )
{ {
fprintf(stderr,"expire from mempool tx.\n");//(%d %d) %.8f\n",tx.vins.size(),tx.vouts.size(),(double)tx.vouts[0].nValue/COIN); fprintf(stderr,"expire from mempool tx. need to verify this works\n");//(%d %d) %.8f\n",tx.vins.size(),tx.vouts.size(),(double)tx.vouts[0].nValue/COIN);
list<CTransaction> removed; list<CTransaction> removed;
mempool.remove(tx, removed, true); mempool.remove(tx, removed, true);
} }
continue; continue;
} else fprintf(stderr,"coinbase or is finaltx (%d %u)\n",(int32_t)nHeight,(uint32_t)tx.nLockTime); } //else fprintf(stderr,"coinbase or is finaltx (%d %u)\n",(int32_t)nHeight,(uint32_t)tx.nLockTime);
COrphan* porphan = NULL; COrphan* porphan = NULL;
double dPriority = 0; double dPriority = 0;
CAmount nTotalIn = 0; CAmount nTotalIn = 0;