AaronFiore/electrum
1
0
Fork 0
Code Activity

dynamic fees: use hardcoded value as upper bound

Browse Source
This commit is contained in:
ThomasV
2016-01-25 16:46:50 +01:00
parent 62ef83e966
commit 9b09c55356
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wallet.py
View File

@@ -903,7 +903,7 @@ class Abstract_Wallet(PrintError):
b = config.get('dynamic_fees')
f = config.get('fee_factor', 50)
F = config.get('fee_per_kb', bitcoin.RECOMMENDED_FEE)
return min(F, self.network.fee*(50 + f)/100) if b and self.network and self.network.fee else F
return min(bitcoin.RECOMMENDED_FEE, self.network.fee*(50 + f)/100) if b and self.network and self.network.fee else F
def relayfee(self):
RELAY_FEE = 5000