Pay to reward script of masternodes.

Instead of using the collateral pubkey, pay to the declared reward
script of masternodes (and use that to check payments).

Author: domob1812

divi/src/main.cpp

@@ -4977,6 +4977,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
 //       it was the one which was commented out
 int ActiveProtocol()
 {
+    if (Params().NetworkID() == CBaseChainParams::REGTEST)
+        return MN_REWARD_SCRIPT_VERSION;
+
     return MIN_PEER_PROTO_VERSION_AFTER_ENFORCEMENT;
 }
 

divi/src/masternode-payments.cpp

@@ -339,7 +339,7 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, const CBloc
         // No masternode detected, fall back to our own queue.
         const CMasternode* winningNode = mnodeman.GetNextMasternodeInQueueForPayment(pindexPrev, 1, true);
         if (winningNode) {
-            payee = GetScriptForDestination(winningNode->pubKeyCollateralAddress.GetID());
+            payee = winningNode->rewardScript;
         } else {
             LogPrint("masternode","CreateNewBlock: Failed to detect masternode to pay\n");
             hasPayment = false;
@@ -496,15 +496,13 @@ bool CMasternodePayments::IsScheduled(const CMasternode& mn, int nNotBlockHeight
     if (tip == nullptr)
         return false;
 
-    const CScript mnpayee = GetScriptForDestination(mn.pubKeyCollateralAddress.GetID());
-
     for (int64_t h = 0; h <= 8; ++h) {
         if (tip->nHeight + h == nNotBlockHeight) continue;
         uint256 seedHash;
         if (!GetBlockHashForScoring(seedHash, tip, h)) continue;
         auto* payees = GetPayeesForScoreHash(seedHash);
         CScript payee;
-        if (payees != nullptr && payees->GetPayee(payee) && payee == mnpayee)
+        if (payees != nullptr && payees->GetPayee(payee) && payee == mn.rewardScript)
             return true;
     }
 
@@ -591,21 +589,31 @@ std::string CMasternodeBlockPayees::GetRequiredPaymentsString() const
 {
     LOCK(cs_vecPayments);
 
-    std::string ret = "Unknown";
+    std::ostringstream ret;
+    bool found = false;
 
     for (const auto& payee : vecPayments) {
-        CTxDestination address1;
-        ExtractDestination(payee.scriptPubKey, address1);
-        CBitcoinAddress address2(address1);
+        std::string thisPayee;
 
-        if (ret != "Unknown") {
-            ret += ", " + address2.ToString() + ":" + boost::lexical_cast<std::string>(payee.nVotes);
+        CTxDestination address1;
+        if (ExtractDestination(payee.scriptPubKey, address1)) {
+            const CBitcoinAddress address2(address1);
+            thisPayee = address2.ToString();
         } else {
-            ret = address2.ToString() + ":" + boost::lexical_cast<std::string>(payee.nVotes);
+            thisPayee = HexStr(payee.scriptPubKey);
         }
+
+        if (found)
+            ret << ", ";
+
+        found = true;
+        ret << thisPayee << ":" << payee.nVotes;
     }
 
-    return ret;
+    if (!found)
+        return "Unknown";
+
+    return ret.str();
 }
 
 std::string CMasternodePayments::GetRequiredPaymentsString(const uint256& seedHash) const
@@ -705,9 +713,7 @@ bool CMasternodePaymentWinner::IsValid(CNode* pnode, std::string& strError) cons
     /* Make sure that the payee is in our own payment queue near the top.  */
     const std::vector<CMasternode*> mnQueue = mnodeman.GetMasternodePaymentQueue(seedHash, nBlockHeight, true);
     for (int i = 0; i < std::min<int>(2 * MNPAYMENTS_SIGNATURES_TOTAL, mnQueue.size()); ++i) {
-        const auto& mn = *mnQueue[i];
-        const CScript mnPayee = GetScriptForDestination(mn.pubKeyCollateralAddress.GetID());
-        if (mnPayee == payee)
+        if (payee == mnQueue[i]->rewardScript)
             return true;
     }
     return false;
@@ -750,11 +756,13 @@ bool CMasternodePayments::ProcessBlock(const CBlockIndex* pindex, const int offs
     if (pmn != NULL) {
         LogPrint("masternode","CMasternodePayments::ProcessBlock() Found by FindOldestNotInVec \n");
 
-        const CTxDestination dest(pmn->pubKeyCollateralAddress.GetID());
-        newWinner.AddPayee(GetScriptForDestination(dest));
+        newWinner.AddPayee(pmn->rewardScript);
+
+        CTxDestination address1;
+        ExtractDestination(pmn->rewardScript, address1);
+        CBitcoinAddress address2(address1);
 
-        const CBitcoinAddress address(dest);
-        LogPrint("masternode","CMasternodePayments::ProcessBlock() Winner payee %s nHeight %d. \n", address.ToString().c_str(), newWinner.GetHeight());
+        LogPrint("masternode","CMasternodePayments::ProcessBlock() Winner payee %s nHeight %d. \n", address2.ToString().c_str(), newWinner.GetHeight());
     } else {
         LogPrint("masternode","CMasternodePayments::ProcessBlock() Failed to find masternode to pay\n");
     }