diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libwalletqt/Wallet.cpp | 38 | ||||
| -rw-r--r-- | src/libwalletqt/Wallet.h | 23 |
2 files changed, 53 insertions, 8 deletions
diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp index 034aa1de..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 @@ -39,7 +38,7 @@ public: virtual void newBlock(uint64_t height) { - qDebug() << __FUNCTION__; + // qDebug() << __FUNCTION__; emit m_wallet->newBlock(height); } @@ -137,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(); @@ -150,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) @@ -199,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)); } diff --git a/src/libwalletqt/Wallet.h b/src/libwalletqt/Wallet.h index faa01263..703bd186 100644 --- a/src/libwalletqt/Wallet.h +++ b/src/libwalletqt/Wallet.h @@ -2,11 +2,11 @@ #define WALLET_H #include <QObject> +#include <QTime> #include "wallet/wallet2_api.h" // we need to have an access to the Bitmonero::Wallet::Status enum here; #include "PendingTransaction.h" // we need to have an access to the PendingTransaction::Priority enum here; - namespace Bitmonero { class Wallet; // forward declaration } @@ -28,7 +28,6 @@ class Wallet : public QObject Q_PROPERTY(TransactionHistory * history READ history) Q_PROPERTY(QString paymentId READ paymentId WRITE setPaymentId) - public: enum Status { Status_Ok = Bitmonero::Wallet::Status_Ok, @@ -77,10 +76,17 @@ public: Q_INVOKABLE void setTrustedDaemon(bool arg); //! returns balance - quint64 balance() const; + Q_INVOKABLE quint64 balance() const; //! returns unlocked balance - quint64 unlockedBalance() const; + Q_INVOKABLE quint64 unlockedBalance() const; + + //! returns current wallet's block height + //! (can be less than daemon's blockchain height when wallet sync in progress) + Q_INVOKABLE quint64 blockChainHeight() const; + + //! returns daemon's blockchain height + Q_INVOKABLE quint64 daemonBlockChainHeight() const; //! refreshes the wallet Q_INVOKABLE bool refresh(); @@ -89,6 +95,12 @@ public: //! refreshes the wallet asynchronously Q_INVOKABLE void refreshAsync(); + //! setup auto-refresh interval in seconds + Q_INVOKABLE void setAutoRefreshInterval(int seconds); + + //! return auto-refresh interval in seconds + Q_INVOKABLE int autoRefreshInterval() const; + //! creates transaction Q_INVOKABLE PendingTransaction * createTransaction(const QString &dst_addr, const QString &payment_id, quint64 amount, quint32 mixin_count, @@ -138,6 +150,9 @@ private: // history lifetime managed by wallet; TransactionHistory * m_history; QString m_paymentId; + mutable QTime m_daemonBlockChainHeightTime; + mutable quint64 m_daemonBlockChainHeight; + int m_daemonBlockChainHeightTtl; }; |