Remove spent transactions from minting table

src/kernelrecord.cpp

@@ -15,11 +15,6 @@ bool KernelRecord::showTransaction(const CWalletTx &wtx)
         }
     }
 
-    if(!wtx.IsConfirmed())
-    {
-        return false;
-    }
-
     return true;
 }
 
@@ -56,7 +51,7 @@ vector<KernelRecord> KernelRecord::decomposeOutput(const CWallet *wallet, const
                     addrStr = mapValue["to"];
                 }
 
-                parts.push_back(KernelRecord(hash, nTime, addrStr, txOut.nValue, wtx.IsSpent(nOut), coinAge));
+                parts.push_back(KernelRecord(hash, nTime, addrStr, txOut.nValue, nOut, wtx.IsSpent(nOut), coinAge));
             }
         }
     }

src/kernelrecord.h

@@ -21,9 +21,9 @@ class KernelRecord
 
     KernelRecord(uint256 hash, int64 nTime,
                  const std::string &address,
-                 int64 nValue, bool spent, int64 coinAge):
+                 int64 nValue, int idx, bool spent, int64 coinAge):
         hash(hash), nTime(nTime), address(address), nValue(nValue),
-        idx(0), spent(spent), coinAge(coinAge), prevMinutes(0), prevDifficulty(0), prevProbability(0)
+        idx(idx), spent(spent), coinAge(coinAge), prevMinutes(0), prevDifficulty(0), prevProbability(0)
     {
     }
 

src/qt/mintingtablemodel.cpp

@@ -1,4 +1,5 @@
 #include "mintingtablemodel.h"
+#include "mintingfilterproxy.h"
 #include "transactiontablemodel.h"
 #include "guiutil.h"
 #include "kernelrecord.h"
@@ -132,16 +133,16 @@ class MintingTablePriv
                             KernelRecord::decomposeOutput(wallet, mi->second);
                     if(!toInsert.empty()) /* only if something to insert */
                     {
-                        parent->beginInsertRows(QModelIndex(), lowerIndex, lowerIndex+toInsert.size()-1);
                         int insert_idx = lowerIndex;
                         BOOST_FOREACH(const KernelRecord &rec, toInsert)
                         {
                             if(!rec.spent) {
+                                parent->beginInsertRows(QModelIndex(), insert_idx, insert_idx);
                                 cachedWallet.insert(insert_idx, rec);
                                 insert_idx += 1;
+                                parent->endInsertRows();
                             }
                         }
-                        parent->endInsertRows();
                     }
                 }
                 else if(!inWallet && inModel)
@@ -153,7 +154,30 @@ class MintingTablePriv
                 }
                 else if(inWallet && inModel)
                 {
-                    // Updated -- nothing to do, status update will take care of this
+                    // Updated -- remove spent coins from table
+                    std::vector<KernelRecord> toCheck = KernelRecord::decomposeOutput(wallet, mi->second);
+                    if(!toCheck.empty())
+                    {
+                        BOOST_FOREACH(const KernelRecord &rec, toCheck)
+                        {
+                            if(rec.spent)
+                            {
+                                for(int i = lowerIndex; i < upperIndex; i++)
+                                {
+                                    KernelRecord cachedRec = cachedWallet.at(i);
+                                    if((rec.address == cachedRec.address)
+                                       && (rec.nValue == cachedRec.nValue)
+                                       && (rec.idx == cachedRec.idx))
+                                    {
+                                        parent->beginRemoveRows(QModelIndex(), i, i);
+                                        cachedWallet.removeAt(i);
+                                        parent->endRemoveRows();
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -233,9 +257,15 @@ void MintingTableModel::update()
     if(!updated.empty())
     {
         priv->updateWallet(updated);
+        mintingProxyModel->invalidate(); // Force deletion of empty rows
     }
 }
 
+void MintingTableModel::setMintingProxyModel(MintingFilterProxy *mintingProxy)
+{
+    mintingProxyModel = mintingProxy;
+}
+
 int MintingTableModel::rowCount(const QModelIndex &parent) const
 {
     Q_UNUSED(parent);
@@ -445,4 +475,3 @@ QModelIndex MintingTableModel::index(int row, int column, const QModelIndex &par
         return QModelIndex();
     }
 }
-

src/qt/mintingtablemodel.h

@@ -7,6 +7,7 @@
 
 class CWallet;
 class MintingTablePriv;
+class MintingFilterProxy;
 class KernelRecord;
 class WalletModel;
 
@@ -27,6 +28,7 @@ class MintingTableModel : public QAbstractTableModel
     };
 
 
+    void setMintingProxyModel(MintingFilterProxy *mintingProxy);
     int rowCount(const QModelIndex &parent) const;
     int columnCount(const QModelIndex &parent) const;
     QVariant data(const QModelIndex &index, int role) const;
@@ -41,6 +43,7 @@ class MintingTableModel : public QAbstractTableModel
     QStringList columns;
     int mintingInterval;
     MintingTablePriv *priv;
+    MintingFilterProxy *mintingProxyModel;
 
     QString lookupAddress(const std::string &address, bool tooltip) const;
 

src/qt/mintingview.cpp

@@ -108,6 +108,7 @@ void MintingView::setModel(WalletModel *model)
         mintingProxyModel->setSourceModel(model->getMintingTableModel());
         mintingProxyModel->setDynamicSortFilter(true);
         mintingProxyModel->setSortRole(Qt::EditRole);
+        model->getMintingTableModel()->setMintingProxyModel(mintingProxyModel);
 
         mintingView->setModel(mintingProxyModel);
         mintingView->setAlternatingRowColors(true);