Skip to content

Commit 41c9851

Browse files
committed
Merge checkpoint_update-28
2 parents 254fabe + f653cde commit 41c9851

File tree

1 file changed

+32
-7
lines changed

1 file changed

+32
-7
lines changed

src/kernel/chainparams.cpp

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ class CMainParams : public CChainParams {
115115
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021
116116
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 709632; // Approximately November 12th, 2021
117117

118-
consensus.nMinimumChainWork = uint256{"000000000000000000000000000000000000000088e186b70e0862c193ec44d6"};
119-
consensus.defaultAssumeValid = uint256{"000000000000000000011c5890365bdbe5d25b97ce0057589acaef4f1a57263f"}; // 856760
118+
consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000b08ea5865bede3101629fa0e"};
119+
consensus.defaultAssumeValid = uint256{"000000000000000000006e926737e6a349f7581525ad36e743dfe5f4bc3abbb7"}; // 885248
120120

121121
/**
122122
* The message start string is designed to be unlikely to occur in normal data.
@@ -129,7 +129,7 @@ class CMainParams : public CChainParams {
129129
pchMessageStart[3] = 0xd9;
130130
nDefaultPort = 8333;
131131
nPruneAfterHeight = 100000;
132-
m_assumed_blockchain_size = 620;
132+
m_assumed_blockchain_size = 810;
133133
m_assumed_chain_state_size = 14;
134134

135135
genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
@@ -180,6 +180,31 @@ class CMainParams : public CChainParams {
180180
{250000, uint256{"000000000000003887df1f29024b06fc2200b55f8af8f35453d7be294df2d214"}},
181181
{279000, uint256{"0000000000000001ae8c72a0b0c301f67e3afca10e819efa9041e458e9bd7e40"}},
182182
{295000, uint256{"00000000000000004d9b4ef50f0f9d686fd69db2e03af35a100370c64632a983"}},
183+
{393216, uint256{"00000000000000000390df7d2bdc06b9fcb260b39e3fb15b4bc9f62572553924"}},
184+
{421888, uint256{"000000000000000004b232ad9492d0729d7f9d6737399ffcdaac1c8160db5ef6"}},
185+
{438784, uint256{"0000000000000000040d6ef667d7a52caf93d8e0d1e40fd7155c787b42667179"}},
186+
{451840, uint256{"0000000000000000029103c8ade7786e7379623465c72d71d84624eb9c159bea"}},
187+
{469766, uint256{"000000000000000000130b2bd812c6a7ae9c02a74fc111806b1dd11e8975da45"}},
188+
{481824, uint256{"0000000000000000001c8018d9cb3b742ef25114f27563e3fc4a1902167f9893"}},
189+
{514048, uint256{"00000000000000000022fe630be397a62c58972bb81f0a2d1ae8c968511a4659"}},
190+
{553472, uint256{"0000000000000000000e06b6698a4f65ab9915f24b23ca2f9d1abf30cc3e9173"}},
191+
{571392, uint256{"00000000000000000019c18b43077775fc299a6646ab0e9dbbd5770bf6ca392d"}},
192+
{596000, uint256{"0000000000000000000706f93dc673ca366c810f317e7cfe8d951c0107b65223"}},
193+
{601723, uint256{"000000000000000000009837f74796532b21d8ccf7def3dcfcb45aa92cd86b9e"}},
194+
{617056, uint256{"0000000000000000000ca51b293fb2be2fbaf1acc76dcbbbff7e4d7796380b9e"}},
195+
{632549, uint256{"00000000000000000001bae1b2b73ec3fde475c1ed7fdd382c2c49860ec19920"}},
196+
{643700, uint256{"00000000000000000002959e9b44507120453344794df09bd1276eb325ed7110"}},
197+
{667811, uint256{"00000000000000000007888a9d01313d69d6335df46ea33e875ee6832670c596"}},
198+
{688888, uint256{"0000000000000000000e1e3bd783ce0de7b0cdabf2034723595dbcd5a28cf831"}},
199+
{704256, uint256{"0000000000000000000465f5acfcd603337994261a4d67a647cb49866c98b538"}},
200+
{714000, uint256{"0000000000000000000184f9b9da75c3ab764438f4f3ecd766637648a3a44d0d"}},
201+
{737232, uint256{"0000000000000000000709881cc8d33f84815fe8ea1baad9889042146b4d3042"}},
202+
{803584, uint256{"000000000000000000003d97a46dbbb4cca4b3e23c39c446df75cfe726163bb5"}},
203+
{832080, uint256{"00000000000000000003349bda23ed5efc98145c10620c247ec93896ac249e22"}},
204+
{843264, uint256{"0000000000000000000101209b4ab3570862dc3fac8633eb62938a541c55a2ff"}},
205+
{846679, uint256{"000000000000000000032b91acdaaf16f8c40d46afeb835c3ac604860f905d56"}},
206+
{855000, uint256{"0000000000000000000233ea80aa10d38aa4486cd7033fffc2c4df556d0b9138"}},
207+
{885248, uint256{"000000000000000000006e926737e6a349f7581525ad36e743dfe5f4bc3abbb7"}},
183208
}
184209
};
185210

@@ -193,10 +218,10 @@ class CMainParams : public CChainParams {
193218
};
194219

195220
chainTxData = ChainTxData{
196-
// Data from RPC: getchaintxstats 4096 000000000000000000011c5890365bdbe5d25b97ce0057589acaef4f1a57263f
197-
.nTime = 1723649144,
198-
.tx_count = 1059312821,
199-
.dTxRate = 6.721086701157182,
221+
// Data from RPC: getchaintxstats 4096 00000000000000000000ab8f76c0f2786ee0272b394ef8ee677f340918fb567a
222+
.nTime = 1740536534,
223+
.tx_count = 1160003905,
224+
.dTxRate = 6.721086701157182, // held back due to present abnormal tx rate
200225
};
201226
}
202227
};

0 commit comments

Comments
 (0)