BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

restore get_master_public_key function. fixes #668

This commit is contained in:
ThomasV 2014-04-29 12:26:58 +02:00
parent 5d68ce4f22
commit 0ba73dfc95
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commands.py
View File

@ -248,7 +248,7 @@ class Commands:
return electrum.ELECTRUM_VERSION
def getmpk(self):
return self.wallet.get_master_public_keys()
return self.wallet.get_master_public_key()
def getseed(self):
mnemonic = self.wallet.get_mnemonic(self.password)

9
lib/wallet.py
View File

@ -515,6 +515,9 @@ class NewWallet:
if s is None: return False
return s[0] == 1
def get_master_public_key(self):
return self.master_public_keys["m/"]
def get_master_public_keys(self):
out = {}
for k, account in self.accounts.items():
@ -1745,9 +1748,11 @@ class OldWallet(NewWallet):
mpk = OldAccount.mpk_from_seed(seed)
self.storage.put('master_public_key', mpk, True)
def get_master_public_key(self):
return self.storage.get("master_public_key")
def get_master_public_keys(self):
mpk = self.storage.get("master_public_key")
return {'Main Account':mpk}
return {'Main Account':self.get_master_public_key()}
def create_accounts(self, password):
mpk = self.storage.get("master_public_key")