Skip to content

Commit 5efcb77

Browse files
committed
Disable bloom filtering by default.
BIP 37 bloom filters have been well-known to be a significant DoS target for some time. However, in order to provide continuity for SPV clients relying on it, the NODE_BLOOM service flag was added, and left as a default, to ensure sufficient nodes exist with such a flag. NODE_BLOOM is, at this point, well-established and, as long as there exist 0.18 nodes with default config (which I'd anticipate will be true for many years), will be available from some peers. By that time, the continued slowdown of BIP 37-based filtering will likely have rendered it useless (though this is already largely the case). Further, BIP 37 was deliberately never updated to support witness-based filtering as newer wallets are expected to migrate to some yet-to-be-network-exposed filters.
1 parent 52ec4c6 commit 5efcb77

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/validation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static const unsigned int MAX_BLOCKS_TO_ANNOUNCE = 8;
127127
/** Maximum number of unconnecting headers announcements before DoS score */
128128
static const int MAX_UNCONNECTING_HEADERS = 10;
129129

130-
static const bool DEFAULT_PEERBLOOMFILTERS = true;
130+
static const bool DEFAULT_PEERBLOOMFILTERS = false;
131131

132132
/** Default for -stopatheight */
133133
static const int DEFAULT_STOPATHEIGHT = 0;

test/functional/p2p_node_network_limited.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
and that it responds to getdata requests for blocks correctly:
99
- send a block within 288 + 2 of the tip
1010
- disconnect peers who request blocks older than that."""
11-
from test_framework.messages import CInv, msg_getdata, msg_verack, NODE_BLOOM, NODE_NETWORK_LIMITED, NODE_WITNESS
11+
from test_framework.messages import CInv, msg_getdata, msg_verack, NODE_NETWORK_LIMITED, NODE_WITNESS
1212
from test_framework.mininode import P2PInterface, mininode_lock
1313
from test_framework.test_framework import BitcoinTestFramework
1414
from test_framework.util import (
@@ -55,7 +55,7 @@ def setup_network(self):
5555
def run_test(self):
5656
node = self.nodes[0].add_p2p_connection(P2PIgnoreInv())
5757

58-
expected_services = NODE_BLOOM | NODE_WITNESS | NODE_NETWORK_LIMITED
58+
expected_services = NODE_WITNESS | NODE_NETWORK_LIMITED
5959

6060
self.log.info("Check that node has signalled expected services.")
6161
assert_equal(node.nServices, expected_services)
@@ -83,7 +83,7 @@ def run_test(self):
8383

8484
node1.wait_for_addr()
8585
#must relay address with NODE_NETWORK_LIMITED
86-
assert_equal(node1.firstAddrnServices, 1036)
86+
assert_equal(node1.firstAddrnServices, expected_services)
8787

8888
self.nodes[0].disconnect_p2ps()
8989
node1.wait_for_disconnect()

test/functional/test_framework/messages.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
NODE_NETWORK = (1 << 0)
4646
# NODE_GETUTXO = (1 << 1)
47-
NODE_BLOOM = (1 << 2)
47+
# NODE_BLOOM = (1 << 2)
4848
NODE_WITNESS = (1 << 3)
4949
NODE_NETWORK_LIMITED = (1 << 10)
5050

0 commit comments

Comments
 (0)