electrum

commit 5ce50f44210e3775e160ad7ec783220efc1918d8
parent 2e1d24939ccb46123974f3338963a65191883981
Author: ThomasV <thomasv@gitorious>
Date:   Sun,  6 Jul 2014 23:20:27 +0200

get_master_public_key: always return xpub of main account

Diffstat:
M
lib/wallet.py
 | 
7
++-----

1 file changed, 2 insertions(+), 5 deletions(-)
diff --git 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 = {}