call check_seed in get_seed
authorThomasV <thomasv@gitorious>
Sat, 9 Nov 2013 07:15:46 +0000 (08:15 +0100)
committerThomasV <thomasv@gitorious>
Sat, 9 Nov 2013 07:15:46 +0000 (08:15 +0100)
lib/account.py
lib/wallet.py

index bf12ae1..a220de8 100644 (file)
@@ -106,7 +106,7 @@ class OldAccount(Account):
         curve = SECP256k1
         secexp = self.stretch_key(seed)
         master_private_key = ecdsa.SigningKey.from_secret_exponent( secexp, curve = SECP256k1 )
-        master_public_key = master_private_key.get_verifying_key().to_string().encode('hex')
+        master_public_key = master_private_key.get_verifying_key().to_string()
         if master_public_key != self.mpk:
             print_error('invalid password (mpk)')
             raise BaseException('Invalid password')
index 26a9515..937cd8b 100644 (file)
@@ -678,9 +678,9 @@ class Wallet:
         s = pw_decode(self.seed, password)
         if self.seed_version == 4:
             seed = s
+            self.accounts[0].check_seed(seed)
         else:
             seed = mnemonic_hash(s)
-        #todo:  #self.sequences[0].check_seed(seed)
         return seed