aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-09-26 15:10:10 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-09-26 15:11:02 +0200
commit8f1fbf36a769a9fbe198ccc8833151368cc954c5 (patch)
tree6514ce36718647bf2aaaf72821b08f1eddb5aadf /src
parentdd20ed1223b95fb2df99fa1d6b72810e5f693473 (diff)
parentc14ffd524b3477d6fdf142e9dc8281b780b45923 (diff)
downloadbitcoin-8f1fbf36a769a9fbe198ccc8833151368cc954c5.tar.xz
Merge #8796: [trivial] fix mempool comment (outdated by BIP125)
c14ffd5 [trivial] fix mempool comment (outdated by BIP125) (jonnynewbs)
Diffstat (limited to 'src')
-rw-r--r--src/txmempool.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/txmempool.h b/src/txmempool.h
index 2c2127f326..6f67dd91d6 100644
--- a/src/txmempool.h
+++ b/src/txmempool.h
@@ -328,14 +328,17 @@ struct TxMempoolInfo
};
/**
- * CTxMemPool stores valid-according-to-the-current-best-chain
- * transactions that may be included in the next block.
+ * CTxMemPool stores valid-according-to-the-current-best-chain transactions
+ * that may be included in the next block.
*
- * Transactions are added when they are seen on the network
- * (or created by the local node), but not all transactions seen
- * are added to the pool: if a new transaction double-spends
- * an input of a transaction in the pool, it is dropped,
- * as are non-standard transactions.
+ * Transactions are added when they are seen on the network (or created by the
+ * local node), but not all transactions seen are added to the pool. For
+ * example, the following new transactions will not be added to the mempool:
+ * - a transaction which doesn't make the mimimum fee requirements.
+ * - a new transaction that double-spends an input of a transaction already in
+ * the pool where the new transaction does not meet the Replace-By-Fee
+ * requirements as defined in BIP 125.
+ * - a non-standard transaction.
*
* CTxMemPool::mapTx, and CTxMemPoolEntry bookkeeping:
*