diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2017-10-23 15:59:26 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2017-10-23 15:59:26 -0500 |
| commit | 80a058c954817bf710561cf6866a895e77664805 (patch) | |
| tree | d43894aaeddb5bc93e6fb53c3670c413b178584d | |
| parent | ff1780aeaaa6a53f59281be3791a53c9968943ab (diff) | |
| parent | 0ae04fde4bc1b5528cc5365529331f614dea809d (diff) | |
| download | monzero-gui-80a058c954817bf710561cf6866a895e77664805.tar.gz monzero-gui-80a058c954817bf710561cf6866a895e77664805.tar.xz monzero-gui-80a058c954817bf710561cf6866a895e77664805.zip | |
Merge pull request #920
0ae04fd use 10 as default required confirmations
| -rw-r--r-- | src/libwalletqt/TransactionHistory.cpp | 2 | ||||
| -rw-r--r-- | src/model/TransactionHistoryModel.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libwalletqt/TransactionHistory.cpp b/src/libwalletqt/TransactionHistory.cpp index 31e8952e..eeb5c2a6 100644 --- a/src/libwalletqt/TransactionHistory.cpp +++ b/src/libwalletqt/TransactionHistory.cpp @@ -45,7 +45,7 @@ QList<TransactionInfo *> TransactionHistory::getAll() const if (ti->timestamp() <= firstDateTime) { firstDateTime = ti->timestamp(); } - quint64 requiredConfirmations = (ti->blockHeight() < ti->unlockTime()) ? ti->unlockTime() - ti->blockHeight() : 0; + quint64 requiredConfirmations = (ti->blockHeight() < ti->unlockTime()) ? ti->unlockTime() - ti->blockHeight() : 10; // store last tx height if (ti->confirmations() < requiredConfirmations && ti->blockHeight() >= lastTxHeight) { lastTxHeight = ti->blockHeight(); diff --git a/src/model/TransactionHistoryModel.cpp b/src/model/TransactionHistoryModel.cpp index c1f61fa1..907c21e8 100644 --- a/src/model/TransactionHistoryModel.cpp +++ b/src/model/TransactionHistoryModel.cpp @@ -3,6 +3,7 @@ #include "TransactionInfo.h" #include <QDateTime> +#include <QDebug> TransactionHistoryModel::TransactionHistoryModel(QObject *parent) @@ -86,7 +87,7 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const result = tInfo->confirmations(); break; case TransactionConfirmationsRequiredRole: - result = (tInfo->blockHeight() < tInfo->unlockTime()) ? tInfo->unlockTime() - tInfo->blockHeight() : 0; + result = (tInfo->blockHeight() < tInfo->unlockTime()) ? tInfo->unlockTime() - tInfo->blockHeight() : 10; break; case TransactionHashRole: result = tInfo->hash(); |