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

fix

Browse Source
This commit is contained in:
blackjok3r
2018-10-29 21:31:31 +08:00
parent 9dfab4e56e
commit 7a0832ebb0
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.cpp
View File

@@ -4307,16 +4307,19 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
LogPrintf("CheckBlockHeader komodo_check_deposit error"); LogPrintf("CheckBlockHeader komodo_check_deposit error");
return(false); return(false);
} }
int invalidtxs = 0; if ( ASSETCHAINS_CC != 0 ) // CC contracts might refer to transactions in the current block, from a CC spend within the same block and out of order
BOOST_FOREACH(const CTxMemPoolEntry& e, tmpmempool.mapTx) { {
const CTransaction &tx = e.GetTx(); int invalidtxs = 0;
if ( myAddtomempool(tx) == false ) // this happens if there were invalid txs in the local mempool, on block arrival, used to make the block invalid. BOOST_FOREACH(const CTxMemPoolEntry& e, tmpmempool.mapTx) {
invalidtxs++; const CTransaction &tx = e.GetTx();
fprintf(stderr, "added mempool tx back to mempool\n"); if ( myAddtomempool(tx) == false ) // this happens if there were invalid txs in the local mempool, on block arrival, used to make the block invalid.
invalidtxs++;
fprintf(stderr, "added mempool tx back to mempool\n");
}
fprintf(stderr, "number of invalid txs: %d\n",invalidtxs );
// empty the temp mempool for next time.
tmpmempool.clear();
} }
fprintf(stderr, "number of invalid txs: %d\n",invalidtxs );
// empty the temp mempool for next time.
tmpmempool.clear();
return true; return true;
} }