dynamic fees: use hardcoded value as upper bound
This commit is contained in:
parent
62ef83e966
commit
9b09c55356
|
@ -2621,8 +2621,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
|
||||||
gui_widgets.append((nz_label, nz))
|
gui_widgets.append((nz_label, nz))
|
||||||
|
|
||||||
msg = '\n'.join([
|
msg = '\n'.join([
|
||||||
_('Fee per kilobyte of transaction.'),
|
_('Fee per kilobyte of transaction.')
|
||||||
_('If you enable dynamic fees, this parameter will be used as upper bound.')
|
|
||||||
])
|
])
|
||||||
fee_label = HelpLabel(_('Transaction fee per kb') + ':', msg)
|
fee_label = HelpLabel(_('Transaction fee per kb') + ':', msg)
|
||||||
fee_e = BTCkBEdit(self.get_decimal_point)
|
fee_e = BTCkBEdit(self.get_decimal_point)
|
||||||
|
|
|
@ -903,7 +903,7 @@ class Abstract_Wallet(PrintError):
|
||||||
b = config.get('dynamic_fees')
|
b = config.get('dynamic_fees')
|
||||||
f = config.get('fee_factor', 50)
|
f = config.get('fee_factor', 50)
|
||||||
F = config.get('fee_per_kb', bitcoin.RECOMMENDED_FEE)
|
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):
|
def relayfee(self):
|
||||||
RELAY_FEE = 5000
|
RELAY_FEE = 5000
|
||||||
|
|
Loading…
Reference in New Issue