electrum

commit c4923ac99d99677883e852d6b0acd610cf76fa8f
parent 1cec6c8decf3c302e1227e0172843c3e28be777d
Author: ThomasV <thomasv@electrum.org>
Date:   Sat, 11 Nov 2017 11:40:19 +0100

Merge pull request #3182 from SomberNight/storage_upgrade_manual_for_qt

wallet storage upgrade will now happen silently whenever possible
Diffstat:
M
gui/qt/__init__.py
 | 
2
+-
M
gui/qt/installwizard.py
 | 
7
+------
M
lib/daemon.py
 | 
2
+-

3 files changed, 3 insertions(+), 8 deletions(-)
diff --git 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/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
 
diff --git 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)