neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version bump / proto bump / try mining lock

Browse Source
This commit is contained in:
Evan Duffield 2015-07-31 15:37:38 -07:00
parent fa9a0ec037
commit 8b62e590df
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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])

2
src/clientversion.h
View File

@ -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

2
src/instantx.h
View File

@ -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<uint256, CTransaction> mapTxLockReq;
extern map<uint256, CTransaction> mapTxLockReqRejected;

10
src/miner.cpp
View File

@ -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);

10
src/version.h
View File

@ -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