diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-12-07 09:07:10 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-12-07 09:07:14 +0100 |
| commit | 9a53ba4618e9731d04511361860fe3dd5fd6e8b7 (patch) | |
| tree | 48df4dfdc9defcc0e7f5445d933fc7b52447432d /src | |
| parent | 42b25025fa741a225bd0431bcec3144dbc7623b3 (diff) | |
| parent | 576720850467b7b21ca1ab59deab27b7a0c1c176 (diff) | |
Merge bitcoin/bitcoin#23676: rpc: correct `getnewaddress`/`getrawchangeaddress` address_type helptext
576720850467b7b21ca1ab59deab27b7a0c1c176 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 576720850467b7b21ca1ab59deab27b7a0c1c176
Tree-SHA512: 3c0cfb96019ca6d316c4a2fe27786d1b621c49b31b3aa61068bad737a5a0ceed89babad704b9923f9aedcabfa670d752916803bdf22236403061ddf9295a2637
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/rpcwallet.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 57ebcd4e93..faf0154d0f 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -144,7 +144,7 @@ static RPCHelpMan getnewaddress() "so payments received with the address will be associated with 'label'.\n", { {"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."}, - {"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -addresstype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\"."}, + {"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -addresstype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", \"bech32\", and \"bech32m\"."}, }, RPCResult{ RPCResult::Type::STR, "address", "The new bitcoin address" @@ -197,7 +197,7 @@ static RPCHelpMan getrawchangeaddress() "\nReturns a new Bitcoin address, for receiving change.\n" "This is for use with raw transactions, NOT normal use.\n", { - {"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -changetype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\"."}, + {"address_type", RPCArg::Type::STR, RPCArg::DefaultHint{"set by -changetype"}, "The address type to use. Options are \"legacy\", \"p2sh-segwit\", \"bech32\", and \"bech32m\"."}, }, RPCResult{ RPCResult::Type::STR, "address", "The address" |