diff --git a/src/node/blockstorage.cpp b/src/node/blockstorage.cpp index 8cc93fb46c8..b060108c186 100644 --- a/src/node/blockstorage.cpp +++ b/src/node/blockstorage.cpp @@ -486,7 +486,9 @@ bool BlockManager::LoadBlockIndex(const std::optional& snapshot_blockha pindex->m_chain_tx_count = pindex->pprev->m_chain_tx_count + pindex->nTx; } else { pindex->m_chain_tx_count = 0; - m_blocks_unlinked.insert(std::make_pair(pindex->pprev, pindex)); + if (pindex->nStatus & BLOCK_HAVE_DATA) { + m_blocks_unlinked.insert(std::make_pair(pindex->pprev, pindex)); + } } } else { pindex->m_chain_tx_count = pindex->nTx; diff --git a/test/functional/feature_prune_stale_fork.py b/test/functional/feature_prune_stale_fork.py new file mode 100755 index 00000000000..5badca0a7cf --- /dev/null +++ b/test/functional/feature_prune_stale_fork.py @@ -0,0 +1,39 @@ +#!/usr/bin/env python3 +# Copyright (c) 2026-present The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or http://www.opensource.org/licenses/mit-license.php. +"""Test node restart with a pruned stale-fork block whose parent has no transactions.""" + +from test_framework.blocktools import create_empty_fork +from test_framework.test_framework import BitcoinTestFramework +from test_framework.util import assert_equal, assert_raises_rpc_error + + +class FeaturePruneStaleForkTest(BitcoinTestFramework): + def set_test_params(self): + self.num_nodes = 1 + self.extra_args = [["-prune=1", "-fastprune"]] + + def run_test(self): + node = self.nodes[0] + + self.log.info("Create a 2-block stale fork: parent has no transactions, child has transactions") + [side_parent, side_child] = create_empty_fork(node, 2) + + node.submitheader(side_parent.serialize().hex()) + node.submitblock(side_child.serialize().hex()) + assert_equal(node.getblockheader(side_parent.hash_hex)["nTx"], 0) + assert_equal(node.getblockheader(side_child.hash_hex)["nTx"], 1) + + self.log.info("Advance and prune so the stale-fork child's block data is removed from disk") + self.generate(node, 500) + node.pruneblockchain(node.getblockcount() - 100) + assert_raises_rpc_error(-1, "Block not available (pruned data)", node.getblock, side_child.hash_hex) + + self.log.info("Restart and mine; node must reload cleanly after the stale-fork child was pruned") + self.restart_node(0) + self.generate(node, 1) + + +if __name__ == '__main__': + FeaturePruneStaleForkTest(__file__).main() diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 545c5072628..4f59f0efee7 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -371,6 +371,7 @@ BASE_SCRIPTS = [ 'wallet_startup.py', 'p2p_private_broadcast_retry_v1.py', 'feature_remove_pruned_files_on_startup.py', + 'feature_prune_stale_fork.py', 'p2p_i2p_ports.py', 'p2p_i2p_sessions.py', 'feature_presegwit_node_upgrade.py',