AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet: call create_accounts in save_seed

Browse Source
This commit is contained in:
ThomasV
2013-11-11 17:41:46 +01:00
parent ee141f6d37
commit 588f8fd110
5 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum
View File

@@ -236,14 +236,12 @@ if __name__ == '__main__':
else: else:
print_msg("Warning: Found no history for this wallet") print_msg("Warning: Found no history for this wallet")
else: else:
wallet.create_accounts()
wallet.synchronize() wallet.synchronize()
print_msg("Warning: This wallet was restored offline. It may contain more addresses than displayed.") print_msg("Warning: This wallet was restored offline. It may contain more addresses than displayed.")
else: else:
wallet.init_seed(None) wallet.init_seed(None)
wallet.save_seed() wallet.save_seed()
wallet.create_accounts()
wallet.synchronize() wallet.synchronize()
print_msg("Your wallet generation seed is:\n\"%s\""% wallet.get_mnemonic(None)) print_msg("Your wallet generation seed is:\n\"%s\""% wallet.get_mnemonic(None))
print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.") print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")

1
gui/android.py
View File

@@ -904,7 +904,6 @@ class ElectrumGui:
wallet.init_seed(None) wallet.init_seed(None)
self.show_seed() self.show_seed()
wallet.save_seed() wallet.save_seed()
wallet.create_accounts()
wallet.synchronize() # generate first addresses offline wallet.synchronize() # generate first addresses offline
elif action == 'restore': elif action == 'restore':

1
gui/gtk.py
View File

@@ -1313,7 +1313,6 @@ class ElectrumGui():
if action == 'create': if action == 'create':
wallet.init_seed(None) wallet.init_seed(None)
wallet.save_seed() wallet.save_seed()
wallet.create_accounts()
wallet.synchronize() # generate first addresses offline wallet.synchronize() # generate first addresses offline
elif action == 'restore': elif action == 'restore':
seed = self.seed_dialog() seed = self.seed_dialog()

2
gui/qt/installwizard.py
View File

@@ -271,7 +271,6 @@ class InstallWizard(QDialog):
if self.verify_seed(wallet): if self.verify_seed(wallet):
def create(): def create():
wallet.save_seed() wallet.save_seed()
wallet.create_accounts()
wallet.synchronize() # generate first addresses offline wallet.synchronize() # generate first addresses offline
self.waiting_dialog(create) self.waiting_dialog(create)
else: else:
@@ -300,7 +299,6 @@ class InstallWizard(QDialog):
wallet.seed = '' wallet.seed = ''
wallet.create_watching_only_wallet(mpk) wallet.create_watching_only_wallet(mpk)
else: raise else: raise
#if not self.config.get('server'): #if not self.config.get('server'):

8
lib/wallet.py
View File

@@ -310,7 +310,7 @@ class Wallet:
# find out what kind of wallet we are # find out what kind of wallet we are
try: try:
seed.decode('hex') seed.strip().decode('hex')
self.seed_version = 4 self.seed_version = 4
self.seed = str(seed) self.seed = str(seed)
return return
@@ -339,6 +339,8 @@ class Wallet:
def save_seed(self): def save_seed(self):
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.create_accounts()
def create_watching_only_wallet(self, params): def create_watching_only_wallet(self, params):
K0, c0 = params K0, c0 = params
@@ -1608,10 +1610,6 @@ class Wallet:
# wait until we are connected, because the user might have selected another server # wait until we are connected, because the user might have selected another server
if self.network: if self.network:
wait_for_network() wait_for_network()
self.create_accounts()
if self.network:
wait_for_wallet() wait_for_wallet()
else: else:
self.synchronize() self.synchronize()