Merge pull request #32

f0d2e58 make splash less resource intensive (Jacob Brydolf)
ad2943f libwallet_api: switched to main repo (Ilya Kitaev)
f402fd9 Wallet::daemonBlockChainHeight(); BC sync progress in GUI (Ilya Kitaev)
7e769b3 Wallet: moneySpent, moneyReceived, newBlock signals (Ilya Kitaev)

1 files changed, 43 insertions, 9 deletions

diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 4c6995cb..987f4640 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -10,8 +10,7 @@
 #include <QTimer>
 
 namespace {
-
-
+    static const int DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS = 60;
 }
 
 class WalletListenerImpl : public  Bitmonero::WalletListener
@@ -25,18 +24,22 @@ public:
 
     virtual void moneySpent(const std::string &txId, uint64_t amount)
     {
-        // TODO
-        Q_UNUSED(txId)
-        Q_UNUSED(amount)
         qDebug() << __FUNCTION__;
+        emit m_wallet->moneySpent(QString::fromStdString(txId), amount);
     }
 
+
     virtual void moneyReceived(const std::string &txId, uint64_t amount)
     {
-        // TODO
-        Q_UNUSED(txId)
-        Q_UNUSED(amount)
+
         qDebug() << __FUNCTION__;
+        emit m_wallet->moneyReceived(QString::fromStdString(txId), amount);
+    }
+
+    virtual void newBlock(uint64_t height)
+    {
+        // qDebug() << __FUNCTION__;
+        emit m_wallet->newBlock(height);
     }
 
     virtual void updated()
@@ -133,6 +136,23 @@ quint64 Wallet::unlockedBalance() const
     return m_walletImpl->unlockedBalance();
 }
 
+quint64 Wallet::blockChainHeight() const
+{
+    return m_walletImpl->blockChainHeight();
+}
+
+quint64 Wallet::daemonBlockChainHeight() const
+{
+    // cache daemon blockchain height for some time (60 seconds by default)
+
+    if (m_daemonBlockChainHeight == 0
+            || m_daemonBlockChainHeightTime.elapsed() / 1000 > m_daemonBlockChainHeightTtl) {
+        m_daemonBlockChainHeight = m_walletImpl->daemonBlockChainHeight();
+        m_daemonBlockChainHeightTime.restart();
+    }
+    return m_daemonBlockChainHeight;
+}
+
 bool Wallet::refresh()
 {
     bool result = m_walletImpl->refresh();
@@ -146,6 +166,16 @@ void Wallet::refreshAsync()
     m_walletImpl->refreshAsync();
 }
 
+void Wallet::setAutoRefreshInterval(int seconds)
+{
+    m_walletImpl->setAutoRefreshInterval(seconds);
+}
+
+int Wallet::autoRefreshInterval() const
+{
+    return m_walletImpl->autoRefreshInterval();
+}
+
 PendingTransaction *Wallet::createTransaction(const QString &dst_addr, const QString &payment_id,
                                               quint64 amount, quint32 mixin_count,
                                               PendingTransaction::Priority priority)
@@ -195,7 +225,11 @@ void Wallet::setPaymentId(const QString &paymentId)
 
 
 Wallet::Wallet(Bitmonero::Wallet *w, QObject *parent)
-    : QObject(parent), m_walletImpl(w), m_history(nullptr)
+    : QObject(parent)
+    , m_walletImpl(w)
+    , m_history(nullptr)
+    , m_daemonBlockChainHeight(0)
+    , m_daemonBlockChainHeightTtl(DAEMON_BLOCKCHAIN_HEIGHT_CACHE_TTL_SECONDS)
 {
     m_walletImpl->setListener(new WalletListenerImpl(this));
 }