Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-28 13:02:38 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge bloom_default-28+knots

Browse Source
This commit is contained in:
Luke Dashjr 2025-03-05 03:27:08 +00:00
commit 401f2f03e8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net_processing.h
View File

@ -28,7 +28,7 @@ static const uint32_t DEFAULT_MAX_ORPHAN_TRANSACTIONS{100};
/** Default number of non-mempool transactions to keep around for block reconstruction. Includes /** Default number of non-mempool transactions to keep around for block reconstruction. Includes
orphan, replaced, and rejected transactions. */ orphan, replaced, and rejected transactions. */
static const uint32_t DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN{100}; static const uint32_t DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN{100};
static const bool DEFAULT_PEERBLOOMFILTERS = false; static const bool DEFAULT_PEERBLOOMFILTERS = true;
static const bool DEFAULT_PEERBLOCKFILTERS = false; static const bool DEFAULT_PEERBLOCKFILTERS = false;
/** Maximum number of outstanding CMPCTBLOCK requests for the same block. */ /** Maximum number of outstanding CMPCTBLOCK requests for the same block. */
static const unsigned int MAX_CMPCTBLOCKS_INFLIGHT_PER_BLOCK = 3; static const unsigned int MAX_CMPCTBLOCKS_INFLIGHT_PER_BLOCK = 3;

3
test/functional/p2p_node_network_limited.py
View File

@ -11,6 +11,7 @@ and that it responds to getdata requests for blocks correctly:
from test_framework.messages import ( from test_framework.messages import (
CInv, CInv,
MSG_BLOCK, MSG_BLOCK,
NODE_BLOOM,
NODE_NETWORK_LIMITED, NODE_NETWORK_LIMITED,
NODE_P2P_V2, NODE_P2P_V2,
NODE_WITNESS, NODE_WITNESS,
@ -119,7 +120,7 @@ class NodeNetworkLimitedTest(BitcoinTestFramework):
def run_test(self): def run_test(self):
node = self.nodes[0].add_p2p_connection(P2PIgnoreInv()) node = self.nodes[0].add_p2p_connection(P2PIgnoreInv())
expected_services = NODE_WITNESS | NODE_NETWORK_LIMITED | NODE_REPLACE_BY_FEE expected_services = NODE_BLOOM | NODE_WITNESS | NODE_NETWORK_LIMITED | NODE_REPLACE_BY_FEE
if self.options.v2transport: if self.options.v2transport:
expected_services |= NODE_P2P_V2 expected_services |= NODE_P2P_V2