sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.11.1.x'

Browse Source
This commit is contained in:
Evan Duffield 2015-02-10 04:31:38 -07:00
commit 707db8427c
5 changed files with 47 additions and 42 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, 11)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 18)
define(_CLIENT_VERSION_BUILD, 19)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2015)
AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])

1
src/checkpoints.cpp
View File

@ -56,6 +56,7 @@ namespace Checkpoints
( 137993, uint256("0x00000000000cf69ce152b1bffdeddc59188d7a80879210d6e5c9503011929c3c"))
( 167996, uint256("0x000000000009486020a80f7f2cc065342b0c2fb59af5e090cd813dba68ab0fed"))
( 207992, uint256("0x00000000000d85c22be098f74576ef00b7aa00c05777e966aff68a270f1e01a5"))
( 217752, uint256("0x00000000000a7baeb2148272a7e14edf5af99a64af456c0afc23d15a0918b704"))
;
static const CCheckpointData data = {
&mapCheckpoints,

2
src/clientversion.h
View File

@ -12,7 +12,7 @@
#define CLIENT_VERSION_MAJOR 0
#define CLIENT_VERSION_MINOR 11
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 18
#define CLIENT_VERSION_BUILD 19

6
src/main.cpp
View File

@ -2867,7 +2867,8 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
if(fDebug) LogPrintf("CheckBlock() : Masternode payment enforcement is off\n");
}
if(MasternodePayments && !fLargeWorkForkFound && !fLargeWorkInvalidChainFound)
if(!fLargeWorkForkFound && !fLargeWorkInvalidChainFound){
if(MasternodePayments)
{
LOCK2(cs_main, mempool.cs);
@ -2920,6 +2921,9 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
} else {
LogPrintf("CheckBlock() : pindex is null, skipping masternode payment check\n");
}
} else {
LogPrintf("CheckBlock() : skipping masternode payment checks\n");
}
} else {
LogPrintf("CheckBlock() : fork detected, skipping masternode payment checks\n");
}

2
src/version.h
View File

@ -33,7 +33,7 @@ static const int PROTOCOL_VERSION = 70066;
static const int INIT_PROTO_VERSION = 209;
// disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 70051;
static const int MIN_PEER_PROTO_VERSION = 70054;
// nTime field added to CAddress, starting with this version;
// if possible, avoid requesting addresses nodes older than this