Cache xpubs

Sjors · Sjors · commit b0c6cd77516c · 2019-08-30T14:04:59.000+02:00
diff --git a/hwilib/commands.py b/hwilib/commands.py
@@ -153,8 +153,10 @@ def getdescriptor(client, master_xpub, testnet=False, path=None, internal=False,
     path_base = path.rsplit(path_suffix)[0]
 
     # Get the key at the base
-    base_key = client.get_pubkey_at_path(path_base)['xpub']
-    return Descriptor(master_fpr, path_base.replace('m', ''), base_key, path_suffix, client.is_testnet, sh_wpkh, wpkh)
+    if client.xpub_cache.get(path_base) is None:
+        client.xpub_cache[path_base] = client.get_pubkey_at_path(path_base)['xpub']
+
+    return Descriptor(master_fpr, path_base.replace('m', ''), client.xpub_cache.get(path_base), path_suffix, client.is_testnet, sh_wpkh, wpkh)
 
 # wrapper to allow both internal and external entries when path not given
 def getkeypool(client, path, start, end, internal=False, keypool=False, account=0, sh_wpkh=False, wpkh=True):
diff --git a/hwilib/hwwclient.py b/hwilib/hwwclient.py
@@ -9,6 +9,7 @@ def __init__(self, path, password):
         self.message_magic = b"\x18Bitcoin Signed Message:\n"
         self.is_testnet = False
         self.fingerprint = None
+        self.xpub_cache = {}
 
     # Get the master BIP 44 pubkey
     def get_master_xpub(self):
