Skip to content

Commit 71d00ba

Browse files
committed
Merge #835: Reduce mintxfee to 0.1 sat/vbyte and fallback fee to 2 sat/vb
bfb77ad Reduce mintxfee to 0.1 sat/vbyte and fallback fee to 2 sat/vb (Steven Roose) Pull request description: This follows the reduction of the `minrelaytxfee` in the previous release to the same value. Using this value, the wallet will be able to make transactions with a 0.1 sat/vbyte fee by default. Tree-SHA512: a8a977e48abdb103f4514cfe92014be4e7d720d7d1626c4648d021f0cdad55ff839d0bb146158186676f4d72515b7b6112140b041de2d86f765c8f443e567560
2 parents f6748b3 + bfb77ad commit 71d00ba

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/wallet/wallet.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ static const unsigned int DEFAULT_KEYPOOL_SIZE = 1000;
7474
//! -paytxfee default
7575
constexpr CAmount DEFAULT_PAY_TX_FEE = 0;
7676
//! -fallbackfee default
77-
static const CAmount DEFAULT_FALLBACK_FEE = 20000;
77+
static const CAmount DEFAULT_FALLBACK_FEE = 2000;
7878
//! -discardfee default
7979
static const CAmount DEFAULT_DISCARD_FEE = 10000;
8080
//! -mintxfee default
81-
static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
81+
static const CAmount DEFAULT_TRANSACTION_MINFEE = 100;
8282
//! minimum recommended increment for BIP 125 replacement txs
8383
static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000;
8484
//! Default for -spendzeroconfchange

test/functional/feature_issuance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def process_raw_issuance(node, issuance_list):
1616
raise Exception('Issuance list too long')
1717
# Make enough outputs for any subsequent spend
1818
next_destinations = {}
19-
output_values = (node.getbalance()['bitcoin']-1)/5
19+
output_values = Decimal('%.8f' % ((node.getbalance()['bitcoin']-1)/5))
2020
for i in range(5):
2121
next_destinations[node.getnewaddress()] = output_values
2222

@@ -382,7 +382,7 @@ def run_test(self):
382382
assert_equal(blinded_multisig, self.nodes[0].getaddressinfo(utxo_info["address"])["confidential"])
383383
break
384384
assert(utxo_info is not None)
385-
assert(utxo_info["amountblinder"] is not "0000000000000000000000000000000000000000000000000000000000000000")
385+
assert(utxo_info["amountblinder"] != "0000000000000000000000000000000000000000000000000000000000000000")
386386

387387
# Now make transaction spending that input
388388
raw_tx = self.nodes[0].createrawtransaction([], {issued_address:1}, 0, False, {issued_address:issued_asset["token"]})

0 commit comments

Comments
 (0)