diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index a76a939..5c4f1ea 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -32,6 +32,8 @@ static MapCheckpoints mapCheckpoints = ( 180646, uint256("9cbc41346470862c61a2acba7b4773128339fe9ffd6c1da6e566657a4eb6f2c5")) ( 208090, uint256("7c0b71191e9419f0ac6a0dad5a4fedb056f190dd0c3aa67628e51c8bf2e7d943")) ( 250000, uint256("9466a840d8f31e7100a6669db27e965f0b5d8d27a3a2e4708f11f424d9224c46")) + ( 257310, uint256("bc7a3cecea050289c2b8eb67a7ba64fd0b6926728d3d8339a7026224ba64fbf1")) + ( 257325, uint256("0601c6ba233354079faa15044c745f9bf219cfb1c236fac8676e8c189a95b705")) ; diff --git a/src/clientversion.h b/src/clientversion.h index fb3cd2b..84d3fd4 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -6,9 +6,9 @@ // // These need to be macros, as version.cpp's and curecoin-qt.rc's voodoo requires it -#define CLIENT_VERSION_MAJOR 1 -#define CLIENT_VERSION_MINOR 9 -#define CLIENT_VERSION_REVISION 6 +#define CLIENT_VERSION_MAJOR 2 +#define CLIENT_VERSION_MINOR 0 +#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 1 diff --git a/src/kernel.cpp b/src/kernel.cpp index 47134fc..b3accc6 100644 --- a/src/kernel.cpp +++ b/src/kernel.cpp @@ -26,7 +26,9 @@ static std::map mapStakeModifierCheckpoints = ( 148000, 0x111af91cu ) ( 180646, 0xb85b7dd1u ) ( 208090, 0x5bcb7d1bu ) - ( 250000, 0x1c511315u ) + ( 250000, 0x1c511315u ) + ( 257310, 0x2b0c04b1u ) + ( 257325, 0x243b5a4bu ) ; // Get time weight diff --git a/src/main.h b/src/main.h index c796b0b..33de5ca 100644 --- a/src/main.h +++ b/src/main.h @@ -36,7 +36,7 @@ static const int64 MAX_MINT_PROOF_OF_WORK = 13 * COIN; //Lucky number 13 Coins p static const int64 MAX_MINT_PROOF_OF_STAKE = 0.01 * MAX_MINT_PROOF_OF_WORK; //1% annual interest reward the folders and holders static const int64 MIN_TXOUT_AMOUNT = MIN_TX_FEE; static const unsigned int MAX_TX_COMMENT_LEN = 268; // curecoin: 256 bytes + 12 little extra -static const unsigned int HF_BLOCK = 300000; // testing hotwire 220000; // hardfork's block height +static const unsigned int HF_BLOCK = 257322; // testing hotwire 220000; // hardfork's block height inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } // Threshold for nLockTime: below this value it is interpreted as block number, otherwise as UNIX timestamp. diff --git a/src/version.h b/src/version.h index 952cc38..626652b 100644 --- a/src/version.h +++ b/src/version.h @@ -25,10 +25,10 @@ extern const std::string CLIENT_DATE; // network protocol versioning // -static const int PROTOCOL_VERSION = 60008; +static const int PROTOCOL_VERSION = 60009; // earlier versions not supported as of Feb 2012, and are disconnected -static const int MIN_PROTO_VERSION = 209; +static const int MIN_PROTO_VERSION = 60009; // nTime field added to CAddress, starting with this version; // if possible, avoid requesting addresses nodes older than this @@ -44,9 +44,9 @@ static const int BIP0031_VERSION = 60000; // "mempool" command, enhanced "getdata" behavior starts with this version: static const int MEMPOOL_GD_VERSION = 60002; -#define DISPLAY_VERSION_MAJOR 1 -#define DISPLAY_VERSION_MINOR 9 -#define DISPLAY_VERSION_REVISION 6 +#define DISPLAY_VERSION_MAJOR 2 +#define DISPLAY_VERSION_MINOR 0 +#define DISPLAY_VERSION_REVISION 0 #define DISPLAY_VERSION_BUILD 1 #endif