diff --git a/configure.ac b/configure.ac index ffe0eb913..0e7a3121e 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, 33) +define(_CLIENT_VERSION_BUILD, 34) 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 7b3b66037..85330ef3a 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 33 +#define CLIENT_VERSION_BUILD 34 //! Set to true for release, false for prerelease or test build #define CLIENT_VERSION_IS_RELEASE true diff --git a/src/instantx.h b/src/instantx.h index ceb5fc6ce..01df0bb25 100644 --- a/src/instantx.h +++ b/src/instantx.h @@ -32,7 +32,7 @@ class CConsensusVote; class CTransaction; class CTransactionLock; -static const int MIN_INSTANTX_PROTO_VERSION = 70099; +static const int MIN_INSTANTX_PROTO_VERSION = 70100; extern map mapTxLockReq; extern map mapTxLockReqRejected; diff --git a/src/miner.cpp b/src/miner.cpp index 19b59ac4b..a29ac4033 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -129,7 +129,15 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) CAmount nFees = 0; { - LOCK2(cs_main, mempool.cs); + TRY_LOCK(cs_main, fLockMain); + if (!fLockMain) { + LogPrintf("CreateNewBlock : ERROR - failed to lock cs_main - disabled mining\n"); + } + TRY_LOCK(mempool.cs, fLockMempool); + if (!fLockMempool) { + LogPrintf("CreateNewBlock : ERROR - failed to lock mempool.cs - disabled mining\n"); + } + CBlockIndex* pindexPrev = chainActive.Tip(); const int nHeight = pindexPrev->nHeight + 1; CCoinsViewCache view(pcoinsTip); diff --git a/src/version.h b/src/version.h index a75c54fcd..a9992a5aa 100644 --- a/src/version.h +++ b/src/version.h @@ -10,7 +10,7 @@ * network protocol versioning */ -static const int PROTOCOL_VERSION = 70099; +static const int PROTOCOL_VERSION = 70100; //! initial proto version, to be increased after version/verack negotiation static const int INIT_PROTO_VERSION = 209; @@ -22,19 +22,19 @@ static const int GETHEADERS_VERSION = 70077; static const int MIN_PEER_PROTO_VERSION = 70066; //! minimum peer version accepted by DarksendPool -static const int MIN_POOL_PEER_PROTO_VERSION = 70099; +static const int MIN_POOL_PEER_PROTO_VERSION = 70100; //! minimum peer version for masternode budgets -static const int MIN_BUDGET_PEER_PROTO_VERSION = 70099; +static const int MIN_BUDGET_PEER_PROTO_VERSION = 70100; //! minimum peer version for masternode winner broadcasts -static const int MIN_MNW_PEER_PROTO_VERSION = 70099; +static const int MIN_MNW_PEER_PROTO_VERSION = 70100; //! minimum peer version that can receive masternode payments // V1 - Last protocol version before update // V2 - Newest protocol version static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_1 = 70066; -static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70099; +static const int MIN_MASTERNODE_PAYMENT_PROTO_VERSION_2 = 70100; //! nTime field added to CAddress, starting with this version; //! if possible, avoid requesting addresses nodes older than this