aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2014-01-19 00:28:30 +0100
committerPieter Wuille <pieter.wuille@gmail.com>2014-01-19 00:33:48 +0100
commitdd7c1cf534b760e9da55c225d6bb05f2bdb8e2e7 (patch)
tree247909f08d80f68f5eded58f4f3dc1c35f79ddd9 /src
parent490d6a30461d11aa112efe9fb3006797651ba4d5 (diff)
parent6873cfb6c0efaeb645ef0a7074651623bb4bec82 (diff)
Merge pull request #3551
6873cfb Update linearize.py defaults to block 279,000 (Micha) e7906d1 Add a new checkpoint at block 279,000 (Micha)
Diffstat (limited to 'src')
-rw-r--r--src/checkpoints.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index 40dd30d1a4..9db1f5e100 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -50,11 +50,12 @@ namespace Checkpoints
(216116, uint256("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e"))
(225430, uint256("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932"))
(250000, uint256("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214"))
+ (279000, uint256("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40"))
;
static const CCheckpointData data = {
&mapCheckpoints,
- 1375533383, // * UNIX timestamp of last checkpoint block
- 21491097, // * total number of transactions between genesis and last checkpoint
+ 1389047471, // * UNIX timestamp of last checkpoint block
+ 30549816, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
60000.0 // * estimated number of transactions per day after checkpoint
};
@@ -111,7 +112,7 @@ namespace Checkpoints
double fWorkBefore = 0.0; // Amount of work done before pindex
double fWorkAfter = 0.0; // Amount of work left after pindex (estimated)
- // Work is defined as: 1.0 per transaction before the last checkoint, and
+ // Work is defined as: 1.0 per transaction before the last checkpoint, and
// fSigcheckVerificationFactor per transaction after.
const CCheckpointData &data = Checkpoints();