Hold and update label in TransactionRecord

codablock · codablock · commit 3b44576fe004 · 2019-10-19T10:38:48.000+02:00
Instead of looking it up in data()
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -254,6 +254,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *
 void TransactionRecord::updateStatus(const CWalletTx &wtx, int chainLockHeight)
 {
     AssertLockHeld(cs_main);
+    AssertLockHeld(wtx.GetWallet()->cs_wallet);
     // Determine transaction status
 
     // Find the block the tx is in
@@ -278,6 +279,13 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx, int chainLockHeight)
         status.lockedByChainLocks = wtx.IsChainLocked();
     }
 
+    auto addrBookIt = wtx.GetWallet()->mapAddressBook.find(this->txDest);
+    if (addrBookIt == wtx.GetWallet()->mapAddressBook.end()) {
+        status.label = "";
+    } else {
+        status.label = QString::fromStdString(addrBookIt->second.name);
+    }
+
     if (!CheckFinalTx(wtx))
     {
         if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD)
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
@@ -50,6 +50,8 @@ class TransactionStatus
     bool lockedByChainLocks;
     /// Sorting key based on status
     std::string sortKey;
+    /// Label
+    QString label;
 
     /** @name Generated (mined) transactions
        @{*/
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -176,6 +176,19 @@ class TransactionTablePriv
         }
     }
 
+    void updateAddressBook(const QString& address, const QString& label, bool isMine, const QString& purpose, int status)
+    {
+        std::string address2 = address.toStdString();
+        int index = 0;
+        for (auto& rec : cachedWallet) {
+            if (rec.strAddress == address2) {
+                rec.status.needsUpdate = true;
+                Q_EMIT parent->dataChanged(parent->index(index, TransactionTableModel::Status), parent->index(index, TransactionTableModel::Status));
+            }
+            index++;
+        }
+    }
+
     int size()
     {
         return cachedWallet.size();
@@ -276,6 +289,12 @@ void TransactionTableModel::updateTransaction(const QString &hash, int status, b
     priv->updateWallet(updated, status, showTransaction);
 }
 
+void TransactionTableModel::updateAddressBook(const QString& address, const QString& label, bool isMine,
+                                              const QString& purpose, int status)
+{
+    priv->updateAddressBook(address, label, isMine, purpose, status);
+}
+
 void TransactionTableModel::updateConfirmations()
 {
     // Blocks came in since last poll.
@@ -669,7 +688,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
     case AddressRole:
         return QString::fromStdString(rec->strAddress);
     case LabelRole:
-        return walletModel->getAddressTableModel()->labelForDestination(rec->txDest);
+        return rec->status.label;
     case AmountRole:
         return qint64(rec->credit + rec->debit);
     case TxIDRole:
@@ -681,7 +700,7 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
     case TxPlainTextRole:
         {
             QString details;
-            QString txLabel = walletModel->getAddressTableModel()->labelForDestination(rec->txDest);
+            QString txLabel = rec->status.label;
 
             details.append(formatTxDate(rec));
             details.append(" ");
@@ -813,6 +832,16 @@ static void NotifyTransactionChanged(TransactionTableModel *ttm, CWallet *wallet
     notification.invoke(ttm);
 }
 
+static void NotifyAddressBookChanged(TransactionTableModel *ttm, CWallet *wallet, const CTxDestination &address, const std::string &label, bool isMine, const std::string &purpose, ChangeType status)
+{
+    QMetaObject::invokeMethod(ttm, "updateAddressBook", Qt::QueuedConnection,
+                              Q_ARG(QString, QString::fromStdString(CBitcoinAddress(address).ToString())),
+                              Q_ARG(QString, QString::fromStdString(label)),
+                              Q_ARG(bool, isMine),
+                              Q_ARG(QString, QString::fromStdString(purpose)),
+                              Q_ARG(int, (int)status));
+}
+
 static void ShowProgress(TransactionTableModel *ttm, const std::string &title, int nProgress)
 {
     if (nProgress == 0)
@@ -838,12 +867,14 @@ void TransactionTableModel::subscribeToCoreSignals()
 {
     // Connect signals to wallet
     wallet->NotifyTransactionChanged.connect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
+    wallet->NotifyAddressBookChanged.connect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5, _6));
     wallet->ShowProgress.connect(boost::bind(ShowProgress, this, _1, _2));
 }
 
 void TransactionTableModel::unsubscribeFromCoreSignals()
 {
     // Disconnect signals from wallet
     wallet->NotifyTransactionChanged.disconnect(boost::bind(NotifyTransactionChanged, this, _1, _2, _3));
+    wallet->NotifyAddressBookChanged.disconnect(boost::bind(NotifyAddressBookChanged, this, _1, _2, _3, _4, _5, _6));
     wallet->ShowProgress.disconnect(boost::bind(ShowProgress, this, _1, _2));
 }
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
@@ -118,6 +118,8 @@ class TransactionTableModel : public QAbstractTableModel
 public Q_SLOTS:
     /* New transaction, or transaction changed status */
     void updateTransaction(const QString &hash, int status, bool showTransaction);
+    void updateAddressBook(const QString &address, const QString &label,
+                           bool isMine, const QString &purpose, int status);
     void updateConfirmations();
     void updateDisplayUnit();
     /** Updates the column title to "Amount (DisplayUnit)" and emits headerDataChanged() signal for table headers to react. */
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -484,6 +484,11 @@ class CWalletTx : public CMerkleTx
         MarkDirty();
     }
 
+    const CWallet* GetWallet() const
+    {
+        return pwallet;
+    }
+
     //! filter decides which addresses will count towards the debit
     CAmount GetDebit(const isminefilter& filter) const;
     CAmount GetCredit(const isminefilter& filter) const;

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,7 @@ QList<TransactionRecord> TransactionRecord::decomposeTransaction(const CWallet *`
`254`	`254`	`void TransactionRecord::updateStatus(const CWalletTx &wtx, int chainLockHeight)`
`255`	`255`	`{`
`256`	`256`	`AssertLockHeld(cs_main);`
	`257`	`+ AssertLockHeld(wtx.GetWallet()->cs_wallet);`
`257`	`258`	`// Determine transaction status`
`258`	`259`
`259`	`260`	`// Find the block the tx is in`
`@@ -278,6 +279,13 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx, int chainLockHeight)`
`278`	`279`	`status.lockedByChainLocks = wtx.IsChainLocked();`
`279`	`280`	`}`
`280`	`281`
	`282`	`+ auto addrBookIt = wtx.GetWallet()->mapAddressBook.find(this->txDest);`
	`283`	`+ if (addrBookIt == wtx.GetWallet()->mapAddressBook.end()) {`
	`284`	`+ status.label = "";`
	`285`	`+ } else {`
	`286`	`+ status.label = QString::fromStdString(addrBookIt->second.name);`
	`287`	`+ }`
	`288`	`+`
`281`	`289`	`if (!CheckFinalTx(wtx))`
`282`	`290`	`{`
`283`	`291`	`if (wtx.tx->nLockTime < LOCKTIME_THRESHOLD)`