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

remove safemode checks for masternode payments & IX block enforce

Browse Source
This commit is contained in:
Evan Duffield 2015-02-13 12:22:58 -07:00
parent b7b2549e56
commit 70c4e0bdee
4 changed files with 54 additions and 62 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, 24)
define(_CLIENT_VERSION_BUILD, 25)
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])

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 24
#define CLIENT_VERSION_BUILD 25

4
src/core.h
View File

@ -24,8 +24,8 @@ static const int64_t DARKSEND_POOL_MAX = (999.99*COIN);
one party without comprimising the security of InstantX
(1000/2150.0)**15 = 1.031e-05
*/
#define INSTANTX_SIGNATURES_REQUIRED 15
#define INSTANTX_SIGNATURES_TOTAL 20
#define INSTANTX_SIGNATURES_REQUIRED 20
#define INSTANTX_SIGNATURES_TOTAL 30
#define MASTERNODE_NOT_PROCESSED 0 // initial state
#define MASTERNODE_IS_CAPABLE 1

8
src/main.cpp
View File

@ -2842,7 +2842,6 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
// ----------- instantX transaction scanning -----------
if(IsSporkActive(SPORK_3_INSTANTX_BLOCK_FILTERING)){
if(!fLargeWorkForkFound && !fLargeWorkInvalidChainFound){
BOOST_FOREACH(const CTransaction& tx, block.vtx){
if (!tx.IsCoinBase()){
//only reject blocks when it's based on complete consensus
@ -2860,9 +2859,6 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
} else {
LogPrintf("CheckBlock() : fork detected, skipping transaction locking checks\n");
}
} else {
if(fDebug) LogPrintf("CheckBlock() : InstantX block filtering is off\n");
}
// ----------- masternode payments -----------
@ -2880,7 +2876,6 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
if(fDebug) LogPrintf("CheckBlock() : Masternode payment enforcement is off\n");
}
if(!fLargeWorkForkFound && !fLargeWorkInvalidChainFound){
if(MasternodePayments)
{
LOCK2(cs_main, mempool.cs);
@ -2937,9 +2932,6 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
} else {
LogPrintf("CheckBlock() : skipping masternode payment checks\n");
}
} else {
LogPrintf("CheckBlock() : fork detected, skipping masternode payment checks\n");
}
// Check transactions