Skip to content
Permalink
Browse files

Merge checkpoint_update-0.18

  • Loading branch information...
luke-jr committed Aug 23, 2019
3 parents ccb7f4d + f8d8a31 + 0a993c9 commit b6067d86629e14a1587d828308e6a935c0bbbbcc
Showing with 16 additions and 6 deletions.
  1. +16 −6 src/chainparams.cpp
@@ -91,10 +91,10 @@ class CMainParams : public CChainParams {
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.

// The best chain should have at least this much work.
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000051dc8b82f450202ecb3d471");
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000008b9dd6337880691c6423e90");

// By default assume that the signatures in ancestors of this block are valid.
consensus.defaultAssumeValid = uint256S("0x0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee"); //563378
consensus.defaultAssumeValid = uint256S("0x0000000000000000000706f93dc673ca366c810f317e7cfe8d951c0107b65223"); //596000

/**
* The message start string is designed to be unlikely to occur in normal data.
@@ -158,14 +158,24 @@ class CMainParams : public CChainParams {
{250000, uint256S("0x000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214")},
{279000, uint256S("0x0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40")},
{295000, uint256S("0x00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983")},
{393216, uint256S("0x00000000000000000390df7d2bdc06b9fcb260b39e3fb15b4bc9f62572553924")},
{421888, uint256S("0x000000000000000004b232ad9492d0729d7f9d6737399ffcdaac1c8160db5ef6")},
{438784, uint256S("0x0000000000000000040d6ef667d7a52caf93d8e0d1e40fd7155c787b42667179")},
{451840, uint256S("0x0000000000000000029103c8ade7786e7379623465c72d71d84624eb9c159bea")},
{469766, uint256S("0x000000000000000000130b2bd812c6a7ae9c02a74fc111806b1dd11e8975da45")},
{481824, uint256S("0x0000000000000000001c8018d9cb3b742ef25114f27563e3fc4a1902167f9893")},
{514048, uint256S("0x00000000000000000022fe630be397a62c58972bb81f0a2d1ae8c968511a4659")},
{553472, uint256S("0x0000000000000000000e06b6698a4f65ab9915f24b23ca2f9d1abf30cc3e9173")},
{571392, uint256S("0x00000000000000000019c18b43077775fc299a6646ab0e9dbbd5770bf6ca392d")},
{596000, uint256S("0x0000000000000000000706f93dc673ca366c810f317e7cfe8d951c0107b65223")},
}
};

chainTxData = ChainTxData{
// Data from rpc: getchaintxstats 4096 0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee
/* nTime */ 1550374134,
/* nTxCount */ 383732546,
/* dTxRate */ 3.685496590998308
// Data as of block 000000000000000000111784bdd322013f8e11eb5d6d4a7e08d05153052d8b5b (height 596281).
/* nTime */ 1569285598,
/* nTxCount */ 458196627,
/* dTxRate */ 3.75
};

/* disable fallback fee on mainnet */

0 comments on commit b6067d8

Please sign in to comment.
You can’t perform that action at this time.