Skip to content

Commit 9fac600

Browse files
author
MarcoFalke
committed
Merge #17383: Refactor: Move consts to their correct translation units
e9ea95a [net processing] Move all const declarations to top of net_processing.cpp (John Newbery) 507b36d [validation] Move all const declarations to top of validation.h (John Newbery) 0109622 [validation] Move validation-only consts to validation.cpp (John Newbery) b8580ca [net processing] Move net processing consts to net_processing.cpp (John Newbery) Pull request description: Following the main.cpp split, there are still some constants in the wrong places, eg net_processing constants in validation.h. Move them all to their rightful homes. At the same time, make them constexpr. Also move all const declarations to the top of their files, and ensure that they all have doxygen comments. ACKs for top commit: practicalswift: ACK e9ea95a -- patch looks correct MarcoFalke: ACK e9ea95a 🚉 Tree-SHA512: 44d81da73c7be01e1d36b939789d793f297d3b94f84ea4e7ac853c621cc7054b5a05c7c9e7b83db506db44c16f344541be8f240d955694211e53a84c32b0d2c5
2 parents 5f19155 + e9ea95a commit 9fac600

File tree

4 files changed

+79
-88
lines changed

4 files changed

+79
-88
lines changed

‎src/net.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,10 @@ static const bool DEFAULT_WHITELISTRELAY = true;
4545
/** Default for -whitelistforcerelay. */
4646
static const bool DEFAULT_WHITELISTFORCERELAY = false;
4747

48-
/** Time between pings automatically sent out for latency probing and keepalive (in seconds). */
49-
static const int PING_INTERVAL = 2 * 60;
5048
/** Time after which to disconnect, after waiting for a ping response (or inactivity). */
5149
static const int TIMEOUT_INTERVAL = 20 * 60;
5250
/** Run the feeler connection loop once every 2 minutes or 120 seconds. **/
5351
static const int FEELER_INTERVAL = 120;
54-
/** The maximum number of entries in an 'inv' protocol message */
55-
static const unsigned int MAX_INV_SZ = 50000;
56-
/** The maximum number of entries in a locator */
57-
static const unsigned int MAX_LOCATOR_SZ = 101;
5852
/** The maximum number of new addresses to accumulate before announcing. */
5953
static const unsigned int MAX_ADDR_TO_SEND = 1000;
6054
/** Maximum length of incoming protocol messages (no message over 4 MB is currently acceptable). */

‎src/net_processing.cpp

