git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(from parent 1:
2e1d249
)
get_master_public_key: always return xpub of main account
author
ThomasV
<thomasv@gitorious>
Sun, 6 Jul 2014 21:20:27 +0000 (23:20 +0200)
committer
ThomasV
<thomasv@gitorious>
Sun, 6 Jul 2014 21:20:27 +0000 (23:20 +0200)
lib/wallet.py
patch
|
blob
|
history
diff --git
a/lib/wallet.py
b/lib/wallet.py
index
48aa098
..
16a259c
100644
(file)
--- a/
lib/wallet.py
+++ b/
lib/wallet.py
@@
-1277,11
+1277,8
@@
class NewWallet(Deterministic_Wallet):
return 'm/' in self.master_private_keys.keys()
def get_master_public_key(self):
- if self.is_watching_only():
- return self.master_public_keys["m/0'"]
- else:
- return self.master_public_keys["m/"]
-
+ """xpub of the main account"""
+ return self.master_public_keys["m/0'"]
def get_master_public_keys(self):
out = {}