AaronFiore/electrum
1
0
Fork 0
Code Activity

Add memory pool based fee estimates

Browse Source 
- fee estimates can use ETA or mempool
 - require protocol version 1.2
 - remove fee_unit preference
This commit is contained in:
ThomasV
2017-11-22 12:09:56 +01:00
parent 2c619ec41d
commit c3f3843cc3
11 changed files with 204 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,15 @@ Builder.load_string('''
text: _('Dynamic Fees')
CheckBox:
id: dynfees
on_active: root.on_checkbox(self.active)
on_active: root.on_dynfees(self.active)
BoxLayout:
orientation: 'horizontal'
size_hint: 1, 0.5
Label:
text: _('Use mempool')
CheckBox:
id: mempool
on_active: root.on_mempool(self.active)
Widget:
size_hint: 1, 1
BoxLayout:
@@ -60,7 +68,9 @@ class FeeDialog(Factory.Popup):
self.config = config
self.fee_rate = self.config.fee_per_kb()
self.callback = callback
self.mempool = self.config.get('mempool_fees', False)
self.dynfees = self.config.get('dynamic_fees', True)
self.ids.mempool.active = self.mempool
self.ids.dynfees.active = self.dynfees
self.update_slider()
self.update_text()
@@ -71,34 +81,30 @@ class FeeDialog(Factory.Popup):
def update_slider(self):
slider = self.ids.slider
if self.dynfees:
slider.range = (0, 4)
slider.step = 1
slider.value = self.config.get('fee_level', 2)
else:
slider.range = (0, 9)
slider.step = 1
slider.value = self.config.static_fee_index(self.fee_rate)
maxp, pos, fee_rate = self.config.get_fee_slider(self.dynfees, self.mempool)
slider.range = (0, maxp)
slider.step = 1
slider.value = pos
def get_fee_text(self, value):
if self.ids.dynfees.active:
tooltip = fee_levels[value]
if self.config.has_fee_estimates():
dynfee = self.config.dynfee(value)
tooltip += '\n' + (self.app.format_amount_and_units(dynfee)) + '/kB'
def get_fee_text(self, pos):
dyn = self.dynfees
mempool = self.mempool
if dyn:
fee_rate = self.config.depth_to_fee(pos) if mempool else self.config.eta_to_fee(pos)
else:
fee_rate = self.config.static_fee(value)
tooltip = self.app.format_amount_and_units(fee_rate) + '/kB'
if self.config.has_fee_estimates():
i = self.config.reverse_dynfee(fee_rate)
tooltip += '\n' + (_('low fee') if i < 0 else 'Within %d blocks'%i)
return tooltip
fee_rate = self.config.static_fee(pos)
target, tooltip = self.config.get_fee_text(pos, dyn, mempool, fee_rate)
return target
def on_ok(self):
value = int(self.ids.slider.value)
self.config.set_key('dynamic_fees', self.dynfees, False)
self.config.set_key('mempool_fees', self.mempool, False)
if self.dynfees:
self.config.set_key('fee_level', value, True)
if self.mempool:
self.config.set_key('depth_level', value, True)
else:
self.config.set_key('fee_level', value, True)
else:
self.config.set_key('fee_per_kb', self.config.static_fee(value), True)
self.callback()
@@ -106,7 +112,12 @@ class FeeDialog(Factory.Popup):
def on_slider(self, value):
self.update_text()
def on_checkbox(self, b):
def on_dynfees(self, b):
self.dynfees = b
self.update_slider()
self.update_text()
def on_mempool(self, b):
self.mempool = b
self.update_slider()
self.update_text()

5
gui/kivy/uix/dialogs/settings.py
View File

@@ -204,10 +204,7 @@ class SettingsDialog(Factory.Popup):
d.open()
def fee_status(self):
if self.config.get('dynamic_fees', True):
return fee_levels[self.config.get('fee_level', 2)]
else:
return self.app.format_amount_and_units(self.config.fee_per_kb()) + '/kB'
return self.config.get_fee_status()
def fee_dialog(self, label, dt):
if self._fee_dialog is None: