Skip to content

Commit 04b9df0

Browse files
committed
Merge bitcoin/bitcoin#29184: RPC/Blockchain: scanblocks: Accept named param for filter_false_positives
5779010 RPC/Blockchain: scanblocks: Accept named param for filter_false_positives (Luke Dashjr) Pull request description: Possibly due to a silent cross-merge, `scanblocks` was left out of 9623314 ACKs for top commit: stickies-v: ACK 5779010 theStack: ACK 5779010 Tree-SHA512: bade107c7cb5fdd1265224c263a1e1edfc8bc0698b3abfac8d65c49a270181f0311713f7243813de17932a7a7ca65a36850e527ab0b433cf64c32191d3adde70
2 parents 82ba0f8 + 5779010 commit 04b9df0

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/rpc/blockchain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2306,7 +2306,7 @@ static RPCHelpMan scanblocks()
23062306
RPCArg{"start_height", RPCArg::Type::NUM, RPCArg::Default{0}, "Height to start to scan from"},
23072307
RPCArg{"stop_height", RPCArg::Type::NUM, RPCArg::DefaultHint{"chain tip"}, "Height to stop to scan"},
23082308
RPCArg{"filtertype", RPCArg::Type::STR, RPCArg::Default{BlockFilterTypeName(BlockFilterType::BASIC)}, "The type name of the filter"},
2309-
RPCArg{"options", RPCArg::Type::OBJ, RPCArg::Optional::OMITTED, "",
2309+
RPCArg{"options", RPCArg::Type::OBJ_NAMED_PARAMS, RPCArg::Optional::OMITTED, "",
23102310
{
23112311
{"filter_false_positives", RPCArg::Type::BOOL, RPCArg::Default{false}, "Filter false positives (slower and may fail on pruned nodes). Otherwise they may occur at a rate of 1/M"},
23122312
},

src/rpc/client.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ static const CRPCConvertParam vRPCConvertParams[] =
9191
{ "scanblocks", 2, "start_height" },
9292
{ "scanblocks", 3, "stop_height" },
9393
{ "scanblocks", 5, "options" },
94+
{ "scanblocks", 5, "filter_false_positives" },
9495
{ "scantxoutset", 1, "scanobjects" },
9596
{ "addmultisigaddress", 0, "nrequired" },
9697
{ "addmultisigaddress", 1, "keys" },

0 commit comments

Comments
 (0)