twizard: ask for password earlier during restore - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit cd4c8335b052596fe9ffa6c7577ccdc18e04a2ba
DIR parent 37127e563bf8f47588b546e0c16871d6d1811e59
HTML Author: ThomasV <thomasv@gitorious>
Date: Sun, 6 Jul 2014 01:49:22 +0200
wizard: ask for password earlier during restore
Diffstat:
M gui/qt/installwizard.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -493,6 +493,10 @@ class InstallWizard(QDialog):
return
text1, text2 = r
wallet = Wallet_2of2(self.storage)
+ if Wallet.is_seed(text1) or Wallet.is_seed(text2):
+ password = self.password_dialog()
+ else:
+ password = None
if Wallet.is_seed(text1):
wallet.add_seed(text1, password)
t@@ -500,8 +504,8 @@ class InstallWizard(QDialog):
wallet.add_cold_seed(text2, password)
else:
wallet.add_master_public_key("cold/", text2)
-
- elif Wallet.is_xpub(text1):
+ else:
+ assert Wallet.is_xpub(text1)
if Wallet.is_seed(text2):
wallet.add_seed(text2, password)
wallet.add_master_public_key("cold/", text1)
t@@ -509,11 +513,7 @@ class InstallWizard(QDialog):
wallet.add_master_public_key("m/", text1)
wallet.add_master_public_key("cold/", text2)
- if wallet.is_watching_only():
- wallet.create_accounts(None)
- else:
- password = self.password_dialog()
- wallet.create_accounts(password)
+ wallet.create_accounts(password)
elif t in ['2of3']:
t@@ -521,8 +521,11 @@ class InstallWizard(QDialog):
if not r:
return
text1, text2, text3 = r
- password = self.password_dialog()
wallet = Wallet_2of3(self.storage)
+ if Wallet.is_seed(text1) or Wallet.is_seed(text2) or Wallet.is_seed(text3):
+ password = self.password_dialog()
+ else:
+ password = None
if Wallet.is_seed(text1):
wallet.add_seed(text1, password)