aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/rpc
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2023-04-18 15:22:57 +0100
committerfanquake <fanquake@gmail.com>2023-04-18 15:28:33 +0100
commit15a24781d01847d3acb77607148eae1c05cd5d4f (patch)
tree7618d0ee4e8e5cab9d1be2f38895f38cf6b95064 /src/wallet/rpc
parent9e05de1d7081decf081d2d7811ae99564da53d87 (diff)
parentdc711fbd32653b09e196f72942106114a32353f4 (diff)
downloadbitcoin-15a24781d01847d3acb77607148eae1c05cd5d4f.tar.xz
Merge bitcoin/bitcoin#27474: [24.x] Additional backports for 24.1
dc711fbd32653b09e196f72942106114a32353f4 doc: update 24.1 release notes (fanquake) fc8c1a8deb80913ff353c878f494c9eaf28061c0 doc: fix/improve warning helps in {create,load,unload,restore}wallet (Jon Atack) 3a26b19df25ca99a9a58ae5398f6f423ac074368 bugfix: rest: avoid segfault for invalid URI (pablomartin4btc) c40b1da2fd64bb10f120f85966b44f0d2bb315f8 depends: fix compiling bdb with clang-16 on aarch64 (fanquake) 0bac52d5cfaf1a3beb99b780ed7446e2faba877f Don't return OutputType::UNKNOWN in ParseOutputType (Pttn) Pull request description: Backports: * https://github.com/bitcoin/bitcoin/pull/27279 (only f73782a9032a462a71569e9424db9bf9eeababf3) * https://github.com/bitcoin/bitcoin/pull/27462 * https://github.com/bitcoin/bitcoin/pull/27468 * https://github.com/bitcoin/bitcoin/pull/27473 ACKs for top commit: stickies-v: ACK dc711fbd32653b09e196f72942106114a32353f4 hebasto: re-ACK dc711fbd32653b09e196f72942106114a32353f4 jonatack: ACK dc711fbd32653b09e196f72942106114a32353f4 Tree-SHA512: 72c673be82689e3c3a1c2564a1fdd6afe0b357b7aa8bec9524fe6999804fbccf310da0b074e647af14b753e5e695024e268fe4f69aa58747f541f7f429ebede6
Diffstat (limited to 'src/wallet/rpc')
-rw-r--r--src/wallet/rpc/backup.cpp2
-rw-r--r--src/wallet/rpc/wallet.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/rpc/backup.cpp b/src/wallet/rpc/backup.cpp
index a971331a70..bebd47356a 100644
--- a/src/wallet/rpc/backup.cpp
+++ b/src/wallet/rpc/backup.cpp
@@ -1886,7 +1886,7 @@ RPCHelpMan restorewallet()
RPCResult::Type::OBJ, "", "",
{
{RPCResult::Type::STR, "name", "The wallet name if restored successfully."},
- {RPCResult::Type::STR, "warning", "Warning message if wallet was not loaded cleanly."},
+ {RPCResult::Type::STR, "warning", "Warning messages, if any, related to restoring the wallet. Multiple messages will be delimited by newlines."},
}
},
RPCExamples{
diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp
index a2ae078343..dfa136e442 100644
--- a/src/wallet/rpc/wallet.cpp
+++ b/src/wallet/rpc/wallet.cpp
@@ -207,7 +207,7 @@ static RPCHelpMan loadwallet()
RPCResult::Type::OBJ, "", "",
{
{RPCResult::Type::STR, "name", "The wallet name if loaded successfully."},
- {RPCResult::Type::STR, "warning", "Warning message if wallet was not loaded cleanly."},
+ {RPCResult::Type::STR, "warning", "Warning messages, if any, related to loading the wallet. Multiple messages will be delimited by newlines."},
}
},
RPCExamples{
@@ -327,7 +327,7 @@ static RPCHelpMan createwallet()
RPCResult::Type::OBJ, "", "",
{
{RPCResult::Type::STR, "name", "The wallet name if created successfully. If the wallet was created using a full path, the wallet_name will be the full path."},
- {RPCResult::Type::STR, "warning", "Warning message if wallet was not loaded cleanly."},
+ {RPCResult::Type::STR, "warning", "Warning messages, if any, related to creating the wallet. Multiple messages will be delimited by newlines."},
}
},
RPCExamples{
@@ -414,7 +414,7 @@ static RPCHelpMan unloadwallet()
{"load_on_startup", RPCArg::Type::BOOL, RPCArg::Optional::OMITTED_NAMED_ARG, "Save wallet name to persistent settings and load on startup. True to add wallet to startup list, false to remove, null to leave unchanged."},
},
RPCResult{RPCResult::Type::OBJ, "", "", {
- {RPCResult::Type::STR, "warning", "Warning message if wallet was not unloaded cleanly."},
+ {RPCResult::Type::STR, "warning", "Warning messages, if any, related to unloading the wallet. Multiple messages will be delimited by newlines."},
}},
RPCExamples{
HelpExampleCli("unloadwallet", "wallet_name")