From 66f1f9b076fc267a352452fe6861e8ef7b951c89 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 23 Dec 2021 12:14:54 -0500 Subject: [PATCH] Remove mention of overwintered from RPC docs. HUSH and all HSCs are all overwintered #19 --- src/wallet/rpcwallet.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 76f160968..e3f5e5064 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -5241,9 +5241,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp, const CPubKey& myp "\nto combine those into a single note." "\n\nThis is an asynchronous operation, and UTXOs selected for merging will be locked. If there is an error, they" "\nare unlocked. The RPC call `listlockunspent` can be used to return a list of locked UTXOs." - "\n\nThe number of UTXOs and notes selected for merging can be limited by the caller. If the transparent limit" - "\nparameter is set to zero, and Overwinter is not yet active, the -mempooltxinputlimit option will determine the" - "\nnumber of UTXOs. Any limit is constrained by the consensus rule defining a maximum transaction size of" + "\n\nThe number of UTXOs and notes selected for merging can be limited by the caller." "\nArguments:\n" "1. fromaddresses (string, required) A JSON array with addresses.\n" " The following special strings are accepted inside the array:\n" @@ -5259,7 +5257,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp, const CPubKey& myp "3. fee (numeric, optional, default=" + strprintf("%s", FormatMoney(MERGE_TO_ADDRESS_OPERATION_DEFAULT_MINERS_FEE)) + ") The fee amount to attach to this transaction.\n" "4. transparent_limit (numeric, optional, default=" - + strprintf("%d", MERGE_TO_ADDRESS_DEFAULT_TRANSPARENT_LIMIT) + ") Limit on the maximum number of UTXOs to merge. Set to 0 to use node option -mempooltxinputlimit (before Overwinter), or as many as will fit in the transaction (after Overwinter).\n" + + strprintf("%d", MERGE_TO_ADDRESS_DEFAULT_TRANSPARENT_LIMIT) + ") Limit on the maximum number of UTXOs to merge. Set to 0 to use as many as will fit in the transaction.\n" "4. shielded_limit (numeric, optional, default=" + strprintf("%d Sapling Notes", MERGE_TO_ADDRESS_DEFAULT_SAPLING_LIMIT) + ") Limit on the maximum number of notes to merge. Set to 0 to merge as many as will fit in the transaction.\n" "5. maximum_utxo_size (numeric, optional) eg, 0.0001 anything under 10000 satoshies will be merged, ignores 10,000 sat p2pk utxo that dragon uses, and merges coinbase utxo.\n"