AaronFiore/electrum
1
0
Fork 0
Code Activity

update restore multisig to add type

Browse Source
This commit is contained in:
Michael Wozniak
2015-06-27 16:12:15 -04:00
parent 765ef338ec
commit 523aa7c380
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/qt/installwizard.py
View File

@@ -522,7 +522,7 @@ class InstallWizard(QDialog):
if not key_list: if not key_list:
return return
password = self.password_dialog() if any(map(lambda x: Wallet.is_seed(x) or Wallet.is_xprv(x), key_list)) else None password = self.password_dialog() if any(map(lambda x: Wallet.is_seed(x) or Wallet.is_xprv(x), key_list)) else None
wallet = Wallet.from_multisig(key_list, password, self.storage) wallet = Wallet.from_multisig(key_list, password, self.storage, t)
else: else:
self.storage.put('wallet_type', t, False) self.storage.put('wallet_type', t, False)

3
lib/wallet.py
View File

@@ -1999,7 +1999,8 @@ class Wallet(object):
return w return w
@classmethod @classmethod
def from_multisig(klass, key_list, password, storage): def from_multisig(klass, key_list, password, storage, wallet_type):
storage.put('wallet_type', wallet_type, True)
self = Multisig_Wallet(storage) self = Multisig_Wallet(storage)
key_list = sorted(key_list, key = lambda x: klass.is_xpub(x)) key_list = sorted(key_list, key = lambda x: klass.is_xpub(x))
for i, text in enumerate(key_list): for i, text in enumerate(key_list):