fix mnemonic decode
authorthomasv <thomasv@gitorious>
Thu, 31 Oct 2013 14:40:10 +0000 (15:40 +0100)
committerthomasv <thomasv@gitorious>
Thu, 31 Oct 2013 14:40:10 +0000 (15:40 +0100)
gui/qt/installwizard.py
lib/wallet.py

index 47309db..1d73faa 100644 (file)
@@ -282,6 +282,8 @@ class InstallWizard(QDialog):
             try:
                 wallet.init_seed(seed)
             except:
+                import traceback
+                traceback.print_exc(file=sys.stdout)
                 QMessageBox.warning(None, _('Error'), _('Incorrect seed'), _('OK'))
                 return
 
index 71e8449..e8b8b6c 100644 (file)
@@ -289,6 +289,8 @@ class Wallet:
 
 
     def init_seed(self, seed):
+        import mnemonic
+        
         if self.seed: 
             raise BaseException("a seed exists")
 
@@ -311,19 +313,22 @@ class Wallet:
             pass
 
         words = seed.split()
-        try:
-            mnemonic.mn_decode(words)
-            uses_electrum_words = True
-        except:
-            uses_electrum_words = False
-
-        if uses_electrum_words and len(words) != 13:
-            self.seed_version = 4
-            self.seed = mnemonic.mn_encode(seed)
-        else:
-            assert mnemonic_hash(seed).startswith(SEED_PREFIX)
-            self.seed_version = SEED_VERSION
-            self.seed = seed
+        self.seed_version = 4
+        self.seed = mnemonic.mn_decode(words)
+        
+        #try:
+        #    mnemonic.mn_decode(words)
+        #    uses_electrum_words = True
+        #except:
+        #    uses_electrum_words = False
+        #
+        #if uses_electrum_words and len(words) != 13:
+        #    self.seed_version = 4
+        #    self.seed = mnemonic.mn_decode(words)
+        #else:
+        #    assert mnemonic_hash(seed).startswith(SEED_PREFIX)
+        #    self.seed_version = SEED_VERSION
+        #    self.seed = seed
             
 
     def save_seed(self):