X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=lib%2Fwallet.py;h=d1be41d611146b802af64c66e106093f46211109;hb=769b4002cd0c7e03ca9f490481e7e6d64a323a7d;hp=48aa098f655e928123b3f62756b39737c0743d66;hpb=2e1d24939ccb46123974f3338963a65191883981;p=electrum-nvc.git

diff --git a/lib/wallet.py b/lib/wallet.py
index 48aa098..d1be41d 100644
--- 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.get("m/0'")
 
     def get_master_public_keys(self):
         out = {}
@@ -1562,8 +1559,8 @@ class Wallet(object):
         config = storage.config
 
         self.wallet_types = [ 
-            ('standard', ("Standard wallet"),          OldWallet), 
-            ('imported', ("Imported wallet"),          Imported_Wallet), 
+            ('standard', ("Standard wallet"),          NewWallet if config.get('bip32') else OldWallet),
+            ('imported', ("Imported wallet"),          Imported_Wallet),
             ('2of2',     ("Multisig wallet (2 of 2)"), Wallet_2of2),
             ('2of3',     ("Multisig wallet (2 of 3)"), Wallet_2of3)
         ]