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

try

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

6
src/main.cpp
View File

@@ -4251,8 +4251,8 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
// Copy the mempool to temporary mempool because there can be tx in local mempool that make the block invalid. // Copy the mempool to temporary mempool because there can be tx in local mempool that make the block invalid.
LOCK(mempool.cs); LOCK(mempool.cs);
BOOST_FOREACH(const CTxMemPoolEntry& e, mempool.mapTx) { BOOST_FOREACH(const CTxMemPoolEntry& e, mempool.mapTx) {
const CTransaction &tx = e.GetTx(); CTransaction &tx = e.GetTx();
const uint256 &hash = tx.GetHash(); uint256 &hash = tx.GetHash();
tmpmempool.addUnchecked(hash,e,!IsInitialBlockDownload()); tmpmempool.addUnchecked(hash,e,!IsInitialBlockDownload());
fprintf(stderr, "added mempool tx to temp mempool\n"); fprintf(stderr, "added mempool tx to temp mempool\n");
} }
@@ -4311,7 +4311,7 @@ bool CheckBlock(int32_t *futureblockp,int32_t height,CBlockIndex *pindex,const C
{ {
int invalidtxs = 0; int invalidtxs = 0;
BOOST_FOREACH(const CTxMemPoolEntry& e, tmpmempool.mapTx) { BOOST_FOREACH(const CTxMemPoolEntry& e, tmpmempool.mapTx) {
const CTransaction &tx = e.GetTx(); CTransaction &tx = e.GetTx();
if ( myAddtomempool(tx) == false ) // this happens if there were invalid txs in the local mempool, on block arrival, used to make the block invalid. 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++; invalidtxs++;
fprintf(stderr, "added mempool tx back to mempool\n"); fprintf(stderr, "added mempool tx back to mempool\n");