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

Merge 3356799ee3 into merged_master (Bitcoin PR #15778)

Browse source
This commit is contained in:
Andrew Poelstra 2020-10-28 23:03:35 +00:00
commit ad0dc00fc2
18 changed files with 46 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/qt/walletmodel.cpp
View file

@ -262,9 +262,9 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
}
// reject absurdly high fee. (This can never happen because the
// wallet caps the fee at maxTxFee. This merely serves as a
// wallet caps the fee at m_default_max_tx_fee. This merely serves as a
// belt-and-suspenders check)
if (nFeeRequired > m_node.getMaxTxFee())
if (nFeeRequired > m_wallet->getDefaultMaxTxFee())
return AbsurdFee;
}