Merge pull request #57 from anonymousbitcoin/patch/masternodes

Patch/masternodes
anonymousbitcoin · Sep 14, 2018 · dc80bc2 · dc80bc2
2 parents 0145888 + ada3dbc
commit dc80bc2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 6 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -112,7 +112,30 @@ class CMainParams : public CChainParams {
         vSeeds.push_back(CDNSSeedData("anon12-mainnet", "91.121.69.100"));
         vSeeds.push_back(CDNSSeedData("anon13-mainnet", "45.76.241.37"));
         vSeeds.push_back(CDNSSeedData("anon14-mainnet", "99.42.79.176"));
-
+
+        vSeeds.push_back(CDNSSeedData("anon14-mainnet", "149.28.224.182"));
+        vSeeds.push_back(CDNSSeedData("anon14-mainnet", "140.82.45.19"));
+        vSeeds.push_back(CDNSSeedData("anon14-mainnet", "45.76.1.51"));
+        vSeeds.push_back(CDNSSeedData("anon14-mainnet", "149.28.224.254"));
+        vSeeds.push_back(CDNSSeedData("anon14-mainnet", "45.63.9.86"));
+        vSeeds.push_back(CDNSSeedData("anon14-mainnet", "108.61.159.183"));
+
+        vSeeds.push_back(CDNSSeedData("anon15-mainnet", "149.28.40.191"));
+        vSeeds.push_back(CDNSSeedData("anon16-mainnet", "207.148.17.101"));
+        vSeeds.push_back(CDNSSeedData("anon17-mainnet", "45.77.103.39"));
+        vSeeds.push_back(CDNSSeedData("anon18-mainnet", "149.28.60.58"));
+        vSeeds.push_back(CDNSSeedData("anon19-mainnet", "45.76.8.166"));
+        vSeeds.push_back(CDNSSeedData("anon20-mainnet", "207.246.95.8"));
+
+
+
+
+
+
+
+
+
+
 
 
 

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -69,10 +69,14 @@ bool IsBlockPayeeValid(const CTransaction &txNew, int nBlockHeight, CAmount bloc
     {
         LogPrint("mnpayments", "IsBlockPayeeValid -- Valid masternode payment at height %d: %s", nBlockHeight, txNew.ToString());
         return true;
-    } else {
+    } 
+
+    if (nBlockHeight >= 37000) {
+        LogPrintf("IsBlockPayeeValid -- ERROR: Invalid masternode payment detected at height %d: %s", nBlockHeight, txNew.ToString());
         return false;
     }
-
+
+    return true;    
 }
 
 void FillBlockPayments(CMutableTransaction &txNew, int nBlockHeight, CAmount blockReward, CTxOut &txoutMasternodeRet)

diff --git a/src/masternode.cpp b/src/masternode.cpp
@@ -968,9 +968,11 @@ bool CMasternodePing::CheckAndUpdate(CMasternode *pmn, bool fFromNewBroadcast, i
         mnodeman.mapSeenMasternodeBroadcast[hash].second.lastPing = *this;
     }
 
-    pmn->Check(true); // force update, ignoring cache
-    if (!pmn->IsEnabled())
-        return false;
+    // force update, ignoring cache
+    pmn->Check(true);
+    // relay ping for nodes in ENABLED/EXPIRED/WATCHDOG_EXPIRED state only, skip everyone else
+    if (!pmn->IsEnabled() && !pmn->IsExpired() && !pmn->IsWatchdogExpired()) return false;
+
 
     LogPrint("masternode", "CMasternodePing::CheckAndUpdate -- Masternode ping acceepted and relayed, masternode=%s\n", vin.prevout.ToStringShort());
     Relay();