max coins changed to 63 million; permanent block reward reduction to 10 added in place of previous block reward halving scheme; PROTOCOL_VERSION and MIN_PEER_PROTO_VERSION incremented forward by 1 to facilitate hardfork; client version number incremented to 1.3.0

This commit is contained in:
root
2014-06-10 00:46:26 -04:00
parent 27408f6304
commit b597348e88
4 changed files with 9 additions and 5 deletions

View File

@@ -7,7 +7,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 1 #define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 2 #define CLIENT_VERSION_MINOR 3
#define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0 #define CLIENT_VERSION_BUILD 0

View File

@@ -1108,8 +1108,12 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
nSubsidy = 45 * COIN; nSubsidy = 45 * COIN;
} }
// Subsidy is cut in half every 3153600 blocks, which will occur approximately every 3 years // Permantently reduce the number of mined coins to 10 after block 620000
nSubsidy >>= (nHeight / 3153600); if(nHeight > 620000){
nSubsidy = 10 * COIN;
}
return nSubsidy + nFees; return nSubsidy + nFees;
} }

View File

@@ -54,7 +54,7 @@ static const int64 DUST_SOFT_LIMIT = 100000; // 0.001 CSC
/** Dust Hard Limit, ignored as wallet inputs (mininput default) */ /** Dust Hard Limit, ignored as wallet inputs (mininput default) */
static const int64 DUST_HARD_LIMIT = 1000; // 0.00001 CSC mininput static const int64 DUST_HARD_LIMIT = 1000; // 0.00001 CSC mininput
/** No amount larger than this (in satoshi) is valid */ /** No amount larger than this (in satoshi) is valid */
static const int64 MAX_MONEY = 336000000 * COIN; static const int64 MAX_MONEY = 63000000 * COIN;
inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
/** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */
static const int COINBASE_MATURITY = 8; static const int COINBASE_MATURITY = 8;

View File

@@ -31,7 +31,7 @@ static const int PROTOCOL_VERSION = 70003;
static const int INIT_PROTO_VERSION = 209; static const int INIT_PROTO_VERSION = 209;
// disconnect from peers older than this proto version // disconnect from peers older than this proto version
static const int MIN_PEER_PROTO_VERSION = 70003; // TODO: Change to 70003 before block 445000 to force new client downloading and therefore doing the actual hard fork static const int MIN_PEER_PROTO_VERSION = 70004; // TODO: Change to 70003 before block 445000 to force new client downloading and therefore doing the actual hard fork
// 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