Reject dust amounts during validation
Replaces the validation check for "amount == 0" with an isDust check, so very small output amounts are caught before the wallet is unlocked, a transaction is created, etc.
This commit is contained in:
parent
b986663ccd
commit
57d80467f1
3 changed files with 22 additions and 14 deletions
|
@ -148,6 +148,14 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)
|
|||
return parseBitcoinURI(uriInstance, out);
|
||||
}
|
||||
|
||||
bool isDust(const QString& address, qint64 amount)
|
||||
{
|
||||
CTxDestination dest = CBitcoinAddress(address.toStdString()).Get();
|
||||
CScript script; script.SetDestination(dest);
|
||||
CTxOut txOut(amount, script);
|
||||
return txOut.IsDust(CTransaction::nMinRelayTxFee);
|
||||
}
|
||||
|
||||
QString HtmlEscape(const QString& str, bool fMultiLine)
|
||||
{
|
||||
#if QT_VERSION < 0x050000
|
||||
|
|
|
@ -36,6 +36,9 @@ namespace GUIUtil
|
|||
bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out);
|
||||
bool parseBitcoinURI(QString uri, SendCoinsRecipient *out);
|
||||
|
||||
// Returns true if given address+amount meets "dust" definition
|
||||
bool isDust(const QString& address, qint64 amount);
|
||||
|
||||
// HTML escaping for rich text controls
|
||||
QString HtmlEscape(const QString& str, bool fMultiLine=false);
|
||||
QString HtmlEscape(const std::string& str, bool fMultiLine=false);
|
||||
|
|
|
@ -101,20 +101,6 @@ bool SendCoinsEntry::validate()
|
|||
// Check input validity
|
||||
bool retval = true;
|
||||
|
||||
if(!ui->payAmount->validate())
|
||||
{
|
||||
retval = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if(ui->payAmount->value() <= 0)
|
||||
{
|
||||
// Cannot send 0 coins or less
|
||||
ui->payAmount->setValid(false);
|
||||
retval = false;
|
||||
}
|
||||
}
|
||||
|
||||
if(!ui->payTo->hasAcceptableInput() ||
|
||||
(model && !model->validateAddress(ui->payTo->text())))
|
||||
{
|
||||
|
@ -122,6 +108,17 @@ bool SendCoinsEntry::validate()
|
|||
retval = false;
|
||||
}
|
||||
|
||||
if(!ui->payAmount->validate())
|
||||
{
|
||||
retval = false;
|
||||
}
|
||||
|
||||
// Reject dust outputs:
|
||||
if (retval && GUIUtil::isDust(ui->payTo->text(), ui->payAmount->value())) {
|
||||
ui->payAmount->setValid(false);
|
||||
retval = false;
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue