From c42b38ea5110008f2d74abb02ee363ea9bb64188 Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Sun, 8 Aug 2021 21:41:35 +0100 Subject: [PATCH] Use CAmount for constant amounts too --- src/policy/policy.h | 6 +++--- src/validation.h | 2 +- src/wallet/wallet.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/policy/policy.h b/src/policy/policy.h index a41d2fe5f..2540f373c 100644 --- a/src/policy/policy.h +++ b/src/policy/policy.h @@ -31,7 +31,7 @@ static const unsigned int MAX_STANDARD_TX_SIGOPS_COST = MAX_BLOCK_SIGOPS_COST/5; /** Default for -maxmempool, maximum megabytes of mempool memory usage */ static const unsigned int DEFAULT_MAX_MEMPOOL_SIZE = 300; /** Default for -incrementalrelayfee, which sets the minimum feerate increase for mempool limiting or BIP 125 replacement **/ -static const unsigned int DEFAULT_INCREMENTAL_RELAY_FEE = 1000; +static const CAmount DEFAULT_INCREMENTAL_RELAY_FEE = 1000; /** Default for -bytespersigop */ static const unsigned int DEFAULT_BYTES_PER_SIGOP = 20; /** The maximum number of witness stack items in a standard P2WSH script */ @@ -45,13 +45,13 @@ static const unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600; * standard and should be done with care and ideally rarely. It makes sense to * only increase the dust limit after prior releases were already not creating * outputs below the new threshold */ -static const unsigned int DUST_RELAY_TX_FEE = COIN / 100000; +static const CAmount DUST_RELAY_TX_FEE = COIN / 100000; /** * Dogecoin: Default dust limit that is evaluated when considering whether a * transaction output is required to pay additional fee for relay and inclusion * in blocks. Overridden by -dustlimit */ -static const unsigned int DEFAULT_DUST_LIMIT = COIN / 1; +static const CAmount DEFAULT_DUST_LIMIT = COIN / 1; /** * Standard script verification flags that standard transactions will comply diff --git a/src/validation.h b/src/validation.h index 138103803..afe5e89ac 100644 --- a/src/validation.h +++ b/src/validation.h @@ -54,7 +54,7 @@ static const bool DEFAULT_WHITELISTRELAY = true; /** Default for DEFAULT_WHITELISTFORCERELAY. */ static const bool DEFAULT_WHITELISTFORCERELAY = true; /** Default for -minrelaytxfee, minimum relay fee for transactions */ -static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = COIN; +static const CAmount DEFAULT_MIN_RELAY_TX_FEE = COIN; //! -maxtxfee default static const CAmount DEFAULT_TRANSACTION_MAXFEE = 400 * COIN; //! Discourage users to set fees higher than this amount (in satoshis) per kB diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index e3a041e7f..32db83f24 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -54,7 +54,7 @@ static const CAmount DEFAULT_FALLBACK_FEE = COIN; //! -mintxfee default static const CAmount DEFAULT_TRANSACTION_MINFEE = COIN; //mlumin 5/2021: adding a minimum Wallet fee vs relay, currently still 1 COIN, to be reduced. -static const unsigned int DEFAULT_MIN_WALLET_TX_FEE = COIN; +static const CAmount DEFAULT_MIN_WALLET_TX_FEE = COIN; //! minimum recommended increment for BIP 125 replacement txs static const CAmount WALLET_INCREMENTAL_RELAY_FEE = COIN/10 * 5; //! target minimum change amount