From b597348e88bd535d4edc31f57f12f19a0ac1e15e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 Jun 2014 00:46:26 -0400 Subject: [PATCH] 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 --- src/clientversion.h | 2 +- src/main.cpp | 8 ++++++-- src/main.h | 2 +- src/version.h | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/clientversion.h b/src/clientversion.h index 343c8a1..6b23a4c 100644 --- a/src/clientversion.h +++ b/src/clientversion.h @@ -7,7 +7,7 @@ // 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_MINOR 2 +#define CLIENT_VERSION_MINOR 3 #define CLIENT_VERSION_REVISION 0 #define CLIENT_VERSION_BUILD 0 diff --git a/src/main.cpp b/src/main.cpp index fbdd8b8..86d7eeb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1108,8 +1108,12 @@ int64 static GetBlockValue(int nHeight, int64 nFees) nSubsidy = 45 * COIN; } - // Subsidy is cut in half every 3153600 blocks, which will occur approximately every 3 years - nSubsidy >>= (nHeight / 3153600); + // Permantently reduce the number of mined coins to 10 after block 620000 + if(nHeight > 620000){ + nSubsidy = 10 * COIN; + } + + return nSubsidy + nFees; } diff --git a/src/main.h b/src/main.h index bd00c7a..72c320b 100644 --- a/src/main.h +++ b/src/main.h @@ -54,7 +54,7 @@ static const int64 DUST_SOFT_LIMIT = 100000; // 0.001 CSC /** Dust Hard Limit, ignored as wallet inputs (mininput default) */ static const int64 DUST_HARD_LIMIT = 1000; // 0.00001 CSC mininput /** 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); } /** Coinbase transaction outputs can only be spent after this number of new blocks (network rule) */ static const int COINBASE_MATURITY = 8; diff --git a/src/version.h b/src/version.h index b8c900f..3e7f918 100644 --- a/src/version.h +++ b/src/version.h @@ -31,7 +31,7 @@ static const int PROTOCOL_VERSION = 70003; static const int INIT_PROTO_VERSION = 209; // 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; // if possible, avoid requesting addresses nodes older than this