Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

wallet2_api: allow connection to return "yes, but wrong version"

Browse Source
This commit is contained in:
moneromooo-monero 2016-11-07 12:00:29 +00:00
parent 1372f255af
commit 63fe6fd9ba
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/api/wallet.cpp
View File

@ -720,9 +720,15 @@ bool WalletImpl::connectToDaemon()
return result; return result;
} }
bool WalletImpl::connected() const Wallet::ConnectionStatus WalletImpl::connected() const
{ {
return m_wallet->check_connection(); 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) void WalletImpl::setTrustedDaemon(bool arg)

2
src/wallet/api/wallet.h
View File

@ -70,7 +70,7 @@ public:
bool init(const std::string &daemon_address, uint64_t upper_transaction_size_limit); 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); void initAsync(const std::string &daemon_address, uint64_t upper_transaction_size_limit);
bool connectToDaemon(); bool connectToDaemon();
bool connected() const; ConnectionStatus connected() const;
void setTrustedDaemon(bool arg); void setTrustedDaemon(bool arg);
bool trustedDaemon() const; bool trustedDaemon() const;
uint64_t balance() const; uint64_t balance() const;

8
src/wallet/wallet2_api.h
View File

@ -159,6 +159,12 @@ struct Wallet
Status_Error Status_Error
}; };
enum ConnectionStatus {
ConnectionStatus_Disconnected,
ConnectionStatus_Connected,
ConnectionStatus_WrongVersion
};
virtual ~Wallet() = 0; virtual ~Wallet() = 0;
virtual std::string seed() const = 0; virtual std::string seed() const = 0;
virtual std::string getSeedLanguage() const = 0; virtual std::string getSeedLanguage() const = 0;
@ -243,7 +249,7 @@ struct Wallet
* @brief connected - checks if the wallet connected to the daemon * @brief connected - checks if the wallet connected to the daemon
* @return - true if connected * @return - true if connected
*/ */
virtual bool connected() const = 0; virtual ConnectionStatus connected() const = 0;
virtual void setTrustedDaemon(bool arg) = 0; virtual void setTrustedDaemon(bool arg) = 0;
virtual bool trustedDaemon() const = 0; virtual bool trustedDaemon() const = 0;
virtual uint64_t balance() const = 0; virtual uint64_t balance() const = 0;