Skip to content

Commit 2f7ae35

Browse files
committed
Merge #14149: doc: Remove misleading checkpoints comment in CMainParams
fab5267 doxygen: Remove misleading checkpoints comment in CMainParams (MarcoFalke) Pull request description: This removes the checkpoints comment because it is misleading for two reasons: * It shows up in the doxygen documentation of `CMainParams` https://dev.visucore.com/bitcoin/doxygen/class_c_main_params.html * The comment refers to "strange transactions" in a block, which are not specified further. Transactions in blocks are always consensus-valid or rejected as consensus-invalid. Also sort the includes with `clang-format`, as the file is touched anyway. Tree-SHA512: b75f38dd0422b9310218307cbaa4dd5afa7579612d7dcdf781b8f25626f79c11e090dbcc83a05571f4418220c1a005f6254a9c461534d517ccecf7f1920be6be
2 parents 35d7d94 + fab5267 commit 2f7ae35

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

src/chainparams.cpp

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,15 @@
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

66
#include <chainparams.h>
7-
#include <consensus/merkle.h>
87

8+
#include <chainparamsseeds.h>
9+
#include <consensus/merkle.h>
910
#include <tinyformat.h>
1011
#include <util.h>
1112
#include <utilstrencodings.h>
1213

1314
#include <assert.h>
1415

15-
#include <chainparamsseeds.h>
16-
1716
static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, uint32_t nNonce, uint32_t nBits, int32_t nVersion, const CAmount& genesisReward)
1817
{
1918
CMutableTransaction txNew;
@@ -62,14 +61,6 @@ void CChainParams::UpdateVersionBitsParameters(Consensus::DeploymentPos d, int64
6261
/**
6362
* Main network
6463
*/
65-
/**
66-
* What makes a good checkpoint block?
67-
* + Is surrounded by blocks with reasonable timestamps
68-
* (no blocks before with a timestamp after, none after with
69-
* timestamp before)
70-
* + Contains no strange transactions
71-
*/
72-
7364
class CMainParams : public CChainParams {
7465
public:
7566
CMainParams() {

0 commit comments

Comments
 (0)