sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 03:52:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #14556: qt: fix confirmed transaction labeled "open" (#13299)

Browse Source 
fb3ce75807c50055a97f573fc72bf44d997ea218 Don't label transactions "Open" while catching up (Hennadii Stepanov)

Pull request description:

  Fix #13299.

  Since the default `nSequence` is `0xFFFFFFFE` and locktime is enabled, the checking `wtx.is_final` is meaningless until the syncing has completed (ref: #1026).

  This PR makes the wallet mark a transaction "Unconfirmed" instead of misleading "Open for NNN more blocks" when syncing after a period of being offline.

  Before this PR (with the issue):
  ![screenshot from 2018-12-12 15-56-23](https://user-images.githubusercontent.com/32963518/49874288-cdd06880-fe26-11e8-8441-f3ceb479611b.png)

  With this PR (the issue has been resolved):
  ![screenshot from 2018-12-12 15-54-41](https://user-images.githubusercontent.com/32963518/49874336-e9d40a00-fe26-11e8-8c05-9aeee2eb1bba.png)

Tree-SHA512: 358ec83b43c266a4d32a37a79dda80e80d40a2b77ad38261c84a095e613399f674aa7184805b3f6310e51ddb83ae2636b8849fcc7c4333e1b3ecbb0f70ad86d3
This commit is contained in:
Wladimir J. van der Laan 2019-01-15 17:25:14 +01:00 committed by Christian Fifi Culp
parent 8caf2f002f
commit 5fb15a98aa
7 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chain.h
View File

@ -19,7 +19,7 @@
* Maximum amount of time that a block timestamp is allowed to exceed the
* current network-adjusted time before the block will be accepted.
*/
static const int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60;
static constexpr int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60;
/**
* Timestamp window used as a grace period by code that compares external
@ -27,7 +27,13 @@ static const int64_t MAX_FUTURE_BLOCK_TIME = 2 * 60 * 60;
* to block timestamps. This should be set at least as high as
* MAX_FUTURE_BLOCK_TIME.
*/
static const int64_t TIMESTAMP_WINDOW = MAX_FUTURE_BLOCK_TIME;
static constexpr int64_t TIMESTAMP_WINDOW = MAX_FUTURE_BLOCK_TIME;
/**
* Maximum gap between node time and block time used
* for the "Catching up..." mode in GUI.
*/
static constexpr int64_t MAX_BLOCK_TIME_GAP = 25 * 60;
class CBlockFileInfo
{

4
src/interfaces/wallet.cpp
View File

@ -343,7 +343,8 @@ public:
return result;
}
bool tryGetTxStatus(const uint256& txid,
interfaces::WalletTxStatus& tx_status) override
interfaces::WalletTxStatus& tx_status,
int64_t& block_time) override
{
TRY_LOCK(::cs_main, locked_chain);
if (!locked_chain) {
@ -358,6 +359,7 @@ public:
return false;
}
tx_status = MakeWalletTxStatus(mi->second);
block_time = ::chainActive.Tip()->GetBlockTime();
return true;
}
WalletTx getWalletTxDetails(const uint256& txid,

3
src/interfaces/wallet.h
View File

@ -183,7 +183,8 @@ public:
//! Try to get updated status for a particular transaction, if possible without blocking.
virtual bool tryGetTxStatus(const uint256& txid,
WalletTxStatus& tx_status) = 0;
WalletTxStatus& tx_status,
int64_t& block_time) = 0;
//! Get transaction details.
virtual WalletTx getWalletTxDetails(const uint256& txid,

11
src/qt/bitcoingui.cpp
View File

@ -29,6 +29,7 @@
#include <qt/macdockiconhandler.h>
#endif
#include <chain.h>
#include <chainparams.h>
#include <interfaces/handler.h>
#include <interfaces/node.h>
@ -1321,16 +1322,12 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, const QStri
// Set icon state: spinning if catching up, tick otherwise
#ifdef ENABLE_WALLET
if (walletFrame)
{
if(secs < 25*60) // 90*60 in bitcoin
{
if (walletFrame) {
if(secs < MAX_BLOCK_TIME_GAP) {
modalOverlay->showHide(true, true);
// TODO instead of hiding it forever, we should add meaningful information about MN sync to the overlay
modalOverlay->hideForever();
}
else
{
} else {
modalOverlay->showHide();
}
}

11
src/qt/transactionrecord.cpp
View File

@ -5,6 +5,7 @@
#include <qt/transactionrecord.h>
#include <chain.h>
#include <consensus/consensus.h>
#include <interfaces/wallet.h>
#include <interfaces/node.h>
@ -13,6 +14,7 @@
#include <stdint.h>
#include <QDateTime>
/* Return positive answer if transaction should be shown in list.
*/
@ -252,7 +254,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(interfaces::Wal
return parts;
}
void TransactionRecord::updateStatus(const interfaces::WalletTxStatus& wtx, int numBlocks, int chainLockHeight)
void TransactionRecord::updateStatus(const interfaces::WalletTxStatus& wtx, int numBlocks, int chainLockHeight, int64_t block_time)
{
// Determine transaction status
@ -269,10 +271,9 @@ void TransactionRecord::updateStatus(const interfaces::WalletTxStatus& wtx, int
status.lockedByChainLocks = wtx.is_chainlocked;
status.lockedByInstantSend = wtx.is_islocked;
if (!wtx.is_final)
{
if (wtx.lock_time < LOCKTIME_THRESHOLD)
{
const bool up_to_date = ((int64_t)QDateTime::currentMSecsSinceEpoch() / 1000 - block_time < MAX_BLOCK_TIME_GAP);
if (up_to_date && !wtx.is_final) {
if (wtx.lock_time < LOCKTIME_THRESHOLD) {
status.status = TransactionStatus::OpenUntilBlock;
status.open_for = wtx.lock_time - numBlocks;
}

2
src/qt/transactionrecord.h
View File

@ -161,7 +161,7 @@ public:
/** Update status from core wallet tx.
*/
void updateStatus(const interfaces::WalletTxStatus& wtx, int numBlocks, int chainLockHeight);
void updateStatus(const interfaces::WalletTxStatus& wtx, int numBlocks, int chainLockHeight, int64_t block_time);
/** Return whether a status update is needed.
*/

5
src/qt/transactiontablemodel.cpp
View File

@ -199,8 +199,9 @@ public:
// try to update the status of this transaction from the wallet.
// Otherwise, simply re-use the cached status.
interfaces::WalletTxStatus wtx;
if (rec->statusUpdateNeeded(numBlocks, parent->getChainLockHeight()) && wallet.tryGetTxStatus(rec->hash, wtx)) {
rec->updateStatus(wtx, numBlocks, parent->getChainLockHeight());
int64_t block_time;
if (rec->statusUpdateNeeded(numBlocks, parent->getChainLockHeight()) && wallet.tryGetTxStatus(rec->hash, wtx, block_time)) {
rec->updateStatus(wtx, numBlocks, parent->getChainLockHeight(), block_time);
}
return rec;
}