Skip to content

Commit 72e358d

Browse files
committed
Merge #14227: integer division instead of implicit double conversion
be54f42 use integer division instead of double conversion and multiplication for computing amounts (Arvid Norberg) Pull request description: use integer division instead of double conversion and multiplication for computing amounts. This will most likely generate identical code. My main argument in favour of this change is one of purity, that we should not rely on implicit conversion from `CAmount` -> `double` and back again. Today this implicit conversion can happen because `CAmount` is just a typedef to `int64_t`. However, I envision a future where `CAmount` is a proper type that does not allow suspicious implicit conversions like these. Tree-SHA512: a70966623ac6e82410ac94d26cf44e2b7b7a4dbaa514d68ae1f0369aaee1bc2851d05a5e365291b005fe0941428e6139dc62bcfdd0b2f66720706fefe0eb92f1
2 parents 3832c25 + be54f42 commit 72e358d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/validation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ static const bool DEFAULT_WHITELISTFORCERELAY = true;
5353
/** Default for -minrelaytxfee, minimum relay fee for transactions */
5454
static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
5555
//! -maxtxfee default
56-
static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN;
56+
static const CAmount DEFAULT_TRANSACTION_MAXFEE = COIN / 10;
5757
//! Discourage users to set fees higher than this amount (in satoshis) per kB
58-
static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
58+
static const CAmount HIGH_TX_FEE_PER_KB = COIN / 100;
5959
//! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
6060
static const CAmount HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB;
6161
/** Default for -limitancestorcount, max number of in-mempool ancestors */

0 commit comments

Comments
 (0)