Remove direct bitcoin access from qt/guiutil.cpp

ryanofsky · jnewbery · commit e872c93ee874 · 2018-04-04T16:52:40.000-04:00
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -13,7 +13,7 @@
 #include <chainparams.h>
 #include <primitives/transaction.h>
 #include <key_io.h>
-#include <init.h>
+#include <interface/node.h>
 #include <policy/policy.h>
 #include <protocol.h>
 #include <script/script.h>
@@ -232,12 +232,12 @@ QString formatBitcoinURI(const SendCoinsRecipient &info)
     return ret;
 }
 
-bool isDust(const QString& address, const CAmount& amount)
+bool isDust(interface::Node& node, const QString& address, const CAmount& amount)
 {
     CTxDestination dest = DecodeDestination(address.toStdString());
     CScript script = GetScriptForDestination(dest);
     CTxOut txOut(amount, script);
-    return IsDust(txOut, ::dustRelayFee);
+    return IsDust(txOut, node.getDustRelayFee());
 }
 
 QString HtmlEscape(const QString& str, bool fMultiLine)
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -20,6 +20,11 @@
 class QValidatedLineEdit;
 class SendCoinsRecipient;
 
+namespace interface
+{
+    class Node;
+}
+
 QT_BEGIN_NAMESPACE
 class QAbstractItemView;
 class QDateTime;
@@ -49,7 +54,7 @@ namespace GUIUtil
     QString formatBitcoinURI(const SendCoinsRecipient &info);
 
     // Returns true if given address+amount meets "dust" definition
-    bool isDust(const QString& address, const CAmount& amount);
+    bool isDust(interface::Node& node, const QString& address, const CAmount& amount);
 
     // HTML escaping for rich text controls
     QString HtmlEscape(const QString& str, bool fMultiLine=false);
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -226,7 +226,7 @@ void SendCoinsDialog::on_sendButton_clicked()
         SendCoinsEntry *entry = qobject_cast<SendCoinsEntry*>(ui->entries->itemAt(i)->widget());
         if(entry)
         {
-            if(entry->validate())
+            if(entry->validate(model->node()))
             {
                 recipients.append(entry->getValue());
             }
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
@@ -127,7 +127,7 @@ void SendCoinsEntry::useAvailableBalanceClicked()
     Q_EMIT useAvailableBalance(this);
 }
 
-bool SendCoinsEntry::validate()
+bool SendCoinsEntry::validate(interface::Node& node)
 {
     if (!model)
         return false;
@@ -158,7 +158,7 @@ bool SendCoinsEntry::validate()
     }
 
     // Reject dust outputs:
-    if (retval && GUIUtil::isDust(ui->payTo->text(), ui->payAmount->value())) {
+    if (retval && GUIUtil::isDust(node, ui->payTo->text(), ui->payAmount->value())) {
         ui->payAmount->setValid(false);
         retval = false;
     }
diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h
@@ -30,7 +30,7 @@ class SendCoinsEntry : public QStackedWidget
     ~SendCoinsEntry();
 
     void setModel(WalletModel *model);
-    bool validate();
+    bool validate(interface::Node& node);
     SendCoinsRecipient getValue();
 
     /** Return whether the entry is still empty and unedited */

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ void SendCoinsDialog::on_sendButton_clicked()`
`226`	`226`	`SendCoinsEntry entry = qobject_cast<SendCoinsEntry>(ui->entries->itemAt(i)->widget());`
`227`	`227`	`if(entry)`
`228`	`228`	`{`
`229`		`- if(entry->validate())`
	`229`	`+ if(entry->validate(model->node()))`
`230`	`230`	`{`
`231`	`231`	`recipients.append(entry->getValue());`
`232`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ void SendCoinsEntry::useAvailableBalanceClicked()`
`127`	`127`	`Q_EMIT useAvailableBalance(this);`
`128`	`128`	`}`
`129`	`129`
`130`		`-bool SendCoinsEntry::validate()`
	`130`	`+bool SendCoinsEntry::validate(interface::Node& node)`
`131`	`131`	`{`
`132`	`132`	`if (!model)`
`133`	`133`	`return false;`
`@@ -158,7 +158,7 @@ bool SendCoinsEntry::validate()`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`// Reject dust outputs:`
`161`		`- if (retval && GUIUtil::isDust(ui->payTo->text(), ui->payAmount->value())) {`
	`161`	`+ if (retval && GUIUtil::isDust(node, ui->payTo->text(), ui->payAmount->value())) {`
`162`	`162`	`ui->payAmount->setValid(false);`
`163`	`163`	`retval = false;`
`164`	`164`	`}`