mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-04-18 19:47:53 +02:00
Merge bitcoin/bitcoin#32514: scripted-diff: Remove unused leading newline in RPC docs
fa1f10a49edoc: Fix minor typos in rpc help (MarcoFalke)fae840e94brpc: Reject beginning newline in RPC docs (MarcoFalke)fa414eda08scripted-diff: Remove unused leading newline in RPC docs (MarcoFalke) Pull request description: It is harmless, but newlines in the beginning read a bit odd ("nReturns"). So just require them to not be present. The diff is large, but a trivial scripted-diff. ACKs for top commit: fanquake: ACKfa1f10a49ew0xlt: ACKfa1f10a49eTree-SHA512: 5d2f9632f42ec1c02814d050f223941f436e5b0df426d7d6eb93fdd0ff118d57185af07b271dd73af63735dd17231125826c0c9ce0aad36bc8829c5b050a628c
This commit is contained in:
@@ -36,8 +36,9 @@ using interfaces::FoundBlock;
|
||||
namespace wallet {
|
||||
RPCHelpMan importprunedfunds()
|
||||
{
|
||||
return RPCHelpMan{"importprunedfunds",
|
||||
"\nImports funds without rescan. Corresponding address or script must previously be included in wallet. Aimed towards pruned wallets. The end-user is responsible to import additional transactions that subsequently spend the imported outputs or rescan after the point in the blockchain the transaction is included.\n",
|
||||
return RPCHelpMan{
|
||||
"importprunedfunds",
|
||||
"Imports funds without rescan. Corresponding address or script must previously be included in wallet. Aimed towards pruned wallets. The end-user is responsible to import additional transactions that subsequently spend the imported outputs or rescan after the point in the blockchain the transaction is included.\n",
|
||||
{
|
||||
{"rawtransaction", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "A raw transaction in hex funding an already-existing address in wallet"},
|
||||
{"txoutproof", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The hex output from gettxoutproof that contains the transaction"},
|
||||
@@ -91,8 +92,9 @@ RPCHelpMan importprunedfunds()
|
||||
|
||||
RPCHelpMan removeprunedfunds()
|
||||
{
|
||||
return RPCHelpMan{"removeprunedfunds",
|
||||
"\nDeletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds. This will affect wallet balances.\n",
|
||||
return RPCHelpMan{
|
||||
"removeprunedfunds",
|
||||
"Deletes the specified transaction from the wallet. Meant for use with pruned wallets and as a companion to importprunedfunds. This will affect wallet balances.\n",
|
||||
{
|
||||
{"txid", RPCArg::Type::STR_HEX, RPCArg::Optional::NO, "The hex-encoded id of the transaction you are deleting"},
|
||||
},
|
||||
@@ -296,9 +298,10 @@ static UniValue ProcessDescriptorImport(CWallet& wallet, const UniValue& data, c
|
||||
|
||||
RPCHelpMan importdescriptors()
|
||||
{
|
||||
return RPCHelpMan{"importdescriptors",
|
||||
"\nImport descriptors. This will trigger a rescan of the blockchain based on the earliest timestamp of all descriptors being imported. Requires a new wallet backup.\n"
|
||||
"When importing descriptors with multipath key expressions, if the multipath specifier contains exactly two elements, the descriptor produced from the second elements will be imported as an internal descriptor.\n"
|
||||
return RPCHelpMan{
|
||||
"importdescriptors",
|
||||
"Import descriptors. This will trigger a rescan of the blockchain based on the earliest timestamp of all descriptors being imported. Requires a new wallet backup.\n"
|
||||
"When importing descriptors with multipath key expressions, if the multipath specifier contains exactly two elements, the descriptor produced from the second element will be imported as an internal descriptor.\n"
|
||||
"\nNote: This call can take over an hour to complete if using an early timestamp; during that time, other rpc calls\n"
|
||||
"may report that the imported keys, addresses or scripts exist but related transactions are still missing.\n"
|
||||
"The rescan is significantly faster if block filters are available (using startup option \"-blockfilterindex=1\").\n",
|
||||
@@ -463,7 +466,7 @@ RPCHelpMan listdescriptors()
|
||||
{
|
||||
return RPCHelpMan{
|
||||
"listdescriptors",
|
||||
"\nList descriptors imported into a descriptor-enabled wallet.\n",
|
||||
"List descriptors imported into a descriptor-enabled wallet.\n",
|
||||
{
|
||||
{"private", RPCArg::Type::BOOL, RPCArg::Default{false}, "Show private descriptors."}
|
||||
},
|
||||
@@ -574,8 +577,9 @@ RPCHelpMan listdescriptors()
|
||||
|
||||
RPCHelpMan backupwallet()
|
||||
{
|
||||
return RPCHelpMan{"backupwallet",
|
||||
"\nSafely copies the current wallet file to the specified destination, which can either be a directory or a path with a filename.\n",
|
||||
return RPCHelpMan{
|
||||
"backupwallet",
|
||||
"Safely copies the current wallet file to the specified destination, which can either be a directory or a path with a filename.\n",
|
||||
{
|
||||
{"destination", RPCArg::Type::STR, RPCArg::Optional::NO, "The destination directory or file"},
|
||||
},
|
||||
@@ -610,7 +614,7 @@ RPCHelpMan restorewallet()
|
||||
{
|
||||
return RPCHelpMan{
|
||||
"restorewallet",
|
||||
"\nRestores and loads a wallet from backup.\n"
|
||||
"Restores and loads a wallet from backup.\n"
|
||||
"\nThe rescan is significantly faster if a descriptor wallet is restored"
|
||||
"\nand block filters are available (using startup option \"-blockfilterindex=1\").\n",
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user