From 9b09c5535652079e262a1f87bf054929568bd12b Mon Sep 17 00:00:00 2001 From: ThomasV Date: Mon, 25 Jan 2016 16:46:50 +0100 Subject: [PATCH] dynamic fees: use hardcoded value as upper bound --- gui/qt/main_window.py | 3 +-- lib/wallet.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index 02ec228ab..981bb5064 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -2621,8 +2621,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): gui_widgets.append((nz_label, nz)) msg = '\n'.join([ - _('Fee per kilobyte of transaction.'), - _('If you enable dynamic fees, this parameter will be used as upper bound.') + _('Fee per kilobyte of transaction.') ]) fee_label = HelpLabel(_('Transaction fee per kb') + ':', msg) fee_e = BTCkBEdit(self.get_decimal_point) diff --git a/lib/wallet.py b/lib/wallet.py index 3cb3f160a..7465491c5 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -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