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

version bump / pose fixes

Browse Source
This commit is contained in:
Evan Duffield 2015-03-23 10:20:56 -07:00
parent c0a658ae43
commit 528cf61185
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core.h
View File

@ -43,7 +43,7 @@ static const int64_t DARKSEND_POOL_MAX = (999.99*COIN);
#define MASTERNODE_EXPIRATION_SECONDS (65*60) #define MASTERNODE_EXPIRATION_SECONDS (65*60)
#define MASTERNODE_REMOVAL_SECONDS (70*60) #define MASTERNODE_REMOVAL_SECONDS (70*60)
static const int MIN_POOL_PEER_PROTO_VERSION = 70074; // minimum peer version accepted by DarkSendPool static const int MIN_POOL_PEER_PROTO_VERSION = 70075; // minimum peer version accepted by DarkSendPool
class CTransaction; class CTransaction;

8
src/masternode-pos.cpp
View File

@ -78,6 +78,10 @@ void ProcessMessageMasternodePOS(CNode* pfrom, std::string& strCommand, CDataStr
return; return;
} }
CMasternode* pmnA = mnodeman.Find(mnse.vinMasternodeA);
if(pmnA == NULL) return;
if(pmnA->protocolVersion < MIN_MASTERNODE_POS_PROTO_VERSION) return;
int nBlockHeight = chainActive.Tip()->nHeight; int nBlockHeight = chainActive.Tip()->nHeight;
if(nBlockHeight - mnse.nBlockHeight > 10){ if(nBlockHeight - mnse.nBlockHeight > 10){
LogPrintf("MasternodePOS::mnse - Too old\n"); LogPrintf("MasternodePOS::mnse - Too old\n");
@ -88,14 +92,14 @@ void ProcessMessageMasternodePOS(CNode* pfrom, std::string& strCommand, CDataStr
int a = mnodeman.GetMasternodeRank(mnse.vinMasternodeA, mnse.nBlockHeight, MIN_MASTERNODE_POS_PROTO_VERSION); int a = mnodeman.GetMasternodeRank(mnse.vinMasternodeA, mnse.nBlockHeight, MIN_MASTERNODE_POS_PROTO_VERSION);
if(a == -1 || a > GetCountScanningPerBlock()) if(a == -1 || a > GetCountScanningPerBlock())
{ {
LogPrintf("MasternodePOS::mnse - MasternodeA ranking is too high\n"); if(a != -1) LogPrintf("MasternodePOS::mnse - MasternodeA ranking is too high\n");
return; return;
} }
int b = mnodeman.GetMasternodeRank(mnse.vinMasternodeB, mnse.nBlockHeight, MIN_MASTERNODE_POS_PROTO_VERSION, false); int b = mnodeman.GetMasternodeRank(mnse.vinMasternodeB, mnse.nBlockHeight, MIN_MASTERNODE_POS_PROTO_VERSION, false);
if(b == -1 || b < mnodeman.CountMasternodesAboveProtocol(MIN_MASTERNODE_POS_PROTO_VERSION)-GetCountScanningPerBlock()) if(b == -1 || b < mnodeman.CountMasternodesAboveProtocol(MIN_MASTERNODE_POS_PROTO_VERSION)-GetCountScanningPerBlock())
{ {
LogPrintf("MasternodePOS::mnse - MasternodeB ranking is too low\n"); if(b != -1) LogPrintf("MasternodePOS::mnse - MasternodeB ranking is too low\n");
return; return;
} }

2
src/masternode-pos.h
View File

@ -25,7 +25,7 @@ class CMasternodeScanningError;
extern map<uint256, CMasternodeScanningError> mapMasternodeScanningErrors; extern map<uint256, CMasternodeScanningError> mapMasternodeScanningErrors;
extern CMasternodeScanning mnscan; extern CMasternodeScanning mnscan;
static const int MIN_MASTERNODE_POS_PROTO_VERSION = 70074; static const int MIN_MASTERNODE_POS_PROTO_VERSION = 70075;
/* /*
1% of the network is scanned every 2.5 minutes, making a full 1% of the network is scanned every 2.5 minutes, making a full

2
src/version.h
View File

@ -27,7 +27,7 @@ extern const std::string CLIENT_DATE;
// network protocol versioning // network protocol versioning
// //
static const int PROTOCOL_VERSION = 70074; static const int PROTOCOL_VERSION = 70075;
// intial proto version, to be increased after version/verack negotiation // intial proto version, to be increased after version/verack negotiation
static const int INIT_PROTO_VERSION = 209; static const int INIT_PROTO_VERSION = 209;