electrum

commit 606f1cd3f8c257d55934290ac10d7b2b2104a624
parent c81810a7c8041d4121c0efb29df07d1db435b1ed
Author: ThomasV <thomasv@gitorious>
Date:   Tue,  5 Aug 2014 10:00:15 +0200

prevent seed collisions

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

1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -1374,7 +1374,6 @@ class NewWallet(Deterministic_Wallet):
         import mnemonic
         import ecdsa
         import math
-
         n = int(math.ceil(math.log(custom_entropy,2)))
         n_added = max(16, 160-n)
         print_error("make_seed: adding %d bits"%n_added)
@@ -1387,7 +1386,7 @@ class NewWallet(Deterministic_Wallet):
             words = mnemonic.mn_encode(s)
             seed = ' '.join(words)
             # this removes 8 bits of entropy
-            if is_new_seed(seed):
+            if not is_old_seed(seed) and is_new_seed(seed):
                 break
             nonce += 1
         print_error(seed)