Skip to content

Commit 8ce55df

Browse files
committed
Merge #13794: chainparams: Update with data from assumed valid chain
fa8f2d8 doc: Fix chainTxData comment (MarcoFalke) fa6094f chainparams: Update with data from assumed valid chain (MarcoFalke) Pull request description: Can be reviewed by using the `getblock` and `getchaintxstats` rpcs of a synced node. Reviewers get extra points when their full node has checkpoints and assumevalid disabled. Tree-SHA512: cedd61fde129ae4c16fc12275b61e4c5659b6d72dd801c608efc294188561bc986d94652fe9bea71ada48654258e2a074d2d2da78036c69608ccff3a6cc1ccf5
2 parents 67af7ef + fa8f2d8 commit 8ce55df

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

src/chainparams.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ class CMainParams : public CChainParams {
102102
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
103103

104104
// The best chain should have at least this much work.
105-
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000f91c579d57cad4bc5278cc");
105+
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000028822fef1c230963535a90d");
106106

107107
// By default assume that the signatures in ancestors of this block are valid.
108-
consensus.defaultAssumeValid = uint256S("0x0000000000000000005214481d2d96f898e3d5416e43359c145944a909d242e0"); //506067
108+
consensus.defaultAssumeValid = uint256S("0x0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8"); //534292
109109

110110
/**
111111
* The message start string is designed to be unlikely to occur in normal data.
@@ -170,11 +170,10 @@ class CMainParams : public CChainParams {
170170
};
171171

172172
chainTxData = ChainTxData{
173-
// Data as of block 0000000000000000002d6cca6761c99b3c2e936f9a0e304b7c7651a993f461de (height 506081).
174-
1516903077, // * UNIX timestamp of last known number of transactions
175-
295363220, // * total number of transactions between genesis and that timestamp
176-
// (the tx=... number in the ChainStateFlushed debug.log lines)
177-
3.5 // * estimated number of transactions per second after that timestamp
173+
// Data from rpc: getchaintxstats 4096 0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8
174+
/* nTime */ 1532884444,
175+
/* nTxCount */ 331282217,
176+
/* dTxRate */ 2.4
178177
};
179178

180179
/* disable fallback fee on mainnet */
@@ -217,10 +216,10 @@ class CTestNetParams : public CChainParams {
217216
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
218217

219218
// The best chain should have at least this much work.
220-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000002830dab7f76dbb7d63");
219+
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000007dbe94253893cbd463");
221220

222221
// By default assume that the signatures in ancestors of this block are valid.
223-
consensus.defaultAssumeValid = uint256S("0x0000000002e9e7b00e1f6dc5123a04aad68dd0f0968d8c7aa45f6640795c37b1"); //1135275
222+
consensus.defaultAssumeValid = uint256S("0x0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75"); //1354312
224223

225224
pchMessageStart[0] = 0x0b;
226225
pchMessageStart[1] = 0x11;
@@ -264,10 +263,10 @@ class CTestNetParams : public CChainParams {
264263
};
265264

266265
chainTxData = ChainTxData{
267-
// Data as of block 000000000000033cfa3c975eb83ecf2bb4aaedf68e6d279f6ed2b427c64caff9 (height 1260526)
268-
1516903490,
269-
17082348,
270-
0.09
266+
// Data from rpc: getchaintxstats 4096 0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75
267+
/* nTime */ 1531929919,
268+
/* nTxCount */ 19438708,
269+
/* dTxRate */ 0.626
271270
};
272271

273272
/* enable fallback fee on testnet */

src/chainparams.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ struct CCheckpointData {
3232
* See also: CChainParams::TxData, GuessVerificationProgress.
3333
*/
3434
struct ChainTxData {
35-
int64_t nTime;
36-
int64_t nTxCount;
37-
double dTxRate;
35+
int64_t nTime; //!< UNIX timestamp of last known number of transactions
36+
int64_t nTxCount; //!< total number of transactions between genesis and that timestamp
37+
double dTxRate; //!< estimated number of transactions per second after that timestamp
3838
};
3939

4040
/**

0 commit comments

Comments
 (0)