diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index 7aeb2311..61de4e3d 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -1130,7 +1130,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): grid.addLayout(vbox_feecontrol, 5, 1, 1, 3) - if not self.config.get('show_fee', False): + if not self.config.get('show_fee', True): self.fee_adv_controls.setVisible(False) self.preview_button = EnterButton(_("Preview"), self.do_preview) @@ -2584,6 +2584,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): nz.valueChanged.connect(on_nz) gui_widgets.append((nz_label, nz)) +''' Disable option for dynamic fee calculation system def on_dynfee(x): self.config.set_key('dynamic_fees', x == Qt.Checked) self.fee_slider.update() @@ -2592,9 +2593,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): dynfee_cb.setToolTip(_("Use fees recommended by the server.")) fee_widgets.append((dynfee_cb, None)) dynfee_cb.stateChanged.connect(on_dynfee) +''' feebox_cb = QCheckBox(_('Edit fees manually')) - feebox_cb.setChecked(self.config.get('show_fee', False)) + feebox_cb.setChecked(self.config.get('show_fee', True)) feebox_cb.setToolTip(_("Show fee edit box in send tab.")) def on_feebox(x): self.config.set_key('show_fee', x == Qt.Checked) diff --git a/lib/bitcoin.py b/lib/bitcoin.py index 2b6660e4..682a313f 100644 --- a/lib/bitcoin.py +++ b/lib/bitcoin.py @@ -117,6 +117,7 @@ NetworkConstants.set_mainnet() ################################## transactions FEE_STEP = 10000 +DEFAULT_FEE_RATE = 10000 MAX_FEE_RATE = 300000 FEE_TARGETS = [25, 10, 5, 2] diff --git a/lib/simple_config.py b/lib/simple_config.py index b3da52de..41e461c0 100644 --- a/lib/simple_config.py +++ b/lib/simple_config.py @@ -7,7 +7,7 @@ import stat from copy import deepcopy from .util import user_dir, print_error, print_stderr, PrintError -from .bitcoin import MAX_FEE_RATE, FEE_TARGETS +from .bitcoin import DFEAULT_FEE_RATE, MAX_FEE_RATE, FEE_TARGETS SYSTEM_CONFIG_PATH = "/etc/electrum.conf" @@ -203,6 +203,12 @@ class SimpleConfig(PrintError): path = wallet.storage.path self.set_key('gui_last_wallet', path) + def default_fee_rate(self): + f = self.get('default_fee_rate', DEFAULT_FEE_RATE) + if f==0: + f = DEFAULT_FEE_RATE + return f + def max_fee_rate(self): f = self.get('max_fee_rate', MAX_FEE_RATE) if f==0: @@ -241,8 +247,9 @@ class SimpleConfig(PrintError): def has_fee_estimates(self): return len(self.fee_estimates)==4 + # 'dynamic' fees are disabled - we use 'static' (but adjustable) fees def is_dynfee(self): - return self.get('dynamic_fees', True) + return self.get('dynamic_fees', False) def fee_per_kb(self): dyn = self.is_dynfee()