electrum

commit a18d21d9464adaebda57cb633a6392302ecf2225
parent 7dc4102e7db39489fa986afb6b2b31f5de584dfb
Author: ThomasV <thomasv@gitorious>
Date:   Thu,  8 May 2014 15:18:38 +0200

fix cmd line wallet creation. fixes #684

Diffstat:
M
electrum
 | 
8
+++-----
M
lib/wallet.py
 | 
2
+-

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/electrum b/electrum
@@ -250,12 +250,10 @@ if __name__ == '__main__':
             else:
                 import getpass
                 seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:")
-                if not seed:
-                    sys.exit("Error: Seed cannot be empty")
-                wallet = Wallet.from_seed(str(seed),storage)
-                if not wallet:
+                if not Wallet.is_seed(seed):
                     sys.exit("Error: Invalid seed")
-                wallet.save_seed(password)
+                wallet = Wallet.from_seed(seed, storage)
+                wallet.add_seed(seed, password)
                 wallet.create_accounts(password)
 
             if not options.offline:
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -1546,7 +1546,7 @@ class OldWallet(Deterministic_Wallet):
 
 
     def create_master_keys(self, password):
-        seed = pw_decode(self.seed, password)
+        seed = self.get_seed(password)
         mpk = OldAccount.mpk_from_seed(seed)
         self.storage.put('master_public_key', mpk, True)