sami7777/triangles_v5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cheops Release Fix 1

Browse Source 
Version 3.4.2.0.
- reverted previous idiocy
This commit is contained in:
TrianglesCommunityProject
2014-08-28 15:34:57 +02:00
parent fbadfb5086
commit a0158e66f2
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clientversion.h
+1 -1
View File
@@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it // 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_MAJOR 3
#define CLIENT_VERSION_MINOR 4 #define CLIENT_VERSION_MINOR 4
#define CLIENT_VERSION_REVISION 1 #define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 0 #define CLIENT_VERSION_BUILD 0
// Converts the parameter X to a string after macro replacement on X has been performed. // Converts the parameter X to a string after macro replacement on X has been performed.
src/kernel.cpp
+2 -5
View File
@@ -296,11 +296,8 @@ bool CheckStakeKernelHash(unsigned int nBits, const CBlock& blockFrom, unsigned
// v0.3 protocol kernel hash weight starts from 0 at the min age // v0.3 protocol kernel hash weight starts from 0 at the min age
// this change increases active coins participating the hash and helps // this change increases active coins participating the hash and helps
// to secure the network when proof-of-stake difficulty is low // to secure the network when proof-of-stake difficulty is low
int64 nTimeWeight = min((int64)nTimeTx - txPrev.nTime, (int64)nStakeMaxAge) - nStakeMinAge;
// triangles: fixed timeweight calculation CBigNum bnCoinDayWeight = CBigNum(nValueIn) * nTimeWeight / COIN / (24 * 60 * 6);
//old: int64 nTimeWeight = min((int64)nTimeTx - txPrev.nTime, (int64)nStakeMaxAge) - nStakeMinAge;
int64 nTimeWeight = min((int64)nTimeTx - txPrev.nTime - nStakeMinAge, (int64)nStakeMaxAge);
CBigNum bnCoinDayWeight = CBigNum(nValueIn) * nTimeWeight / COIN / (24 * 60 * 60);
// printf(">>> CheckStakeKernelHash: nTimeWeight = %"PRI64d"\n", nTimeWeight); // printf(">>> CheckStakeKernelHash: nTimeWeight = %"PRI64d"\n", nTimeWeight);
// Calculate hash // Calculate hash
src/version.h
+5 -5
View File
@@ -24,18 +24,18 @@ extern const std::string CLIENT_DATE;
// //
// network protocol versioning // network protocol versioning
// //
static const int PROTOCOL_VERSION = 70200; static const int PROTOCOL_VERSION = 70201;
// earlier versions not supported as of Aug 2014, and are disconnected // earlier versions not supported as of Aug 2014, and are disconnected
static const int MIN_PROTO_VERSION = 70200; static const int MIN_PROTO_VERSION = 70201;
// nTime field added to CAddress, starting with this version; // nTime field added to CAddress, starting with this version;
// if possible, avoid requesting addresses nodes older than this // if possible, avoid requesting addresses nodes older than this
static const int CADDR_TIME_VERSION = 70101; static const int CADDR_TIME_VERSION = 70200;
// only request blocks from nodes outside this range of versions // only request blocks from nodes outside this range of versions
static const int NOBLKS_VERSION_START = 0; static const int NOBLKS_VERSION_START = 0;
static const int NOBLKS_VERSION_END = 70101; static const int NOBLKS_VERSION_END = 70200;
// BIP 0031, pong message, is enabled for all versions AFTER this one // BIP 0031, pong message, is enabled for all versions AFTER this one
static const int BIP0031_VERSION = 60000; 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_MAJOR 3
#define DISPLAY_VERSION_MINOR 4 #define DISPLAY_VERSION_MINOR 4
#define DISPLAY_VERSION_REVISION 1 #define DISPLAY_VERSION_REVISION 2
#define DISPLAY_VERSION_BUILD 0 #define DISPLAY_VERSION_BUILD 0
#endif #endif