version 12
This commit is contained in:
parent
6eae1071dc
commit
6c9cc68449
@ -3,7 +3,7 @@ AC_PREREQ([2.60])
|
|||||||
define(_CLIENT_VERSION_MAJOR, 0)
|
define(_CLIENT_VERSION_MAJOR, 0)
|
||||||
define(_CLIENT_VERSION_MINOR, 11)
|
define(_CLIENT_VERSION_MINOR, 11)
|
||||||
define(_CLIENT_VERSION_REVISION, 2)
|
define(_CLIENT_VERSION_REVISION, 2)
|
||||||
define(_CLIENT_VERSION_BUILD, 11)
|
define(_CLIENT_VERSION_BUILD, 12)
|
||||||
define(_CLIENT_VERSION_IS_RELEASE, true)
|
define(_CLIENT_VERSION_IS_RELEASE, true)
|
||||||
define(_COPYRIGHT_YEAR, 2015)
|
define(_COPYRIGHT_YEAR, 2015)
|
||||||
AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash])
|
AC_INIT([Dash Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@dashpay.io],[dash])
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#define CLIENT_VERSION_MAJOR 0
|
#define CLIENT_VERSION_MAJOR 0
|
||||||
#define CLIENT_VERSION_MINOR 11
|
#define CLIENT_VERSION_MINOR 11
|
||||||
#define CLIENT_VERSION_REVISION 2
|
#define CLIENT_VERSION_REVISION 2
|
||||||
#define CLIENT_VERSION_BUILD 11
|
#define CLIENT_VERSION_BUILD 12
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -399,6 +399,7 @@ void CMasternodePayments::CleanPaymentList()
|
|||||||
|
|
||||||
bool CMasternodePayments::ProcessBlock(int nBlockHeight)
|
bool CMasternodePayments::ProcessBlock(int nBlockHeight)
|
||||||
{
|
{
|
||||||
|
if(nBlockHeight < nLastBlockHeight) return false;;
|
||||||
if(!enabled) return false;
|
if(!enabled) return false;
|
||||||
CMasternodePaymentWinner newWinner;
|
CMasternodePaymentWinner newWinner;
|
||||||
int nMinimumAge = mnodeman.CountEnabled();
|
int nMinimumAge = mnodeman.CountEnabled();
|
||||||
@ -465,6 +466,7 @@ bool CMasternodePayments::ProcessBlock(int nBlockHeight)
|
|||||||
if(AddWinningMasternode(newWinner))
|
if(AddWinningMasternode(newWinner))
|
||||||
{
|
{
|
||||||
Relay(newWinner);
|
Relay(newWinner);
|
||||||
|
nLastBlockHeight = nBlockHeight;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -282,6 +282,7 @@ private:
|
|||||||
std::string strTestPubKey;
|
std::string strTestPubKey;
|
||||||
std::string strMainPubKey;
|
std::string strMainPubKey;
|
||||||
bool enabled;
|
bool enabled;
|
||||||
|
int nLastBlockHeight;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user