Skip to content

Commit 9a53ba4

Browse files
author
MarcoFalke
committed
Merge bitcoin/bitcoin#23676: rpc: correct getnewaddress/getrawchangeaddress address_type helptext
5767208 correct rpc address_type helptext (brianddk) Pull request description: RPC calls `getnewaddress`/`getrawchangeaddress` support the address_type of `bech32m` but it is omitted in the `RPCHelpMan` help text. The `createmultisig` and `addmultisigaddress` help text was not updated since `bech32m` is not yet supported in these. ACKs for top commit: shaavan: ACK 5767208 Tree-SHA512: 3c0cfb96019ca6d316c4a2fe27786d1b621c49b31b3aa61068bad737a5a0ceed89babad704b9923f9aedcabfa670d752916803bdf22236403061ddf9295a2637
2 parents 42b2502 + 5767208 commit 9a53ba4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/wallet/rpcwallet.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static RPCHelpMan getnewaddress()
144144
"so payments received with the address will be associated with 'label'.\n",
145145
{
146146
{"label", RPCArg::Type::STR, RPCArg::Default{""}, "The label name for the address to be linked to. It can also be set to the empty string \"\" to represent the default label. The label does not need to exist, it will be created if there is no label by the given name."},
147-
{"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -addresstype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\"."},
147+
{"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -addresstype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", \"bech32\", and \"bech32m\"."},
148148
},
149149
RPCResult{
150150
RPCResult::Type::STR, "address", "The new bitcoin address"
@@ -197,7 +197,7 @@ static RPCHelpMan getrawchangeaddress()
197197
"\nReturns a new Bitcoin address, for receiving change.\n"
198198
"This is for use with raw transactions, NOT normal use.\n",
199199
{
200-
{"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -changetype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\"."},
200+
{"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -changetype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", \"bech32\", and \"bech32m\"."},
201201
},
202202
RPCResult{
203203
RPCResult::Type::STR, "address", "The address"

0 commit comments

Comments
 (0)