AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #4253

Browse Source
This commit is contained in:
SomberNight
2018-04-12 12:17:24 +02:00
parent 426ab85ed6
commit 3bf5afa61a
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/kivy/uix/dialogs/bump_fee_dialog.py
View File

@@ -76,7 +76,7 @@ class BumpFeeDialog(Factory.Popup):
self.callback = callback self.callback = callback
self.config = app.electrum_config self.config = app.electrum_config
self.mempool = self.config.use_mempool_fees() self.mempool = self.config.use_mempool_fees()
self.dynfees = self.config.is_dynfee() and self.app.network and self.config.has_dynamic_fees_ready() self.dynfees = self.config.is_dynfee() and bool(self.app.network) and self.config.has_dynamic_fees_ready()
self.ids.old_fee.value = self.app.format_amount_and_units(self.init_fee) self.ids.old_fee.value = self.app.format_amount_and_units(self.init_fee)
self.update_slider() self.update_slider()
self.update_text() self.update_text()
@@ -116,7 +116,3 @@ class BumpFeeDialog(Factory.Popup):
def on_slider(self, value): def on_slider(self, value):
self.update_text() self.update_text()
def on_checkbox(self, b):
self.dynfees = b
self.update_text()

1
gui/kivy/uix/dialogs/fee_dialog.py
View File

@@ -74,7 +74,6 @@ class FeeDialog(Factory.Popup):
Factory.Popup.__init__(self) Factory.Popup.__init__(self)
self.app = app self.app = app
self.config = config self.config = config
self.fee_rate = self.config.fee_per_kb()
self.callback = callback self.callback = callback
mempool = self.config.use_mempool_fees() mempool = self.config.use_mempool_fees()
dynfees = self.config.is_dynfee() dynfees = self.config.is_dynfee()

14
lib/simple_config.py
View File

@@ -407,7 +407,7 @@ class SimpleConfig(PrintError):
maxp = len(FEE_ETA_TARGETS) # not (-1) to have "next block" maxp = len(FEE_ETA_TARGETS) # not (-1) to have "next block"
fee_rate = self.eta_to_fee(pos) fee_rate = self.eta_to_fee(pos)
else: else:
fee_rate = self.fee_per_kb() fee_rate = self.fee_per_kb(dyn=False)
pos = self.static_fee_index(fee_rate) pos = self.static_fee_index(fee_rate)
maxp = 9 maxp = 9
return maxp, pos, fee_rate return maxp, pos, fee_rate
@@ -416,6 +416,8 @@ class SimpleConfig(PrintError):
return FEERATE_STATIC_VALUES[i] return FEERATE_STATIC_VALUES[i]
def static_fee_index(self, value): def static_fee_index(self, value):
if value is None:
raise TypeError('static fee cannot be None')
dist = list(map(lambda x: abs(x - value), FEERATE_STATIC_VALUES)) dist = list(map(lambda x: abs(x - value), FEERATE_STATIC_VALUES))
return min(range(len(dist)), key=dist.__getitem__) return min(range(len(dist)), key=dist.__getitem__)
@@ -437,12 +439,16 @@ class SimpleConfig(PrintError):
def use_mempool_fees(self): def use_mempool_fees(self):
return bool(self.get('mempool_fees', False)) return bool(self.get('mempool_fees', False))
def fee_per_kb(self): def fee_per_kb(self, dyn=None, mempool=None):
"""Returns sat/kvB fee to pay for a txn. """Returns sat/kvB fee to pay for a txn.
Note: might return None. Note: might return None.
""" """
if self.is_dynfee(): if dyn is None:
if self.use_mempool_fees(): dyn = self.is_dynfee()
if mempool is None:
mempool = self.use_mempool_fees()
if dyn:
if mempool:
fee_rate = self.depth_to_fee(self.get_depth_level()) fee_rate = self.depth_to_fee(self.get_depth_level())
else: else:
fee_rate = self.eta_to_fee(self.get_fee_level()) fee_rate = self.eta_to_fee(self.get_fee_level())