aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-09-28 08:08:02 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-09-28 08:09:42 +0200
commit14b7b3fb9f79aeadddb350c8ba795ebf0728a3ec (patch)
tree0b747bb7ad0066558b3a1f2a4149e38e6d9bcafe /src
parentfc4f4547b7f6ea13d273ad926738fcdffee36295 (diff)
parentfa4bfb48193a03d99d1dfdfd1e67b613293755bf (diff)
Merge #8814: [wallet, policy] ParameterInteraction: Don't allow 0 fee
fa4bfb4 [wallet, policy] ParameterInteraction: Don't allow 0 fee (MarcoFalke)
Diffstat (limited to 'src')
-rw-r--r--src/init.cpp2
-rw-r--r--src/wallet/wallet.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/init.cpp b/src/init.cpp
index b20675dd9e..cb8da06d64 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -951,7 +951,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (mapArgs.count("-minrelaytxfee"))
{
CAmount n = 0;
- if (!ParseMoney(mapArgs["-minrelaytxfee"], n))
+ if (!ParseMoney(mapArgs["-minrelaytxfee"], n) || 0 == n)
return InitError(AmountErrMsg("minrelaytxfee", mapArgs["-minrelaytxfee"]));
// High fee check is done afterward in CWallet::ParameterInteraction()
::minRelayTxFee = CFeeRate(n);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 85219c24c8..43e22383f4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3492,7 +3492,7 @@ bool CWallet::ParameterInteraction()
if (mapArgs.count("-mintxfee"))
{
CAmount n = 0;
- if (!ParseMoney(mapArgs["-mintxfee"], n))
+ if (!ParseMoney(mapArgs["-mintxfee"], n) || 0 == n)
return InitError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
if (n > HIGH_TX_FEE_PER_KB)
InitWarning(AmountHighWarn("-mintxfee") + " " +