AaronFiore/electrum
1
0
Fork 0
Code Activity

mpk window: detect self and cosigner keys

Browse Source
This commit is contained in:
ThomasV
2015-03-24 17:33:08 +01:00
parent cbb1a39879
commit 973f7f9fe5
2 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/wallet.py
View File

@@ -1503,9 +1503,7 @@ class Wallet_2of2(BIP32_Wallet, Mnemonic):
self.add_account('0', account)
def get_master_public_keys(self):
xpub1 = self.master_public_keys.get("x1/")
xpub2 = self.master_public_keys.get("x2/")
return { 'Self':xpub1, 'Cosigner':xpub2 }
return self.master_public_keys
def get_action(self):
xpub1 = self.master_public_keys.get("x1/")
@@ -1530,12 +1528,6 @@ class Wallet_2of3(Wallet_2of2):
account = BIP32_Account_2of3({'xpub':xpub1, 'xpub2':xpub2, 'xpub3':xpub3})
self.add_account('0', account)
def get_master_public_keys(self):
xpub1 = self.master_public_keys.get("x1/")
xpub2 = self.master_public_keys.get("x2/")
xpub3 = self.master_public_keys.get("x3/")
return {'x1':xpub1, 'x2':xpub2, 'x3':xpub3}
def get_action(self):
xpub1 = self.master_public_keys.get("x1/")
xpub2 = self.master_public_keys.get("x2/")