Correct UI display/categorization of MRC payments

Author: jamescowens

src/qt/transactiondesc.cpp

@@ -139,6 +139,12 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, unsigned int vo
         case MinedType::POR_SIDE_STAKE_SEND:
             strHTML += tr("PoS+RR Side Stake Sent");
             break;
+        case MinedType::MRC_RCV:
+            strHTML += tr("MRC Payment Received");
+            break;
+        case MinedType::MRC_SEND:
+            strHTML += tr("MRC Payment Sent");
+            break;
         case MinedType::SUPERBLOCK:
             strHTML += tr("Mined - Superblock");
             break;

src/qt/transactiontablemodel.cpp

@@ -420,6 +420,10 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
                 return tr("PoS Side Stake Sent");
             case MinedType::POR_SIDE_STAKE_SEND:
                 return tr("PoS+RR Side Stake Sent");
+            case MinedType::MRC_RCV:
+                return tr("MRC Payment Received");
+            case MinedType::MRC_SEND:
+                return tr("MRC Payment Sent");
             case MinedType::SUPERBLOCK:
                 return tr("Mined - Superblock");
             default:
@@ -462,6 +466,10 @@ QVariant TransactionTableModel::txAddressDecoration(const TransactionRecord *wtx
             return QIcon(":/icons/tx_pos_ss_sent");
         case MinedType::POR_SIDE_STAKE_SEND:
             return QIcon(":/icons/tx_por_ss_sent");
+        case MinedType::MRC_RCV:
+            return QIcon(":/icons/tx_por_ss");
+        case MinedType::MRC_SEND:
+            return QIcon(":/icons/tx_por_ss_sent");
         case MinedType::SUPERBLOCK:
             return QIcon(":/icons/superblock");
         default:

src/wallet/generated_type.h

@@ -16,7 +16,9 @@ enum MinedType
     POR_SIDE_STAKE_RCV = 5,
     POS_SIDE_STAKE_SEND = 6,
     POR_SIDE_STAKE_SEND = 7,
-    SUPERBLOCK = 8
+    MRC_RCV = 8,
+    MRC_SEND = 9,
+    SUPERBLOCK = 10
 };
 
 #endif // BITCOIN_WALLET_GENERATED_TYPE_H

src/wallet/rpcwallet.cpp

@@ -1436,6 +1436,8 @@ UniValue listreceivedbyaccount(const UniValue& params, bool fHelp)
                     case MinedType::POR_SIDE_STAKE_RCV  :    entry.pushKV("Type", "POR SIDE STAKE RECEIVED"); break;
                     case MinedType::POS_SIDE_STAKE_SEND :    entry.pushKV("Type", "POS SIDE STAKE SENT");     break;
                     case MinedType::POR_SIDE_STAKE_SEND :    entry.pushKV("Type", "POR SIDE STAKE SENT");     break;
+                    case MinedType::MRC_RCV             :    entry.pushKV("Type", "MRC PAYMENT RECEIVED");    break;
+                    case MinedType::MRC_SEND            :    entry.pushKV("Type", "MRC PAYMENT SENT");        break;
                     default                             :    entry.pushKV("Type", "UNKNOWN");                 break;
                 }
             }

src/wallet/wallet.cpp

@@ -2963,6 +2963,10 @@ MinedType GetGeneratedType(const CWallet *wallet, const uint256& tx, unsigned in
         bool fIsCoinStakeMine = (wallet->IsMine(wallettx.vout[1]) != ISMINE_NO) ? true : false;
         bool fIsOutputMine = (wallet->IsMine(wallettx.vout[vout]) != ISMINE_NO) ? true : false;
 
+        // This will be at an index value one unit beyond the end of the vector is m_mrc_researchers.size()
+        // in the claim is zero.
+        unsigned int mrc_index_start = wallettx.vout.size() - blkindex->m_mrc_researchers.size();
+
         // If output 1 is mine and the pubkey (address) for the output is the same as
         // output 1, it is a split stake return from my stake.
         if (fIsCoinStakeMine && wallettx.vout[vout].scriptPubKey == wallettx.vout[1].scriptPubKey)
@@ -2987,27 +2991,32 @@ MinedType GetGeneratedType(const CWallet *wallet, const uint256& tx, unsigned in
                         return MinedType::POR_SIDE_STAKE_RCV;
                 }
                 // ... or the output is not mine, then this must be a
-                // sidestake sent to someone else.
+                // sidestake sent to someone else or an MRC payment.
                 else
                 {
-                    if (blkindex->ResearchSubsidy() == 0)
+                    if (blkindex->ResearchSubsidy() == 0 && vout < mrc_index_start) {
                         return MinedType::POS_SIDE_STAKE_SEND;
-                    else
+                    } else if (vout >= mrc_index_start) {
+                        return MinedType::MRC_SEND;
+                    } else {
                         return MinedType::POR_SIDE_STAKE_SEND;
+                    }
                 }
             }
             // otherwise, the coinstake return is not mine... (i.e. someone else...)
             else
             {
                 // ... but the output is mine, then this must be a
-                // received sidestake from the staker.
+                // received sidestake or mrc payment from the staker.
                 if (fIsOutputMine)
                 {
-                    if (blkindex->ResearchSubsidy() == 0)
+                    if (blkindex->ResearchSubsidy() == 0 && vout < mrc_index_start) {
                         return MinedType::POS_SIDE_STAKE_RCV;
-
-                    else
+                    } else if (vout >= mrc_index_start) {
+                        return MinedType::MRC_RCV;
+                    } else {
                         return MinedType::POR_SIDE_STAKE_RCV;
+                    }
                 }
 
                 // the asymmetry is that the case when neither the first coinstake output