aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlex Morcos <morcos@chaincode.com>2017-01-19 21:48:10 -0500
committerAlex Morcos <morcos@chaincode.com>2017-03-03 16:50:20 -0500
commit7d4e9509ade0c258728011d8f6544ec3e75d63dc (patch)
tree8d5d25eb3c9f6c94ab2124d53f7643763b9f6a6c /src
parent359e8a03d1667dca3e8375695131b8b5e6c54f0a (diff)
downloadbitcoin-7d4e9509ade0c258728011d8f6544ec3e75d63dc.tar.xz
Allow setting minrelaytxfee to 0
Setting minrelaytxfee to 0 will allow all transactions regardless of fee to enter your mempool until it reaches its size limit. However now that mempool limiting is governed by a separate incrementalrelay fee, it is an unnecessary restriction to prevent a minrelaytxfee of 0.
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 3276ec9f13..47d18dad6b 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -977,13 +977,14 @@ bool AppInitParameterInteraction()
// If you are mining, be careful setting this:
// if you set it to zero then
// a transaction spammer can cheaply fill blocks using
- // 1-satoshi-fee transactions. It should be set above the real
+ // 0-fee transactions. It should be set above the real
// cost to you of processing a transaction.
if (IsArgSet("-minrelaytxfee"))
{
CAmount n = 0;
- if (!ParseMoney(GetArg("-minrelaytxfee", ""), n) || 0 == n)
+ if (!ParseMoney(GetArg("-minrelaytxfee", ""), n)) {
return InitError(AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", "")));
+ }
// High fee check is done afterward in CWallet::ParameterInteraction()
::minRelayTxFee = CFeeRate(n);
} else if (incrementalRelayFee > ::minRelayTxFee) {