Merge pull request #1173

65ea836 wallet2_api: added Wallet::daemonBlockChainTargetHeight() libwallet_api: Wallet::blockChainTargetHeight (Jacob Brydolf)

2 files changed, 18 insertions, 0 deletions

diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 16321a5a2..4d35bc404 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -438,6 +438,23 @@ uint64_t WalletImpl::daemonBlockChainHeight() const
     return result;
 }
 
+uint64_t WalletImpl::daemonBlockChainTargetHeight() const
+{
+    std::string err;
+    uint64_t result = m_wallet->get_daemon_blockchain_target_height(err);
+    if (!err.empty()) {
+        LOG_ERROR(__FUNCTION__ << ": " << err);
+        result = 0;
+        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 5706b2bf5..c399e3ab6 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -77,6 +77,7 @@ public:
     uint64_t unlockedBalance() const;
     uint64_t blockChainHeight() const;
     uint64_t daemonBlockChainHeight() const;
+    uint64_t daemonBlockChainTargetHeight() const;
     bool refresh();
     void refreshAsync();
     void setAutoRefreshInterval(int millis);