src/qt/mempooltxtables.h/cpp:fix blocking issue

RandyMcMillan · RandyMcMillan · commit be93ac103856 · 2025-10-17T08:13:28.000-04:00
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -267,7 +267,17 @@ void ClientModel::onWalletTxChanged()
     for (std::unique_ptr<interfaces::Wallet>& wallet_ptr : m_node.walletLoader().getWallets()) {
         if (!wallet_ptr) continue;
         for (const interfaces::WalletTx& wtx : wallet_ptr->getWalletTxs()) {
-            m_wallet_transactions.insert(wtx);
+            interfaces::WalletTxStatus tx_status;
+            int num_blocks;
+            int64_t block_time;
+            if (wallet_ptr->tryGetTxStatus(wtx.tx->GetHash(), tx_status, num_blocks, block_time)) {
+                if (tx_status.depth_in_main_chain == 0 && !tx_status.is_in_main_chain) {
+                    m_wallet_transactions.append(wtx);
+                }
+            } else {
+                // If status can't be retrieved, assume it's in mempool for now
+                m_wallet_transactions.append(wtx);
+            }
         }
     }
     Q_EMIT walletTxChanged();
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -113,7 +113,7 @@ class ClientModel : public QObject
     std::vector<mempool_feehist_sample> m_mempool_feehist;
     std::atomic<int64_t> m_mempool_feehist_last_sample_timestamp{0};
 
-    std::set<interfaces::WalletTx> m_wallet_transactions; // New: Stores active wallet's mempool transactions
+    QList<interfaces::WalletTx> m_wallet_transactions; // New: Stores active wallet's mempool transactions
 
 private:
     interfaces::Node& m_node;
diff --git a/src/qt/mempooldetail.cpp b/src/qt/mempooldetail.cpp
@@ -129,6 +129,14 @@ void MempoolDetail::setPlatformStyle(const PlatformStyle* platform_style)
         }
         m_fee_table_model->setSelectedRange(m_selected_range);
     });
+
+    connect(m_tx_table_model, &MempoolTxTableModel::mempoolStatusChanged, this, &MempoolDetail::onMempoolStatusChanged);
+}
+
+void MempoolDetail::onMempoolStatusChanged(bool hasMempoolTxs)
+{
+    qDebug() << "MempoolDetail::onMempoolStatusChanged(" << hasMempoolTxs << ")";
+    m_tx_table->setVisible(hasMempoolTxs);
 }
 
 void MempoolDetail::setClientModel(ClientModel* model)
@@ -165,6 +173,7 @@ void MempoolDetail::updateTxTable()
     if (m_clientmodel) {
         QMutexLocker locker(&m_clientmodel->m_mempool_locker);
         bool has_active_wallet = !m_clientmodel->node().walletLoader().getWallets().empty();
+        // m_clientmodel->m_wallet_transactions is now a QList<interfaces::WalletTx> and already filtered
         m_tx_table_model->updateModel(m_clientmodel->m_wallet_transactions, has_active_wallet);
     }
 }
diff --git a/src/qt/mempooldetail.h b/src/qt/mempooldetail.h
@@ -33,6 +33,7 @@ public Q_SLOTS:
     void onRangeSelected(int range);
     void updateFeeTable();
     void updateTxTable();
+    void onMempoolStatusChanged(bool hasMempoolTxs);
 
     void mousePressEvent(QMouseEvent        *event) override;
     void mouseReleaseEvent(QMouseEvent      *event) override;
diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp
@@ -341,7 +341,7 @@ void MempoolStats::drawWalletTxIndicators()
     if (!m_clientmodel)
         return;
 
