[Budget] Introduce mapFeeTxToProposal and mapFeeTxToBudget

random-zebra · random-zebra · commit 9c6173cba47b · 2020-10-30T12:12:38.000+01:00
Keep track of the collateral txid for current proposals/budgets.
Update in AddProposal/AddFinalizedBudget - CheckAndRemove
and database it with CBudgetManager.

Also rename mapCollateralTxids to mapUnconfirmedFeeTx to avoid confusion
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -199,7 +199,7 @@ void CBudgetManager::SubmitFinalBudget()
     }
 
     // See if collateral tx exists
-    if (!mapCollateralTxids.count(budgetHash)) {
+    if (!mapUnconfirmedFeeTx.count(budgetHash)) {
         // create the collateral tx, send it to the network and return
         CWalletTx wtx;
         // Get our change address
@@ -210,20 +210,21 @@ void CBudgetManager::SubmitFinalBudget()
         }
         // Send the tx to the network. Do NOT use SwiftTx, locking might need too much time to propagate, especially for testnet
         const CWallet::CommitResult& res = pwalletMain->CommitTransaction(wtx, keyChange, g_connman.get(), "NO-ix");
-        if (res.status == CWallet::CommitStatus::OK)
-            mapCollateralTxids.emplace(budgetHash, wtx.GetHash());
+        if (res.status == CWallet::CommitStatus::OK) {
+            const uint256& collateraltxid = wtx.GetHash();
+            mapUnconfirmedFeeTx.emplace(budgetHash, collateraltxid);
+            LogPrint(BCLog::MNBUDGET,"%s: Collateral sent. txid: %s\n", __func__, collateraltxid.ToString());
+        }
         return;
     }
 
     // Collateral tx already exists, see if it's mature enough.
-    CFinalizedBudget fb(strBudgetName, nBlockStart, vecTxBudgetPayments, mapCollateralTxids.at(budgetHash));
+    CFinalizedBudget fb(strBudgetName, nBlockStart, vecTxBudgetPayments, mapUnconfirmedFeeTx.at(budgetHash));
     if (!AddFinalizedBudget(fb)) {
         return;
     }
     fb.Relay();
     nSubmittedHeight = nCurrentHeight;
-    // Remove collateral tx from map
-    mapCollateralTxids.erase(budgetHash);
     LogPrint(BCLog::MNBUDGET,"%s: Done! %s\n", __func__, budgetHash.ToString());
 }
 
@@ -445,9 +446,10 @@ bool CBudgetManager::AddFinalizedBudget(CFinalizedBudget& finalizedBudget)
 
     std::string strError;
     int nCurrentHeight = GetBestHeight();
-    if (!CheckCollateral(finalizedBudget.GetFeeTXHash(), nHash, strError, finalizedBudget.nTime, nCurrentHeight, true)) {
-        LogPrint(BCLog::MNBUDGET,"%s: invalid finalized budget (%s) collateral - %s\n",
-                __func__, nHash.ToString(), strError);
+    const uint256& feeTxId = finalizedBudget.GetFeeTXHash();
+    if (!CheckCollateral(feeTxId, nHash, strError, finalizedBudget.nTime, nCurrentHeight, true)) {
+        LogPrint(BCLog::MNBUDGET,"%s: invalid finalized budget (%s) collateral id=%s - %s\n",
+                __func__, nHash.ToString(), feeTxId.ToString(), strError);
         return false;
     }
 
@@ -458,7 +460,15 @@ bool CBudgetManager::AddFinalizedBudget(CFinalizedBudget& finalizedBudget)
     }
 
     SetBudgetProposalsStr(finalizedBudget);
-    WITH_LOCK(cs_budgets, mapFinalizedBudgets.emplace(nHash, finalizedBudget); );
+    {
+        LOCK(cs_budgets);
+        mapFinalizedBudgets.emplace(nHash, finalizedBudget);
+        // Add to feeTx index
+        mapFeeTxToBudget.emplace(feeTxId, nHash);
+        // Remove the budget from the unconfirmed map, if it was there
+        if (mapUnconfirmedFeeTx.count(nHash))
+            mapUnconfirmedFeeTx.erase(nHash);
+    }
     LogPrint(BCLog::MNBUDGET,"%s: finalized budget %s [%s (%s)] added\n",
             __func__, nHash.ToString(), finalizedBudget.GetName(), finalizedBudget.GetProposalsStr());
     return true;
@@ -481,9 +491,10 @@ bool CBudgetManager::AddProposal(CBudgetProposal& budgetProposal)
 
     std::string strError;
     int nCurrentHeight = GetBestHeight();
-    if (!CheckCollateral(budgetProposal.GetFeeTXHash(), nHash, strError, budgetProposal.nTime, nCurrentHeight, false)) {
-        LogPrint(BCLog::MNBUDGET,"%s: invalid budget proposal (%s) collateral - %s\n",
-                __func__, nHash.ToString(), strError);
+    const uint256& feeTxId = budgetProposal.GetFeeTXHash();
+    if (!CheckCollateral(feeTxId, nHash, strError, budgetProposal.nTime, nCurrentHeight, false)) {
+        LogPrint(BCLog::MNBUDGET,"%s: invalid budget proposal (%s) collateral id=%s - %s\n",
+                __func__, nHash.ToString(), feeTxId.ToString(), strError);
         return false;
     }
 
@@ -493,8 +504,14 @@ bool CBudgetManager::AddProposal(CBudgetProposal& budgetProposal)
         return false;
     }
 
