Auto merge of #1865 - bitcartel:master_checkpoint_11000, r=str4d

Add checkpoint at block height 15000
This commit is contained in:
zkbot
2016-11-29 05:39:27 +00:00

View File

@@ -127,11 +127,13 @@ public:
checkpointData = (Checkpoints::CCheckpointData) { checkpointData = (Checkpoints::CCheckpointData) {
boost::assign::map_list_of boost::assign::map_list_of
(0, consensus.hashGenesisBlock) (0, consensus.hashGenesisBlock)
(2500, uint256S("0x00000006dc968f600be11a86cbfbf7feb61c7577f45caced2e82b6d261d19744")), (2500, uint256S("0x00000006dc968f600be11a86cbfbf7feb61c7577f45caced2e82b6d261d19744"))
1477973071, // * UNIX timestamp of last checkpoint block (15000, uint256S("0x00000000b6bc56656812a5b8dcad69d6ad4446dec23b5ec456c18641fb5381ba")),
22063, // * total number of transactions between genesis and last checkpoint 1479851027, // * UNIX timestamp of last checkpoint block
// (the tx=... number in the SetBestChain debug.log lines) 110415, // * total number of transactions between genesis and last checkpoint
5083 // * estimated number of transactions per day after checkpoint // (the tx=... number in the SetBestChain debug.log lines)
4240 // * estimated number of transactions per day after checkpoint
// total number of tx / (checkpoint block height / (24 * 24))
}; };
// Founders reward script expects a vector of 2-of-3 multisig addresses // Founders reward script expects a vector of 2-of-3 multisig addresses