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:
jl777
2018-04-24 15:35:48 +03:00
parent 4825cbeb68
commit f045635ebc
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/txmempool.cpp
View File

@@ -401,15 +401,19 @@ void CTxMemPool::removeConflicts(const CTransaction &tx, std::list<CTransaction>
} }
} }
int32_t komodo_validate_interest(const CTransaction &tx,int32_t txheight,uint32_t nTime,int32_t dispflag);
void CTxMemPool::removeExpired(unsigned int nBlockHeight) void CTxMemPool::removeExpired(unsigned int nBlockHeight)
{ {
CBlockIndex *tipindex;
// Remove expired txs from the mempool // Remove expired txs from the mempool
LOCK(cs); LOCK(cs);
list<CTransaction> transactionsToRemove; list<CTransaction> transactionsToRemove;
for (indexed_transaction_set::const_iterator it = mapTx.begin(); it != mapTx.end(); it++) for (indexed_transaction_set::const_iterator it = mapTx.begin(); it != mapTx.end(); it++)
{ {
const CTransaction& tx = it->GetTx(); const CTransaction& tx = it->GetTx();
if (IsExpiredTx(tx, nBlockHeight) || komodo_validate_interest(tx,chainActive.Tip()->nHeight+1,chainActive.Tip()->GetMedianTimePast() + 777,0) < 0) tipindex = chainActive.Tip();
if (IsExpiredTx(tx, nBlockHeight) || (tipindex != 0 && komodo_validate_interest(tx,tipindex->nHeight+1,tipindex->GetMedianTimePast() + 777,1) < 0)
{ {
transactionsToRemove.push_back(tx); transactionsToRemove.push_back(tx);
} }