monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-10-02 05:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #920

Browse source 
0ae04fd use 10 as default required confirmations
This commit is contained in:
luigi1111 2017-10-23 15:59:26 -05:00
commit 80a058c954
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libwalletqt/TransactionHistory.cpp
View file

@ -45,7 +45,7 @@ QList<TransactionInfo *> TransactionHistory::getAll() const
if (ti->timestamp() <= firstDateTime) { if (ti->timestamp() <= firstDateTime) {
firstDateTime = ti->timestamp(); 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 // store last tx height
if (ti->confirmations() < requiredConfirmations && ti->blockHeight() >= lastTxHeight) { if (ti->confirmations() < requiredConfirmations && ti->blockHeight() >= lastTxHeight) {
lastTxHeight = ti->blockHeight(); lastTxHeight = ti->blockHeight();

3
src/model/TransactionHistoryModel.cpp
View file

@ -3,6 +3,7 @@
#include "TransactionInfo.h" #include "TransactionInfo.h"
#include <QDateTime> #include <QDateTime>
#include <QDebug>
TransactionHistoryModel::TransactionHistoryModel(QObject *parent) TransactionHistoryModel::TransactionHistoryModel(QObject *parent)
@ -86,7 +87,7 @@ QVariant TransactionHistoryModel::data(const QModelIndex &index, int role) const
result = tInfo->confirmations(); result = tInfo->confirmations();
break; break;
case TransactionConfirmationsRequiredRole: case TransactionConfirmationsRequiredRole:
result = (tInfo->blockHeight() < tInfo->unlockTime()) ? tInfo->unlockTime() - tInfo->blockHeight() : 0; result = (tInfo->blockHeight() < tInfo->unlockTime()) ? tInfo->unlockTime() - tInfo->blockHeight() : 10;
break; break;
case TransactionHashRole: case TransactionHashRole:
result = tInfo->hash(); result = tInfo->hash();