Merge pull request #66

628b26c Transfer: validate destination address (moneromooo.monero)
51f89a8 Transfer: disable Send button if the payment id is invalid (moneromooo.monero)

2 files changed, 19 insertions, 0 deletions

diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp
index 2e1fe57b..7b60c528 100644
--- a/src/libwalletqt/WalletManager.cpp
+++ b/src/libwalletqt/WalletManager.cpp
@@ -149,6 +149,21 @@ quint64 WalletManager::amountFromDouble(double amount) const
     return Bitmonero::Wallet::amountFromDouble(amount);
 }
 
+bool WalletManager::paymentIdValid(const QString &payment_id) const
+{
+    return Bitmonero::Wallet::paymentIdValid(payment_id.toStdString());
+}
+
+bool WalletManager::addressValid(const QString &address, bool testnet) const
+{
+    return Bitmonero::Wallet::addressValid(address.toStdString(), testnet);
+}
+
+QString WalletManager::paymentIdFromAddress(const QString &address, bool testnet) const
+{
+    return QString::fromStdString(Bitmonero::Wallet::paymentIdFromAddress(address.toStdString(), testnet));
+}
+
 void WalletManager::setLogLevel(int logLevel)
 {
     Bitmonero::WalletManagerFactory::setLogLevel(logLevel);
diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h
index 24fb60fc..51ad0dbf 100644
--- a/src/libwalletqt/WalletManager.h
+++ b/src/libwalletqt/WalletManager.h
@@ -89,6 +89,10 @@ public:
     // QML JS engine doesn't support unsigned integers
     Q_INVOKABLE QString maximumAllowedAmountAsSting() const;
 
+    Q_INVOKABLE bool paymentIdValid(const QString &payment_id) const;
+    Q_INVOKABLE bool addressValid(const QString &address, bool testnet) const;
+    Q_INVOKABLE QString paymentIdFromAddress(const QString &address, bool testnet) const;
+
     // QML missing such functionality, implementing these helpers here
     Q_INVOKABLE QString urlToLocalPath(const QUrl &url) const;
     Q_INVOKABLE QUrl localPathToUrl(const QString &path) const;