Merge pull request #8041 from bigspider/app-bitcoin-new

Modify Ledger plugin to support the new bitcoin app v2.1.0

contrib/requirements/requirements-hw.txt

@@ -7,6 +7,7 @@ trezor[hidapi]>=0.13.0,<0.14
 safet>=0.1.5
 keepkey>=6.3.1
 btchip-python>=0.1.32
+ledger-bitcoin>=0.1.1,<0.2.0
 ckcc-protocol>=0.7.7
 bitbox02>=6.0.0
 cbor>=1.0.0,<2.0.0

electrum/plugins/ledger/__init__.py

@@ -2,6 +2,6 @@ from electrum.i18n import _
 
 fullname = 'Ledger Wallet'
 description = 'Provides support for Ledger hardware wallet'
-requires = [('btchip', 'github.com/ledgerhq/btchip-python')]
+requires = [('ledger_bitcoin', 'github.com/LedgerHQ/app-bitcoin-new')]
 registers_keystore = ('hardware', 'ledger', _("Ledger wallet"))
 available_for = ['qt', 'cmdline']

electrum/plugins/ledger/qt.py

@@ -28,7 +28,7 @@ class Plugin(LedgerPlugin, QtPluginBase):
         keystore = wallet.get_keystore()
         if type(keystore) == self.keystore_class and len(addrs) == 1:
             def show_address():
-                keystore.thread.add(partial(self.show_address, wallet, addrs[0]))
+                keystore.thread.add(partial(self.show_address, wallet, addrs[0], keystore=keystore))
             menu.addAction(_("Show on Ledger"), show_address)
 
 class Ledger_Handler(QtHandlerBase):