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

Remove `-mintxfee` config option

This commit is contained in:
Greg Pfeil 2023-04-14 15:42:23 -06:00 committed by Kris Nuttycombe
parent b67c5852a4
commit 59b98d8290
6 changed files with 19 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@
#rpcpassword=YourSuperGreatPasswordNumber_DO_NOT_USE_THIS_OR_YOU_WILL_GET_ROBBED_385593
# How many seconds zcash will wait for a complete RPC HTTP request.
# after the HTTP connection is established.
# after the HTTP connection is established.
#rpcclienttimeout=30
# By default, only RPC connections from localhost are allowed.
@ -82,7 +82,7 @@
# either as a single IPv4/IPv6 or with a subnet specification.
# NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED,
# because the rpcpassword is transmitted over the network unencrypted and also because anyone
# because the rpcpassword is transmitted over the network unencrypted and also because anyone
# that can authenticate on the RPC port can steal your keys + take over the account running zcashd
# For more information see https://github.com/zcash/zcash/issues/1497
@ -116,15 +116,9 @@
# 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; if not,
# the fallback fee set by mintxfee is used.
# used if there is sufficient mempool data to estimate the fee.
#txconfirmtarget=2
# The fallback fee rate (in ZEC per 1000 bytes) used by legacy APIs when
# paytxfee has not been set and there is insufficient mempool data to
# estimate a fee according to the txconfirmtarget option.
#mintxfee=0.00001
##
## Miscellaneous options
##

5
doc/man/zcashd.1
View File

@ -309,11 +309,6 @@ Enable the Sprout to Sapling migration
.IP
Set the Sapling migration address
.HP
\fB\-mintxfee=\fR<amt>
.IP
Fees (in ZEC/kB) smaller than this are considered zero fee for
transaction creation (default: 0.00001)
.HP
\fB\-orchardactionlimit=\fR<n>
.IP
Set the maximum number of Orchard actions permitted in a transaction

10
doc/release-notes.md
View File

@ -25,8 +25,8 @@ RPC Changes
while you should already be checking the async operation status, there are now
more cases that may trigger failure at that stage.
- The `AllowRevealedRecipients` privacy policy is now required in order to choose a
transparent change address for a transaction. This will only occur when the wallet
is unable to construct the transaction without selecting funds from the transparent
transparent change address for a transaction. This will only occur when the wallet
is unable to construct the transaction without selecting funds from the transparent
pool, so the impact of this change is that for such transactions, the user must specify
`AllowFullyTransparent`.
- The `estimatepriority` RPC call has been removed.
@ -59,6 +59,12 @@ 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`
-----------
- 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.
[Deprecations](https://zcash.github.io/zcash/user/deprecation.html)
--------------

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

@ -257,12 +257,6 @@ Wallet options:
-migrationdestaddress=<zaddr>
Set the Sapling migration address
-mintxfee=<amt>
The fallback fee rate (in ZEC per 1000 bytes) used by legacy APIs
(sendtoaddress, sendmany, and fundrawtransaction) when -paytxfee has not
been set and there is insufficient mempool data to estimate a fee
according to the -txconfirmtarget option (default: 0.00001)
-orchardactionlimit=<n>
Set the maximum number of Orchard actions permitted in a transaction
(default 50)
@ -271,9 +265,9 @@ 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 descriptions
of -txconfirmtarget and -mintxfee options for how the fee is calculated
when this option is not set.
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.
-rescan
Rescan the block chain for missing wallet transactions on startup
@ -289,8 +283,7 @@ Wallet options:
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; if not, the fallback fee
set by -mintxfee is used. (default: 2)
sufficient mempool data to estimate the fee. (default: 2)
-txexpirydelta
Set the number of blocks after which a transaction that has not been

23
src/wallet/wallet.cpp
View File

@ -55,13 +55,6 @@ unsigned int nOrchardActionLimit = DEFAULT_ORCHARD_ACTION_LIMIT;
const char * DEFAULT_WALLET_DAT = "wallet.dat";
/**
* -mintxfee: the fallback fee rate (in ZEC per 1000 bytes) used by legacy APIs
* when -paytxfee has not been set and there is insufficient mempool data to
* estimate a fee according to the -txconfirmtarget option.
*/
CFeeRate CWallet::minTxFee = CFeeRate(DEFAULT_TRANSACTION_MINFEE);
std::set<ReceiverType> CWallet::DefaultReceiverTypes(int nHeight) {
// For now, just ignore the height information because the default
// is always the same.
@ -6496,20 +6489,16 @@ std::string CWallet::GetWalletHelpString(bool showDebug)
strUsage += HelpMessageOpt("-keypool=<n>", strprintf(_("Set key pool size to <n> (default: %u)"), DEFAULT_KEYPOOL_SIZE));
strUsage += HelpMessageOpt("-migration", _("Enable the Sprout to Sapling migration"));
strUsage += HelpMessageOpt("-migrationdestaddress=<zaddr>", _("Set the Sapling migration address"));
strUsage += HelpMessageOpt("-mintxfee=<amt>", strprintf(_("The fallback fee rate (in %s per 1000 bytes) used by legacy APIs (sendtoaddress, sendmany, and fundrawtransaction) when -paytxfee "
"has not been set and there is insufficient mempool data to estimate a fee according to the -txconfirmtarget option (default: %s)"),
CURRENCY_UNIT, FormatMoney(DEFAULT_TRANSACTION_MINFEE)));
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 descriptions of -txconfirmtarget "
"and -mintxfee options 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. See the description of the -txconfirmtarget "
"option for how the fee is calculated when this option is not set."),
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; if not, the "
"fallback fee set by -mintxfee is used. (default: %u)"),
"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"));
@ -6715,11 +6704,7 @@ bool CWallet::ParameterInteraction(const CChainParams& params)
{
if (mapArgs.count("-mintxfee"))
{
CAmount n = 0;
if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
CWallet::minTxFee = CFeeRate(n);
else
return UIError(AmountErrMsg("mintxfee", mapArgs["-mintxfee"]));
UIWarning(_("The argument -mintxfee is no longer supported."));
}
if (mapArgs.count("-paytxfee"))
{

4
src/wallet/wallet.h
View File

@ -63,8 +63,6 @@ extern unsigned int nOrchardActionLimit;
static const unsigned int DEFAULT_KEYPOOL_SIZE = 100;
//! -paytxfee default
static const CAmount DEFAULT_TRANSACTION_FEE = 0;
//! -mintxfee default
static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
//! minimum change amount
static const CAmount MIN_CHANGE = CENT;
//! Default for -spendzeroconfchange
@ -1949,8 +1947,6 @@ public:
bool CommitTransaction(CWalletTx& wtxNew, std::optional<std::reference_wrapper<CReserveKey>> reservekey, CValidationState& state);
static CFeeRate minTxFee;
/** Adjust the requested fee by bounding it below to the minimum relay fee required
* for a transaction of the given size and bounding it above to the maximum fee
* configured using the `-maxtxfee` configuration option.