diff --git a/src/txmempool.h b/src/txmempool.h --- a/src/txmempool.h +++ b/src/txmempool.h @@ -70,12 +70,6 @@ * When a new entry is added to the mempool, we update the descendant state * (nCountWithDescendants, nSizeWithDescendants, and nModFeesWithDescendants) * for all ancestors of the newly added transaction. - * - * If updating the descendant state is skipped, we can mark the entry as - * "dirty", and set nSizeWithDescendants/nModFeesWithDescendants to equal - * nTxSize/nFee+feeDelta. (This can potentially happen during a reorg, where we - * limit the amount of work we're willing to do to avoid consuming too much - * CPU.) */ class CTxMemPoolEntry { @@ -109,9 +103,7 @@ // Information about descendants of this transaction that are in the // mempool; if we remove this transaction we must remove all of these - // descendants as well. if nCountWithDescendants is 0, treat this entry as - // dirty, and nSizeWithDescendants and nModFeesWithDescendants will not be - // correct. + // descendants as well. //!< number of descendant transactions uint64_t nCountWithDescendants; //!< ... and size @@ -149,7 +141,7 @@ size_t DynamicMemoryUsage() const { return nUsageSize; } const LockPoints &GetLockPoints() const { return lockPoints; } - // Adjusts the descendant state, if this entry is not dirty. + // Adjusts the descendant state. void UpdateDescendantState(int64_t modifySize, Amount modifyFee, int64_t modifyCount); // Adjusts the ancestor state @@ -458,14 +450,6 @@ * if no bound exists on how many in-mempool ancestors there may be. * CalculateMemPoolAncestors() takes configurable limits that are designed to * prevent these calculations from being too CPU intensive. - * - * Adding transactions from a disconnected block can be very time consuming, - * because we don't have a way to limit the number of in-mempool descendants. To - * bound CPU processing, we limit the amount of work we're willing to do to - * properly update the descendant information for a tx being added from a - * disconnected block. If we would exceed the limit, then we instead mark the - * entry as "dirty", and set the feerate for sorting purposes to be equal the - * feerate of the transaction without any descendants. */ class CTxMemPool { private: