Skip to content

Commit

Permalink
update to v1.2.1 mandatory
Browse files Browse the repository at this point in the history
Reward halved at block 268840 and halved thereafter at Block 467200 and
every 2 years.
  • Loading branch information
MarKus13 committed Oct 26, 2015
1 parent e6f0f4f commit 08aeec3
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 6 deletions.
4 changes: 4 additions & 0 deletions src/checkpoints.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ namespace Checkpoints
static MapCheckpoints mapCheckpoints =
boost::assign::map_list_of
( 0, uint256("0xbcb2bb00da6bdf5f80e2afce42307b7fe664f3ec789b6c61936e03ea0e9cf5cc"))
( 17011, uint256("0x70004956cda2df2e33c455aff894829c3bb4165216423d98348e9c9b4c6aa696"))
( 170100, uint256("0x09c9deac7ab6b07b5bee5fbaa7084d6ca5710132bdacb1dcf4493c0e499eed99"))
( 244388, uint256("0xfadfdcce012970859df05da1945f65efad091b8840593b922c1be160d6440134"))
( 256036, uint256("0x7998244d4e44c9aef2749798caf49c21a1fbe3c555e6a7c5bba8eee1dffc3645"))
;
static const CCheckpointData data = {
&mapCheckpoints,
Expand Down
4 changes: 2 additions & 2 deletions src/clientversion.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 0
#define CLIENT_VERSION_MINOR 1
#define CLIENT_VERSION_REVISION 1
#define CLIENT_VERSION_BUILD 2
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_BUILD 1

// Set to true for release, false for prerelease or test build
#define CLIENT_VERSION_IS_RELEASE true
Expand Down
12 changes: 9 additions & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1093,9 +1093,15 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
nSubsidy = 850500 * COIN; //first block premine less than 1% 0.8505%

}
// Subsidy is cut in half every 840000 blocks, which will occur approximately every 4 years
nSubsidy >>= (nHeight / 934400); // Litecoin: 840k blocks in ~4 years Quatloo: 934.4k blocks ~ 4 years

if(nHeight >= 268840) // (2.25 min intervals in 20 days) + 256036 (block height on 10/25/15 at 10pm -- so around 11/14/2015 halving will occur
{
//change of the first halving of block reward at block 268840
nSubsidy = 8.505 * COIN;

}
// Subsidy is cut in half every 467200 blocks, which will occur approximately every 2 years
//nSubsidy >>= (nHeight / 934400); // Quatloo: 934.4k blocks ~ 4 years
nSubsidy >>= (nHeight / 467200); // Quatloo: 467.2k blocks ~ 2 years
return nSubsidy + nFees;
}

Expand Down
2 changes: 1 addition & 1 deletion src/qt/aboutdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// Copyright year (2009-this)
// Todo: update this when changing our copyright comments in the source
const int ABOUTDIALOG_COPYRIGHT_YEAR = 2014;
const int ABOUTDIALOG_COPYRIGHT_YEAR = 2015;

AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent),
Expand Down
Binary file modified src/qt/res/images/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/images/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/images/splash_testnet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 08aeec3

Please sign in to comment.