Skip to content

Commit 30d6c7d

Browse files
committed
Merge bitcoin/bitcoin#27657: doc: Remove unused NO_BLOOM_VERSION constant
facbcd3 doc: Remove unused NO_BLOOM_VERSION constant (MarcoFalke) Pull request description: This source code is the wrong place to document historic and now irrelevant details. Also, while touching the docs, clarify that the BIP 35 `mempool` message type is currently also guarded by the BIP 111 `NODE_BLOOM` flag, even though BIP 111 does not mention the `mempool` message type. ACKs for top commit: 0xB10C: ACK facbcd3 dergoegge: ACK facbcd3 Tree-SHA512: e69cf5cc2a4e6b061e8996bd9afc0c3e3c4e8174c086ecde425e0e9350b918f1c6612ce273ea1722d30e856049b83dada8782e7e96f676ae0112af85b22f868f
2 parents 2a786ea + facbcd3 commit 30d6c7d

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/protocol.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ extern const char* GETADDR;
134134
/**
135135
* The mempool message requests the TXIDs of transactions that the receiving
136136
* node has verified as valid but which have not yet appeared in a block.
137-
* @since protocol version 60002.
137+
* @since protocol version 60002 as described by BIP35.
138+
* Only available with service bit NODE_BLOOM, see also BIP111.
138139
*/
139140
extern const char* MEMPOOL;
140141
/**
@@ -278,8 +279,6 @@ enum ServiceFlags : uint64_t {
278279
// set by all Bitcoin Core non pruned nodes, and is unset by SPV clients or other light clients.
279280
NODE_NETWORK = (1 << 0),
280281
// NODE_BLOOM means the node is capable and willing to handle bloom-filtered connections.
281-
// Bitcoin Core nodes used to support this by default, without advertising this bit,
282-
// but no longer do as of protocol version 70011 (= NO_BLOOM_VERSION)
283282
NODE_BLOOM = (1 << 2),
284283
// NODE_WITNESS indicates that a node can be asked for blocks and transactions including
285284
// witness data.

src/version.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ static const int MIN_PEER_PROTO_VERSION = 31800;
2020
//! BIP 0031, pong message, is enabled for all versions AFTER this one
2121
static const int BIP0031_VERSION = 60000;
2222

23-
//! "filter*" commands are disabled without NODE_BLOOM after and including this version
24-
static const int NO_BLOOM_VERSION = 70011;
25-
2623
//! "sendheaders" command and announcing blocks with headers starts with this version
2724
static const int SENDHEADERS_VERSION = 70012;
2825

0 commit comments

Comments
 (0)