highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-29 11:12:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge 5b2d0216d871bd481f733506a2e8f80b8a34eca0 into db2c57ae9eebdb75c58cd165ac929919969c19a9

Browse Source
This commit is contained in:
tdb3 2025-03-17 10:39:58 +01:00 committed by GitHub
commit 79d7af66bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/release-notes-30713.md Normal file
View File

@ -0,0 +1,5 @@
Updated RPCs
------------
- The `status` action of the`scanblocks` RPC now returns an additional array `relevant_blocks` containing
the matching block hashes found so far during a scan.

32
src/rpc/blockchain.cpp
View File

@ -2381,9 +2381,17 @@ public:
return true;
}
void release() {
if (!m_could_reserve) {
throw std::runtime_error("Attempt to release unreserved BlockFiltersScanReserver");
}
g_scanfilter_in_progress = false;
m_could_reserve = false;
}
~BlockFiltersScanReserver() {
if (m_could_reserve) {
g_scanfilter_in_progress = false;
release();
}
}
};
@ -2443,6 +2451,9 @@ static RPCHelpMan scanblocks()
RPCResult{"when action=='status' and a scan is currently in progress", RPCResult::Type::OBJ, "", "", {
{RPCResult::Type::NUM, "progress", "Approximate percent complete"},
{RPCResult::Type::NUM, "current_height", "Height of the block currently being scanned"},
{RPCResult::Type::ARR, "relevant_blocks", "Blocks that may have matched a scanobject.", {
{RPCResult::Type::STR_HEX, "blockhash", "A relevant blockhash"},
}},
},
},
scan_result_abort,
@ -2457,15 +2468,20 @@ static RPCHelpMan scanblocks()
},
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
static GlobalMutex cs_relevant_blocks;
static UniValue relevant_blocks GUARDED_BY(cs_relevant_blocks);
UniValue ret(UniValue::VOBJ);
if (request.params[0].get_str() == "status") {
BlockFiltersScanReserver reserver;
LOCK(cs_relevant_blocks);
if (reserver.reserve()) {
// no scan in progress
return NullUniValue;
}
ret.pushKV("progress", g_scanfilter_progress.load());
ret.pushKV("current_height", g_scanfilter_progress_height.load());
ret.pushKV("relevant_blocks", relevant_blocks);
return ret;
} else if (request.params[0].get_str() == "abort") {
BlockFiltersScanReserver reserver;
@ -2477,6 +2493,11 @@ static RPCHelpMan scanblocks()
g_scanfilter_should_abort_scan = true;
return true;
} else if (request.params[0].get_str() == "start") {
{
LOCK(cs_relevant_blocks);
relevant_blocks = UniValue(UniValue::VARR);
}
BlockFiltersScanReserver reserver;
if (!reserver.reserve()) {
throw JSONRPCError(RPC_INVALID_PARAMETER, "Scan already in progress, use action \"abort\" or \"status\"");
@ -2532,7 +2553,7 @@ static RPCHelpMan scanblocks()
needle_set.emplace(script.begin(), script.end());
}
}
UniValue blocks(UniValue::VARR);
const int amount_per_chunk = 10000;
std::vector<BlockFilter> filters;
int start_block_height = start_index->nHeight; // for progress reporting
@ -2570,7 +2591,8 @@ static RPCHelpMan scanblocks()
}
}
blocks.push_back(filter.GetBlockHash().GetHex());
LOCK(cs_relevant_blocks);
relevant_blocks.push_back(filter.GetBlockHash().GetHex());
}
}
}
@ -2590,8 +2612,10 @@ static RPCHelpMan scanblocks()
ret.pushKV("from_height", start_block_height);
ret.pushKV("to_height", start_index->nHeight); // start_index is always the last scanned block here
ret.pushKV("relevant_blocks", std::move(blocks));
LOCK(cs_relevant_blocks);
ret.pushKV("relevant_blocks", std::move(relevant_blocks));
ret.pushKV("completed", completed);
reserver.release(); // ensure this is before cs_relevant_blocks is released, so status doesn't try to use moved relevant_blocks
}
else {
throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid action '%s'", request.params[0].get_str()));