aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/wallet/wallet.cpp')
-rw-r--r--src/wallet/wallet.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index d9187e383..9ad4fb7f0 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -3894,6 +3894,13 @@ bool CWallet::ParameterInteraction()
return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must be at least %s)"),
GetArg("-paytxfee", ""), ::minRelayTxFeeRate.ToString()));
}
+
+ // if -mintxfee is not set, then a lower payTxFee overrides minTxFee
+ if (!IsArgSet("-mintxfee") && payTxFee < CWallet::minTxFee)
+ {
+ LogPrintf("%s: parameter interaction: -paytxfee=%s -> setting -mintxfee=%s\n", __func__, GetArg("-paytxfee",""), GetArg("-paytxfee",""));
+ CWallet:minTxFee = CFeeRate(nFeePerK,1000);
+ }
}
if (IsArgSet("-maxtxfee"))
{