[Qt] attribute replaceable (RBF) transactions

jonasschnelli · jonasschnelli · commit 7a30ed647875 · 2016-06-10T09:52:12.000+02:00
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -269,7 +269,8 @@ RES_ICONS = \
   qt/res/icons/tx_mined.png \
   qt/res/icons/warning.png \
   qt/res/icons/verify.png \
-  qt/res/icons/transaction_abandoned.png
+  qt/res/icons/transaction_abandoned.png \
+  qt/res/icons/transaction_replaceable.png
 
 BITCOIN_QT_CPP = \
   qt/bantablemodel.cpp \
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
@@ -50,6 +50,7 @@
         <file alias="fontsmaller">res/icons/fontsmaller.png</file>
         <file alias="prompticon">res/icons/chevron.png</file>
         <file alias="transaction_abandoned">res/icons/transaction_abandoned.png</file>
+        <file alias="transaction_replaceable">res/icons/transaction_replaceable.png</file>
     </qresource>
     <qresource prefix="/movies">
         <file alias="spinner-000">res/movies/spinner-000.png</file>
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
@@ -31,6 +31,8 @@ static const bool DEFAULT_SPLASHSCREEN = true;
 #define COLOR_TX_STATUS_OFFLINE QColor(192, 192, 192)
 /* Transaction list -- TX status decoration - danger, tx needs attention */
 #define COLOR_TX_STATUS_DANGER QColor(200, 100, 100)
+/* Transaction list -- TX status decoration - mempool-replaceable */
+#define COLOR_TX_STATUS_REPLACEABLE QColor(230, 130, 20)
 /* Transaction list -- TX status decoration - default color */
 #define COLOR_BLACK QColor(0, 0, 0)
 
diff --git a/src/qt/res/icons/transaction_replaceable.png b/src/qt/res/icons/transaction_replaceable.png
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
@@ -39,7 +39,7 @@ QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
         else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
             return tr("%1/offline").arg(nDepth);
         else if (nDepth == 0)
-            return tr("0/unconfirmed, %1").arg((wtx.InMempool() ? tr("in memory pool") : tr("not in memory pool"))) + (wtx.isAbandoned() ? ", "+tr("abandoned") : "");
+            return tr("0/unconfirmed, %1").arg((wtx.InMempool() ? tr("in memory pool") : tr("not in memory pool"))) + (wtx.signalsOptInRBF() ? ", "+tr("signals replaceability (optin RBF)") : "") + (wtx.isAbandoned() ? ", "+tr("abandoned") : "");
         else if (nDepth < 6)
             return tr("%1/unconfirmed").arg(nDepth);
         else
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
@@ -7,6 +7,7 @@
 #include "base58.h"
 #include "consensus/consensus.h"
 #include "main.h"
+#include "policy/rbf.h"
 #include "timedata.h"
 #include "wallet/wallet.h"
 
@@ -239,6 +240,8 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
         else if (status.depth == 0)
         {
             status.status = TransactionStatus::Unconfirmed;
+            if (wtx.signalsOptInRBF())
+                status.status = TransactionStatus::Replaceable;
             if (wtx.isAbandoned())
                 status.status = TransactionStatus::Abandoned;
         }
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
@@ -31,6 +31,7 @@ class TransactionStatus
         OpenUntilBlock,     /**< Transaction not yet final, waiting for block */
         Offline,            /**< Not sent to any other nodes **/
         Unconfirmed,        /**< Not yet mined into a block **/
+        Replaceable,        /**< Replaceable by optin-RBF (bip125) **/
         Confirming,         /**< Confirmed, but waiting for the recommended number of confirmations **/
         Conflicted,         /**< Conflicts with other transaction or mempool **/
         Abandoned,          /**< Abandoned from the wallet **/
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -312,6 +312,9 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons
     case TransactionStatus::Unconfirmed:
         status = tr("Unconfirmed");
         break;
+    case TransactionStatus::Replaceable:
+        status = tr("Unconfirmed & Replaceable");
+        break;
     case TransactionStatus::Abandoned:
         status = tr("Abandoned");
         break;
@@ -471,6 +474,8 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
         return COLOR_TX_STATUS_OFFLINE;
     case TransactionStatus::Unconfirmed:
         return QIcon(":/icons/transaction_0");
+    case TransactionStatus::Replaceable:
+        return QIcon(":/icons/transaction_replaceable");
     case TransactionStatus::Abandoned:
         return QIcon(":/icons/transaction_abandoned");
     case TransactionStatus::Confirming:
@@ -583,6 +588,10 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
         {
             return COLOR_TX_STATUS_DANGER;
         }
+        if(rec->status.status == TransactionStatus::Replaceable)
+        {
+            return COLOR_TX_STATUS_REPLACEABLE;
+        }
         // Non-confirmed (but not immature) as transactions are grey
         if(!rec->status.countsForBalance && rec->status.status != TransactionStatus::Immature)
         {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -16,6 +16,7 @@
 #include "main.h"
 #include "net.h"
 #include "policy/policy.h"
+#include "policy/rbf.h"
 #include "primitives/block.h"
 #include "primitives/transaction.h"
 #include "script/script.h"
@@ -3475,3 +3476,8 @@ bool CMerkleTx::AcceptToMemoryPool(bool fLimitFree, CAmount nAbsurdFee)
     CValidationState state;
     return ::AcceptToMemoryPool(mempool, state, *this, fLimitFree, NULL, false, nAbsurdFee);
 }
+
+bool CMerkleTx::signalsOptInRBF() const
+{
+    return SignalsOptInRBF(*this);
+}
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -213,6 +213,7 @@ class CMerkleTx : public CTransaction
     bool hashUnset() const { return (hashBlock.IsNull() || hashBlock == ABANDON_HASH); }
     bool isAbandoned() const { return (hashBlock == ABANDON_HASH); }
     void setAbandoned() { hashBlock = ABANDON_HASH; }
+    bool signalsOptInRBF() const;
 };
 
 /** 
