diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h --- a/src/interfaces/wallet.h +++ b/src/interfaces/wallet.h @@ -168,14 +168,13 @@ //! Try to get updated status for a particular transaction, if possible //! without blocking. virtual bool tryGetTxStatus(const TxId &txid, WalletTxStatus &tx_status, - int &num_blocks, int64_t &adjusted_time) = 0; + int &num_blocks) = 0; //! Get transaction details. virtual WalletTx getWalletTxDetails(const TxId &txid, WalletTxStatus &tx_status, WalletOrderForm &order_form, - bool &in_mempool, int &num_blocks, - int64_t &adjusted_time) = 0; + bool &in_mempool, int &num_blocks) = 0; //! Get balances. virtual WalletBalances getBalances() = 0; diff --git a/src/interfaces/wallet.cpp b/src/interfaces/wallet.cpp --- a/src/interfaces/wallet.cpp +++ b/src/interfaces/wallet.cpp @@ -267,7 +267,7 @@ } bool tryGetTxStatus(const TxId &txid, interfaces::WalletTxStatus &tx_status, - int &num_blocks, int64_t &adjusted_time) override { + int &num_blocks) override { TRY_LOCK(::cs_main, locked_chain); if (!locked_chain) { return false; @@ -281,19 +281,17 @@ return false; } num_blocks = ::chainActive.Height(); - adjusted_time = GetAdjustedTime(); tx_status = MakeWalletTxStatus(mi->second); return true; } WalletTx getWalletTxDetails(const TxId &txid, WalletTxStatus &tx_status, WalletOrderForm &order_form, - bool &in_mempool, int &num_blocks, - int64_t &adjusted_time) override { + bool &in_mempool, + int &num_blocks) override { LOCK2(::cs_main, m_wallet.cs_wallet); auto mi = m_wallet.mapWallet.find(txid); if (mi != m_wallet.mapWallet.end()) { num_blocks = ::chainActive.Height(); - adjusted_time = GetAdjustedTime(); in_mempool = mi->second.InMempool(); order_form = mi->second.vOrderForm; tx_status = MakeWalletTxStatus(mi->second); diff --git a/src/qt/transactiondesc.h b/src/qt/transactiondesc.h --- a/src/qt/transactiondesc.h +++ b/src/qt/transactiondesc.h @@ -32,8 +32,7 @@ static QString FormatTxStatus(const interfaces::WalletTx &wtx, const interfaces::WalletTxStatus &status, - bool inMempool, int numBlocks, - int64_t adjustedTime); + bool inMempool, int numBlocks); }; #endif // BITCOIN_QT_TRANSACTIONDESC_H diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp --- a/src/qt/transactiondesc.cpp +++ b/src/qt/transactiondesc.cpp @@ -23,9 +23,10 @@ #include #include -QString TransactionDesc::FormatTxStatus( - const interfaces::WalletTx &wtx, const interfaces::WalletTxStatus &status, - bool inMempool, int numBlocks, int64_t adjustedTime) { +QString +TransactionDesc::FormatTxStatus(const interfaces::WalletTx &wtx, + const interfaces::WalletTxStatus &status, + bool inMempool, int numBlocks) { if (!status.is_final) { if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD) { return tr("Open for %n more block(s)", "", @@ -56,12 +57,11 @@ interfaces::Wallet &wallet, TransactionRecord *rec, int unit) { int numBlocks; - int64_t adjustedTime; interfaces::WalletTxStatus status; interfaces::WalletOrderForm orderForm; bool inMempool; interfaces::WalletTx wtx = wallet.getWalletTxDetails( - rec->txid, status, orderForm, inMempool, numBlocks, adjustedTime); + rec->txid, status, orderForm, inMempool, numBlocks); QString strHTML; @@ -74,7 +74,7 @@ Amount nNet = nCredit - nDebit; strHTML += "" + tr("Status") + ": " + - FormatTxStatus(wtx, status, inMempool, numBlocks, adjustedTime); + FormatTxStatus(wtx, status, inMempool, numBlocks); strHTML += "
"; strHTML += "" + tr("Date") + ": " + diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h --- a/src/qt/transactionrecord.h +++ b/src/qt/transactionrecord.h @@ -144,8 +144,7 @@ /** Update status from core wallet tx. */ - void updateStatus(const interfaces::WalletTxStatus &wtx, int numBlocks, - int64_t adjustedTime); + void updateStatus(const interfaces::WalletTxStatus &wtx, int numBlocks); /** Return whether a status update is needed. */ diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp --- a/src/qt/transactionrecord.cpp +++ b/src/qt/transactionrecord.cpp @@ -151,7 +151,7 @@ } void TransactionRecord::updateStatus(const interfaces::WalletTxStatus &wtx, - int numBlocks, int64_t adjustedTime) { + int numBlocks) { // Determine transaction status // Sort order, unrecorded transactions sort to the top diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -184,11 +184,9 @@ // simply re-use the cached status. interfaces::WalletTxStatus wtx; int numBlocks; - int64_t adjustedTime; - if (wallet.tryGetTxStatus(rec->txid, wtx, numBlocks, - adjustedTime) && + if (wallet.tryGetTxStatus(rec->txid, wtx, numBlocks) && rec->statusUpdateNeeded(numBlocks)) { - rec->updateStatus(wtx, numBlocks, adjustedTime); + rec->updateStatus(wtx, numBlocks); } return rec; }