From ad7e9053f6f03a4e8527f357fab167e40a3122f9 Mon Sep 17 00:00:00 2001 From: Adrian Gallagher Date: Fri, 5 Oct 2018 01:09:54 -0700 Subject: [PATCH] Litecoin: Fee system --- src/wallet/wallet.h | 4 ++-- test/functional/mempool_limit.py | 2 +- test/functional/rpc_fundrawtransaction.py | 2 +- test/functional/wallet_abandonconflict.py | 2 +- test/functional/wallet_groups.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 7b791ae41..31e9c5594 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -44,11 +44,11 @@ static const unsigned int DEFAULT_KEYPOOL_SIZE = 1000; //! -paytxfee default constexpr CAmount DEFAULT_PAY_TX_FEE = 0; //! -fallbackfee default -static const CAmount DEFAULT_FALLBACK_FEE = 20000; +static const CAmount DEFAULT_FALLBACK_FEE = 200000; //! -discardfee default static const CAmount DEFAULT_DISCARD_FEE = 10000; //! -mintxfee default -static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000; +static const CAmount DEFAULT_TRANSACTION_MINFEE = 10000; //! minimum recommended increment for BIP 125 replacement txs static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000; //! Default for -spendzeroconfchange diff --git a/test/functional/mempool_limit.py b/test/functional/mempool_limit.py index c0918893c..be1a15e0c 100755 --- a/test/functional/mempool_limit.py +++ b/test/functional/mempool_limit.py @@ -41,7 +41,7 @@ class MempoolLimitTest(BitcoinTestFramework): txid = self.nodes[0].sendrawtransaction(txFS['hex']) relayfee = self.nodes[0].getnetworkinfo()['relayfee'] - base_fee = relayfee*100 + base_fee = relayfee*1000 for i in range (3): txids.append([]) txids[i] = create_lots_of_big_transactions(self.nodes[0], txouts, utxos[30*i:30*i+30], 30, (i+1)*base_fee) diff --git a/test/functional/rpc_fundrawtransaction.py b/test/functional/rpc_fundrawtransaction.py index 26134d677..1a7661157 100755 --- a/test/functional/rpc_fundrawtransaction.py +++ b/test/functional/rpc_fundrawtransaction.py @@ -661,7 +661,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/wallet_abandonconflict.py b/test/functional/wallet_abandonconflict.py index e5ac2c8bd..dff3dc849 100755 --- a/test/functional/wallet_abandonconflict.py +++ b/test/functional/wallet_abandonconflict.py @@ -40,7 +40,7 @@ class AbandonConflictTest(BitcoinTestFramework): sync_blocks(self.nodes) newbalance = self.nodes[0].getbalance() - assert(balance - newbalance < Decimal("0.001")) #no more than fees lost + assert(balance - newbalance < Decimal("0.01")) #no more than fees lost balance = newbalance # Disconnect nodes so node0's transactions don't get into node1's mempool diff --git a/test/functional/wallet_groups.py b/test/functional/wallet_groups.py index 9d6148386..f56297afd 100755 --- a/test/functional/wallet_groups.py +++ b/test/functional/wallet_groups.py @@ -55,7 +55,7 @@ class WalletGroupTest(BitcoinTestFramework): v = [vout["value"] for vout in tx1["vout"]] v.sort() assert_approx(v[0], 0.2) - assert_approx(v[1], 0.3, 0.0001) + assert_approx(v[1], 0.3, 0.001) txid2 = self.nodes[2].sendtoaddress(self.nodes[0].getnewaddress(), 0.2) tx2 = self.nodes[2].getrawtransaction(txid2, True) @@ -66,7 +66,7 @@ class WalletGroupTest(BitcoinTestFramework): v = [vout["value"] for vout in tx2["vout"]] v.sort() assert_approx(v[0], 0.2) - assert_approx(v[1], 1.3, 0.0001) + assert_approx(v[1], 1.3, 0.001) # Empty out node2's wallet self.nodes[2].sendtoaddress(address=self.nodes[0].getnewaddress(), amount=self.nodes[2].getbalance(), subtractfeefromamount=True)