diff options
author | Ilya Kitaev <mbg033@gmail.com> | 2016-09-26 21:35:00 +0300 |
---|---|---|
committer | Ilya Kitaev <mbg033@gmail.com> | 2016-09-26 23:19:25 +0300 |
commit | 7b4a85b309aa0fb864d63a2fd6f1ae062aaa71dd (patch) | |
tree | bd7c073734e9de7b2326ded18bfda73557aaa9eb /src/wallet/api | |
parent | libwallet_api: Wallet::blockChainHeight, WalletListener::newBlock (diff) | |
download | monero-7b4a85b309aa0fb864d63a2fd6f1ae062aaa71dd.tar.xz |
wallet2_api: added Wallet::daemonBlockChainHeight()
Diffstat (limited to 'src/wallet/api')
-rw-r--r-- | src/wallet/api/wallet.cpp | 15 | ||||
-rw-r--r-- | src/wallet/api/wallet.h | 5 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index eef956e80..986deca1f 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -422,6 +422,21 @@ uint64_t WalletImpl::blockChainHeight() const return m_wallet->get_blockchain_current_height(); } +uint64_t WalletImpl::daemonBlockChainHeight() const +{ + std::string err; + uint64_t result = m_wallet->get_daemon_blockchain_height(err); + if (!err.empty()) { + LOG_ERROR(__FUNCTION__ << ": " << err); + m_errorString = err; + m_status = Status_Error; + } else { + m_status = Status_Ok; + m_errorString = ""; + } + return result; +} + bool WalletImpl::refresh() { clearStatus(); diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h index 1a34a04fd..03801edac 100644 --- a/src/wallet/api/wallet.h +++ b/src/wallet/api/wallet.h @@ -76,6 +76,7 @@ public: uint64_t balance() const; uint64_t unlockedBalance() const; uint64_t blockChainHeight() const; + uint64_t daemonBlockChainHeight() const; bool refresh(); void refreshAsync(); void setAutoRefreshInterval(int seconds); @@ -106,8 +107,8 @@ private: friend class TransactionHistoryImpl; tools::wallet2 * m_wallet; - std::atomic<int> m_status; - std::string m_errorString; + mutable std::atomic<int> m_status; + mutable std::string m_errorString; std::string m_password; TransactionHistoryImpl * m_history; bool m_trustedDaemon; |