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

Merge 71d00ba8df into merged_master (Elements PR #835)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:57 +00:00
commit cc259f1835
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet.h
View file

@ -66,11 +66,11 @@ WalletCreationStatus CreateWallet(interfaces::Chain& chain, const SecureString&
//! -paytxfee default
constexpr CAmount DEFAULT_PAY_TX_FEE = 0;
//! -fallbackfee default
static const CAmount DEFAULT_FALLBACK_FEE = 0;
static const CAmount DEFAULT_FALLBACK_FEE = 0; // ELEMENTS: no fallback fee
//! -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

2
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