From c350bdfea8207132ab96a90a329b8680d4598249 Mon Sep 17 00:00:00 2001
From: evan82 <eduffield82@gmail.com>
Date: Wed, 8 Jul 2015 00:21:04 -0700
Subject: [PATCH] Revert "V0.12.0.x fix min mnpayments proto usage"

---
 src/masternode-payments.cpp | 10 ++--------
 src/masternode-payments.h   |  4 ++--
 src/masternodeman.cpp       |  7 ++++++-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
index 0eac3cccc79f..670f6a07b3c9 100644
--- a/src/masternode-payments.cpp
+++ b/src/masternode-payments.cpp
@@ -153,12 +153,6 @@ void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, int64_t nFe
     }
 }
 
-int CMasternodePayments::GetMinMasternodePaymentsProto() {
-    return IsSporkActive(SPORK_10_MASTERNODE_PAY_NEWEST_NODES)
-            ? MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2
-            : MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1;
-}
-
 void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::string& strCommand, CDataStream& vRecv)
 {
     if(IsInitialBlockDownload()) return;
@@ -415,7 +409,7 @@ bool CMasternodePaymentWinner::IsValid()
 {
     if(IsReferenceNode(vinMasternode)) return true;
 
-    int n = mnodeman.GetMasternodeRank(vinMasternode, nBlockHeight-100, GetMinMasternodePaymentsProto());
+    int n = mnodeman.GetMasternodeRank(vinMasternode, nBlockHeight-100, MIN_MNPAYMENTS_PROTO_VERSION);
 
     if(n == -1)
     {
@@ -441,7 +435,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
     //reference node - hybrid mode
 
     if(!IsReferenceNode(activeMasternode.vin)){
-        int n = mnodeman.GetMasternodeRank(activeMasternode.vin, nBlockHeight-100, GetMinMasternodePaymentsProto());
+        int n = mnodeman.GetMasternodeRank(activeMasternode.vin, nBlockHeight-100, MIN_MNPAYMENTS_PROTO_VERSION);
 
         if(n == -1)
         {
diff --git a/src/masternode-payments.h b/src/masternode-payments.h
index c42decc619f1..378abedf930e 100644
--- a/src/masternode-payments.h
+++ b/src/masternode-payments.h
@@ -21,6 +21,7 @@ extern CMasternodePayments masternodePayments;
 extern std::map<uint256, CMasternodePaymentWinner> mapMasternodePayeeVotes;
 extern std::map<uint256, CMasternodeBlockPayees> mapMasternodeBlocks;
 
+static const int MIN_MNPAYMENTS_PROTO_VERSION = 70066;
 #define MNPAYMENTS_SIGNATURES_REQUIRED           6
 #define MNPAYMENTS_SIGNATURES_TOTAL              10
 
@@ -199,7 +200,6 @@ class CMasternodePayments
     bool IsTransactionValid(const CTransaction& txNew, int nBlockHeight);
     bool IsScheduled(CMasternode& mn, int nNotBlockHeight);
 
-    int GetMinMasternodePaymentsProto();
     void ProcessMessageMasternodePayments(CNode* pfrom, std::string& strCommand, CDataStream& vRecv);
     std::string GetRequiredPaymentsString(int nBlockHeight);
     void FillBlockPayee(CMutableTransaction& txNew, int64_t nFees);
@@ -207,4 +207,4 @@ class CMasternodePayments
 };
 
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
index 6d86fdd3d564..95bc3d1010bf 100644
--- a/src/masternodeman.cpp
+++ b/src/masternodeman.cpp
@@ -385,7 +385,12 @@ CMasternode* CMasternodeMan::GetNextMasternodeInQueueForPayment(int nBlockHeight
         if(!mn.IsEnabled()) continue;
 
         // //check protocol version
-        if(mn.protocolVersion < masternodePayments.GetMinMasternodePaymentsProto()) continue;
+        if(IsSporkActive(SPORK_10_MASTERNODE_PAY_NEWEST_NODES)){
+            if(mn.protocolVersion < MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2) continue;
+        } else {
+            //support older versions for a period of time
+            if(mn.protocolVersion < MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1) continue;
+        }
 
         //it's in the list -- so let's skip it
         if(masternodePayments.IsScheduled(mn, nBlockHeight)) continue;