-    WITH_LOCK(cs_proposals, mapProposals.emplace(nHash, budgetProposal); );
-    LogPrint(BCLog::MNBUDGET,"%s: proposal %s [%s] added\n", __func__, nHash.ToString(), budgetProposal.GetName());
+    {
+        LOCK(cs_proposals);
+        mapProposals.emplace(nHash, budgetProposal);
+        // Add to feeTx index
+        mapFeeTxToProposal.emplace(feeTxId, nHash);
+    }
+    LogPrint(BCLog::MNBUDGET,"%s: budget proposal %s [%s] added\n", __func__, nHash.ToString(), budgetProposal.GetName());
+
     return true;
 }
 
@@ -511,6 +528,7 @@ void CBudgetManager::CheckAndRemove()
             CFinalizedBudget* pfinalizedBudget = &(it.second);
             if (!pfinalizedBudget->UpdateValid(nCurrentHeight)) {
                 LogPrint(BCLog::MNBUDGET,"%s: Invalid finalized budget %s %s\n", __func__, (it.first).ToString(), pfinalizedBudget->IsInvalidLogStr());
+                mapFeeTxToBudget.erase(pfinalizedBudget->GetFeeTXHash());
             } else {
                 LogPrint(BCLog::MNBUDGET,"%s: Found valid finalized budget: %s %s\n", __func__,
                           pfinalizedBudget->GetName(), pfinalizedBudget->GetFeeTXHash().ToString());
@@ -530,6 +548,7 @@ void CBudgetManager::CheckAndRemove()
             CBudgetProposal* pbudgetProposal = &(it.second);
             if (!pbudgetProposal->UpdateValid(nCurrentHeight)) {
                 LogPrint(BCLog::MNBUDGET,"%s: Invalid budget proposal %s %s\n", __func__, (it.first).ToString(), pbudgetProposal->IsInvalidLogStr());
+                mapFeeTxToProposal.erase(pbudgetProposal->GetFeeTXHash());
             } else {
                  LogPrint(BCLog::MNBUDGET,"%s: Found valid budget proposal: %s %s\n", __func__,
                           pbudgetProposal->GetName(), pbudgetProposal->GetFeeTXHash().ToString());
diff --git a/src/masternode-budget.h b/src/masternode-budget.h
@@ -200,8 +200,13 @@ class CBudgetManager
 {
 private:
     // map budget hash --> CollTx hash.
-    // hold finalized-budgets collateral txes until they mature enough to use
-    std::map<uint256, uint256> mapCollateralTxids;
+    // hold unconfirmed finalized-budgets collateral txes until they mature enough to use
+    std::map<uint256, uint256> mapUnconfirmedFeeTx;                         // guarded by cs_budgets
+
+    // map CollTx hash --> budget hash
+    // keep track of collaterals for valid budgets/proposals (for reorgs)
+    std::map<uint256, uint256> mapFeeTxToProposal;                          // guarded by cs_proposals
+    std::map<uint256, uint256> mapFeeTxToBudget;                            // guarded by cs_budgets
 
     std::map<uint256, CBudgetProposal> mapProposals;                        // guarded by cs_proposals
     std::map<uint256, CFinalizedBudget> mapFinalizedBudgets;                // guarded by cs_budgets
@@ -234,6 +239,8 @@ class CBudgetManager
         LOCK2(cs_budgets, cs_proposals);
         mapProposals.clear();
         mapFinalizedBudgets.clear();
+        mapFeeTxToProposal.clear();
+        mapFeeTxToBudget.clear();
     }
 
     void ClearSeen()
@@ -302,8 +309,17 @@ class CBudgetManager
     void CheckOrphanVotes();
     void Clear()
     {
-        WITH_LOCK(cs_proposals, mapProposals.clear(); );
-        WITH_LOCK(cs_budgets, mapFinalizedBudgets.clear(); );
+        {
+            LOCK(cs_proposals);
+            mapProposals.clear();
+            mapFeeTxToProposal.clear();
+        }
+        {
+            LOCK(cs_budgets);
+            mapFinalizedBudgets.clear();
+            mapFeeTxToBudget.clear();
+            mapUnconfirmedFeeTx.clear();
+        }
         {
             LOCK(cs_votes);
             mapSeenProposalVotes.clear();
@@ -323,13 +339,22 @@ class CBudgetManager
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action)
     {
-        WITH_LOCK(cs_proposals, READWRITE(mapProposals); );
+        {
+            LOCK(cs_proposals);
+            READWRITE(mapProposals);
+            READWRITE(mapFeeTxToProposal);
+        }
         {
             LOCK(cs_votes);
             READWRITE(mapSeenProposalVotes);
             READWRITE(mapOrphanProposalVotes);
         }
-        WITH_LOCK(cs_budgets, READWRITE(mapFinalizedBudgets); );
+        {
+            LOCK(cs_budgets);
+            READWRITE(mapFinalizedBudgets);
+            READWRITE(mapFeeTxToBudget);
+            READWRITE(mapUnconfirmedFeeTx);
+        }
         {
             LOCK(cs_finalizedvotes);
             READWRITE(mapSeenFinalizedBudgetVotes);
