LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge pull request #3551

Browse source 
6873cfb Update linearize.py defaults to block 279,000 (Micha)
e7906d1 Add a new checkpoint at block 279,000 (Micha)
This commit is contained in:
Pieter Wuille 2014-01-19 00:28:30 +01:00
commit dd7c1cf534
No known key found for this signature in database
GPG key ID: 8F653255C87992E0
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/linearize/example-linearize.cfg
View file

@ -7,6 +7,6 @@ port=8332
# bootstrap.dat settings # bootstrap.dat settings
netmagic=f9beb4d9 netmagic=f9beb4d9
max_height=250000 max_height=279000
output=bootstrap.dat output=bootstrap.dat

2
contrib/linearize/linearize.py
View file

@ -117,7 +117,7 @@ if __name__ == '__main__':
if 'min_height' not in settings: if 'min_height' not in settings:
settings['min_height'] = 0 settings['min_height'] = 0
if 'max_height' not in settings: if 'max_height' not in settings:
settings['max_height'] = 250000 settings['max_height'] = 279000
if 'rpcuser' not in settings or 'rpcpass' not in settings: if 'rpcuser' not in settings or 'rpcpass' not in settings:
print "Missing username and/or password in cfg file" print "Missing username and/or password in cfg file"
sys.exit(1) sys.exit(1)

9
src/checkpoints.cpp
View file

@ -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 // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
@ -50,11 +50,12 @@ namespace Checkpoints
(216116, uint256("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e")) (216116, uint256("0x00000000000001b4f4b433e81ee46494af945cf96014816a4e2370f11b23df4e"))
(225430, uint256("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932")) (225430, uint256("0x00000000000001c108384350f74090433e7fcf79a606b8e797f065b130575932"))
(250000, uint256("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214")) (250000, uint256("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214"))
(279000, uint256("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40"))
; ;
static const CCheckpointData data = { static const CCheckpointData data = {
&mapCheckpoints, &mapCheckpoints,
1375533383, // * UNIX timestamp of last checkpoint block 1389047471, // * UNIX timestamp of last checkpoint block
21491097, // * total number of transactions between genesis and last checkpoint 30549816, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines) // (the tx=... number in the SetBestChain debug.log lines)
60000.0 // * estimated number of transactions per day after checkpoint 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 fWorkBefore = 0.0; // Amount of work done before pindex
double fWorkAfter = 0.0; // Amount of work left after pindex (estimated) 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. // fSigcheckVerificationFactor per transaction after.
const CCheckpointData &data = Checkpoints(); const CCheckpointData &data = Checkpoints();