From 0c831e4f75095827f8153feeaa670f618fe162f3 Mon Sep 17 00:00:00 2001
From: "Peter D. Gray" <peter@conalgo.com>
Date: Mon, 29 Apr 2019 10:32:58 -0400
Subject: [PATCH] devices/coldcard.py: accelerate enum process by using
 fingerprint value revealed during connection setup

---
 hwilib/devices/coldcard.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/hwilib/devices/coldcard.py b/hwilib/devices/coldcard.py
index c989e5e..6fe8912 100644
--- a/hwilib/devices/coldcard.py
+++ b/hwilib/devices/coldcard.py
@@ -14,6 +14,8 @@ import hid
 import io
 import sys
 import time
+import struct
+from binascii import hexlify
 
 CC_SIMULATOR_SOCK = '/tmp/ckcc-simulator.sock'
 # Using the simulator: https://github.com/Coldcard/firmware/blob/master/unix/README.md
@@ -56,6 +58,10 @@ class ColdcardClient(HardwareWalletClient):
         else:
             return {'xpub':xpub}
 
+    def _get_fingerprint_hex(self):
+        # quick method to get fingerprint of wallet
+        return hexlify(struct.pack('<I', self.device.master_fingerprint)).decode()
+
     # Must return a hex string with the signed transaction
     # The tx must be in the combined unsigned transaction format
     @coldcard_exception
@@ -223,8 +229,7 @@ def enumerate(password=''):
         client = None
         try:
             client = ColdcardClient(path)
-            master_xpub = client.get_pubkey_at_path('m/0h')['xpub']
-            d_data['fingerprint'] = get_xpub_fingerprint_hex(master_xpub)
+            d_data['fingerprint'] = client._get_fingerprint_hex()
         except Exception as e:
             d_data['error'] = "Could not open client or get fingerprint information: " + str(e)
 
@@ -232,14 +237,14 @@ def enumerate(password=''):
             client.close()
 
         results.append(d_data)
+
     # Check if the simulator is there
     client = None
     try:
         client = ColdcardClient(CC_SIMULATOR_SOCK)
-        master_xpub = client.get_pubkey_at_path('m/0h')['xpub']
 
         d_data = {}
-        d_data['fingerprint'] = get_xpub_fingerprint_hex(master_xpub)
+        d_data['fingerprint'] = client._get_fingerprint_hex()
         d_data['type'] = 'coldcard'
         d_data['path'] = CC_SIMULATOR_SOCK
         results.append(d_data)
@@ -250,4 +255,5 @@ def enumerate(password=''):
             raise e
     if client:
         client.close()
+
     return results