Update checkpoints/mnpayments

Author: nyxpay

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 12)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 6)
+define(_CLIENT_VERSION_BUILD, 7)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)
 AC_INIT([Nyx Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/nyxpay/nyx/issues],[nyx])

src/chainparams.cpp

@@ -141,12 +141,10 @@ class CMainParams : public CChainParams {
             boost::assign::map_list_of
             ( 175, uint256S("0x0000008324b22109a4cd33aa15181a81e13b0ed6b4724fd4b0b9355637a65058"))
             ( 5175, uint256S("0x000000000002b5b8886acc2c0613f871e1eff192c68bde64fded61a337652065"))
-            ( 7175, uint256S("0x000000000414eefe72278ca920180ab474a40142e8670f637051ce9161639458"))
-            ( 10060, uint256S("0x00000000062fb058cf59407a9f5b367112d443e2ad7335fd5744efcd9dfdbd93"))
-            ( 10306, uint256S("0x00000000005f0cf9410b0c5700ecc41589d9ef8f771352d4465008ae185e62bb"))
-            ( 10600, uint256S("0x000000000143db6fd3c07ff85bfd59515ac1493ff4abacaaedffbcb121bd3635")),
-            1518942216, // * UNIX timestamp of last checkpoint block
-            12481,    	// * total number of transactions between genesis and last checkpoint
+            ( 10600, uint256S("0x000000000143db6fd3c07ff85bfd59515ac1493ff4abacaaedffbcb121bd3635"))
+            ( 16645, uint256S("0x00000000029e0335414abd74bacbddc4c971589517aaced8a022cfb936454e62")),				
+            1519198542, // * UNIX timestamp of last checkpoint block
+            20112,    	// * total number of transactions between genesis and last checkpoint
                         //   (the tx=... number in the SetBestChain debug.log lines)
 	    1000 		// * estimated number of transactions per day after checkpoint
         };

src/chainparamsseeds.h

@@ -8,12 +8,7 @@
  * IPv4 as well as onion addresses are wrapped inside a IPv6 address accordingly.
  */
 static SeedSpec6 pnSeed6_main[] = {
-    {{0x2a,0x0b,0x70,0x80,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xc0,0x58}, 4330},
-    {{0x2a,0x0b,0x70,0x80,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xef,0x9b}, 4330},
-    {{0x2a,0x0b,0x70,0x80,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x72,0x33}, 4330},
-    {{0x2a,0x0b,0x70,0x80,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xbc,0xee}, 4330},
-    {{0x2a,0x0b,0x70,0x80,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0xd4,0x1e}, 4330},
-    {{0x2a,0x0b,0x70,0x80,0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x24,0x48}, 4330}
+
 };
 
 static SeedSpec6 pnSeed6_test[] = {

src/clientversion.h

@@ -17,7 +17,7 @@
 #define CLIENT_VERSION_MAJOR 0
 #define CLIENT_VERSION_MINOR 12
 #define CLIENT_VERSION_REVISION 1
-#define CLIENT_VERSION_BUILD 6
+#define CLIENT_VERSION_BUILD 7
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true

src/masternode-payments.cpp

@@ -561,27 +561,30 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew)
 
     // if we don't have at least MNPAYMENTS_SIGNATURES_REQUIRED signatures on a payee, approve whichever is the longest chain
     if(nMaxSignatures < MNPAYMENTS_SIGNATURES_REQUIRED) return true;
-
-    BOOST_FOREACH(CMasternodePayee& payee, vecPayees) {
-        if (payee.GetVoteCount() >= MNPAYMENTS_SIGNATURES_REQUIRED) {
-            BOOST_FOREACH(CTxOut txout, txNew.vout) {
-                if (payee.GetPayee() == txout.scriptPubKey && nMasternodePayment == txout.nValue) {
-                    LogPrint("mnpayments", "CMasternodeBlockPayees::IsTransactionValid -- Found required payment\n");
-                    return true;
-                }
-            }
-
-            CTxDestination address1;
-            ExtractDestination(payee.GetPayee(), address1);
-            CBitcoinAddress address2(address1);
-
-            if(strPayeesPossible == "") {
-                strPayeesPossible = address2.ToString();
-            } else {
-                strPayeesPossible += "," + address2.ToString();
+	
+    BOOST_FOREACH (CMasternodePayee& payee, vecPayees) {
+        bool MasternodePaymentFound = false;
+        BOOST_FOREACH (CTxOut txout, txNew.vout) {
+            if (payee.GetPayee() == txout.scriptPubKey) {
+                if(txout.nValue >= nMasternodePayment)
+                    MasternodePaymentFound = true;
+                else
+                    LogPrintf("Masternode payment is out of range. Paid=%f Min=%f\n", (float)txout.nValue/COIN, (float)nMasternodePayment/COIN);
             }
         }
-    }
+		
+		if (MasternodePaymentFound) return true;
+		
+        CTxDestination address1;
+        ExtractDestination(payee.GetPayee(), address1);
+        CBitcoinAddress address2(address1);
+
+        if (strPayeesPossible == "") {
+               strPayeesPossible = address2.ToString();
+           } else {
+               strPayeesPossible += "," + address2.ToString();
+           }
+    }	
 
     LogPrintf("CMasternodeBlockPayees::IsTransactionValid -- ERROR: Missing required payment, possible payees: '%s', amount: %f NYX\n", strPayeesPossible, (float)nMasternodePayment/COIN);
     return false;