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

RPC/blockchain: Restore ability for pruned nodes to getblockfrompeer future blocks

Browse Source
This commit is contained in:
Luke Dashjr 2023-07-08 23:39:10 +00:00
parent 9eefcb9b3f
commit aebfd947d2
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/blockchain.cpp
View File

@ -458,11 +458,13 @@ static RPCHelpMan getblockfrompeer()
throw JSONRPCError(RPC_MISC_ERROR, "Block header missing"); throw JSONRPCError(RPC_MISC_ERROR, "Block header missing");
} }
#if 0
// Fetching blocks before the node has syncing past their height can prevent block files from // Fetching blocks before the node has syncing past their height can prevent block files from
// being pruned, so we avoid it if the node is in prune mode. // being pruned, so we avoid it if the node is in prune mode.
if (chainman.m_blockman.IsPruneMode() && index->nHeight > WITH_LOCK(chainman.GetMutex(), return chainman.ActiveTip()->nHeight)) { if (chainman.m_blockman.IsPruneMode() && index->nHeight > WITH_LOCK(chainman.GetMutex(), return chainman.ActiveTip()->nHeight)) {
throw JSONRPCError(RPC_MISC_ERROR, "In prune mode, only blocks that the node has already synced previously can be fetched from a peer"); throw JSONRPCError(RPC_MISC_ERROR, "In prune mode, only blocks that the node has already synced previously can be fetched from a peer");
} }
#endif
const bool block_has_data = WITH_LOCK(::cs_main, return index->nStatus & BLOCK_HAVE_DATA); const bool block_has_data = WITH_LOCK(::cs_main, return index->nStatus & BLOCK_HAVE_DATA);
if (block_has_data) { if (block_has_data) {

12
test/functional/rpc_getblockfrompeer.py
View File

@ -103,7 +103,7 @@ class GetBlockFromPeerTest(BitcoinTestFramework):
self.log.info("Non-existent peer generates error, even if we already have the block") self.log.info("Non-existent peer generates error, even if we already have the block")
assert_raises_rpc_error(-1, "Block already downloaded", self.nodes[0].getblockfrompeer, short_tip, peer_0_peer_1_id + 1) assert_raises_rpc_error(-1, "Block already downloaded", self.nodes[0].getblockfrompeer, short_tip, peer_0_peer_1_id + 1)
self.log.info("Don't fetch blocks while the node has not synced past it yet") self.log.info("Do fetch blocks even if the node has not synced past it yet")
# For this test we need node 1 in prune mode and as a side effect this also disconnects # For this test we need node 1 in prune mode and as a side effect this also disconnects
# the nodes which is also necessary for the rest of the test. # the nodes which is also necessary for the rest of the test.
self.restart_node(1, ["-prune=550"]) self.restart_node(1, ["-prune=550"])
@ -119,13 +119,13 @@ class GetBlockFromPeerTest(BitcoinTestFramework):
node1_interface.send_and_ping(msg_headers([block])) node1_interface.send_and_ping(msg_headers([block]))
# Get the peer id of the P2PInterface from the pruning node # Get the peer id of the P2PInterface from the pruning node
node1_interface = self.nodes[1].add_p2p_connection(P2PInterface())
node1_peers = self.nodes[1].getpeerinfo() node1_peers = self.nodes[1].getpeerinfo()
assert_equal(len(node1_peers), 1) assert_equal(len(node1_peers), 2)
node1_interface_id = node1_peers[0]["id"] node1_interface_id = node1_peers[1]["id"]
# Trying to fetch this block from the P2PInterface should not be possible # Trying to fetch this block from the P2PInterface should be possible
error_msg = "In prune mode, only blocks that the node has already synced previously can be fetched from a peer" assert_equal(self.nodes[1].getblockfrompeer(blockhash, node1_interface_id), {})
assert_raises_rpc_error(-1, error_msg, self.nodes[1].getblockfrompeer, blockhash, node1_interface_id)
self.log.info("Connect pruned node") self.log.info("Connect pruned node")
self.connect_nodes(0, 2) self.connect_nodes(0, 2)