diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-23 21:22:50 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-23 21:22:50 +0200 |
| commit | c04417d37b80752e4f4e6b2ea1d6c702aeabd18a (patch) | |
| tree | c9096a2df37aa38d2995a3fb4e2603263b55dc8a /src/libwalletqt/TransactionHistory.cpp | |
| parent | 7521472325f430995e694df7823f43a383909489 (diff) | |
| parent | a7f52db61386e1af24ce3aa3836f6991decebae3 (diff) | |
| download | monzero-gui-c04417d37b80752e4f4e6b2ea1d6c702aeabd18a.tar.gz monzero-gui-c04417d37b80752e4f4e6b2ea1d6c702aeabd18a.tar.xz monzero-gui-c04417d37b80752e4f4e6b2ea1d6c702aeabd18a.zip | |
Merge pull request #807
a7f52db History: Support coinbase txs requires #2247 (Jaquee)
Diffstat (limited to 'src/libwalletqt/TransactionHistory.cpp')
| -rw-r--r-- | src/libwalletqt/TransactionHistory.cpp | 5 |
1 files changed, 3 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; } |