installwizard: multisig wallets

[electrum-nvc.git] / lib / wallet.py

diff --git a/lib/wallet.py b/lib/wallet.py
index 857e903..9d7fff5 100644 (file)
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -1854,15 +1854,36 @@ class Wallet(object):
         if not seed:
             return False
         elif is_old_seed(seed):
-            return OldWallet
+            return True
         elif is_new_seed(seed):
-            return NewWallet
+            return True
         else: 
             return False
 
     @classmethod
+    def is_mpk(self, mpk):
+        try:
+            int(mpk, 16)
+            old = True
+        except:
+            old = False
+            
+        if old:
+            return len(mpk) == 128
+        else:
+            try:
+                deserialize_xkey(mpk)
+                return True
+            except:
+                return False
+                
+
+    @classmethod
     def from_seed(self, seed, storage):
-        klass = self.is_seed(seed)
+        if is_old_seed(seed):
+            klass = OldWallet
+        elif is_new_seed(seed):
+            klass = NewWallet
         w = klass(storage)
         w.init_seed(seed)
         return w