[Consensus] Check against current hash when no payee is found

random-zebra · random-zebra · commit ad2cc30e37e7 · 2021-05-23T09:38:40.000+02:00
Instead of using always the genesis hash (which is constant)
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -324,7 +324,10 @@ bool CMasternodePayments::GetLegacyMasternodeTxOut(int nHeight, std::vector<CTxO
     CScript payee;
     if (!GetBlockPayee(nHeight, payee)) {
         //no masternode detected
-        MasternodeRef winningNode = mnodeman.GetCurrentMasterNode(Params().GetConsensus().hashGenesisBlock);
+        const Consensus::Params& consensus = Params().GetConsensus();
+        const uint256& hash = consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_V6_0) ?
+                              mnodeman.GetHashAtHeight(nHeight - 1) : consensus.hashGenesisBlock;
+        MasternodeRef winningNode = mnodeman.GetCurrentMasterNode(hash);
         if (winningNode) {
             payee = winningNode->GetPayeeScript();
         } else {
