From 08fab753e88f1b24a8e76f9262eb64b38ffc2572 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Tue, 8 Aug 2017 06:03:47 +0200 Subject: [PATCH] change default value of confirmed_only, spending unconfirmed coins --- gui/kivy/main_window.py | 2 +- gui/qt/main_window.py | 2 +- lib/wallet.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py index 7c6eb8811..1956d735a 100644 --- a/gui/kivy/main_window.py +++ b/gui/kivy/main_window.py @@ -262,7 +262,7 @@ class ElectrumWindow(App): self.use_rbf = config.get('use_rbf', False) self.use_change = config.get('use_change', True) - self.use_unconfirmed = not config.get('confirmed_only', True) + self.use_unconfirmed = not config.get('confirmed_only', False) # create triggers so as to minimize updation a max of 2 times a sec self._trigger_update_wallet = Clock.create_trigger(self.update_wallet, .5) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index 5449e7145..0d4ee15f0 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -2619,7 +2619,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): def on_unconf(x): self.config.set_key('confirmed_only', bool(x)) - conf_only = self.config.get('confirmed_only', True) + conf_only = self.config.get('confirmed_only', False) unconf_cb = QCheckBox(_('Spend only confirmed coins')) unconf_cb.setToolTip(_('Spend only confirmed inputs.')) unconf_cb.setChecked(conf_only) diff --git a/lib/wallet.py b/lib/wallet.py index ba510ce28..82d944eef 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -536,7 +536,7 @@ class Abstract_Wallet(PrintError): return c, u, x def get_spendable_coins(self, domain, config): - confirmed_only = config.get('confirmed_only', True) + confirmed_only = config.get('confirmed_only', False) return self.get_utxos(domain, exclude_frozen=True, mature=True, confirmed_only=confirmed_only) def get_utxos(self, domain = None, exclude_frozen = False, mature = False, confirmed_only = False):