zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove `-txconfirmtarget` config option

This commit is contained in:
Greg Pfeil 2023-04-14 23:15:13 -06:00 committed by Kris Nuttycombe
parent 3f9714aa9d
commit bf68d69439
6 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/debian/examples/zcash.conf
View File

@ -114,11 +114,6 @@
# the fee rate is applied as though it were 1000 bytes.
#paytxfee=<amt>
# If paytxfee is not set, include enough fee that transactions created by
# legacy APIs begin confirmation on average within n blocks. This is only
# used if there is sufficient mempool data to estimate the fee.
#txconfirmtarget=2
##
## Miscellaneous options
##

5
doc/man/zcashd.1
View File

@ -335,11 +335,6 @@ Send transactions as zero\-fee transactions if possible (default: 0)
.IP
Spend unconfirmed change when sending transactions (default: 1)
.HP
\fB\-txconfirmtarget=\fR<n>
.IP
If paytxfee is not set, include enough fee so transactions begin
confirmation on average within n blocks (default: 2)
.HP
\fB\-txexpirydelta\fR
.IP
Set the number of blocks after which a transaction that has not been

8
doc/release-notes.md
View File

@ -59,11 +59,11 @@ Removal of Priority Estimation
these priority estimates. It will automatically be converted to the new format
which is not readable by prior versions of the software.
Removal of `-mintxfee`
-----------
Removal of obsolete config options
----------------------------------
- The fee changes for ZIP 317 have made the `-mintxfee` config option obsolete. It has been removed
and will now cause a warning if used.
- The fee changes for ZIP 317 have made the `-mintxfee` and `-txconfirmtarget` config options
obsolete. They have been removed and will now cause a warning if used.
[Deprecations](https://zcash.github.io/zcash/user/deprecation.html)
--------------

11
qa/rpc-tests/show_help.py
View File

@ -265,9 +265,8 @@ Wallet options:
The preferred fee rate (in ZEC per 1000 bytes) used for transactions
created by legacy APIs (sendtoaddress, sendmany, and
fundrawtransaction). If the transaction is less than 1000 bytes then the
fee rate is applied as though it were 1000 bytes. See the description
of the -txconfirmtarget option for how the fee is calculated when this
option is not set.
fee rate is applied as though it were 1000 bytes. When this option is
not set, the ZIP 317 fee calculation is used.
-rescan
Rescan the block chain for missing wallet transactions on startup
@ -279,12 +278,6 @@ Wallet options:
-spendzeroconfchange
Spend unconfirmed change when sending transactions (default: 1)
-txconfirmtarget=<n>
If -paytxfee is not set, include enough fee that transactions created by
legacy APIs (sendtoaddress, sendmany, and fundrawtransaction) begin
confirmation on average within n blocks. This is only used if there is
sufficient mempool data to estimate the fee. (default: 2)
-txexpirydelta
Set the number of blocks after which a transaction that has not been
mined will become invalid (min: 4, default: 20 (pre-Blossom) or 40

12
src/wallet/wallet.cpp
View File

@ -48,7 +48,6 @@ using namespace libzcash;
CWallet* pwalletMain = NULL;
/** Transaction fee set by the user */
CFeeRate payTxFee(DEFAULT_TRANSACTION_FEE);
unsigned int nTxConfirmTarget = DEFAULT_TX_CONFIRM_TARGET;
bool bSpendZeroConfChange = DEFAULT_SPEND_ZEROCONF_CHANGE;
bool fPayAtLeastCustomFee = true;
unsigned int nAnchorConfirmations = DEFAULT_ANCHOR_CONFIRMATIONS;
@ -6485,15 +6484,12 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
strUsage += HelpMessageOpt("-migrationdestaddress=<zaddr>", _("Set the Sapling migration address"));
strUsage += HelpMessageOpt("-orchardactionlimit=<n>", strprintf(_("Set the maximum number of Orchard actions permitted in a transaction (default %u)"), DEFAULT_ORCHARD_ACTION_LIMIT));
strUsage += HelpMessageOpt("-paytxfee=<amt>", strprintf(_("The preferred fee rate (in %s per 1000 bytes) used for transactions created by legacy APIs (sendtoaddress, sendmany, and fundrawtransaction). "
"If the transaction is less than 1000 bytes then the fee rate is applied as though it were 1000 bytes. See the description of the -txconfirmtarget "
"option for how the fee is calculated when this option is not set."),
"If the transaction is less than 1000 bytes then the fee rate is applied as though it were 1000 bytes. When this option is not set, "
"the ZIP 317 fee calculation is used."),
CURRENCY_UNIT));
strUsage += HelpMessageOpt("-rescan", _("Rescan the block chain for missing wallet transactions on startup"));
strUsage += HelpMessageOpt("-salvagewallet", _("Attempt to recover private keys from a corrupt wallet on startup (implies -rescan)"));
strUsage += HelpMessageOpt("-spendzeroconfchange", strprintf(_("Spend unconfirmed change when sending transactions (default: %u)"), DEFAULT_SPEND_ZEROCONF_CHANGE));
strUsage += HelpMessageOpt("-txconfirmtarget=<n>", strprintf(_("If -paytxfee is not set, include enough fee that transactions created by legacy APIs (sendtoaddress, sendmany, and fundrawtransaction) "
"begin confirmation on average within n blocks. This is only used if there is sufficient mempool data to estimate the fee. (default: %u)"),
DEFAULT_TX_CONFIRM_TARGET));
strUsage += HelpMessageOpt("-txexpirydelta", strprintf(_("Set the number of blocks after which a transaction that has not been mined will become invalid (min: %u, default: %u (pre-Blossom) or %u (post-Blossom))"), TX_EXPIRING_SOON_THRESHOLD + 1, DEFAULT_PRE_BLOSSOM_TX_EXPIRY_DELTA, DEFAULT_POST_BLOSSOM_TX_EXPIRY_DELTA));
strUsage += HelpMessageOpt("-upgradewallet", _("Upgrade wallet to latest format on startup"));
strUsage += HelpMessageOpt("-wallet=<file>", _("Specify wallet file absolute path or a path relative to the data directory") + " " + strprintf(_("(default: %s)"), DEFAULT_WALLET_DAT));
@ -6728,7 +6724,9 @@ bool CWallet::ParameterInteraction(const CChainParams& params)
mapArgs["-maxtxfee"], LOW_LOGICAL_ACTIONS));
}
}
nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
if (mapArgs.count("-txconfirmtarget")) {
UIWarning(_("The argument -txconfirmtarget is no longer supported."));
}
if (mapArgs.count("-txexpirydelta")) {
int64_t expiryDelta = atoi64(mapArgs["-txexpirydelta"]);
uint32_t minExpiryDelta = TX_EXPIRING_SOON_THRESHOLD + 1;

3
src/wallet/wallet.h
View File

@ -52,7 +52,6 @@ extern CWallet* pwalletMain;
* Settings
*/
extern CFeeRate payTxFee;
extern unsigned int nTxConfirmTarget;
extern bool bSpendZeroConfChange;
extern bool fPayAtLeastCustomFee;
extern unsigned int nAnchorConfirmations;
@ -67,8 +66,6 @@ static const CAmount DEFAULT_TRANSACTION_FEE = 0;
static const CAmount MIN_CHANGE = CENT;
//! Default for -spendzeroconfchange
static const bool DEFAULT_SPEND_ZEROCONF_CHANGE = true;
//! -txconfirmtarget default
static const unsigned int DEFAULT_TX_CONFIRM_TARGET = 2;
static const bool DEFAULT_WALLETBROADCAST = true;
//! Size of witness cache
// Should be large enough that we can expect not to reorg beyond our cache