Merge pull request #807

a7f52db History: Support coinbase txs requires #2247 (Jaquee)

3 files changed, 10 insertions, 2 deletions

diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp
index 9cd22bee..31e8952e 100644
--- a/src/libwalletqt/TransactionHistory.cpp
+++ b/src/libwalletqt/TransactionHistory.cpp
@@ -45,11 +45,12 @@ QList<TransactionInfo *> TransactionHistory::getAll() const
         if (ti->timestamp() <= firstDateTime) {
             firstDateTime = ti->timestamp();
         }
+        quint64 requiredConfirmations = (ti->blockHeight() < ti->unlockTime()) ? ti->unlockTime() - ti->blockHeight() : 0;
         // store last tx height
-        if (ti->confirmations() < 10 && ti->blockHeight() >= lastTxHeight ){
+        if (ti->confirmations() < requiredConfirmations && ti->blockHeight() >= lastTxHeight) {
             lastTxHeight = ti->blockHeight();
             // TODO: Fetch block time and confirmations needed from wallet2?
-            m_minutesToUnlock = (10 - ti->confirmations()) * 2;
+            m_minutesToUnlock = (requiredConfirmations - ti->confirmations()) * 2;
             m_locked = true;
         }
 
diff --git a/src/libwalletqt/TransactionInfo.cpp b/src/libwalletqt/TransactionInfo.cpp
index 71df2b02..5ad739bf 100644
--- a/src/libwalletqt/TransactionInfo.cpp
+++ b/src/libwalletqt/TransactionInfo.cpp
@@ -51,6 +51,11 @@ quint64 TransactionInfo::confirmations() const
     return m_pimpl->confirmations();
 }
 
+quint64 TransactionInfo::unlockTime() const
+{
+    return m_pimpl->unlockTime();
+}
+
 QString TransactionInfo::hash() const
 {
     return QString::fromStdString(m_pimpl->hash());
diff --git a/src/libwalletqt/TransactionInfo.h b/src/libwalletqt/TransactionInfo.h
index 30418b88..fa13a3be 100644
--- a/src/libwalletqt/TransactionInfo.h
+++ b/src/libwalletqt/TransactionInfo.h
@@ -19,6 +19,7 @@ class TransactionInfo : public QObject
     Q_PROPERTY(QString fee READ fee)
     Q_PROPERTY(quint64 blockHeight READ blockHeight)
     Q_PROPERTY(quint64 confirmations READ confirmations)
+    Q_PROPERTY(quint64 unlockTime READ unlockTime)
     Q_PROPERTY(QString hash READ hash)
     Q_PROPERTY(QDateTime timestamp READ timestamp)
     Q_PROPERTY(QString date READ date)
@@ -44,6 +45,7 @@ public:
     QString fee() const;
     quint64 blockHeight() const;
     quint64 confirmations() const;
+    quint64 unlockTime() const;
     //! transaction_id
     QString hash() const;
     QDateTime timestamp() const;