Skip to content

Commit 4b51ed8

Browse files
committed
Merge #17002: chainparams: Bump assumed chain params
fa3a733 chainparams: Bump assumed chain params (MarcoFalke) Pull request description: As every year, reviewers get extra point when their node is running: * `assumevalid=0` * `checkpoints=0` * on non-x86_64 hardware See https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-every-major-and-minor-release for the process. ACKs for top commit: laanwj: ACK fa3a733 Sjors: ACK fa3a733 for mainnet on macOS 10.14.6. jamesob: ACK bitcoin/bitcoin@fa3a733 fanquake: ACK fa3a733 - checked the mainnet values. I have notes on reviewing `assumevalid` updates in [core-review](https://github.com/fanquake/core-review/blob/master/update-assumevalid.md). Tree-SHA512: fc545ba0a7056908040b47076b393d028c1c022967c25a2074752f76f0386ef099a64445da6125117a04418bd7eb0655121bfc94e6f60b7bc2666947491b5228
2 parents dab0e36 + fa3a733 commit 4b51ed8

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

doc/release-process.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Release Process
2626
* Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example.
2727
* Update [`src/chainparams.cpp`](/src/chainparams.cpp) m_assumed_blockchain_size and m_assumed_chain_state_size with the current size plus some overhead (see [this](#how-to-calculate-m_assumed_blockchain_size-and-m_assumed_chain_state_size) for information on how to calculate them).
2828
* Update `src/chainparams.cpp` chainTxData with statistics about the transaction count and rate. Use the output of the RPC `getchaintxstats`, see
29-
[this pull request](https://github.com/bitcoin/bitcoin/pull/12270) for an example. Reviewers can verify the results by running `getchaintxstats <window_block_count> <window_last_block_hash>` with the `window_block_count` and `window_last_block_hash` from your output.
29+
[this pull request](https://github.com/bitcoin/bitcoin/pull/17002) for an example. Reviewers can verify the results by running `getchaintxstats <window_block_count> <window_last_block_hash>` with the `window_block_count` and `window_last_block_hash` from your output.
3030
* On both the master branch and the new release branch:
3131
- update `CLIENT_VERSION_MINOR` in [`configure.ac`](../configure.ac)
3232
- update `CLIENT_VERSION_MINOR`, `PACKAGE_VERSION`, and `PACKAGE_STRING` in [`build_msvc/bitcoin_config.h`](/build_msvc/bitcoin_config.h)
@@ -378,7 +378,7 @@ Both variables are used as a guideline for how much space the user needs on thei
378378
Note that all values should be taken from a **fully synced** node and have an overhead of 5-10% added on top of its base value.
379379

380380
To calculate `m_assumed_blockchain_size`:
381-
- For `mainnet` -> Take the size of the Bitcoin data directory, excluding `/regtest` and `/testnet3` directories.
381+
- For `mainnet` -> Take the size of the data directory, excluding `/regtest` and `/testnet3` directories.
382382
- For `testnet` -> Take the size of the `/testnet3` directory.
383383

384384

src/chainparams.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ class CMainParams : public CChainParams {
8484
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
8585

8686
// The best chain should have at least this much work.
87-
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000051dc8b82f450202ecb3d471");
87+
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000008ea3cf107ae0dec57f03fe8");
8888

8989
// By default assume that the signatures in ancestors of this block are valid.
90-
consensus.defaultAssumeValid = uint256S("0x0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee"); //563378
90+
consensus.defaultAssumeValid = uint256S("0x00000000000000000005f8920febd3925f8272a6a71237563d78c2edfdd09ddf"); // 597379
9191

9292
/**
9393
* The message start string is designed to be unlikely to occur in normal data.
@@ -100,8 +100,8 @@ class CMainParams : public CChainParams {
100100
pchMessageStart[3] = 0xd9;
101101
nDefaultPort = 8333;
102102
nPruneAfterHeight = 100000;
103-
m_assumed_blockchain_size = 240;
104-
m_assumed_chain_state_size = 3;
103+
m_assumed_blockchain_size = 280;
104+
m_assumed_chain_state_size = 4;
105105

106106
genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
107107
consensus.hashGenesisBlock = genesis.GetHash();
@@ -155,10 +155,10 @@ class CMainParams : public CChainParams {
155155
};
156156

157157
chainTxData = ChainTxData{
158-
// Data from rpc: getchaintxstats 4096 0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee
159-
/* nTime */ 1550374134,
160-
/* nTxCount */ 383732546,
161-
/* dTxRate */ 3.685496590998308
158+
// Data from RPC: getchaintxstats 4096 00000000000000000005f8920febd3925f8272a6a71237563d78c2edfdd09ddf
159+
/* nTime */ 1569926786,
160+
/* nTxCount */ 460596047,
161+
/* dTxRate */ 3.77848885073875,
162162
};
163163
}
164164
};
@@ -191,10 +191,10 @@ class CTestNetParams : public CChainParams {
191191
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
192192

193193
// The best chain should have at least this much work.
194-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000007dbe94253893cbd463");
194+
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000012b2a3a62424f21c918");
195195

196196
// By default assume that the signatures in ancestors of this block are valid.
197-
consensus.defaultAssumeValid = uint256S("0x0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75"); //1354312
197+
consensus.defaultAssumeValid = uint256S("0x00000000000000b7ab6ce61eb6d571003fbe5fe892da4c9b740c49a07542462d"); // 1580000
198198

199199
pchMessageStart[0] = 0x0b;
200200
pchMessageStart[1] = 0x11;
@@ -240,10 +240,10 @@ class CTestNetParams : public CChainParams {
240240
};
241241

242242
chainTxData = ChainTxData{
243-
// Data from rpc: getchaintxstats 4096 0000000000000037a8cd3e06cd5edbfe9dd1dbcc5dacab279376ef7cfc2b4c75
244-
/* nTime */ 1531929919,
245-
/* nTxCount */ 19438708,
246-
/* dTxRate */ 0.626
243+
// Data from RPC: getchaintxstats 4096 00000000000000b7ab6ce61eb6d571003fbe5fe892da4c9b740c49a07542462d
244+
/* nTime */ 1569741320,
245+
/* nTxCount */ 52318009,
246+
/* dTxRate */ 0.1517002392872353,
247247
};
248248
}
249249
};

0 commit comments

Comments
 (0)