disable mempool fee use, remove from RELEASE-NOTES

This commit is contained in:
zebra-lucky 2018-06-10 01:55:43 +03:00
parent 3d84bd8441
commit e1b7a1b846
3 changed files with 5 additions and 6 deletions

View File

@ -24,7 +24,7 @@ Builder.load_string('''
background_color: (0,0,0,0)
bold: True
on_release:
root.method = (root.method + 1) % 3
root.method = (root.method + 1) % 2
root.update_slider()
root.update_text()
BoxLayout:
@ -117,7 +117,7 @@ class FeeDialog(Factory.Popup):
value = int(self.ids.slider.value)
dynfees, mempool = self.get_method()
self.config.set_key('dynamic_fees', dynfees, False)
self.config.set_key('mempool_fees', mempool, False)
self.config.set_key('mempool_fees', False, False)
if dynfees:
if mempool:
self.config.set_key('depth_level', value, True)

View File

@ -2639,15 +2639,14 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
msg = '\n'.join([
_('Time based: fee rate is based on average confirmation time estimates'),
_('Mempool based: fee rate is targeting a depth in the memory pool')
]
)
fee_type_label = HelpLabel(_('Fee estimation') + ':', msg)
fee_type_combo = QComboBox()
fee_type_combo.addItems([_('Static'), _('ETA'), _('Mempool')])
fee_type_combo.addItems([_('Static'), _('ETA')])
fee_type_combo.setCurrentIndex((2 if self.config.use_mempool_fees() else 1) if self.config.is_dynfee() else 0)
def on_fee_type(x):
self.config.set_key('mempool_fees', x==2)
self.config.set_key('mempool_fees', False)
self.config.set_key('dynamic_fees', x>0)
self.fee_slider.update()
fee_type_combo.currentIndexChanged.connect(on_fee_type)

View File

@ -437,7 +437,7 @@ class SimpleConfig(PrintError):
return bool(self.get('dynamic_fees', True))
def use_mempool_fees(self):
return bool(self.get('mempool_fees', False))
return False
def fee_per_kb(self, dyn=None, mempool=None):
"""Returns sat/kvB fee to pay for a txn.