Lines changed: 47 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ static constexpr int STALE_RELAY_AGE_LIMIT = 30 * 24 * 60 * 60;
6464
/// Age after which a block is considered historical for purposes of rate
6565
/// limiting block relay. Set to one week, denominated in seconds.
6666
static constexpr int HISTORICAL_BLOCK_AGE = 7 * 24 * 60 * 60;
67+
/** Time between pings automatically sent out for latency probing and keepalive (in seconds). */
68+
static const int PING_INTERVAL = 2 * 60;
69+
/** The maximum number of entries in a locator */
70+
static const unsigned int MAX_LOCATOR_SZ = 101;
71+
/** The maximum number of entries in an 'inv' protocol message */
72+
static const unsigned int MAX_INV_SZ = 50000;
6773
/** Maximum number of in-flight transactions from a peer */
6874
static constexpr int32_t MAX_PEER_TX_IN_FLIGHT = 100;
6975
/** Maximum number of announced transactions from a peer */
@@ -80,7 +86,47 @@ static_assert(INBOUND_PEER_TX_DELAY >= MAX_GETDATA_RANDOM_DELAY,
8086
"To preserve security, MAX_GETDATA_RANDOM_DELAY should not exceed INBOUND_PEER_DELAY");
8187
/** Limit to avoid sending big packets. Not used in processing incoming GETDATA for compatibility */
8288
static const unsigned int MAX_GETDATA_SZ = 1000;
83-
89+
/** Number of blocks that can be requested at any given time from a single peer. */
90+
static const int MAX_BLOCKS_IN_TRANSIT_PER_PEER = 16;
91+
/** Timeout in seconds during which a peer must stall block download progress before being disconnected. */
92+
static const unsigned int BLOCK_STALLING_TIMEOUT = 2;
93+
/** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends
94+
* less than this number, we reached its tip. Changing this value is a protocol upgrade. */
95+
static const unsigned int MAX_HEADERS_RESULTS = 2000;
96+
/** Maximum depth of blocks we're willing to serve as compact blocks to peers
97+
* when requested. For older blocks, a regular BLOCK response will be sent. */
98+
static const int MAX_CMPCTBLOCK_DEPTH = 5;
99+
/** Maximum depth of blocks we're willing to respond to GETBLOCKTXN requests for. */
100+
static const int MAX_BLOCKTXN_DEPTH = 10;
101+
/** Size of the "block download window": how far ahead of our current height do we fetch?
102+
* Larger windows tolerate larger download speed differences between peer, but increase the potential
103+
* degree of disordering of blocks on disk (which make reindexing and pruning harder). We'll probably
104+
* want to make this a per-peer adaptive value at some point. */
105+
static const unsigned int BLOCK_DOWNLOAD_WINDOW = 1024;
106+
/** Block download timeout base, expressed in millionths of the block interval (i.e. 10 min) */
107+
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
108+
/** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
109+
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
110+
/** Maximum number of headers to announce when relaying blocks with headers message.*/
111+
static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
112+
/** Maximum number of unconnecting headers announcements before DoS score */
113+
static const int MAX_UNCONNECTING_HEADERS = 10;
114+
/** Minimum blocks required to signal NODE_NETWORK_LIMITED */
115+
static const unsigned int NODE_NETWORK_LIMITED_MIN_BLOCKS = 288;
116+
/** Average delay between local address broadcasts */
117+
static constexpr std::chrono::hours AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL{24};
118+
/** Average delay between peer address broadcasts */
119+
static constexpr std::chrono::seconds AVG_ADDRESS_BROADCAST_INTERVAL{30};
120+
/** Average delay between trickled inventory transmissions in seconds.
121+
* Blocks and whitelisted receivers bypass this, outbound peers get half this delay. */
122+
static const unsigned int INVENTORY_BROADCAST_INTERVAL = 5;
123+
/** Maximum number of inventory items to send per transmission.
124+
* Limits the impact of low-fee transaction floods. */
125+
static constexpr unsigned int INVENTORY_BROADCAST_MAX = 7 * INVENTORY_BROADCAST_INTERVAL;
126+
/** Average delay between feefilter broadcasts in seconds. */
127+
static constexpr unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60;
128+
/** Maximum feefilter broadcast delay after significant change. */
129+
static constexpr unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60;
84130

