diff options
author | fanquake <fanquake@gmail.com> | 2021-12-28 20:23:12 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-12-28 20:23:31 +0800 |
commit | 5d2344885bb50cada57bbec79f473db79cfab96c (patch) | |
tree | 5a8517d6192197110fe5078ab415853780171a09 | |
parent | bb655a6aac93e41005b6ad2ca98000cc07aa8119 (diff) | |
parent | fa993d0e7e4d27ca1cf7d88a5a6ec5b93b7ed503 (diff) | |
download | bitcoin-5d2344885bb50cada57bbec79f473db79cfab96c.tar.xz |
Merge bitcoin/bitcoin#23840: doc: Fix -changetype help text
fa993d0e7e4d27ca1cf7d88a5a6ec5b93b7ed503 doc: Fix -changetype help text (MarcoFalke)
Pull request description:
This was forgotten in commit 3ac38058ce0e80a9f4276bfa82951decdb237e9a
ACKs for top commit:
shaavan:
ACK fa993d0e7e4d27ca1cf7d88a5a6ec5b93b7ed503
w0xlt:
ACK fa993d0
josibake:
ACK https://github.com/bitcoin/bitcoin/pull/23840/commits/fa993d0e7e4d27ca1cf7d88a5a6ec5b93b7ed503
Tree-SHA512: 9f84b1168e3b3ab06e5c1f4915a1874598b273099eb5878ed28c3a66f1484e34c836fd3c68c4131bee541f3428052f6b66e02b192170752d1082de689d44cd4d
-rw-r--r-- | src/wallet/init.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wallet/init.cpp b/src/wallet/init.cpp index 5def02d96a..7368f87574 100644 --- a/src/wallet/init.cpp +++ b/src/wallet/init.cpp @@ -45,7 +45,10 @@ void WalletInit::AddWalletOptions(ArgsManager& argsman) const { argsman.AddArg("-addresstype", strprintf("What type of addresses to use (\"legacy\", \"p2sh-segwit\", \"bech32\", or \"bech32m\", default: \"%s\")", FormatOutputType(DEFAULT_ADDRESS_TYPE)), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET); argsman.AddArg("-avoidpartialspends", strprintf("Group outputs by address, selecting many (possibly all) or none, instead of selecting on a per-output basis. Privacy is improved as addresses are mostly swept with fewer transactions and outputs are aggregated in clean change addresses. It may result in higher fees due to less optimal coin selection caused by this added limitation and possibly a larger-than-necessary number of inputs being used. Always enabled for wallets with \"avoid_reuse\" enabled, otherwise default: %u.", DEFAULT_AVOIDPARTIALSPENDS), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET); - argsman.AddArg("-changetype", "What type of change to use (\"legacy\", \"p2sh-segwit\", \"bech32\", or \"bech32m\"). Default is same as -addresstype, except when -addresstype=p2sh-segwit a native segwit output is used when sending to a native segwit address)", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET); + argsman.AddArg("-changetype", + "What type of change to use (\"legacy\", \"p2sh-segwit\", \"bech32\", or \"bech32m\"). Default is \"legacy\" when " + "-addresstype=legacy, else it is an implementation detail.", + ArgsManager::ALLOW_ANY, OptionsCategory::WALLET); argsman.AddArg("-consolidatefeerate=<amt>", strprintf("The maximum feerate (in %s/kvB) at which transaction building may use more inputs than strictly necessary so that the wallet's UTXO pool can be reduced (default: %s).", CURRENCY_UNIT, FormatMoney(DEFAULT_CONSOLIDATE_FEERATE)), ArgsManager::ALLOW_ANY, OptionsCategory::WALLET); argsman.AddArg("-disablewallet", "Do not load the wallet and disable wallet RPC calls", ArgsManager::ALLOW_ANY, OptionsCategory::WALLET); argsman.AddArg("-discardfee=<amt>", strprintf("The fee rate (in %s/kvB) that indicates your tolerance for discarding change by adding it to the fee (default: %s). " |