From bf67fc61cee33446e3be6e3d8aa95a40963db3bd Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101-github@achow101.com>
Date: Thu, 10 Jan 2019 14:43:34 -0500
Subject: [PATCH] Use keepkey 6.0.1 from keepkey/python-keepkey repo

---
 README.md                 | 2 +-
 hwilib/devices/keepkey.py | 2 +-
 setup.py                  | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f2a6895..78f9ad5 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ pip3 install hidapi # HID API needed in general
 pip3 install trezor[hidapi] # Trezor One
 pip3 install btchip-python # Ledger Nano S
 pip3 install ecdsa # Needed for btchip-python but is not installed by it
-pip3 install keepkey # KeepKey
+pip3 install git+git://github.com/keepkey/python-keepkey.git@43fe80ae2e54b274c7b8641ff409bce4ebe04914#egg=keepkey # KeepKey. The tags and pypi don't have the right version yet, so lock to a specific commit from their git repo
 pip3 install ckcc-protocol[cli] # Coldcard
 pip3 install pyaes # For digitalbitbox
 ```
diff --git a/hwilib/devices/keepkey.py b/hwilib/devices/keepkey.py
index 5953089..d7b301c 100644
--- a/hwilib/devices/keepkey.py
+++ b/hwilib/devices/keepkey.py
@@ -69,7 +69,7 @@ class KeepkeyClient(HardwareWalletClient):
     def get_pubkey_at_path(self, path):
         path = path.replace('h', '\'')
         path = path.replace('H', '\'')
-        expanded_path = self.client.expand_path(path)
+        expanded_path = tools.parse_path(path)
         output = self.client.get_public_node(expanded_path)
         if self.is_testnet:
             return {'xpub':xpub_main_2_test(output.xpub)}
diff --git a/setup.py b/setup.py
index 7699620..9991502 100644
--- a/setup.py
+++ b/setup.py
@@ -17,11 +17,14 @@ setuptools.setup(
         'hidapi', # HID API needed in general
         'trezor>=0.11.0', # Trezor One
         'btchip-python', # Ledger Nano S
-        'keepkey', # KeepKey
+        'keepkey==6.0.1', # KeepKey
         'ckcc-protocol[cli]', # Coldcard
         'pyaes',
         'ecdsa', # Needed for Ledger but their library does not install it
     ],
+    dependency_links=[
+        'https://github.com/keepkey/python-keepkey/tarball/43fe80ae2e54b274c7b8641ff409bce4ebe04914#egg=keepkey-6.0.1' # The tags don't have the right version yet, so lock to a specific commit
+    ],
     python_requires='>=3',
     classifiers=[
         "Programming Language :: Python :: 3",