From 7cede481a8a7a0d7a03910c19f54e9be9ecb0bc9 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Fri, 4 Sep 2015 15:22:17 +0300 Subject: [PATCH 1/2] fix mnw limits --- src/masternode-payments.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index a94377be70..8608c0bc0e 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -375,9 +375,9 @@ void CMasternodePayments::ProcessMessageMasternodePayments(CNode* pfrom, std::st return; } - int nFirstBlock = chainActive.Tip()->nHeight - (mnodeman.CountEnabled()*2); + int nFirstBlock = chainActive.Tip()->nHeight - (mnodeman.CountEnabled()*1.25); if(winner.nBlockHeight < nFirstBlock || winner.nBlockHeight > chainActive.Tip()->nHeight+20){ - LogPrintf("mnw - winner out of range - FirstBlock %d Height %d bestHeight %d\n", nFirstBlock, winner.nBlockHeight, chainActive.Tip()->nHeight); + LogPrint("mnpayments", "mnw - winner out of range - FirstBlock %d Height %d bestHeight %d\n", nFirstBlock, winner.nBlockHeight, chainActive.Tip()->nHeight); return; } @@ -779,7 +779,7 @@ void CMasternodePayments::Sync(CNode* node, int nCountNeeded) if(chainActive.Tip() == NULL) return; - int nCount = (mnodeman.CountEnabled()*2); + int nCount = (mnodeman.CountEnabled()*1.25); if(nCountNeeded > nCount) nCountNeeded = nCount; int nInvCount = 0; From fd5497614925f62ace112a770a9f8711d6479f40 Mon Sep 17 00:00:00 2001 From: Holger Schinzel Date: Fri, 4 Sep 2015 15:33:53 +0200 Subject: [PATCH 2/2] bump version --- configure.ac | 2 +- src/clientversion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0f87d10c5c..5f647caad0 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MINOR, 12) define(_CLIENT_VERSION_REVISION, 0) -define(_CLIENT_VERSION_BUILD, 52) +define(_CLIENT_VERSION_BUILD, 53) define(_CLIENT_VERSION_IS_RELEASE, true) define(_COPYRIGHT_YEAR, 2015) AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash]) diff --git a/src/clientversion.h b/src/clientversion.h index dc3ed2cafa..ae7036d49c 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -17,7 +17,7 @@ #define CLIENT_VERSION_MAJOR 0 #define CLIENT_VERSION_MINOR 12 #define CLIENT_VERSION_REVISION 0 -#define CLIENT_VERSION_BUILD 52 +#define CLIENT_VERSION_BUILD 53 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true