AaronFiore/electrum
1
0
Fork 0
Code Activity

separate add_seed from create_master_keys

Browse Source
This commit is contained in:
ThomasV
2014-08-29 14:11:59 +02:00
parent 2c51b0aa14
commit c7f667e2ed
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/gtk.py
View File

@@ -1304,7 +1304,8 @@ class ElectrumGui():
r = change_password_dialog(False, None)
password = r[2] if r else None
wallet.add_seed(seed, password)
wallet.create_accounts(password)
wallet.create_master_keys(password)
wallet.create_main_account(password)
wallet.synchronize() # generate first addresses offline
elif action == 'restore':
@@ -1314,7 +1315,8 @@ class ElectrumGui():
r = change_password_dialog(False, None)
password = r[2] if r else None
wallet.add_seed(seed, password)
wallet.create_accounts(password)
wallet.create_master_keys(password)
wallet.create_main_account(password)
else:
exit()

4
gui/qt/installwizard.py
View File

@@ -380,6 +380,7 @@ class InstallWizard(QDialog):
return
password = self.password_dialog()
wallet.add_seed(seed, password)
wallet.create_master_keys(password)
elif action == 'add_cosigner':
xpub1 = wallet.master_public_keys.get("x1/")
@@ -464,6 +465,7 @@ class InstallWizard(QDialog):
password = self.password_dialog()
wallet = Wallet.from_seed(text, self.storage)
wallet.add_seed(text, password)
wallet.create_master_keys(password)
wallet.create_main_account(password)
else:
raise BaseException('unknown wallet type')
@@ -486,6 +488,7 @@ class InstallWizard(QDialog):
if Wallet.is_seed(text1):
wallet.add_seed(text1, password)
wallet.create_master_keys(password)
else:
wallet.add_master_public_key("x1/", text1)
@@ -520,6 +523,7 @@ class InstallWizard(QDialog):
if Wallet.is_seed(text1):
wallet.add_seed(text1, password)
wallet.create_master_keys(password)
else:
wallet.add_master_public_key("x1/", text1)