aboutsummaryrefslogtreecommitdiff
path: root/src/validation.h
diff options
context:
space:
mode:
authorRoss Nicoll <[email protected]>2018-01-10 08:43:05 +0000
committerRoss Nicoll <[email protected]>2018-09-19 21:09:16 +0100
commit3d363eccd436df49bcdfccf01bcd5148ba3cfb87 (patch)
tree1f045afcb027093b6261f5e2ddd179664fd13d64 /src/validation.h
parentAlways use parameters at block 0 to get genesis block hash (#1416) (diff)
downloaddiscoin-3d363eccd436df49bcdfccf01bcd5148ba3cfb87.tar.xz
discoin-3d363eccd436df49bcdfccf01bcd5148ba3cfb87.zip
Bring 1.14 fees in line with 1.10 (#1425)
* Disable free transactions * Updating remaining fee calculation constants * Round up to the nearest 1k, not up 1k so the UI fee estimator is correct
Diffstat (limited to 'src/validation.h')
-rw-r--r--src/validation.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/validation.h b/src/validation.h
index 707ada3ee..0d075ae3a 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -56,9 +56,9 @@ static const unsigned int 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
-static const CAmount HIGH_TX_FEE_PER_KB = 10 * COIN;
+static const CAmount HIGH_TX_FEE_PER_KB = 25 * COIN;
//! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
-static const CAmount HIGH_MAX_TX_FEE = 100 * HIGH_TX_FEE_PER_KB;
+static const CAmount HIGH_MAX_TX_FEE = 10 * HIGH_TX_FEE_PER_KB;
/** Default for -limitancestorcount, max number of in-mempool ancestors */
static const unsigned int DEFAULT_ANCESTOR_LIMIT = 25;
/** Default for -limitancestorsize, maximum kilobytes of tx + all in-mempool ancestors */