Merge pull request #6887

53238ff Clarify what minrelaytxfee does (MarcoFalke)
abd8b76 [qt] Properly display required fee instead of minTxFee (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2015-11-05 12:10:38 +01:00
commit 3694b74fa9
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
7 changed files with 28 additions and 14 deletions

View file

@ -74,7 +74,7 @@ size_t nCoinCacheUsage = 5000 * 300;
uint64_t nPruneTarget = 0;
bool fAlerts = DEFAULT_ALERTS;
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying and mining) */
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying, mining and transaction creation) */
CFeeRate minRelayTxFee = CFeeRate(1000);
CTxMemPool mempool(::minRelayTxFee);