Permalink
Browse files

Merge pull request #6951

513686d [qt] Use maxTxFee instead of 10000000 (MarcoFalke)
  • Loading branch information...
jonasschnelli committed Nov 18, 2015
2 parents 7f8e90d + 513686d commit 03403d8c0f3b40f04ef9fac8781ac8e19ed304ec
Showing with 5 additions and 3 deletions.
  1. +1 −1 src/qt/sendcoinsdialog.cpp
  2. +4 −2 src/qt/walletmodel.cpp
@@ -531,7 +531,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn
msgParams.second = CClientUIInterface::MSG_ERROR;
break;
case WalletModel::AbsurdFee:
- msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), 10000000));
+ msgParams.first = tr("A fee higher than %1 is considered an absurdly high fee.").arg(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), maxTxFee));
break;
case WalletModel::PaymentRequestExpired:
msgParams.first = tr("Payment request expired.");
View
@@ -290,8 +290,10 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact
return TransactionCreationFailed;
}
- // reject absurdly high fee > 0.1 bitcoin
- if (nFeeRequired > 10000000)
+ // reject absurdly high fee. (This can never happen because the
+ // wallet caps the fee at maxTxFee. This merely serves as a
+ // belt-and-suspenders check)
+ if (nFeeRequired > maxTxFee)
return AbsurdFee;
}

0 comments on commit 03403d8

Please sign in to comment.