Skip to content

Commit 12fd4bb

Browse files
author
MarcoFalke
committed
Merge #16063: rpc: Mention getwalletinfo where a rescan is triggered
be4efb1 rpc: Mention getwalletinfo where a rescan is triggered (João Barbosa) Pull request description: ACKs for commit be4efb: jonasschnelli: utACK be4efb1 sipa: utACK be4efb1 Tree-SHA512: c9e5adda6fcb71dd64ad35cc5af89b0ed815aba440df26b61ef2018abd3b801c9e93cdbedf90db3938e88dc9af39f1577c4c7248bc77260d3afda5e2a0928e68
2 parents fdc951a + be4efb1 commit 12fd4bb

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

src/wallet/rpcdump.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ UniValue importprivkey(const JSONRPCRequest& request)
116116
"\nAdds a private key (as returned by dumpprivkey) to your wallet. Requires a new wallet backup.\n"
117117
"Hint: use importmulti to import more than one private key.\n"
118118
"\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
119-
"may report that the imported key exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n",
119+
"may report that the imported key exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n"
120+
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
120121
{
121122
{"privkey", RPCArg::Type::STR, RPCArg::Optional::NO, "The private key (see dumpprivkey)"},
122123
{"label", RPCArg::Type::STR, /* default */ "current label if address exists, otherwise \"\"", "An optional label"},
@@ -220,7 +221,8 @@ UniValue abortrescan(const JSONRPCRequest& request)
220221
if (request.fHelp || request.params.size() > 0)
221222
throw std::runtime_error(
222223
RPCHelpMan{"abortrescan",
223-
"\nStops current wallet rescan triggered by an RPC call, e.g. by an importprivkey call.\n",
224+
"\nStops current wallet rescan triggered by an RPC call, e.g. by an importprivkey call.\n"
225+
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
224226
{},
225227
RPCResults{},
226228
RPCExamples{
@@ -291,7 +293,8 @@ UniValue importaddress(const JSONRPCRequest& request)
291293
"If you have the full public key, you should call importpubkey instead of this.\n"
292294
"Hint: use importmulti to import more than one address.\n"
293295
"\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n"
294-
"as change, and not show up in many RPCs.\n",
296+
"as change, and not show up in many RPCs.\n"
297+
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
295298
{
296299
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The Bitcoin address (or hex-encoded script)"},
297300
{"label", RPCArg::Type::STR, /* default */ "\"\"", "An optional label"},
@@ -489,7 +492,8 @@ UniValue importpubkey(const JSONRPCRequest& request)
489492
"\nAdds a public key (in hex) that can be watched as if it were in your wallet but cannot be used to spend. Requires a new wallet backup.\n"
490493
"Hint: use importmulti to import more than one public key.\n"
491494
"\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
492-
"may report that the imported pubkey exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n",
495+
"may report that the imported pubkey exists but related transactions are still missing, leading to temporarily incorrect/bogus balances and unspent outputs until rescan completes.\n"
496+
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
493497
{
494498
{"pubkey", RPCArg::Type::STR, RPCArg::Optional::NO, "The hex-encoded public key"},
495499
{"label", RPCArg::Type::STR, /* default */ "\"\"", "An optional label"},
@@ -570,7 +574,8 @@ UniValue importwallet(const JSONRPCRequest& request)
570574
if (request.fHelp || request.params.size() != 1)
571575
throw std::runtime_error(
572576
RPCHelpMan{"importwallet",
573-
"\nImports keys from a wallet dump file (see dumpwallet). Requires a new wallet backup to include imported keys.\n",
577+
"\nImports keys from a wallet dump file (see dumpwallet). Requires a new wallet backup to include imported keys.\n"
578+
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
574579
{
575580
{"filename", RPCArg::Type::STR, RPCArg::Optional::NO, "The wallet file"},
576581
},
@@ -1361,7 +1366,8 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
13611366
"If an address/script is imported without all of the private keys required to spend from that address, it will be watchonly. The 'watchonly' option must be set to true in this case or a warning will be returned.\n"
13621367
"Conversely, if all the private keys are provided and the address/script is spendable, the watchonly option must be set to false, or a warning will be returned.\n"
13631368
"\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
1364-
"may report that the imported keys, addresses or scripts exists but related transactions are still missing.\n",
1369+
"may report that the imported keys, addresses or scripts exist but related transactions are still missing.\n"
1370+
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
13651371
{
13661372
{"requests", RPCArg::Type::ARR, RPCArg::Optional::NO, "Data to be imported",
13671373
{

src/wallet/rpcwallet.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3452,7 +3452,8 @@ UniValue rescanblockchain(const JSONRPCRequest& request)
34523452
if (request.fHelp || request.params.size() > 2) {
34533453
throw std::runtime_error(
34543454
RPCHelpMan{"rescanblockchain",
3455-
"\nRescan the local blockchain for wallet related transactions.\n",
3455+
"\nRescan the local blockchain for wallet related transactions.\n"
3456+
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
34563457
{
34573458
{"start_height", RPCArg::Type::NUM, /* default */ "0", "block height where the rescan should start"},
34583459
{"stop_height", RPCArg::Type::NUM, RPCArg::Optional::OMITTED_NAMED_ARG, "the last block height that should be scanned. If none is provided it will rescan up to the tip at return time of this call."},

0 commit comments

Comments
 (0)