storage upgrade as part of the wizard. fix storage upgrade on kivy.

lib/base_wizard.py

@@ -26,11 +26,12 @@
 import os
 import sys
 import traceback
+from functools import partial
 
 from . import bitcoin
 from . import keystore
 from .keystore import bip44_derivation
-from .wallet import Imported_Wallet, Standard_Wallet, Multisig_Wallet, wallet_types
+from .wallet import Imported_Wallet, Standard_Wallet, Multisig_Wallet, wallet_types, Wallet
 from .storage import STO_EV_USER_PW, STO_EV_XPUB_PW, get_derivation_used_for_hw_device_encryption
 from .i18n import _
 from .util import UserCancelled, InvalidPassword
@@ -100,6 +101,12 @@ class BaseWizard(object):
         choices = [pair for pair in wallet_kinds if pair[0] in wallet_types]
         self.choice_dialog(title=title, message=message, choices=choices, run_next=self.on_wallet_type)
 
+    def upgrade_storage(self):
+        def on_finished():
+            self.wallet = Wallet(self.storage)
+            self.terminate()
+        self.waiting_dialog(partial(self.storage.upgrade), _('Upgrading wallet format...'), on_finished=on_finished)
+
     def load_2fa(self):
         self.storage.put('wallet_type', '2fa')
         self.storage.put('use_trustedcoin', True)

lib/daemon.py

@@ -238,8 +238,6 @@ class Daemon(DaemonThread):
             storage.decrypt(password)
         if storage.requires_split():
             return
-        if storage.requires_upgrade():
-            return
         if storage.get_action():
             return
         wallet = Wallet(storage)

lib/storage.py

@@ -578,10 +578,17 @@ class WalletStorage(PrintError):
             return True
 
     def get_action(self):
-        action = run_hook('get_action', self)
-        if action:
-            return action
-        if not self.file_exists():
+        if self.file_exists():
+            action = run_hook('get_action', self)
+            if action and self.requires_upgrade():
+                raise WalletFileException(_('Incomplete wallet files cannot be upgraded.'))
+            elif self.requires_upgrade():
+                return 'upgrade_storage'
+            elif action:
+                return action
+            else:
+                return None
+        else:
             return 'new'
 
     def get_seed_version(self):