From ad2cc30e37e75bdc4628abd01026a67ab15a0147 Mon Sep 17 00:00:00 2001
From: random-zebra <random.zebra@protonmail.com>
Date: Fri, 21 May 2021 10:38:35 +0200
Subject: [PATCH] [Consensus] Check against current hash when no payee is found

Instead of using always the genesis hash (which is constant)
---
 src/masternode-payments.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 00592e68fa9d6..5c029749bfc9e 100644
--- 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 {