AaronFiore/electrum
1
0
Fork 0
Code Activity

fix: restore wallet from master public key

Browse Source
This commit is contained in:
ecdsa
2013-03-07 16:41:43 +01:00
parent 29a8c0f0e6
commit 3382354442
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum
View File

@@ -148,7 +148,7 @@ if __name__ == '__main__':
wallet.gap_limit = gap wallet.gap_limit = gap
if len(seed) == 128: if len(seed) == 128:
wallet.seed = '' wallet.seed = ''
wallet.sequence.master_public_key = seed wallet.init_sequence(str(seed))
else: else:
wallet.init_seed(str(seed)) wallet.init_seed(str(seed))

3
gui/gui_classic.py
View File

@@ -2315,7 +2315,8 @@ class ElectrumGui:
def password_dialog(self): def password_dialog(self):
ElectrumWindow.change_password_dialog(self.wallet) if self.wallet.seed:
ElectrumWindow.change_password_dialog(self.wallet)
def restore_wallet(self): def restore_wallet(self):

7
lib/wallet.py
View File

@@ -161,16 +161,17 @@ class Wallet:
self.seed = seed self.seed = seed
self.config.set_key('seed', self.seed, True) self.config.set_key('seed', self.seed, True)
self.config.set_key('seed_version', self.seed_version, True) self.config.set_key('seed_version', self.seed_version, True)
mpk = ElectrumSequence.mpk_from_seed(self.seed) mpk = ElectrumSequence.mpk_from_seed(self.seed)
self.init_sequence(mpk)
def init_sequence(self, mpk):
self.config.set_key('master_public_key', mpk, True) self.config.set_key('master_public_key', mpk, True)
self.sequences[0] = ElectrumSequence(mpk) self.sequences[0] = ElectrumSequence(mpk)
self.accounts[0] = { 0:[], 1:[], 'name':'Main account' } self.accounts[0] = { 0:[], 1:[], 'name':'Main account' }
self.config.set_key('accounts', self.accounts, True) self.config.set_key('accounts', self.accounts, True)
def addresses(self, include_change = False): def addresses(self, include_change = False):
o = self.imported_keys.keys() o = self.imported_keys.keys()
for a in self.accounts.values(): for a in self.accounts.values():