Browse Source

fix multisig seed detection

283
ThomasV 9 years ago
parent
commit
765ef338ec
  1. 14
      lib/wallet.py

14
lib/wallet.py

@ -2005,18 +2005,18 @@ class Wallet(object):
for i, text in enumerate(key_list): for i, text in enumerate(key_list):
assert klass.is_seed(text) or klass.is_xprv(text) or klass.is_xpub(text) assert klass.is_seed(text) or klass.is_xprv(text) or klass.is_xpub(text)
name = "x%d/"%(i+1) name = "x%d/"%(i+1)
if klass.is_seed(text): if klass.is_xprv(text):
if name == 'x1/':
self.add_seed(text, password)
self.create_master_keys(password)
else:
self.add_cosigner_seed(text, name, password)
elif klass.is_xprv(text):
xpub = bitcoin.xpub_from_xprv(text) xpub = bitcoin.xpub_from_xprv(text)
self.add_master_public_key(name, xpub) self.add_master_public_key(name, xpub)
self.add_master_private_key(name, text, password) self.add_master_private_key(name, text, password)
elif klass.is_xpub(text): elif klass.is_xpub(text):
self.add_master_public_key(name, text) self.add_master_public_key(name, text)
elif klass.is_seed(text):
if name == 'x1/':
self.add_seed(text, password)
self.create_master_keys(password)
else:
self.add_cosigner_seed(text, name, password)
self.use_encryption = (password != None) self.use_encryption = (password != None)
self.storage.put('use_encryption', self.use_encryption, True) self.storage.put('use_encryption', self.use_encryption, True)
self.create_main_account(password) self.create_main_account(password)

Loading…
Cancel
Save