electrum

commit 5a3b80cfb2480b33eb21e70586e625a18684f541
parent 5cb1d6afda436def5a01ce79490e1b0083fe1fe7
Author: thomasv <thomasv@gitorious>
Date:   Thu, 31 Oct 2013 13:28:52 +0100

disable bip32

Diffstat:
M
gui/qt/installwizard.py
 | 
4
++--
M
lib/wallet.py
 | 
23
++++++++++++++---------

2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -75,7 +75,7 @@ class InstallWizard(QDialog):
         if not r:
             return
 
-        if r != wallet.seed:
+        if r != wallet.get_mnemonic(None):
             QMessageBox.warning(None, _('Error'), _('Incorrect seed'), _('OK'))
             return False
         else:
@@ -232,7 +232,7 @@ class InstallWizard(QDialog):
     def show_seed(self, wallet):
         from seed_dialog import make_seed_dialog
 
-        vbox = make_seed_dialog(wallet.seed, wallet.imported_keys)
+        vbox = make_seed_dialog(wallet.get_mnemonic(None), wallet.imported_keys)
         vbox.addLayout(ok_cancel_buttons(self, _("Next")))
 
         if self.layout(): QWidget().setLayout(self.layout())
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -293,10 +293,15 @@ class Wallet:
             raise BaseException("a seed exists")
 
         if not seed:
-            self.seed = self.make_seed()
-            self.seed_version = SEED_VERSION
+            self.seed = random_seed(128)
+            self.seed_version = 4
             return
 
+        #if not seed:
+        #    self.seed = self.make_seed()
+        #    self.seed_version = SEED_VERSION
+        #    return
+
         # find out what kind of wallet we are
         try:
             seed.decode('hex')
@@ -335,9 +340,12 @@ class Wallet:
 
 
     def create_accounts(self): 
-        # create default account
-        self.create_master_keys('1')
-        self.create_account('1','Main account')
+        if self.seed_version == 4:
+            self.create_old_account()
+        else:
+            # create default account
+            self.create_master_keys('1')
+            self.create_account('1','Main account')
 
 
     def create_master_keys(self, account_type):
@@ -1546,10 +1554,7 @@ class Wallet:
         wait_for_network()
 
 
-        if self.seed_version == 4:
-            self.create_old_account()
-        else:
-            self.create_accounts()
+        self.create_accounts()
         wait_for_wallet()