GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 8af835a72d into merged_master (Bitcoin PR #16796)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:23 +00:00
commit 8fa52e84b0
8 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/init.cpp
View file

@ -1148,7 +1148,7 @@ bool AppInitParameterInteraction()
if (!ParseMoney(gArgs.GetArg("-minrelaytxfee", ""), n)) {
return InitError(AmountErrMsg("minrelaytxfee", gArgs.GetArg("-minrelaytxfee", "")).translated);
}
// High fee check is done afterward in WalletParameterInteraction()
// High fee check is done afterward in CWallet::CreateWalletFromFile()
::minRelayTxFee = CFeeRate(n);
} else if (incrementalRelayFee > ::minRelayTxFee) {
// Allow only setting incrementalRelayFee to control both