Merge pull request #1302

63fe6fd wallet2_api: allow connection to return "yes, but wrong version" (moneromooo-monero)

3 files changed, 17 insertions, 5 deletions

diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 3c472b410..fb56a347f 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -760,9 +760,15 @@ bool WalletImpl::connectToDaemon()
     return result;
 }
 
-bool WalletImpl::connected() const
-{
-    return m_wallet->check_connection();
+Wallet::ConnectionStatus WalletImpl::connected() const
+{
+    bool same_version = false;
+    bool is_connected = m_wallet->check_connection(&same_version);
+    if (!is_connected)
+        return Wallet::ConnectionStatus_Disconnected;
+    if (!same_version)
+        return Wallet::ConnectionStatus_WrongVersion;
+    return Wallet::ConnectionStatus_Connected;
 }
 
 void WalletImpl::setTrustedDaemon(bool arg)
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index 7973349ca..3f6d2ac7b 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -70,7 +70,7 @@ public:
     bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit);
     void initAsync(const std::string &daemon_address, uint64_t upper_transaction_size_limit);
     bool connectToDaemon();
-    bool connected() const;
+    ConnectionStatus connected() const;
     void setTrustedDaemon(bool arg);
     bool trustedDaemon() const;
     uint64_t balance() const;
diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h
index afa4aa5fe..da1dbd6e1 100644
--- a/src/wallet/wallet2_api.h
+++ b/src/wallet/wallet2_api.h
@@ -160,6 +160,12 @@ struct Wallet
         Status_Error
     };
 
+    enum ConnectionStatus {
+        ConnectionStatus_Disconnected,
+        ConnectionStatus_Connected,
+        ConnectionStatus_WrongVersion
+    };
+
     virtual ~Wallet() = 0;
     virtual std::string seed() const = 0;
     virtual std::string getSeedLanguage() const = 0;
@@ -244,7 +250,7 @@ struct Wallet
      * @brief connected - checks if the wallet connected to the daemon
      * @return - true if connected
      */
-    virtual bool connected() const = 0;
+    virtual ConnectionStatus connected() const = 0;
     virtual void setTrustedDaemon(bool arg) = 0;
     virtual bool trustedDaemon() const = 0;
     virtual uint64_t balance() const = 0;