diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-16 19:32:51 +0100 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-01-16 19:33:08 +0100 |
commit | dd98f045382428f450dc917a3933c9e4e8e1ba99 (patch) | |
tree | 3dcc0f69a886c8eb4fee8378447ca4a15031b22d /src/qt/paymentserver.cpp | |
parent | 8a445c5651edb9a1f51497055b7ddf4402be9188 (diff) | |
parent | eb30d1a5b215c6dd3763d7f7948f2dd8cb61f6bf (diff) | |
download | bitcoin-dd98f045382428f450dc917a3933c9e4e8e1ba99.tar.xz |
Merge #9380: Separate different uses of minimum fees
eb30d1a Introduce -dustrelayfee (Alex Morcos)
7b1add3 Introduce -incrementalrelayfee (Alex Morcos)
daec955 Introduce -blockmintxfee (Alex Morcos)
Diffstat (limited to 'src/qt/paymentserver.cpp')
-rw-r--r-- | src/qt/paymentserver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 6b2871424d..688e8123af 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -10,7 +10,7 @@ #include "base58.h" #include "chainparams.h" -#include "validation.h" // For minRelayTxFee +#include "policy/policy.h" #include "ui_interface.h" #include "util.h" #include "wallet/wallet.h" @@ -582,7 +582,7 @@ bool PaymentServer::processPaymentRequest(const PaymentRequestPlus& request, Sen // Extract and check amounts CTxOut txOut(sendingTo.second, sendingTo.first); - if (txOut.IsDust(::minRelayTxFee)) { + if (txOut.IsDust(dustRelayFee)) { Q_EMIT message(tr("Payment request error"), tr("Requested payment amount of %1 is too small (considered dust).") .arg(BitcoinUnits::formatWithUnit(optionsModel->getDisplayUnit(), sendingTo.second)), CClientUIInterface::MSG_ERROR); |