aboutsummaryrefslogtreecommitdiff
path: root/src/consensus
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-06-24 15:43:50 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-06-24 15:45:14 +0200
commiteee398fa123ff677f24f2211e8d3012650530c32 (patch)
tree7fd45688bc9d8c10555d3dab1db0cf49551759f8 /src/consensus
parentb62b4c873e18f26c0ba049a02b8cdf764e3d98ce (diff)
parent18873373bde38a026f154c5878fedac6c2a04446 (diff)
downloadbitcoin-eee398fa123ff677f24f2211e8d3012650530c32.tar.xz
Merge #10608: Add a comment explaining the use of MAX_BLOCK_BASE_SIZE.
1887337 Add a comment explaining the use of MAX_BLOCK_BASE_SIZE. (Gregory Maxwell) Tree-SHA512: 4c643a3696241fbf4eac8d58bb26586f319338b28ee86d20394a8ea362911b467853eb40c43487ede753209a3c7bee2e576d2ca80627e9fc924fabefbcaea34b
Diffstat (limited to 'src/consensus')
-rw-r--r--src/consensus/consensus.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
index 351911a3a4..58b2ed4b3e 100644
--- a/src/consensus/consensus.h
+++ b/src/consensus/consensus.h
@@ -12,7 +12,13 @@
static const unsigned int MAX_BLOCK_SERIALIZED_SIZE = 4000000;
/** The maximum allowed weight for a block, see BIP 141 (network rule) */
static const unsigned int MAX_BLOCK_WEIGHT = 4000000;
-/** The maximum allowed size for a block excluding witness data, in bytes (network rule) */
+/**
+ * The maximum allowed size for a block excluding witness data, in bytes (network rule).
+ * This parameter is largely superfluous because it is directly implied by the above block
+ * weight limit, even when BIP 141 is not active. It continues to exist for use in
+ * various early tests that run before the witness data has been checked.
+ * All tests related to it could be removed without breaking consensus compatibility.
+ */
static const unsigned int MAX_BLOCK_BASE_SIZE = 1000000;
/** The maximum allowed number of signature check operations in a block (network rule) */
static const int64_t MAX_BLOCK_SIGOPS_COST = 80000;