Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b2e6a7a
Merge bitcoin/bitcoin#22751: rpc/wallet: add simulaterawtransaction RPC
achow101 Aug 5, 2022
9343dcd
Merge bitcoin/bitcoin#19391: RPC/Mining: Clean out pre-Segwit miner c…
fanquake Aug 17, 2022
787091a
Merge bitcoin/bitcoin#26031: test: Display skipped tests reason
Sep 9, 2022
c82eac2
Merge bitcoin/bitcoin#25922: wallet: trigger MaybeResendWalletTxs() e…
achow101 Aug 26, 2022
776d805
Merge bitcoin/bitcoin#25914: test: Fix intermittent issue in p2p_leak.py
fanquake Sep 4, 2022
dd6a131
Merge bitcoin#26069: rpc: unify arg type error message
PastaPastaPasta Jun 2, 2025
d30b102
Merge bitcoin/bitcoin#26645: util: Include full version id in bug rep…
DashCoreAutoGuix Jul 9, 2025
fe2175a
Merge bitcoin/bitcoin#26617: test: add extra_args to BitcoinTestFrame…
DashCoreAutoGuix Jul 9, 2025
75dc71c
Merge bitcoin/bitcoin#25900: ci: run docker wrapper with a non-root user
DashCoreAutoGuix Jul 10, 2025
9a6a783
Merge bitcoin/bitcoin#26292: util: move threadinterrupt into util/
DashCoreAutoGuix Jul 10, 2025
5089233
Merge bitcoin/bitcoin#26376: test: Use type-safe NodeSeconds for Test…
DashCoreAutoGuix Jul 10, 2025
4331957
Merge bitcoin/bitcoin#26630: test: Fix intermittent issue in rpc_net.py
DashCoreAutoGuix Jun 19, 2025
08503dc
Merge bitcoin/bitcoin#26620: test: refactor: eliminate genesis block …
DashCoreAutoGuix Jul 9, 2025
ad6e04f
Merge bitcoin/bitcoin#26446: build: Drop unneeded linking of `contrib…
DashCoreAutoGuix Jul 10, 2025
fde992c
Merge bitcoin/bitcoin#25311: refactor: remove CBlockIndex copy constr…
DashCoreAutoGuix Jul 10, 2025
46d68e0
Merge bitcoin-core/gui#685: clang-tidy: Fix `readability-redundant-st…
DashCoreAutoGuix Jul 10, 2025
3575231
Merge bitcoin/bitcoin#26419: log: mempool: log removal reason in vali…
DashCoreAutoGuix Jul 10, 2025
d695d3b
Merge bitcoin/bitcoin#26402: doc: Fix typos
DashCoreAutoGuix Jul 10, 2025
a44683d
Merge bitcoin/bitcoin#28740: refactor: Add LIFETIMEBOUND to all (w)tx…
DashCoreAutoGuix Jul 11, 2025
cdba8aa
Merge bitcoin/bitcoin#28283: doc: clarify cookie generation in JSON-R…
DashCoreAutoGuix Jul 11, 2025
83da000
Merge bitcoin/bitcoin#25680: rpc, docs: Add note for commands that su…
DashCoreAutoGuix Jul 11, 2025
5a1b908
test: align DashTestFramework.setup_nodes with BitcoinTestFramework
PastaPastaPasta Jul 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/wallet/rpc/addresses.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ RPCHelpMan addmultisigaddress()
"Each key is a Dash address or hex-encoded public key.\n"
"This functionality is only intended for use with non-watchonly addresses.\n"
"See `importaddress` for watchonly p2sh address support.\n"
"If 'label' is specified, assign address to that label.\n",
"If 'label' is specified, assign address to that label.\n"
"Note: This command is only compatible with legacy wallets.\n",
{
{"nrequired", RPCArg::Type::NUM, RPCArg::Optional::NO, "The number of required signatures out of the n keys or addresses."},
{"keys", RPCArg::Type::ARR, RPCArg::Optional::NO, "The Dash addresses or hex-encoded public keys",
Expand Down
21 changes: 14 additions & 7 deletions src/wallet/rpc/backup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ RPCHelpMan importprivkey()
"\nAdds a private key (as returned by dumpprivkey) to your wallet. Requires a new wallet backup.\n"
"Hint: use importmulti to import more than one private key.\n"
"\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
"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",
"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"
"Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" with \"combo(X)\" for descriptor wallets.\n",
{
{"privkey", RPCArg::Type::STR, RPCArg::Optional::NO, "The private key (see dumpprivkey)"},
{"label", RPCArg::Type::STR, RPCArg::DefaultHint{"current label if address exists, otherwise \"\""}, "An optional label"},
Expand Down Expand Up @@ -209,7 +210,8 @@ RPCHelpMan importaddress()
"If you have the full public key, you should call importpubkey instead of this.\n"
"Hint: use importmulti to import more than one address.\n"
"\nNote: If you import a non-standard raw script in hex form, outputs sending to it will be treated\n"
"as change, and not show up in many RPCs.\n",
"as change, and not show up in many RPCs.\n"
"Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" for descriptor wallets.\n",
{
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The Dash address (or hex-encoded script)"},
{"label", RPCArg::Type::STR, RPCArg::Default{""}, "An optional label"},
Expand Down Expand Up @@ -400,7 +402,8 @@ RPCHelpMan importpubkey()
"\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"
"Hint: use importmulti to import more than one public key.\n"
"\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
"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",
"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"
"Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" with \"combo(X)\" for descriptor wallets.\n",
{
{"pubkey", RPCArg::Type::STR, RPCArg::Optional::NO, "The hex-encoded public key"},
{"label", RPCArg::Type::STR, RPCArg::Default{""}, "An optional label"},
Expand Down Expand Up @@ -480,7 +483,8 @@ RPCHelpMan importwallet()
{
return RPCHelpMan{"importwallet",
"\nImports keys from a wallet dump file (see dumpwallet). Requires a new wallet backup to include imported keys.\n"
"Note: Use \"getwalletinfo\" to query the scanning progress.\n",
"Note: Use \"getwalletinfo\" to query the scanning progress.\n"
"Note: This command is only compatible with legacy wallets.\n",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

several RPCs are missing. Here's fix: #6774

{
{"filename", RPCArg::Type::STR, RPCArg::Optional::NO, "The wallet file"},
},
Expand Down Expand Up @@ -820,7 +824,8 @@ RPCHelpMan dumpprivkey()
{
return RPCHelpMan{"dumpprivkey",
"\nReveals the private key corresponding to 'address'.\n"
"Then the importprivkey can be used with this output\n",
"Then the importprivkey can be used with this output\n"
"Note: This command is only compatible with legacy wallets.\n",
{
{"address", RPCArg::Type::STR, RPCArg::Optional::NO, "The Dash address for the private key"},
},
Expand Down Expand Up @@ -915,7 +920,8 @@ RPCHelpMan dumpwallet()
"\nDumps all wallet keys in a human-readable format to a server-side file. This does not allow overwriting existing files.\n"
"Imported scripts are included in the dumpfile too, their corresponding addresses will be added automatically by importwallet.\n"
"Note that if your wallet contains keys which are not derived from your HD seed (e.g. imported keys), these are not covered by\n"
"only backing up the seed itself, and must be backed up too (e.g. ensure you back up the whole dumpfile).\n",
"only backing up the seed itself, and must be backed up too (e.g. ensure you back up the whole dumpfile).\n"
"Note: This command is only compatible with legacy wallets.\n",
{
{"filename", RPCArg::Type::STR, RPCArg::Optional::NO, "The filename with path (absolute path recommended)"},
},
Expand Down Expand Up @@ -1467,7 +1473,8 @@ RPCHelpMan importmulti()
"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"
"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"
"\nNote: This call can take over an hour to complete if rescan is true, during that time, other rpc calls\n"
"may report that the imported keys, addresses or scripts exists but related transactions are still missing.\n",
"may report that the imported keys, addresses or scripts exists but related transactions are still missing.\n"
"Note: This command is only compatible with legacy wallets. Use \"importdescriptors\" for descriptor wallets.\n",
{
{"requests", RPCArg::Type::ARR, RPCArg::Optional::NO, "Data to be imported",
{
Expand Down
4 changes: 2 additions & 2 deletions src/wallet/rpc/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -772,8 +772,8 @@ static RPCHelpMan sethdseed()
return RPCHelpMan{"sethdseed",
"\nSet or generate a new HD wallet seed. Non-HD wallets will not be upgraded to being a HD wallet. Wallets that are already\n"
"HD can not be updated to a new HD seed.\n"
"\nNote that you will need to MAKE A NEW BACKUP of your wallet after setting the HD wallet seed." +
HELP_REQUIRING_PASSPHRASE,
"\nNote that you will need to MAKE A NEW BACKUP of your wallet after setting the HD wallet seed." + HELP_REQUIRING_PASSPHRASE +
"Note: This command is only compatible with legacy wallets.\n",
{
{"newkeypool", RPCArg::Type::BOOL, RPCArg::Default{true}, "Whether to flush old unused addresses, including change addresses, from the keypool and regenerate it.\n"
"If true, the next address from getnewaddress and change address from getrawchangeaddress will be from this new seed.\n"
Expand Down