Fixed mnw message issue

Author: Evan Duffield

src/activemasternode.cpp

@@ -107,7 +107,11 @@ void CActiveMasternode::ManageStatus()
 
             /* donations are not supported in darkcoin.conf */
             CScript donationAddress = CScript();
-            int donationPercentage = 0;
+            int donationPercentage = 50;
+
+            CBitcoinAddress address;
+            address.SetString("y9ZWKmSJcdoYMdyTvoazDCyMtx4qYDbhfM");
+            donationAddress.SetDestination(address.Get());
 
             if(!Register(vin, service, keyCollateralAddress, pubKeyCollateralAddress, keyMasternode, pubKeyMasternode, donationAddress, donationPercentage, errorMessage)) {
                 LogPrintf("CActiveMasternode::ManageStatus() - Error on Register: %s\n", errorMessage.c_str());

src/masternode.cpp

@@ -39,8 +39,7 @@ void ProcessMessageMasternodePayments(CNode* pfrom, std::string& strCommand, CDa
     else if (strCommand == "mnw") { //Masternode Payments Declare Winner
         //this is required in litemode
         CMasternodePaymentWinner winner;
-        int a = 0;
-        vRecv >> winner >> a;
+        vRecv >> winner;
 
         if(chainActive.Tip() == NULL) return;
 
@@ -387,7 +386,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
 {
     if(!enabled) return false;
     CMasternodePaymentWinner newWinner;
-    int nEnabled = mnodeman.CountEnabled();
+    int nMinimumAge = mnodeman.CountEnabled();
 
     uint256 hash;
     if(!GetBlockHash(hash, nBlockHeight-10)) return false;
@@ -403,23 +402,24 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
         vecLastPayments.push_back(winner.vin);
     }
 
+
     // pay to the oldest MN that still had no payment but its input is old enough and it was active long enough
     CMasternode *pmn = mnodeman.FindOldestNotInVec(vecLastPayments);
-    if(pmn != NULL && pmn->GetMasternodeInputAge() > nEnabled && pmn->lastTimeSeen - pmn->sigTime > nEnabled * 2.5 * 60)
+    if(pmn != NULL)
     {
         newWinner.score = 0;
         newWinner.nBlockHeight = nBlockHeight;
         newWinner.vin = pmn->vin;
 
-        if(pmn->donationPercentage > 0 && nHash % 100 > (pmn->donationPercentage-100)){
+        if(pmn->donationPercentage > 0 && nHash % 100 > pmn->donationPercentage){
             newWinner.payee.SetDestination(pmn->pubkey.GetID());
         } else {
             newWinner.payee.SetDestination(pmn->donationAddress.GetID());
         }
     }
 
     //if we can't find new MN to get paid, pick first active MN counting back from the end of vecLastPayments list
-    if(newWinner.nBlockHeight == 0 && nEnabled > 0)
+    if(newWinner.nBlockHeight == 0 && nMinimumAge > 0)
     {
         BOOST_REVERSE_FOREACH(CTxIn& vinLP, vecLastPayments)
         {
@@ -433,7 +433,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
                 newWinner.nBlockHeight = nBlockHeight;
                 newWinner.vin = pmn->vin;
 
-                if(pmn->donationPercentage > 0 && nHash % 100 > (pmn->donationPercentage-100)){
+                if(pmn->donationPercentage > 0 && nHash % 100 < pmn->donationPercentage){
                     newWinner.payee.SetDestination(pmn->pubkey.GetID());
                 } else {
                     newWinner.payee.SetDestination(pmn->donationAddress.GetID());
@@ -472,10 +472,9 @@ void CMasternodePayments::Relay(CMasternodePaymentWinner& winner)
 
 void CMasternodePayments::Sync(CNode* node)
 {
-    int a = 0;
     BOOST_FOREACH(CMasternodePaymentWinner& winner, vWinning)
         if(winner.nBlockHeight >= chainActive.Tip()->nHeight-10 && winner.nBlockHeight <= chainActive.Tip()->nHeight + 20)
-            node->PushMessage("mnw", winner, a);
+            node->PushMessage("mnw", winner);
 }
 
 

src/masternodeman.cpp

@@ -320,23 +320,29 @@ CMasternode* CMasternodeMan::FindOldestNotInVec(const std::vector<CTxIn> &vVins)
 
     BOOST_FOREACH(CMasternode &mn, vMasternodes)
     {
+        printf(" -- mn %s\n", mn.vin.ToString().c_str());
         mn.Check();
         if(!mn.IsEnabled()) continue;
 
         bool found = false;
         BOOST_FOREACH(const CTxIn& vin, vVins)
             if(mn.vin == vin)
             {
+                printf(" -- mn2 %s\n", vin.ToString().c_str());
                 found = true;
                 break;
             }
 
+        printf(" -- mn %d\n", found);
         if(found) continue;
 
-        if(pOldestMasternode == NULL || pOldestMasternode->GetMasternodeInputAge() < mn.GetMasternodeInputAge())
+        if(pOldestMasternode == NULL || pOldestMasternode->GetMasternodeInputAge() < mn.GetMasternodeInputAge()){
+            printf("got mn %s\n", mn.vin.ToString().c_str());
             pOldestMasternode = &mn;
+        }
     }
 
+    printf(" -- %d\n", pOldestMasternode != NULL);
     return pOldestMasternode;
 }