electrum

commit 82769fc1fbef99351a6c47d186f0407a6fddf292
parent 4f7169db6adea6804dab17dfceb810a584d70eda
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 12 Aug 2016 15:21:47 +0200

fix classmethod normalize_passphrase

Diffstat:
M
lib/keystore.py
 | 
3
+--

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