highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 05:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

indexes: set prune lock to genesis before first block

Browse Source 
When setting both a new index and prune size and restarting
an unpruned node, the node will prune the block store first
and then the index will fail to start syncing.

Fix this by setting the prune lock to 0 if the index does not
yet have a best block.
This commit is contained in:
Andrew Toth
2026-09-02 12:43:01 -04:00
parent 0ae3b40c27
commit 9b22995140
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/index/base.cpp
View File

@@ -504,9 +504,9 @@ void BaseIndex::SetBestBlockIndex(const CBlockIndex* block)
{
assert(!m_chainstate->m_blockman.IsPruneMode() || AllowPrune());
if (AllowPrune() && block) {
if (AllowPrune()) {
node::PruneLockInfo prune_lock;
prune_lock.height_first = block->nHeight;
prune_lock.height_first = block ? block->nHeight : 0;
WITH_LOCK(::cs_main, m_chainstate->m_blockman.UpdatePruneLock(GetName(), prune_lock));
}

11
test/functional/feature_pruning.py
View File

@@ -20,7 +20,6 @@ from test_framework.script import (
OP_RETURN,
)
from test_framework.test_framework import BitcoinTestFramework
from test_framework.test_node import ErrorMatch
from test_framework.util import (
assert_equal,
assert_greater_than,
@@ -472,15 +471,9 @@ class PruneTest(BitcoinTestFramework):
self.sync_blocks([self.nodes[0], self.nodes[5]], wait=5, timeout=300)
self.log.info("Test prune with a new index")
self.stop_node(0)
self.restart_node(0, extra_args=["-prune=550", "-blockfilterindex=1"])
node = self.nodes[0]
# TODO: Starting prune with a new index must sync the index before pruning.
node.assert_start_raises_init_error(
extra_args=["-prune=550", "-blockfilterindex=1"],
expected_msg="basic block filter index best block of the index goes beyond pruned data",
match=ErrorMatch.PARTIAL_REGEX,
)
self.start_node(0, extra_args=["-prune=550"])
self.wait_until(lambda: node.getindexinfo()["basic block filter index"]["best_block_height"] >= 10, timeout=300)
if self.is_wallet_compiled():
self.log.info("Test wallet re-scan")