diff options
| author | Suhas Daftuar <sdaftuar@chaincode.com> | 2015-10-29 22:49:00 -0400 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2015-11-10 14:14:07 -0500 |
| commit | 73d904009dc25ddfe5d6c4a91a13673c8f5cf87a (patch) | |
| tree | 0e4407ac15d3977fbe0efa613876a897a8b62e3d /src/txmempool.h | |
| parent | b272ecfdb39f976dd61e35bacb22047da02b3416 (diff) | |
Improve RBF replacement criteria
Fix the calculation of conflicting size/conflicting fees.
Diffstat (limited to 'src/txmempool.h')
| -rw-r--r-- | src/txmempool.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/txmempool.h b/src/txmempool.h index 7b5843a8d0..3d8ac435f5 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -420,6 +420,11 @@ public: */ bool CalculateMemPoolAncestors(const CTxMemPoolEntry &entry, setEntries &setAncestors, uint64_t limitAncestorCount, uint64_t limitAncestorSize, uint64_t limitDescendantCount, uint64_t limitDescendantSize, std::string &errString, bool fSearchForParents = true); + /** Populate setDescendants with all in-mempool descendants of hash. + * Assumes that setDescendants includes all in-mempool descendants of anything + * already in it. */ + void CalculateDescendants(txiter it, setEntries &setDescendants); + /** The minimum fee to get into the mempool, which may itself not be enough * for larger-sized transactions. * The minReasonableRelayFee constructor arg is used to bound the time it @@ -493,10 +498,6 @@ private: void UpdateForRemoveFromMempool(const setEntries &entriesToRemove); /** Sever link between specified transaction and direct children. */ void UpdateChildrenForRemoval(txiter entry); - /** Populate setDescendants with all in-mempool descendants of hash. - * Assumes that setDescendants includes all in-mempool descendants of anything - * already in it. */ - void CalculateDescendants(txiter it, setEntries &setDescendants); /** Before calling removeUnchecked for a given transaction, * UpdateForRemoveFromMempool must be called on the entire (dependent) set |