Augment Tally:RecordRewardBlock and ForgetRewardBlock to handle MRCs

Author: jamescowens

src/gridcoin/tally.cpp

@@ -1182,25 +1182,47 @@ AccrualComputer Tally::GetLegacyComputer(
         last_block_ptr->nHeight);
 }
 
+// TODO: Verify RecordRewardBlock works correctly with MRC's
 void Tally::RecordRewardBlock(const CBlockIndex* const pindex)
 {
-    if (!pindex || pindex->ResearchSubsidy() <= 0) {
-        return;
+    if (!pindex) return;
+
+    // Record tally for staker's research
+    if (pindex->ResearchSubsidy() > 0) {
+        if (const CpidOption cpid = pindex->GetMiningId().TryCpid()) {
+            g_researcher_tally.RecordRewardBlock(*cpid, pindex);
+        }
     }
 
-    if (const CpidOption cpid = pindex->GetMiningId().TryCpid()) {
-        g_researcher_tally.RecordRewardBlock(*cpid, pindex);
+    // Record tally for manual reward claims
+    if (pindex->ResearchMRCSubsidy() > 0) {
+        for (const auto& mrc_researcher : pindex->m_mrc_researchers) {
+            Cpid cpid = mrc_researcher->m_cpid;
+
+            g_researcher_tally.RecordRewardBlock(cpid, pindex);
+        }
     }
 }
 
+// TODO: Verify ForgetRewardBlock works correctly with MRC's
 void Tally::ForgetRewardBlock(const CBlockIndex* const pindex)
 {
-    if (!pindex || pindex->ResearchSubsidy() <= 0) {
-        return;
+    if (!pindex) return;
+
+    // Un-record tally for staker's research
+    if (pindex->ResearchSubsidy() > 0) {
+        if (const CpidOption cpid = pindex->GetMiningId().TryCpid()) {
+            g_researcher_tally.ForgetRewardBlock(*cpid, pindex);
+        }
     }
 
-    if (const CpidOption cpid = pindex->GetMiningId().TryCpid()) {
-        g_researcher_tally.ForgetRewardBlock(*cpid, pindex);
+    // Un-record tally for manual reward claims
+    if (pindex->ResearchMRCSubsidy() > 0) {
+        for (const auto& mrc_researcher : pindex->m_mrc_researchers) {
+            Cpid cpid = mrc_researcher->m_cpid;
+
+            g_researcher_tally.ForgetRewardBlock(cpid, pindex);
+        }
     }
 }
 

src/main.h

@@ -713,6 +713,17 @@ class CBlockIndex
         return 0;
     }
 
+    int64_t ResearchMRCSubsidy() const
+    {
+        int64_t mrc_subsidy = 0;
+
+        for (const auto& mrc_researcher : m_mrc_researchers) {
+            mrc_subsidy += mrc_researcher->m_research_subsidy;
+        }
+
+        return mrc_subsidy;
+    }
+
     double Magnitude() const
     {
         if (m_researcher) {