AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #3943 from SomberNight/fee_cleanup

Browse Source 
clean up fees a bit
This commit is contained in:
ThomasV
2018-02-23 10:11:20 +01:00
committed by GitHub
parent d38a50b119 4ddda74dad
commit 24054ac399
9 changed files with 89 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/wallet.py
View File

@@ -78,9 +78,9 @@ TX_HEIGHT_UNCONFIRMED = 0
def relayfee(network):
RELAY_FEE = 1000
from .simple_config import FEERATE_DEFAULT_RELAY
MAX_RELAY_FEE = 50000
f = network.relay_fee if network and network.relay_fee else RELAY_FEE
f = network.relay_fee if network and network.relay_fee else FEERATE_DEFAULT_RELAY
return min(f, MAX_RELAY_FEE)
def dust_threshold(network):