GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-13 12:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge #835: Reduce mintxfee to 0.1 sat/vbyte and fallback fee to 2 sat/vb

Browse source 
bfb77ad44 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
This commit is contained in:
Steven Roose 2020-03-17 17:35:06 +00:00
commit 71d00ba8df
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet.h
View file

@ -74,11 +74,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 = 2000;
//! -discardfee default
static const CAmount DEFAULT_DISCARD_FEE = 10000;
//! -mintxfee default
static const CAmount DEFAULT_TRANSACTION_MINFEE = 1000;
static const CAmount DEFAULT_TRANSACTION_MINFEE = 100;
//! minimum recommended increment for BIP 125 replacement txs
static const CAmount WALLET_INCREMENTAL_RELAY_FEE = 5000;
//! Default for -spendzeroconfchange

4
test/functional/feature_issuance.py
View file

@ -16,7 +16,7 @@ def process_raw_issuance(node, issuance_list):
raise Exception('Issuance list too long')
# Make enough outputs for any subsequent spend
next_destinations = {}
output_values = (node.getbalance()['bitcoin']-1)/5
output_values = Decimal('%.8f' % ((node.getbalance()['bitcoin']-1)/5))
for i in range(5):
next_destinations[node.getnewaddress()] = output_values
@ -382,7 +382,7 @@ class IssuanceTest(BitcoinTestFramework):
assert_equal(blinded_multisig, self.nodes[0].getaddressinfo(utxo_info["address"])["confidential"])
break
assert(utxo_info is not None)
assert(utxo_info["amountblinder"] is not "0000000000000000000000000000000000000000000000000000000000000000")
assert(utxo_info["amountblinder"] != "0000000000000000000000000000000000000000000000000000000000000000")
# Now make transaction spending that input
raw_tx = self.nodes[0].createrawtransaction([], {issued_address:1}, 0, False, {issued_address:issued_asset["token"]})