diff --git a/src/txmempool.cpp b/src/txmempool.cpp index d3f5c1bd2a1..52d223656b6 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -1055,11 +1055,22 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector* pvNoSpends } } +uint64_t CTxMemPool::CalculateDescendantMaximum(txiter entry) const { + // find top parent + txiter top = entry; + for (;;) { + const setEntries& parents = GetMemPoolParents(top); + if (parents.size() == 0) break; + top = *parents.begin(); + } + return top->GetCountWithDescendants(); +} + bool CTxMemPool::TransactionWithinChainLimit(const uint256& txid, size_t ancestor_limit, size_t descendant_limit) const { LOCK(cs); auto it = mapTx.find(txid); return it == mapTx.end() || (it->GetCountWithAncestors() < ancestor_limit && - it->GetCountWithDescendants() < descendant_limit); + CalculateDescendantMaximum(it) < descendant_limit); } SaltedTxidHasher::SaltedTxidHasher() : k0(GetRand(std::numeric_limits::max())), k1(GetRand(std::numeric_limits::max())) {} diff --git a/src/txmempool.h b/src/txmempool.h index f6792b09686..b60c2c50b11 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -498,6 +498,7 @@ public: const setEntries & GetMemPoolParents(txiter entry) const EXCLUSIVE_LOCKS_REQUIRED(cs); const setEntries & GetMemPoolChildren(txiter entry) const EXCLUSIVE_LOCKS_REQUIRED(cs); + uint64_t CalculateDescendantMaximum(txiter entry) const EXCLUSIVE_LOCKS_REQUIRED(cs); private: typedef std::map cacheMap;