src/qt/mempooltxtables.cpp:inital impl

RandyMcMillan · RandyMcMillan · commit a9b56df14b07 · 2025-10-15T15:09:20.000-04:00
diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt
@@ -95,6 +95,8 @@ add_library(bitcoinqt STATIC EXCLUDE_FROM_ALL
   mempooldetail.cpp
   mempoolfeetables.cpp
   mempoolfeetables.h
+  mempooltxtables.cpp
+  mempooltxtables.h
   mempoolstats.h
   mempoolstats.cpp
   modaloverlay.cpp
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -16,6 +16,7 @@
 
 #include <netaddress.h>
 #include <interfaces/node.h>
+#include <interfaces/wallet.h> // New: Include for interfaces::WalletTx
 
 class BanTableModel;
 class CBlockIndex;
@@ -63,6 +64,10 @@ class ClientModel : public QObject
     explicit ClientModel(interfaces::Node& node, OptionsModel *optionsModel, QObject *parent = nullptr);
     ~ClientModel();
 
+    // Delete copy constructor and assignment operator to prevent implicit copying
+    ClientModel(const ClientModel&) = delete;
+    ClientModel& operator=(const ClientModel&) = delete;
+
     void stop();
 
     interfaces::Node& node() const { return m_node; }
@@ -108,6 +113,8 @@ 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
+
 private:
     interfaces::Node& m_node;
     std::unique_ptr<interfaces::Handler> m_handler_show_progress;
@@ -140,6 +147,7 @@ class ClientModel : public QObject
     void networkActiveChanged(bool networkActive);
     void alertsChanged(const QString &warnings);
     void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
+    void walletTxChanged(); // New: Signal emitted when wallet transactions in mempool change
 
     //! Fired when a message should be reported to the user
     void message(const QString &title, const QString &message, unsigned int style);
diff --git a/src/qt/mempooldetail.cpp b/src/qt/mempooldetail.cpp
@@ -13,6 +13,7 @@
 #include <qt/mempoolconstants.h>
 #include <qt/mempooldetail.h>
 #include <qt/platformstyle.h>
+#include <qt/mempooltxtables.h>
 
 
 const QSize FONT_RANGE(8, 24);
@@ -64,6 +65,7 @@ void MempoolDetail::setPlatformStyle(const PlatformStyle* platform_style)
     m_top_layout->addStretch();
     m_top_layout->addWidget(m_temp_widget);
 
+    // Mempool Fee Table
     m_fee_table_model = new MempoolFeeTableModel(this);
 
     m_fee_table = new QTableView(this);
@@ -87,9 +89,31 @@ void MempoolDetail::setPlatformStyle(const PlatformStyle* platform_style)
     m_fee_table_header->resizeSection(MempoolFeeTableModel::TotalSize, 55);
     m_fee_table_header->resizeSection(MempoolFeeTableModel::TotalWeight, 50);
 
+    // Mempool Transaction Table
+    m_tx_table_model = new MempoolTxTableModel(this);
+    m_tx_table = new QTableView(this);
+    m_tx_table->setModel(m_tx_table_model);
+    m_tx_table->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_tx_table->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    m_tx_table->setEditTriggers(QAbstractItemView::NoEditTriggers);
+    m_tx_table->setSelectionBehavior(QAbstractItemView::SelectRows);
+    m_tx_table->setSelectionMode(QAbstractItemView::SingleSelection);
+    m_tx_table->setAlternatingRowColors(true);
+    m_tx_table->setStyleSheet("QTableView { background-color: transparent; border: 1px solid gray; border-radius: 5px; }");
+    m_tx_table->setSortingEnabled(false); // Sorting not implemented for this model yet
+    m_tx_table->verticalHeader()->setVisible(false);
+    m_tx_table->horizontalHeader()->setStretchLastSection(true);
+
+    QHeaderView* m_tx_table_header = m_tx_table->horizontalHeader();
+    m_tx_table_header->resizeSection(MempoolTxTableModel::TxID, 200);
+    m_tx_table_header->resizeSection(MempoolTxTableModel::Amount, 100);
+    m_tx_table_header->resizeSection(MempoolTxTableModel::Fee, 80);
+    m_tx_table_header->resizeSection(MempoolTxTableModel::Status, 80);
+
     QVBoxLayout* main_layout = new QVBoxLayout(this);
     main_layout->addLayout(m_top_layout);
-    main_layout->addWidget(m_fee_table);
+    main_layout->addWidget(m_tx_table); // Add transaction table first
+    main_layout->addWidget(m_fee_table); // Then add fee table
     setLayout(main_layout);
 
     connect(m_fee_table->selectionModel(), &QItemSelectionModel::currentRowChanged, this, [this](const QModelIndex& current, const QModelIndex& previous) {
@@ -113,7 +137,9 @@ void MempoolDetail::setClientModel(ClientModel* model)
         connect(model, &ClientModel::mempoolFeeHistChanged, this, &MempoolDetail::updateFeeTable);
         connect(model, &ClientModel::numBlocksChanged, this, &MempoolDetail::updateFeeTable);
         connect(model, &ClientModel::mempoolRangeSelected, this, &MempoolDetail::onRangeSelected);
+        connect(model, &ClientModel::walletTxChanged, this, &MempoolDetail::updateTxTable); // Connect new signal
         MempoolDetail::updateFeeTable();
+        MempoolDetail::updateTxTable(); // Initial update for transaction table
     }
 }
 
@@ -132,6 +158,18 @@ void MempoolDetail::updateFeeTable()
     }
 }
 