-    std::set<interfaces::WalletTx> wallet_transactions_copy;
+    QList<interfaces::WalletTx> wallet_transactions_copy;
     {
         QMutexLocker locker(&m_wallet_tx_mutex);
         wallet_transactions_copy = m_wallet_transactions;
@@ -363,49 +363,33 @@ void MempoolStats::drawWalletTxIndicators()
 
         for (const interfaces::WalletTx& wtx : wallet_transactions_copy) {
             if (!wtx.tx) continue;
-            bool in_mempool = false;
-            CAmount net_amount = 0;
-
-            for (std::unique_ptr<interfaces::Wallet>& wallet_ptr : m_clientmodel->node().walletLoader().getWallets()) {
-                if (!wallet_ptr) continue;
-                interfaces::WalletTxStatus tx_status;
-                int num_blocks;
-                int64_t block_time;
-
-                if (wallet_ptr->tryGetTxStatus(wtx.tx->GetHash(), tx_status, num_blocks, block_time)) {
-                    if (tx_status.depth_in_main_chain == 0 && !tx_status.is_abandoned) {
-                        in_mempool = true;
-                        net_amount = wtx.credit - wtx.debit;
-                        break; // Found status for this transaction, no need to check other wallets
-                    }
-                }
-            }
+            // Transactions in m_wallet_transactions are already filtered to be in mempool
+            // No need to check status again here.
+            CAmount net_amount = wtx.credit - wtx.debit;
 
             if (MEMPOOL_GRAPH_LOGGING) {
-                LogPrintf("drawWalletTxIndicators: tx %s, in_mempool: %s, net_amount: %s\n", wtx.tx->GetHash().ToString(), in_mempool, net_amount);
+                LogPrintf("drawWalletTxIndicators: tx %s, net_amount: %s\n", wtx.tx->GetHash().ToString(), net_amount);
             }
 
-            if (in_mempool) {
-                QGraphicsTextItem *sign_item = nullptr;
-                QColor sign_color;
-
-                if (net_amount > 0) { // Receive transaction
-                    gridFont.setPointSize(36);
-                    sign_item = m_scene->addText("+", gridFont);
-                    sign_color = QColor(0, 255, 0); // Green
-                } else if (net_amount < 0) { // Send transaction
-                    gridFont.setPointSize(48);
-                    sign_item = m_scene->addText("-", gridFont);
-                    sign_color = QColor(255, 0, 0); // Red
-                }
+            QGraphicsTextItem *sign_item = nullptr;
+            QColor sign_color;
+
+            if (net_amount > 0) { // Receive transaction
+                gridFont.setPointSize(36);
+                sign_item = m_scene->addText("+", gridFont);
+                sign_color = QColor(0, 255, 0); // Green
+            } else if (net_amount < 0) { // Send transaction
+                gridFont.setPointSize(48);
+                sign_item = m_scene->addText("-", gridFont);
+                sign_color = QColor(255, 0, 0); // Red
+            }
 
-                if (sign_item) {
-                    sign_item->setDefaultTextColor(sign_color);
-                    sign_item->setPos(indicator_x, indicator_y);
-                    sign_item->setToolTip(QString::fromStdString(wtx.tx->GetHash().ToString()));
-                    m_wallet_indicator_items.append(sign_item); // Store the item
-                    indicator_y += y_offset; // Move down for the next indicator
-                }
+            if (sign_item) {
+                sign_item->setDefaultTextColor(sign_color);
+                sign_item->setPos(indicator_x, indicator_y);
+                sign_item->setToolTip(QString::fromStdString(wtx.tx->GetHash().ToString()));
+                m_wallet_indicator_items.append(sign_item); // Store the item
+                indicator_y += y_offset; // Move down for the next indicator
             }
         }
     }
@@ -431,18 +415,11 @@ void MempoolStats::onWalletTxChanged()
     {
         QMutexLocker locker(&m_wallet_tx_mutex);
         if (m_clientmodel) {
-            m_clientmodel->m_wallet_transactions.clear(); // Clear ClientModel's transactions
-            for (std::unique_ptr<interfaces::Wallet>& wallet_ptr : m_clientmodel->node().walletLoader().getWallets()) {
-                if (!wallet_ptr) continue;
-                for (const interfaces::WalletTx& wtx : wallet_ptr->getWalletTxs()) {
-                    m_clientmodel->m_wallet_transactions.insert(wtx); // Populate ClientModel's transactions
-                }
-            }
-            m_wallet_transactions = m_clientmodel->m_wallet_transactions; // Keep MempoolStats's local copy in sync for indicators
+            // ClientModel's m_wallet_transactions is already updated and filtered by ClientModel itself.
+            // We just need to keep MempoolStats's local copy in sync.
+            m_wallet_transactions = m_clientmodel->m_wallet_transactions;
         }
     }
     QMetaObject::invokeMethod(this, "drawChart", Qt::QueuedConnection);
-    if (m_clientmodel) {
-        Q_EMIT m_clientmodel->walletTxChanged(); // Emit ClientModel's signal
-    }
+    // No need to emit ClientModel's signal here, it's already emitted by ClientModel itself.
 }
diff --git a/src/qt/mempoolstats.h b/src/qt/mempoolstats.h
@@ -55,7 +55,7 @@ public Q_SLOTS:
     int m_selected_range = -1;
     MempoolDetail* m_mempool_detail{nullptr};
     QMutex m_wallet_tx_mutex;
