diff options
| author | Ross Nicoll <[email protected]> | 2021-08-12 20:20:38 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-08-12 20:20:38 +0100 |
| commit | 3bf47e73f35c8c61d59093dcd94b3f797752ee67 (patch) | |
| tree | eb2a7c0c642b7ba9ad0958981567ff0a3f3dc5c5 /src | |
| parent | Merge pull request #2440 from michilumin/1.14.4-fees-reduced-minimums (diff) | |
| parent | Adding startup logic where -paytxfee if lower than default, implies -mintxfee... (diff) | |
| download | discoin-3bf47e73f35c8c61d59093dcd94b3f797752ee67.tar.xz discoin-3bf47e73f35c8c61d59093dcd94b3f797752ee67.zip | |
Merge pull request #2437 from michilumin/1.14.4-mintxfee
Adding startup logic where -paytxfee if lower than default, mintxfee is overridden
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/wallet.cpp | 7 |
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")) { |