tMerge pull request #1322 from wozz/multisig-restore - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1e9e3f149341a6e0e87c1b330fadea6128ca3f0f
DIR parent 765ef338ec018191b5fd7597c8db0fe1c123f2ab
HTML Author: ThomasV <electrumdev@gmail.com>
Date: Sat, 27 Jun 2015 22:29:57 +0200
Merge pull request #1322 from wozz/multisig-restore
update restore multisig to add wallet type
Diffstat:
M gui/qt/installwizard.py | 2 +-
M lib/wallet.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -522,7 +522,7 @@ class InstallWizard(QDialog):
if not key_list:
return
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:
self.storage.put('wallet_type', t, False)
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1999,7 +1999,8 @@ class Wallet(object):
return w
@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)
key_list = sorted(key_list, key = lambda x: klass.is_xpub(x))
for i, text in enumerate(key_list):