From e5f0613503b6973dbc886eba8e999f208d84853b Mon Sep 17 00:00:00 2001 From: sedited Date: Fri, 28 Nov 2025 23:05:17 +0100 Subject: [PATCH] net processing: Check if we are in ibd before processing block for txdownloadman MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This avoids wasting work on calculating bloom filters that aren't consumed during ibd and continuously re-calculated as now blocks get validated. Also update the functional test to document that transactions would now be requested again once out of IBD. Co-authored-by: Lőrinc --- src/net_processing.cpp | 10 +++++----- test/functional/p2p_ibd_txrelay.py | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 16b4735e5ef..0ec1103e5a0 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -2054,12 +2054,12 @@ void PeerManagerImpl::BlockConnected( } // The following task can be skipped since we don't maintain a mempool for - // the historical chainstate. - if (role.historical) { - return; + // the historical chainstate, or during ibd since we don't receive incoming + // transactions from peers into the mempool. + if (!role.historical && !m_chainman.IsInitialBlockDownload()) { + LOCK(m_tx_download_mutex); + m_txdownloadman.BlockConnected(pblock); } - LOCK(m_tx_download_mutex); - m_txdownloadman.BlockConnected(pblock); } void PeerManagerImpl::BlockDisconnected(const std::shared_ptr &block, const CBlockIndex* pindex) diff --git a/test/functional/p2p_ibd_txrelay.py b/test/functional/p2p_ibd_txrelay.py index a622554a0c3..fe70d04626e 100755 --- a/test/functional/p2p_ibd_txrelay.py +++ b/test/functional/p2p_ibd_txrelay.py @@ -89,13 +89,11 @@ class P2PIBDTxRelayTest(BitcoinTestFramework): assert not node.getblockchaininfo()['initialblockdownload'] self.wait_until(lambda: all(peer['minfeefilter'] == NORMAL_FEE_FILTER for peer in node.getpeerinfo())) - self.log.info("Check that txs confirmed during IBD are in the recently-confirmed filter once out of ibd") + self.log.info("Check that txs confirmed during IBD are not in the recently-confirmed filter once out of ibd") peer_inver = self.nodes[0].add_p2p_connection(P2PDataStore()) peer_inver.send_and_ping(msg_inv([CInv(t=MSG_WTX, h=ibd_wtxid)])) self.nodes[0].bumpmocktime(NONPREF_PEER_TX_DELAY) - peer_inver.sync_with_ping() - with p2p_lock: - assert ibd_wtxid not in peer_inver.getdata_requests + peer_inver.wait_for_getdata([ibd_wtxid]) self.nodes[0].disconnect_p2ps() self.log.info("Check that nodes process the same transaction, even when unsolicited, when no longer in IBD")