Browse Source

Merge pull request #6951

513686d [qt] Use maxTxFee instead of 10000000 (MarcoFalke)
0.13
Jonas Schnelli 9 years ago
parent
commit
03403d8c0f
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
  1. 2
      src/qt/sendcoinsdialog.cpp
  2. 6
      src/qt/walletmodel.cpp

2
src/qt/sendcoinsdialog.cpp

@ -531,7 +531,7 @@ void SendCoinsDialog::processSendCoinsReturn(const WalletModel::SendCoinsReturn @@ -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.");

6
src/qt/walletmodel.cpp

@ -290,8 +290,10 @@ WalletModel::SendCoinsReturn WalletModel::prepareTransaction(WalletModelTransact @@ -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;
}

Loading…
Cancel
Save