diff options
| author | Patrick Lodder <[email protected]> | 2021-07-31 20:58:53 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-07-31 20:58:53 +0200 |
| commit | 7abb81b2ea3bd11e6d01476b2c1739d793006a83 (patch) | |
| tree | 7765fbeda190b3630de9810f4b246a7c1c0c5e75 /src/init.cpp | |
| parent | Merge pull request #2426 from xanimo/1.14.4-qa (diff) | |
| parent | Initial back end framework to separate wallet and relay fees + dust. (diff) | |
| download | discoin-7abb81b2ea3bd11e6d01476b2c1739d793006a83.tar.xz discoin-7abb81b2ea3bd11e6d01476b2c1739d793006a83.zip | |
Merge pull request #2368 from michilumin/1.14.4-fees
1.14.4 fees backend improvements
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index f06c1811f..22dc45929 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1012,11 +1012,11 @@ bool AppInitParameterInteraction() if (!ParseMoney(GetArg("-minrelaytxfee", ""), n) || 0 == n) return InitError(AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", ""))); // High fee check is done afterward in CWallet::ParameterInteraction() - ::minRelayTxFee = CFeeRate(n); - } else if (incrementalRelayFee > ::minRelayTxFee) { + ::minRelayTxFeeRate = CFeeRate(n); + } else if (incrementalRelayFee > ::minRelayTxFeeRate) { // Allow only setting incrementalRelayFee to control both - ::minRelayTxFee = incrementalRelayFee; - LogPrintf("Increasing minrelaytxfee to %s to match incrementalrelayfee\n",::minRelayTxFee.ToString()); + ::minRelayTxFeeRate = incrementalRelayFee; + LogPrintf("Increasing minrelaytxfee to %s to match incrementalrelayfee\n",::minRelayTxFeeRate.ToString()); } // Sanity check argument for min fee for including tx in block |