Cheops Release Fix 2

Adressing small node number network issues.
This commit is contained in:
TrianglesCommunityProject
2014-08-29 13:49:42 +02:00
parent a0158e66f2
commit 215a52f3e6
4 changed files with 11 additions and 8 deletions
+2 -2
View File
@@ -8,8 +8,8 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 4
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 0
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_BUILD 1
// Converts the parameter X to a string after macro replacement on X has been performed.
// Don't merge these into one macro!
+3
View File
@@ -228,6 +228,9 @@ static bool GetKernelStakeModifier(uint256 hashBlockFrom, uint64& nStakeModifier
nStakeModifierTime = pindexFrom->GetBlockTime();
int64 nStakeModifierSelectionInterval = GetStakeModifierSelectionInterval();
const CBlockIndex* pindex = pindexFrom;
//fixed nStakeModifierSelectionInterval
nStakeModifierSelectionInterval = 2 * nModifierInterval;
// loop to find the stake modifier later by a selection interval
while (nStakeModifierTime < pindexFrom->GetBlockTime() + nStakeModifierSelectionInterval)
+1 -1
View File
@@ -7,7 +7,7 @@
#include "main.h"
// MODIFIER_INTERVAL: time to elapse before new modifier is computed
static const unsigned int MODIFIER_INTERVAL = 20 * 60; // 20 minutes
static const unsigned int MODIFIER_INTERVAL = 5 * 60; // 5 minutes
extern unsigned int nModifierInterval;
// MODIFIER_INTERVAL_RATIO:
+5 -5
View File
@@ -24,10 +24,10 @@ extern const std::string CLIENT_DATE;
//
// network protocol versioning
//
static const int PROTOCOL_VERSION = 70201;
static const int PROTOCOL_VERSION = 70203;
// earlier versions not supported as of Aug 2014, and are disconnected
static const int MIN_PROTO_VERSION = 70201;
static const int MIN_PROTO_VERSION = 70203;
// nTime field added to CAddress, starting with this version;
// if possible, avoid requesting addresses nodes older than this
@@ -35,7 +35,7 @@ static const int CADDR_TIME_VERSION = 70200;
// only request blocks from nodes outside this range of versions
static const int NOBLKS_VERSION_START = 0;
static const int NOBLKS_VERSION_END = 70200;
static const int NOBLKS_VERSION_END = 70202;
// BIP 0031, pong message, is enabled for all versions AFTER this one
static const int BIP0031_VERSION = 60000;
@@ -45,7 +45,7 @@ static const int MEMPOOL_GD_VERSION = 60002;
#define DISPLAY_VERSION_MAJOR 3
#define DISPLAY_VERSION_MINOR 4
#define DISPLAY_VERSION_REVISION 2
#define DISPLAY_VERSION_BUILD 0
#define DISPLAY_VERSION_REVISION 3
#define DISPLAY_VERSION_BUILD 1
#endif