installwizard: multisig wallets

2014-04-19 20:23:27 +02:00
parent 5b0d0f4d99
commit 6c96b38abf
7 changed files with 162 additions and 106 deletions
--- 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