Skip to content

Commit f648039

Browse files
Merge dashpay#6774: fix: follow-up bitcoin#25680 for several Dash rpcs: newkeypool, dumpprivkey, importelectrumwallet
b27ab96 fix: follow-up bitcoin#25680 for several Dash rpcs: newkeypool, dumpprivkey, importelectrumwallet (Konstantin Akimov) Pull request description: ## Issue being fixed or feature implemented These Dash RPCs are legacy-only, but note is missing in dashpay#6747 ## What was done? Added note for `newkeypool`, `dumpprivkey`, `importelectrumwallet` ## How Has This Been Tested? N/A ## Breaking Changes N/A ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone ACKs for top commit: UdjinM6: utACK b27ab96 Tree-SHA512: a0b9c179e691be217511f669e93cf56a9a0182a536d54dcc0f54f3ba436c2b0cff6e078da5c72e39b10a5298ace1640488ac2e0955767ab767ea275b13ffd536
2 parents 7149b9d + b27ab96 commit f648039

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/wallet/rpc/addresses.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ RPCHelpMan newkeypool()
314314
"When restoring a backup of an HD wallet created before the newkeypool command is run, funds received to\n"
315315
"new addresses may not appear automatically. They have not been lost, but the wallet may not find them.\n"
316316
"This can be fixed by running the newkeypool command on the backup and then rescanning, so the wallet\n"
317-
"re-generates the required keys." +
317+
"re-generates the required keys.\n"
318+
"Note: This command is only compatible with legacy wallets.\n" +
318319
HELP_REQUIRING_PASSPHRASE,
319320
{},
320321
RPCResult{RPCResult::Type::NONE, "", ""},

src/wallet/rpc/backup.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,8 @@ RPCHelpMan importwallet()
644644
RPCHelpMan importelectrumwallet()
645645
{
646646
return RPCHelpMan{"importelectrumwallet",
647-
"\nImports keys from an Electrum wallet export file (.csv or .json)\n",
647+
"\nImports keys from an Electrum wallet export file (.csv or .json)\n"
648+
"Note: This command is only compatible with legacy wallets.\n",
648649
{
649650
{"filename", RPCArg::Type::STR, RPCArg::Optional::NO, "The Electrum wallet export file, should be in csv or json format"},
650651
{"index", RPCArg::Type::NUM, RPCArg::Default{0}, "Rescan the wallet for transactions starting from this block index"},
@@ -869,7 +870,8 @@ RPCHelpMan dumpprivkey()
869870
RPCHelpMan dumphdinfo()
870871
{
871872
return RPCHelpMan{"dumphdinfo",
872-
"Returns an object containing sensitive private info about this HD wallet.\n",
873+
"Returns an object containing sensitive private info about this HD wallet.\n"
874+
"Note: This command is only compatible with legacy wallets.\n",
873875
{},
874876
RPCResult{
875877
RPCResult::Type::OBJ, "", "",

0 commit comments

Comments
 (0)