GUI: Support returning positions from BitcoinAddress{Entry,Check}Validator::validate

Author: luke-jr

src/qt/bitcoinaddressvalidator.cpp

@@ -6,6 +6,8 @@
 
 #include <key_io.h>
 
+#include <vector>
+
 /* Base58 characters are:
      "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
 
@@ -20,10 +22,8 @@ BitcoinAddressEntryValidator::BitcoinAddressEntryValidator(QObject *parent) :
 {
 }
 
-QValidator::State BitcoinAddressEntryValidator::validate(QString &input, int &pos) const
+QValidator::State BitcoinAddressEntryValidator::validate(QString &input, std::vector<int>&error_locations) const
 {
-    Q_UNUSED(pos);
-
     // Empty address is "intermediate" input
     if (input.isEmpty())
         return QValidator::Intermediate;
@@ -73,23 +73,33 @@ QValidator::State BitcoinAddressEntryValidator::validate(QString &input, int &po
         }
         else
         {
+            error_locations.push_back(idx);
             state = QValidator::Invalid;
         }
     }
 
     return state;
 }
 
+QValidator::State BitcoinAddressEntryValidator::validate(QString &input, int &pos) const
+{
+    std::vector<int> error_locations;
+    const auto ret = validate(input, error_locations);
+    if (!error_locations.empty()) pos = error_locations.at(0);
+    return ret;
+}
+
 BitcoinAddressCheckValidator::BitcoinAddressCheckValidator(QObject *parent) :
-    QValidator(parent)
+    BitcoinAddressEntryValidator(parent)
 {
 }
 
-QValidator::State BitcoinAddressCheckValidator::validate(QString &input, int &pos) const
+QValidator::State BitcoinAddressCheckValidator::validate(QString &input, std::vector<int>&error_locations) const
 {
-    Q_UNUSED(pos);
     // Validate the passed Bitcoin address
-    if (IsValidDestinationString(input.toStdString())) {
+    std::string error_msg;
+    CTxDestination dest = DecodeDestination(input.toStdString(), error_msg, &error_locations);
+    if (IsValidDestination(dest)) {
         return QValidator::Acceptable;
     }
 

src/qt/bitcoinaddressvalidator.h

@@ -7,6 +7,8 @@
 
 #include <QValidator>
 
+#include <vector>
+
 /** Base58 entry widget validator, checks for valid characters and
  * removes some whitespace.
  */
@@ -17,19 +19,20 @@ class BitcoinAddressEntryValidator : public QValidator
 public:
     explicit BitcoinAddressEntryValidator(QObject *parent);
 
-    State validate(QString &input, int &pos) const override;
+    virtual State validate(QString &input, std::vector<int>&error_locations) const;
+    virtual State validate(QString &input, int &pos) const override;
 };
 
 /** Bitcoin address widget validator, checks for a valid bitcoin address.
  */
-class BitcoinAddressCheckValidator : public QValidator
+class BitcoinAddressCheckValidator : public BitcoinAddressEntryValidator
 {
     Q_OBJECT
 
 public:
     explicit BitcoinAddressCheckValidator(QObject *parent);
 
-    State validate(QString &input, int &pos) const override;
+    State validate(QString &input, std::vector<int>&error_locations) const override;
 };
 
 #endif // BITCOIN_QT_BITCOINADDRESSVALIDATOR_H