AaronFiore/electrum
1
0
Fork 0
Code Activity

store passphrase in keystore

Browse Source
This commit is contained in:
ThomasV
2016-08-26 16:21:36 +02:00
parent 0ceb7181d6
commit 8b729d0f83
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/keystore.py
View File

@@ -148,14 +148,18 @@ class Deterministic_KeyStore(Software_KeyStore):
def __init__(self, d): def __init__(self, d):
Software_KeyStore.__init__(self) Software_KeyStore.__init__(self)
self.seed = d.get('seed', '') self.seed = d.get('seed', '')
self.passphrase = d.get('passphrase', '')
def is_deterministic(self): def is_deterministic(self):
return True return True
def dump(self): def dump(self):
return { d = {}
'seed': self.seed, if self.seed:
} d['seed'] = self.seed
if self.passphrase:
d['passphrase'] = self.passphrase
return d
def has_seed(self): def has_seed(self):
return self.seed != '' return self.seed != ''
@@ -171,6 +175,10 @@ class Deterministic_KeyStore(Software_KeyStore):
def get_seed(self, password): def get_seed(self, password):
return pw_decode(self.seed, password).encode('utf8') return pw_decode(self.seed, password).encode('utf8')
def get_passphrase(self, password):
return pw_decode(self.passphrase, password).encode('utf8')
class Xpub: class Xpub:
@@ -249,7 +257,10 @@ class BIP32_KeyStore(Deterministic_KeyStore, Xpub):
new_password = None new_password = None
if self.has_seed(): if self.has_seed():
decoded = self.get_seed(old_password) decoded = self.get_seed(old_password)
self.seed = pw_encode( decoded, new_password) self.seed = pw_encode(decoded, new_password)
if self.passphrase:
decoded = self.get_passphrase(old_password)
self.passphrase = pw_encode(decoded, new_password)
if self.xprv is not None: if self.xprv is not None:
b = pw_decode(self.xprv, old_password) b = pw_decode(self.xprv, old_password)
self.xprv = pw_encode(b, new_password) self.xprv = pw_encode(b, new_password)
@@ -631,6 +642,7 @@ def from_seed(seed, passphrase):
elif is_new_seed(seed): elif is_new_seed(seed):
keystore = BIP32_KeyStore({}) keystore = BIP32_KeyStore({})
keystore.add_seed(seed) keystore.add_seed(seed)
keystore.passphrase = passphrase
bip32_seed = Mnemonic.mnemonic_to_seed(seed, passphrase) bip32_seed = Mnemonic.mnemonic_to_seed(seed, passphrase)
keystore.add_xprv_from_seed(bip32_seed, "m/") keystore.add_xprv_from_seed(bip32_seed, "m/")
return keystore return keystore