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

2
electrum
View File

@@ -289,6 +289,7 @@ if __name__ == '__main__':
sys.exit("Error: Invalid seed") sys.exit("Error: Invalid seed")
wallet = Wallet.from_seed(seed, storage) wallet = Wallet.from_seed(seed, storage)
wallet.add_seed(seed, password) wallet.add_seed(seed, password)
wallet.create_master_keys(password)
wallet.create_main_account(password) wallet.create_main_account(password)
if not options.offline: if not options.offline:
@@ -310,6 +311,7 @@ if __name__ == '__main__':
wallet = Wallet(storage) wallet = Wallet(storage)
seed = wallet.make_seed() seed = wallet.make_seed()
wallet.add_seed(seed, password) wallet.add_seed(seed, password)
wallet.create_master_keys(password)
wallet.create_main_account(password) wallet.create_main_account(password)
wallet.synchronize() wallet.synchronize()
print_msg("Your wallet generation seed is:\n\"%s\"" % seed) print_msg("Your wallet generation seed is:\n\"%s\"" % seed)

6
gui/gtk.py
View File

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

4
gui/qt/installwizard.py
View File

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

1
lib/wallet.py
View File

@@ -1071,7 +1071,6 @@ class Deterministic_Wallet(Abstract_Wallet):
self.storage.put('seed', self.seed, True) self.storage.put('seed', self.seed, True)
self.storage.put('seed_version', self.seed_version, True) self.storage.put('seed_version', self.seed_version, True)
self.storage.put('use_encryption', self.use_encryption,True) self.storage.put('use_encryption', self.use_encryption,True)
self.create_master_keys(password)
def get_seed(self, password): def get_seed(self, password):
return pw_decode(self.seed, password) return pw_decode(self.seed, password)