85131
struct COrphanTx {
86132
// When modifying, adapt the copy of this definition in tests/DoS_tests.
@@ -97,21 +143,6 @@ void EraseOrphansFor(NodeId peer);
97143
/** Increase a node's misbehavior score. */
98144
void Misbehaving(NodeId nodeid, int howmuch, const std::string& message="") EXCLUSIVE_LOCKS_REQUIRED(cs_main);
99145

100-
/** Average delay between local address broadcasts */
101-
static constexpr std::chrono::hours AVG_LOCAL_ADDRESS_BROADCAST_INTERVAL{24};
102-
/** Average delay between peer address broadcasts */
103-
static constexpr std::chrono::seconds AVG_ADDRESS_BROADCAST_INTERVAL{30};
104-
/** Average delay between trickled inventory transmissions in seconds.
105-
* Blocks and whitelisted receivers bypass this, outbound peers get half this delay. */
106-
static const unsigned int INVENTORY_BROADCAST_INTERVAL = 5;
107-
/** Maximum number of inventory items to send per transmission.
108-
* Limits the impact of low-fee transaction floods. */
109-
static constexpr unsigned int INVENTORY_BROADCAST_MAX = 7 * INVENTORY_BROADCAST_INTERVAL;
110-
/** Average delay between feefilter broadcasts in seconds. */
111-
static constexpr unsigned int AVG_FEEFILTER_BROADCAST_INTERVAL = 10 * 60;
112-
/** Maximum feefilter broadcast delay after significant change. */
113-
static constexpr unsigned int MAX_FEEFILTER_CHANGE_DELAY = 5 * 60;
114-
115146
// Internal stuff
116147
namespace {
117148
/** Number of nodes with fSyncStarted. */

‎src/validation.cpp

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,25 @@
5959
#define MICRO 0.000001
6060
#define MILLI 0.001
6161

62+
/**
63+
* An extra transaction can be added to a package, as long as it only has one
64+
* ancestor and is no larger than this. Not really any reason to make this
65+
* configurable as it doesn't materially change DoS parameters.
66+
*/
67+
static const unsigned int EXTRA_DESCENDANT_TX_SIZE_LIMIT = 10000;
68+
/** Maximum kilobytes for transactions to store for processing during reorg */
69+
static const unsigned int MAX_DISCONNECTED_TX_POOL_SIZE = 20000;
70+
/** The pre-allocation chunk size for blk?????.dat files (since 0.8) */
71+
static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB
72+
/** The pre-allocation chunk size for rev?????.dat files (since 0.8) */
73+
static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB
74+
/** Time to wait (in seconds) between writing blocks/block index to disk. */
75+
static const unsigned int DATABASE_WRITE_INTERVAL = 60 * 60;
76+
/** Time to wait (in seconds) between flushing chainstate to disk. */
77+
static const unsigned int DATABASE_FLUSH_INTERVAL = 24 * 60 * 60;
78+
/** Maximum age of our tip in seconds for us to be considered current for fee estimation */
79+
static const int64_t MAX_FEE_ESTIMATION_TIP_AGE = 3 * 60 * 60;
80+
6281
bool CBlockIndexWorkComparator::operator()(const CBlockIndex *pa, const CBlockIndex *pb) const {
6382
// First sort by most total work, ...
6483
if (pa->nChainWork > pb->nChainWork) return false;

‎src/validation.h

Lines changed: 13 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -60,57 +60,15 @@ static const unsigned int DEFAULT_ANCESTOR_SIZE_LIMIT = 101;
6060
static const unsigned int DEFAULT_DESCENDANT_LIMIT = 25;
6161
/** Default for -limitdescendantsize, maximum kilobytes of in-mempool descendants */
6262
static const unsigned int DEFAULT_DESCENDANT_SIZE_LIMIT = 101;
63-
/**
64-
* An extra transaction can be added to a package, as long as it only has one
65-
* ancestor and is no larger than this. Not really any reason to make this
66-
* configurable as it doesn't materially change DoS parameters.
67-
*/
68-
static const unsigned int EXTRA_DESCENDANT_TX_SIZE_LIMIT = 10000;
6963
/** Default for -mempoolexpiry, expiration time for mempool transactions in hours */
7064
static const unsigned int DEFAULT_MEMPOOL_EXPIRY = 336;
71-
/** Maximum kilobytes for transactions to store for processing during reorg */
72-
static const unsigned int MAX_DISCONNECTED_TX_POOL_SIZE = 20000;
7365
/** The maximum size of a blk?????.dat file (since 0.8) */
7466
static const unsigned int MAX_BLOCKFILE_SIZE = 0x8000000; // 128 MiB
75-
/** The pre-allocation chunk size for blk?????.dat files (since 0.8) */
76-
static const unsigned int BLOCKFILE_CHUNK_SIZE = 0x1000000; // 16 MiB
77-
/** The pre-allocation chunk size for rev?????.dat files (since 0.8) */
78-
static const unsigned int UNDOFILE_CHUNK_SIZE = 0x100000; // 1 MiB
79-
8067
/** Maximum number of dedicated script-checking threads allowed */
8168
static const int MAX_SCRIPTCHECK_THREADS = 15;
8269
/** -par default (number of script-checking threads, 0 = auto) */
8370
static const int DEFAULT_SCRIPTCHECK_THREADS = 0;
84-
/** Number of blocks that can be requested at any given time from a single peer. */
85-
static const int MAX_BLOCKS_IN_TRANSIT_PER_PEER = 16;
86-
/** Timeout in seconds during which a peer must stall block download progress before being disconnected. */
87-
static const unsigned int BLOCK_STALLING_TIMEOUT = 2;
88-
/** Number of headers sent in one getheaders result. We rely on the assumption that if a peer sends
89-
* less than this number, we reached its tip. Changing this value is a protocol upgrade. */
90-
static const unsigned int MAX_HEADERS_RESULTS = 2000;
91-
/** Maximum depth of blocks we're willing to serve as compact blocks to peers
92-
* when requested. For older blocks, a regular BLOCK response will be sent. */
93-
static const int MAX_CMPCTBLOCK_DEPTH = 5;
94-
/** Maximum depth of blocks we're willing to respond to GETBLOCKTXN requests for. */
95-
static const int MAX_BLOCKTXN_DEPTH = 10;
96-
/** Size of the "block download window": how far ahead of our current height do we fetch?
97-
* Larger windows tolerate larger download speed differences between peer, but increase the potential
98-
* degree of disordering of blocks on disk (which make reindexing and pruning harder). We'll probably
99-
* want to make this a per-peer adaptive value at some point. */
100-
static const unsigned int BLOCK_DOWNLOAD_WINDOW = 1024;
101-
/** Time to wait (in seconds) between writing blocks/block index to disk. */
102-
static const unsigned int DATABASE_WRITE_INTERVAL = 60 * 60;
103-
/** Time to wait (in seconds) between flushing chainstate to disk. */
104-
static const unsigned int DATABASE_FLUSH_INTERVAL = 24 * 60 * 60;
105-
/** Block download timeout base, expressed in millionths of the block interval (i.e. 10 min) */
106-
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_BASE = 1000000;
107-
/** Additional block download timeout per parallel downloading peer (i.e. 5 min) */
108-
static const int64_t BLOCK_DOWNLOAD_TIMEOUT_PER_PEER = 500000;
109-
11071
static const int64_t DEFAULT_MAX_TIP_AGE = 24 * 60 * 60;
111-
/** Maximum age of our tip in seconds for us to be considered current for fee estimation */
112-
static const int64_t MAX_FEE_ESTIMATION_TIP_AGE = 3 * 60 * 60;
113-
11472
static const bool DEFAULT_CHECKPOINTS_ENABLED = true;
11573
static const bool DEFAULT_TXINDEX = false;
11674
static const char* const DEFAULT_BLOCKFILTERINDEX = "0";
@@ -119,15 +77,21 @@ static const unsigned int DEFAULT_BANSCORE_THRESHOLD = 100;
11977
static const bool DEFAULT_PERSIST_MEMPOOL = true;
12078
/** Default for using fee filter */
12179
static const bool DEFAULT_FEEFILTER = true;
122-
123-
/** Maximum number of headers to announce when relaying blocks with headers message.*/
124-
static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
125-
126-
/** Maximum number of unconnecting headers announcements before DoS score */
127-
static const int MAX_UNCONNECTING_HEADERS = 10;
128-
12980
/** Default for -stopatheight */
13081
static const int DEFAULT_STOPATHEIGHT = 0;
82+
/** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of ::ChainActive().Tip() will not be pruned. */
83+
static const unsigned int MIN_BLOCKS_TO_KEEP = 288;
84+
static const signed int DEFAULT_CHECKBLOCKS = 6;
85+
static const unsigned int DEFAULT_CHECKLEVEL = 3;
86+
// Require that user allocate at least 550 MiB for block & undo files (blk???.dat and rev???.dat)
87+
// At 1MB per block, 288 blocks = 288MB.
88+
// Add 15% for Undo data = 331MB
89+
// Add 20% for Orphan block rate = 397MB
90+
// We want the low water mark after pruning to be at least 397 MB and since we prune in
91+
// full block file chunks, we need the high water mark which triggers the prune to be
92+
// one 128MB block file + added 15% undo data = 147MB greater for a total of 545MB
93+
// Setting the target to >= 550 MiB will make it likely we can respect the target.
94+
static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
13195

13296
struct BlockHasher
13397
{
@@ -175,23 +139,6 @@ extern bool fHavePruned;
175139
extern bool fPruneMode;
176140
/** Number of MiB of block files that we're trying to stay below. */
177141
extern uint64_t nPruneTarget;
178-
/** Block files containing a block-height within MIN_BLOCKS_TO_KEEP of ::ChainActive().Tip() will not be pruned. */
179-
static const unsigned int MIN_BLOCKS_TO_KEEP = 288;
180-
/** Minimum blocks required to signal NODE_NETWORK_LIMITED */
181-
static const unsigned int NODE_NETWORK_LIMITED_MIN_BLOCKS = 288;
182-
183-
static const signed int DEFAULT_CHECKBLOCKS = 6;
184-
static const unsigned int DEFAULT_CHECKLEVEL = 3;
185-
186-
// Require that user allocate at least 550 MiB for block & undo files (blk???.dat and rev???.dat)
187-
// At 1MB per block, 288 blocks = 288MB.
188-
// Add 15% for Undo data = 331MB
189-
// Add 20% for Orphan block rate = 397MB
190-
// We want the low water mark after pruning to be at least 397 MB and since we prune in
191-
// full block file chunks, we need the high water mark which triggers the prune to be
192-
// one 128MB block file + added 15% undo data = 147MB greater for a total of 545MB
193-
// Setting the target to >= 550 MiB will make it likely we can respect the target.
194-
static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
195142

196143
/**
197144
* Process an incoming block. This only returns after the best known valid

0 commit comments

Comments
 (0)