AaronFiore/electrum
1
0
Fork 0
Code Activity

fix classmethod normalize_passphrase

Browse Source
This commit is contained in:
ThomasV
2016-08-12 15:21:47 +02:00
parent 4f7169db6a
commit 82769fc1fb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/keystore.py
View File

@@ -527,6 +527,7 @@ class Hardware_KeyStore(KeyStore, Xpub):
class BIP44_KeyStore(BIP32_KeyStore): class BIP44_KeyStore(BIP32_KeyStore):
root_derivation = "m/44'/0'/0'" root_derivation = "m/44'/0'/0'"
@classmethod
def normalize_passphrase(self, passphrase): def normalize_passphrase(self, passphrase):
return normalize('NFKD', unicode(passphrase or '')) return normalize('NFKD', unicode(passphrase or ''))
@@ -676,13 +677,11 @@ def from_xprv(xprv, password):
def xprv_from_seed(seed, password): def xprv_from_seed(seed, password):
# do not store the seed, only the master xprv # do not store the seed, only the master xprv
xprv, xpub = bip32_root(Mnemonic.mnemonic_to_seed(seed, '')) xprv, xpub = bip32_root(Mnemonic.mnemonic_to_seed(seed, ''))
#xprv, xpub = bip32_private_derivation(xprv, "m/", self.root_derivation)
return from_xprv(xprv, password) return from_xprv(xprv, password)
def xpub_from_seed(seed): def xpub_from_seed(seed):
# store only master xpub # store only master xpub
xprv, xpub = bip32_root(Mnemonic.mnemonic_to_seed(seed,'')) xprv, xpub = bip32_root(Mnemonic.mnemonic_to_seed(seed,''))
#xprv, xpub = bip32_private_derivation(xprv, "m/", self.root_derivation)
return from_xpub(xpub) return from_xpub(xpub)
def from_text(text, password): def from_text(text, password):