Skip to content

Commit 513686d

Browse files
author
MarcoFalke
committed
[qt] Use maxTxFee instead of 10000000
1 parent 3038eb6 commit 513686d

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/qt/sendcoinsdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
530530
msgParams.second = CClientUIInterface::MSG_ERROR;
531531
break;
532532
case WalletModel::AbsurdFee:
533-
msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), 10000000));
533+
msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), maxTxFee));
534534
break;
535535
case WalletModel::PaymentRequestExpired:
536536
msgParams.first = tr("Payment request expired.");

src/qt/walletmodel.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,10 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
290290
return TransactionCreationFailed;
291291
}
292292

293-
// reject absurdly high fee > 0.1 bitcoin
294-
if (nFeeRequired > 10000000)
293+
// reject absurdly high fee. (This can never happen because the
294+
// wallet caps the fee at maxTxFee. This merely serves as a
295+
// belt-and-suspenders check)
296+
if (nFeeRequired > maxTxFee)
295297
return AbsurdFee;
296298
}
297299

0 commit comments

Comments
 (0)