+void MempoolDetail::updateTxTable()
+{
+    if (m_clientmodel) {
+        QMutexLocker locker(&m_clientmodel->m_mempool_locker);
+        // Assuming m_wallet_transactions in ClientModel is updated via MempoolStats::onWalletTxChanged
+        // and ClientModel::walletTxChanged signal is emitted.
+        // For now, we'll pass the raw set of wallet transactions.
+        // Further filtering for 'in mempool' status can be done in MempoolTxTableModel if needed.
+        m_tx_table_model->updateModel(m_clientmodel->m_wallet_transactions);
+    }
+}
+
 void MempoolDetail::setFontSize(qreal newSize)
 {
     if (newSize < FONT_RANGE.width() || newSize > FONT_RANGE.height())
diff --git a/src/qt/mempooldetail.h b/src/qt/mempooldetail.h
@@ -14,6 +14,7 @@
 #include <policy/fees.h>
 
 #include <qt/mempoolfeetables.h>
+#include <qt/mempooltxtables.h>
 #include <interfaces/wallet.h>
 
 class ClientModel;
@@ -31,6 +32,7 @@ class MempoolDetail : public QWidget
 public Q_SLOTS:
     void onRangeSelected(int range);
     void updateFeeTable();
+    void updateTxTable();
 
     void mousePressEvent(QMouseEvent        *event) override;
     void mouseReleaseEvent(QMouseEvent      *event) override;
@@ -53,6 +55,9 @@ public Q_SLOTS:
     QTableView *m_fee_table{nullptr};
     MempoolFeeTableModel *m_fee_table_model{nullptr};
 
+    QTableView *m_tx_table{nullptr};
+    MempoolTxTableModel *m_tx_table_model{nullptr};
+
     virtual void enterEvent(QEnterEvent      *event) override;
     virtual void leaveEvent(QEvent           *event) override;
     void changeEvent(QEvent* e) override;
diff --git a/src/qt/mempoolstats.cpp b/src/qt/mempoolstats.cpp
@@ -309,6 +309,7 @@ void MempoolStats::setClientModel(ClientModel *model)
         connect(model, &ClientModel::mempoolRangeSelected, this, &MempoolStats::onMempoolRangeSelected);
         if (m_mempool_detail) {
             connect(model, &ClientModel::mempoolFeeHistChanged, m_mempool_detail, &MempoolDetail::updateFeeTable);
+            connect(model, &ClientModel::walletTxChanged, m_mempool_detail, &MempoolDetail::updateTxTable); // Connect new signal
         }
 
         // Connect to wallet transaction changes
diff --git a/src/qt/mempooltxtables.cpp b/src/qt/mempooltxtables.cpp
@@ -0,0 +1,124 @@
+
+// Copyright (c) 2023 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include <qt/mempooltxtables.h>
+
+#include <qt/guiutil.h>
+#include <qt/bitcoinunits.h> // New include for BitcoinUnits
+#include <QApplication>
+#include <QDebug>
+
+MempoolTxTableModel::MempoolTxTableModel(QObject* parent)
+    : QAbstractTableModel(parent)
+{
+}
+
+MempoolTxTableModel::~MempoolTxTableModel() = default;
+
+int MempoolTxTableModel::rowCount(const QModelIndex& parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+    return m_tx_data.size();
+}
+
+int MempoolTxTableModel::columnCount(const QModelIndex& parent) const
+{
+    if (parent.isValid()) {
+        return 0;
+    }
+    return columns.length();
+}
+
+QVariant MempoolTxTableModel::data(const QModelIndex& index, int role) const
+{
+    if(!index.isValid())
+        return QVariant();
+
+    const interfaces::WalletTx* wtx = static_cast<const interfaces::WalletTx*>(index.internalPointer());
+
+    const auto column = static_cast<ColumnIndex>(index.column());
+    if (role == Qt::DisplayRole) {
+        switch (column) {
+        case TxID:
+            return QString::fromStdString(wtx->tx->GetHash().ToString());
+        case Amount:
+            return BitcoinUnits::formatWithUnit(BitcoinUnits::Unit::BTC, wtx->credit - wtx->debit, false, BitcoinUnits::SeparatorStyle::ALWAYS);
+        case Fee:
+            {
+                CAmount fee = wtx->debit - wtx->credit - wtx->change;
+                return BitcoinUnits::formatWithUnit(BitcoinUnits::Unit::BTC, fee, false, BitcoinUnits::SeparatorStyle::ALWAYS);
+            }
+        case Status:
+            // For now, we'll just indicate if it's in the mempool. More detailed status can be added later.
+            return tr("In Mempool");
+        default:
+            return QVariant();
+        }
+    } else if (role == OriginalIndexRole) {
+        // We don't have a simple integer index for WalletTx, so we can return the TXID hash as a string
+        return QString::fromStdString(wtx->tx->GetHash().ToString());
+    } else if (role == Qt::TextAlignmentRole) {
+        switch (column) {
+        case TxID:
+            return QVariant(Qt::AlignLeft | Qt::AlignVCenter);
+        case Amount:
+        case Fee:
+            return QVariant(Qt::AlignRight | Qt::AlignVCenter);
+        case Status:
+            return QVariant(Qt::AlignCenter | Qt::AlignVCenter);
+        default:
+            return QVariant();
+        }
+    }
+    return QVariant();
+}
+
+QVariant MempoolTxTableModel::headerData(int section, Qt::Orientation orientation, int role) const
+{
+    if(orientation == Qt::Horizontal)
+    {
+        if(role == Qt::DisplayRole && section < columns.size())
+        {
+            return columns[section];
+        }
+    }
+    return QVariant();
+}
+
+Qt::ItemFlags MempoolTxTableModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid()) return Qt::NoItemFlags;
+
+    Qt::ItemFlags retval = Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+    return retval;
+}
+
+QModelIndex MempoolTxTableModel::index(int row, int column, const QModelIndex& parent) const
+{
+    Q_UNUSED(parent);
+
+    if (0 <= row && row < rowCount() && 0 <= column && column < columnCount()) {
+        return createIndex(row, column, const_cast<interfaces::WalletTx*>(&m_tx_data[row]));
+    }
+
+    return QModelIndex();
+}
+
+void MempoolTxTableModel::updateModel(const std::set<interfaces::WalletTx>& wallet_transactions)
+{
+    beginResetModel();
+    m_tx_data.clear();
+    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);
+    }
+    endResetModel();
+}
diff --git a/src/qt/mempooltxtables.h b/src/qt/mempooltxtables.h
@@ -0,0 +1,63 @@
+
+// Copyright (c) 2023 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QT_MEMPOOLTXTABLES_H
+#define BITCOIN_QT_MEMPOOLTXTABLES_H
+
+#include <QAbstractTableModel>
+#include <QList>
+#include <QModelIndex>
+#include <QStringList>
+#include <QVariant>
+
+#include <interfaces/wallet.h>
+
+/**
+   Qt model providing information about mempool transactions from the active wallet.
+ */
+class MempoolTxTableModel : public QAbstractTableModel
+{
+    Q_OBJECT
+
+public:
+    explicit MempoolTxTableModel(QObject* parent = nullptr);
+    ~MempoolTxTableModel();
+
+    enum ColumnIndex {
+        TxID = 0,
+        Amount,
+        Fee,
+        Status,
+        OriginalIndexRole = Qt::UserRole
+    };
+
+    /** @name Methods overridden from QAbstractTableModel
+        @{*/
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    /*@}*/
+
+public Q_SLOTS:
+    void updateModel(const std::set<interfaces::WalletTx>& wallet_transactions);
+
+private:
+    QList<interfaces::WalletTx> m_tx_data;
+    const QStringList columns{
+        /*: Title of Mempool Tx Table column which contains the transaction ID. */
+        tr("TXID"),
+        /*: Title of Mempool Tx Table column which contains the amount. */
+        tr("Amount"),
+        /*: Title of Mempool Tx Table column which contains the fee. */
+        tr("Fee"),
+        /*: Title of Mempool Tx Table column which contains the status. */
+        tr("Status")
+    };
+};
+
+#endif // BITCOIN_QT_MEMPOOLTXTABLES_H

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,7 @@ void MempoolStats::setClientModel(ClientModel *model)`
`309`	`309`	`connect(model, &ClientModel::mempoolRangeSelected, this, &MempoolStats::onMempoolRangeSelected);`
`310`	`310`	`if (m_mempool_detail) {`
`311`	`311`	`connect(model, &ClientModel::mempoolFeeHistChanged, m_mempool_detail, &MempoolDetail::updateFeeTable);`
	`312`	`+ connect(model, &ClientModel::walletTxChanged, m_mempool_detail, &MempoolDetail::updateTxTable); // Connect new signal`
`312`	`313`	`}`
`313`	`314`
`314`	`315`	`// Connect to wallet transaction changes`