From 115ef54c0c467ec79fba740ac49aa56bb5b2d756 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 2 Nov 2017 12:11:36 +0100 Subject: [PATCH 1/2] fix: wallet storage upgrade happening silently even when using QT GUI --- gui/qt/__init__.py | 2 +- lib/daemon.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py index ad733a524..31cd94d25 100644 --- a/gui/qt/__init__.py +++ b/gui/qt/__init__.py @@ -192,7 +192,7 @@ class ElectrumGui: d.exec_() return if not wallet: - storage = WalletStorage(path) + storage = WalletStorage(path, manual_upgrades=True) wizard = InstallWizard(self.config, self.app, self.plugins, storage) try: wallet = wizard.run_and_get_wallet() diff --git a/lib/daemon.py b/lib/daemon.py index 1aa3a07dd..fbc9c28f8 100644 --- a/lib/daemon.py +++ b/lib/daemon.py @@ -220,7 +220,7 @@ class Daemon(DaemonThread): if storage.requires_split(): return if storage.requires_upgrade(): - storage.upgrade() + return if storage.get_action(): return wallet = Wallet(storage) From 39187c9a3a64b8b8a84bad8a7384c4ecc4f6c48e Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 11 Nov 2017 09:23:56 +0100 Subject: [PATCH 2/2] follow-up 115ef54c0c467ec79fba740ac49aa56bb5b2d756: wallet storage - silent upgrades whenever possible --- gui/qt/installwizard.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py index 603b17734..66b4b903b 100644 --- a/gui/qt/installwizard.py +++ b/gui/qt/installwizard.py @@ -240,7 +240,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard): path = self.storage.path if self.storage.requires_split(): self.hide() - msg = _("The wallet '%s' contains multiple accounts, which are no longer supported in Electrum 2.7.\n\n" + msg = _("The wallet '%s' contains multiple accounts, which are no longer supported since Electrum 2.7.\n\n" "Do you want to split your wallet into multiple files?"%path) if not self.question(msg): return @@ -252,12 +252,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard): return if self.storage.requires_upgrade(): - self.hide() - msg = _("The format of your wallet '%s' must be upgraded for Electrum. This change will not be backward compatible"%path) - if not self.question(msg): - return self.storage.upgrade() - self.show_warning(_('Your wallet was upgraded successfully')) self.wallet = Wallet(self.storage) return self.wallet