Auto merge of #3887 - bitcartel:2.0.4_pre_release, r=bitcartel

Update chain work and checkpoint for 2.0.4

Closes #3886
This commit is contained in:
Homu 2019-03-18 14:53:09 -07:00
commit 1078c7f9a6
1 changed files with 6 additions and 5 deletions

View File

@ -108,7 +108,7 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_SAPLING].nActivationHeight = 419200;
// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000a95cc5099213e3");
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000c12875ded911cf");
/**
* The message start string should be awesome!
@ -181,11 +181,12 @@ public:
(222222, uint256S("0x000000000cafb9e56445a6cabc8057b57ee6fcc709e7adbfa195e5c7fac61343"))
(270000, uint256S("0x00000000025c1cfa0258e33ab050aaa9338a3d4aaa3eb41defefc887779a9729"))
(304600, uint256S("0x00000000028324e022a45014c4a4dc51e95d41e6bceb6ad554c5b65d5cea3ea5"))
(410100, uint256S("0x0000000002c565958f783a24a4ac17cde898ff525e75ed9baf66861b0b9fcada")),
1539405939, // * UNIX timestamp of last checkpoint block
3954156, // * total number of transactions between genesis and last checkpoint
(410100, uint256S("0x0000000002c565958f783a24a4ac17cde898ff525e75ed9baf66861b0b9fcada"))
(497000, uint256S("0x0000000000abd333f0acca6ffdf78a167699686d6a7d25c33fca5f295061ffff")),
1552501838, // * UNIX timestamp of last checkpoint block
4463933, // * total number of transactions between genesis and last checkpoint
// (the tx=... number in the SetBestChain debug.log lines)
5553 // * estimated number of transactions per day after checkpoint
5173 // * estimated number of transactions per day after checkpoint
// total number of tx / (checkpoint block height / (24 * 24))
};