-    std::set<interfaces::WalletTx> m_wallet_transactions;
+    QList<interfaces::WalletTx> m_wallet_transactions;
     std::vector<std::unique_ptr<interfaces::Handler>> m_wallet_handlers;
     QList<QGraphicsItem*> m_wallet_indicator_items;
     QList<ClickableFeePathItem*> m_fee_path_items;
diff --git a/src/qt/mempooltxtables.cpp b/src/qt/mempooltxtables.cpp
@@ -156,26 +156,24 @@ void MempoolTxTableModel::sort(int column, Qt::SortOrder order)
     endResetModel();
 }
 
-void MempoolTxTableModel::updateModel(const std::set<interfaces::WalletTx>& wallet_transactions, bool has_active_wallet)
+void MempoolTxTableModel::updateModel(const QList<interfaces::WalletTx>& wallet_transactions, bool has_active_wallet)
 {
     beginResetModel();
     m_tx_data.clear();
 
     if (!has_active_wallet || wallet_transactions.empty()) {
         endResetModel();
+        qDebug() << "MempoolTxTableModel::mempoolStatusChanged(" << !m_tx_data.empty() << ")";
+        Q_EMIT mempoolStatusChanged(!m_tx_data.empty());
         return;
     }
 
-    for (const auto& wtx : wallet_transactions) {
-        // Only add transactions that are currently in the mempool
-        // This logic might need to be more sophisticated if we want to show other statuses
-        // For now, we assume the set only contains mempool transactions or we filter here.
-        // The `drawWalletTxIndicators` in MempoolStats already checks for in_mempool status.
-        // We'll rely on that for now, or add a similar check here if needed.
-        m_tx_data.append(wtx);
-    }
+    m_tx_data = wallet_transactions;
+
     if (m_sort_column != -1) {
         sort(m_sort_column, m_sort_order);
     }
     endResetModel();
+    qDebug() << "MempoolTxTableModel::mempoolStatusChanged(" << !m_tx_data.empty() << ")";
+    Q_EMIT mempoolStatusChanged(!m_tx_data.empty());
 }
diff --git a/src/qt/mempooltxtables.h b/src/qt/mempooltxtables.h
@@ -44,8 +44,11 @@ class MempoolTxTableModel : public QAbstractTableModel
     void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
     /*@}*/
 
+Q_SIGNALS:
+    void mempoolStatusChanged(bool hasMempoolTxs);
+
 public Q_SLOTS:
-    void updateModel(const std::set<interfaces::WalletTx>& wallet_transactions, bool has_active_wallet);
+    void updateModel(const QList<interfaces::WalletTx>& wallet_transactions, bool has_active_wallet);
 
 public:
     QList<interfaces::WalletTx> m_tx_data;

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,14 @@ void MempoolDetail::setPlatformStyle(const PlatformStyle* platform_style)`
`129`	`129`	`}`
`130`	`130`	`m_fee_table_model->setSelectedRange(m_selected_range);`
`131`	`131`	`});`
	`132`	`+`
	`133`	`+ connect(m_tx_table_model, &MempoolTxTableModel::mempoolStatusChanged, this, &MempoolDetail::onMempoolStatusChanged);`
	`134`	`+}`
	`135`	`+`
	`136`	`+void MempoolDetail::onMempoolStatusChanged(bool hasMempoolTxs)`
	`137`	`+{`
	`138`	`+ qDebug() << "MempoolDetail::onMempoolStatusChanged(" << hasMempoolTxs << ")";`
	`139`	`+ m_tx_table->setVisible(hasMempoolTxs);`
`132`	`140`	`}`
`133`	`141`
`134`	`142`	`void MempoolDetail::setClientModel(ClientModel* model)`
`@@ -165,6 +173,7 @@ void MempoolDetail::updateTxTable()`
`165`	`173`	`if (m_clientmodel) {`
`166`	`174`	`QMutexLocker locker(&m_clientmodel->m_mempool_locker);`
`167`	`175`	`bool has_active_wallet = !m_clientmodel->node().walletLoader().getWallets().empty();`
	`176`	`+ // m_clientmodel->m_wallet_transactions is now a QList<interfaces::WalletTx> and already filtered`
`168`	`177`	`m_tx_table_model->updateModel(m_clientmodel->m_wallet_transactions, has_active_wallet);`
`169`	`178`	`}`
`170`	`179`	`}`