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

merge downstream 0.11.1

Browse Source
This commit is contained in:
vertoe 2015-02-14 08:50:55 +01:00
commit fb6a288fbc
5 changed files with 61 additions and 64 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_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 11) define(_CLIENT_VERSION_MINOR, 11)
define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_BUILD, 23) define(_CLIENT_VERSION_BUILD, 25)
define(_CLIENT_VERSION_IS_RELEASE, true) define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2015) define(_COPYRIGHT_YEAR, 2015)
AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin]) 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_MAJOR 0
#define CLIENT_VERSION_MINOR 11 #define CLIENT_VERSION_MINOR 11
#define CLIENT_VERSION_REVISION 1 #define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 23 #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 one party without comprimising the security of InstantX
(1000/2150.0)**15 = 1.031e-05 (1000/2150.0)**15 = 1.031e-05
*/ */
#define INSTANTX_SIGNATURES_REQUIRED 15 #define INSTANTX_SIGNATURES_REQUIRED 20
#define INSTANTX_SIGNATURES_TOTAL 20 #define INSTANTX_SIGNATURES_TOTAL 30
#define MASTERNODE_NOT_PROCESSED 0 // initial state #define MASTERNODE_NOT_PROCESSED 0 // initial state
#define MASTERNODE_IS_CAPABLE 1 #define MASTERNODE_IS_CAPABLE 1

10
src/main.cpp
View File

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

9
src/masternode.cpp
View File

@ -513,6 +513,11 @@ int GetMasternodeRank(CTxIn& vin, int64_t nBlockHeight, int minProtocol)
//Get the last hash that matches the modulus given. Processed in reverse order //Get the last hash that matches the modulus given. Processed in reverse order
bool GetBlockHash(uint256& hash, int nBlockHeight) bool GetBlockHash(uint256& hash, int nBlockHeight)
{ {
if (chainActive.Tip() == NULL) return false;
if(nBlockHeight == 0)
nBlockHeight = chainActive.Tip()->nHeight;
if(mapCacheBlockHashes.count(nBlockHeight)){ if(mapCacheBlockHashes.count(nBlockHeight)){
hash = mapCacheBlockHashes[nBlockHeight]; hash = mapCacheBlockHashes[nBlockHeight];
return true; return true;
@ -521,7 +526,6 @@ bool GetBlockHash(uint256& hash, int nBlockHeight)
const CBlockIndex *BlockLastSolved = chainActive.Tip(); const CBlockIndex *BlockLastSolved = chainActive.Tip();
const CBlockIndex *BlockReading = chainActive.Tip(); const CBlockIndex *BlockReading = chainActive.Tip();
if (chainActive.Tip() == NULL) return false;
if (BlockLastSolved == NULL || BlockLastSolved->nHeight == 0 || chainActive.Tip()->nHeight+1 < nBlockHeight) return false; if (BlockLastSolved == NULL || BlockLastSolved->nHeight == 0 || chainActive.Tip()->nHeight+1 < nBlockHeight) return false;
int nBlocksAgo = 0; int nBlocksAgo = 0;
@ -796,9 +800,10 @@ void CMasternodePayments::Relay(CMasternodePaymentWinner& winner)
void CMasternodePayments::Sync(CNode* node) void CMasternodePayments::Sync(CNode* node)
{ {
int a = 0;
BOOST_FOREACH(CMasternodePaymentWinner& winner, vWinning) BOOST_FOREACH(CMasternodePaymentWinner& winner, vWinning)
if(winner.nBlockHeight >= chainActive.Tip()->nHeight-10 && winner.nBlockHeight <= chainActive.Tip()->nHeight + 20) if(winner.nBlockHeight >= chainActive.Tip()->nHeight-10 && winner.nBlockHeight <= chainActive.Tip()->nHeight + 20)
node->PushMessage("mnw", winner); node->PushMessage("mnw", winner, a);
} }