From 98d755d14034f116f6da83049ccc2d20fe04cb38 Mon Sep 17 00:00:00 2001 From: Adrian Gallagher Date: Thu, 18 Jan 2018 14:34:27 -0800 Subject: [PATCH] Litecoin: Relax minrelayfee to prepare for fee drop in next release --- src/validation.h | 2 +- test/functional/fundrawtransaction.py | 2 +- test/functional/mempool_limit.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/validation.h b/src/validation.h index 7458d12b8..672ef0a37 100644 --- a/src/validation.h +++ b/src/validation.h @@ -50,7 +50,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 = 100000; +static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000; //! -maxtxfee default static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN; //! Discourage users to set fees higher than this amount (in satoshis) per kB diff --git a/test/functional/fundrawtransaction.py b/test/functional/fundrawtransaction.py index 1c4812c6b..1c9598f3c 100755 --- a/test/functional/fundrawtransaction.py +++ b/test/functional/fundrawtransaction.py @@ -625,7 +625,7 @@ class RawTransactionsTest(BitcoinTestFramework): inputs = [] outputs = {self.nodes[3].getnewaddress() : 1} rawtx = self.nodes[3].createrawtransaction(inputs, outputs) - result = self.nodes[3].fundrawtransaction(rawtx) # uses min_relay_tx_fee (set by settxfee) + result = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 1*min_relay_tx_fee}) # uses min_relay_tx_fee (set by settxfee) result2 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 2*min_relay_tx_fee}) result3 = self.nodes[3].fundrawtransaction(rawtx, {"feeRate": 10*min_relay_tx_fee}) result_fee_rate = result['fee'] * 1000 / count_bytes(result['hex']) diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py index 6c1bdd799..ca7fb925a 100755 --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -11,7 +11,7 @@ class MempoolLimitTest(BitcoinTestFramework): def set_test_params(self): self.setup_clean_chain = True self.num_nodes = 1 - self.extra_args = [["-maxmempool=5", "-spendzeroconfchange=0"]] + self.extra_args = [["-maxmempool=5", "-mintxfee=0.00001", "-spendzeroconfchange=0"]] def run_test(self): txouts = gen_return_txouts()