From 688dd07381c28090dd0bbb6bb2b9c96fd7dc9ad0 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Fri, 27 Apr 2018 03:21:27 +0200
Subject: [PATCH 1/2] qt receive tab: show address on hw wallet

---
 plugins/digitalbitbox/digitalbitbox.py | 18 ++++++++++++++++--
 plugins/digitalbitbox/qt.py            |  2 +-
 plugins/hw_wallet/plugin.py            | 17 +++++++++++++++++
 plugins/hw_wallet/qt.py                | 11 +++++++++++
 plugins/keepkey/plugin.py              | 10 +++++++++-
 plugins/ledger/ledger.py               | 12 ++++++++++--
 plugins/trezor/qt_generic.py           |  2 +-
 plugins/trezor/trezor.py               |  8 ++++++--
 8 files changed, 71 insertions(+), 9 deletions(-)

diff --git a/plugins/digitalbitbox/digitalbitbox.py b/plugins/digitalbitbox/digitalbitbox.py
index c0453ee4c..0129d0a79 100644
--- a/plugins/digitalbitbox/digitalbitbox.py
+++ b/plugins/digitalbitbox/digitalbitbox.py
@@ -5,8 +5,9 @@
 
 try:
     import electrum
-    from electrum.bitcoin import TYPE_ADDRESS, push_script, var_int, msg_magic, Hash, verify_message, pubkey_from_signature, point_to_ser, public_key_to_p2pkh, EncodeAES, DecodeAES, MyVerifyingKey
+    from electrum.bitcoin import TYPE_ADDRESS, push_script, var_int, msg_magic, Hash, verify_message, pubkey_from_signature, point_to_ser, public_key_to_p2pkh, EncodeAES, DecodeAES, MyVerifyingKey, is_address
     from electrum.bitcoin import serialize_xpub, deserialize_xpub
+    from electrum.wallet import Standard_Wallet
     from electrum import constants
     from electrum.transaction import Transaction
     from electrum.i18n import _
@@ -737,7 +738,20 @@ class DigitalBitboxPlugin(HW_PluginBase):
             client.check_device_dialog()
         return client
 
-    def show_address(self, wallet, keystore, address):
+    def show_address(self, wallet, address, keystore=None):
+        if keystore is None:
+            keystore = wallet.get_keystore()
+        if not self.show_address_helper(wallet, address, keystore):
+            return
+        if type(wallet) is not Standard_Wallet:
+            keystore.handler.show_error(_('This function is only available for standard wallets when using {}.').format(self.device))
+            return
+        if not self.is_mobile_paired():
+            keystore.handler.show_error(_('This function is only available after pairing your {} with a mobile device.').format(self.device))
+            return
+        if not keystore.is_p2pkh():
+            keystore.handler.show_error(_('This function is only available for p2pkh keystores when using {}.').format(self.device))
+            return
         change, index = wallet.get_address_index(address)
         keypath = '%s/%d/%d' % (keystore.derivation, change, index)
         xpub = self.get_client(keystore)._get_xpub(keypath)
diff --git a/plugins/digitalbitbox/qt.py b/plugins/digitalbitbox/qt.py
index 1978ce8cc..0d4512529 100644
--- a/plugins/digitalbitbox/qt.py
+++ b/plugins/digitalbitbox/qt.py
@@ -32,7 +32,7 @@ class Plugin(DigitalBitboxPlugin, QtPluginBase):
 
         if len(addrs) == 1:
             def show_address():
-                keystore.thread.add(partial(self.show_address, wallet, keystore, addrs[0]))
+                keystore.thread.add(partial(self.show_address, wallet, addrs[0], keystore))
 
             menu.addAction(_("Show on {}").format(self.device), show_address)
 
diff --git a/plugins/hw_wallet/plugin.py b/plugins/hw_wallet/plugin.py
index 34573cf99..fe5086a17 100644
--- a/plugins/hw_wallet/plugin.py
+++ b/plugins/hw_wallet/plugin.py
@@ -26,6 +26,7 @@
 
 from electrum.plugins import BasePlugin, hook
 from electrum.i18n import _
+from electrum.bitcoin import is_address
 
 
 class HW_PluginBase(BasePlugin):
@@ -58,3 +59,19 @@ class HW_PluginBase(BasePlugin):
         uninitialized, go through the initialization process.
         """
         raise NotImplementedError()
+
+    def show_address(self, wallet, address, keystore=None):
+        pass  # implemented in child classes
+
+    def show_address_helper(self, wallet, address, keystore=None):
+        if keystore is None:
+            keystore = wallet.get_keystore()
+        if not is_address(address):
+            keystore.handler.show_error(_('Invalid Bitcoin Address'))
+            return False
+        if not wallet.is_mine(address):
+            keystore.handler.show_error(_('Address not in wallet.'))
+            return False
+        if type(keystore) != self.keystore_class:
+            return False
+        return True
diff --git a/plugins/hw_wallet/qt.py b/plugins/hw_wallet/qt.py
index 7c9fbeace..529dabbaf 100644
--- a/plugins/hw_wallet/qt.py
+++ b/plugins/hw_wallet/qt.py
@@ -201,6 +201,7 @@ class QtPluginBase(object):
             handler.button = button
             keystore.handler = handler
             keystore.thread = TaskThread(window, window.on_error)
+            self.add_show_address_on_hw_device_button_for_receive_addr(wallet, keystore, window)
             # Trigger a pairing
             keystore.thread.add(partial(self.get_client, keystore))
 
@@ -218,3 +219,13 @@ class QtPluginBase(object):
 
     def show_settings_dialog(self, window, keystore):
         device_id = self.choose_device(window, keystore)
+
+    def add_show_address_on_hw_device_button_for_receive_addr(self, wallet, keystore, main_window):
+        plugin = keystore.plugin
+        receive_address_e = main_window.receive_address_e
+
+        def show_address():
+            addr = receive_address_e.text()
+            keystore.thread.add(partial(plugin.show_address, wallet, addr, keystore))
+        # TODO icon
+        receive_address_e.addButton(":icons/tab_console.png", show_address, _("Show on {}").format(plugin.device))
diff --git a/plugins/keepkey/plugin.py b/plugins/keepkey/plugin.py
index bd4b3b3da..3b52e6924 100644
--- a/plugins/keepkey/plugin.py
+++ b/plugins/keepkey/plugin.py
@@ -9,6 +9,7 @@ from electrum.i18n import _
 from electrum.plugins import BasePlugin
 from electrum.transaction import deserialize, Transaction
 from electrum.keystore import Hardware_KeyStore, is_xpubkey, parse_xpubkey
+from electrum.wallet import Standard_Wallet
 from electrum.base_wizard import ScriptTypeNotSupported
 
 from ..hw_wallet import HW_PluginBase
@@ -224,7 +225,14 @@ class KeepKeyCompatiblePlugin(HW_PluginBase):
         raw = bh2u(signed_tx)
         tx.update_signatures(raw)
 
-    def show_address(self, wallet, address):
+    def show_address(self, wallet, address, keystore=None):
+        if keystore is None:
+            keystore = wallet.get_keystore()
+        if not self.show_address_helper(wallet, address, keystore):
+            return
+        if type(wallet) is not Standard_Wallet:
+            keystore.handler.show_error(_('This function is only available for standard wallets when using {}.').format(self.device))
+            return
         client = self.get_client(wallet.keystore)
         if not client.atleast_version(1, 3):
             wallet.keystore.handler.show_error(_("Your device firmware is too old"))
diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
index e4a074d7e..8e31c6ece 100644
--- a/plugins/ledger/ledger.py
+++ b/plugins/ledger/ledger.py
@@ -9,6 +9,7 @@ from electrum.i18n import _
 from electrum.plugins import BasePlugin
 from electrum.keystore import Hardware_KeyStore
 from electrum.transaction import Transaction
+from electrum.wallet import Standard_Wallet
 from ..hw_wallet import HW_PluginBase
 from electrum.util import print_error, is_verbose, bfh, bh2u, versiontuple
 
@@ -597,7 +598,14 @@ class LedgerPlugin(HW_PluginBase):
             client.checkDevice()
         return client
 
-    def show_address(self, wallet, address):
+    def show_address(self, wallet, address, keystore=None):
+        if keystore is None:
+            keystore = wallet.get_keystore()
+        if not self.show_address_helper(wallet, address, keystore):
+            return
+        if type(wallet) is not Standard_Wallet:
+            keystore.handler.show_error(_('This function is only available for standard wallets when using {}.').format(self.device))
+            return
         sequence = wallet.get_address_index(address)
         txin_type = wallet.get_txin_type(address)
-        wallet.get_keystore().show_address(sequence, txin_type)
+        keystore.show_address(sequence, txin_type)
diff --git a/plugins/trezor/qt_generic.py b/plugins/trezor/qt_generic.py
index c2a76d82d..2e947f932 100644
--- a/plugins/trezor/qt_generic.py
+++ b/plugins/trezor/qt_generic.py
@@ -193,7 +193,7 @@ class QtPlugin(QtPluginBase):
         for keystore in wallet.get_keystores():
             if type(keystore) == self.keystore_class:
                 def show_address():
-                    keystore.thread.add(partial(self.show_address, wallet, keystore, addrs[0]))
+                    keystore.thread.add(partial(self.show_address, wallet, addrs[0], keystore))
                 menu.addAction(_("Show on {}").format(self.device), show_address)
                 break
 
diff --git a/plugins/trezor/trezor.py b/plugins/trezor/trezor.py
index 3eb7008d4..218cca736 100644
--- a/plugins/trezor/trezor.py
+++ b/plugins/trezor/trezor.py
@@ -2,7 +2,7 @@ from binascii import hexlify, unhexlify
 
 from electrum.util import bfh, bh2u, versiontuple
 from electrum.bitcoin import (b58_address_to_hash160, xpub_from_pubkey,
-                              TYPE_ADDRESS, TYPE_SCRIPT)
+                              TYPE_ADDRESS, TYPE_SCRIPT, is_address)
 from electrum import constants
 from electrum.i18n import _
 from electrum.plugins import BasePlugin, Device
@@ -271,7 +271,11 @@ class TrezorPlugin(HW_PluginBase):
         raw = bh2u(signed_tx)
         tx.update_signatures(raw)
 
-    def show_address(self, wallet, keystore, address):
+    def show_address(self, wallet, address, keystore=None):
+        if keystore is None:
+            keystore = wallet.get_keystore()
+        if not self.show_address_helper(wallet, address, keystore):
+            return
         client = self.get_client(keystore)
         if not client.atleast_version(1, 3):
             keystore.handler.show_error(_("Your device firmware is too old"))

From 78745f1f02afb6a6ded1699c7d56dc7c7bd4b1ef Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Sat, 28 Apr 2018 16:07:49 +0200
Subject: [PATCH 2/2] show address on hw: change icon

---
 icons.qrc               |   1 +
 icons/eye1.png          | Bin 0 -> 2910 bytes
 plugins/hw_wallet/qt.py |   3 +--
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 icons/eye1.png

diff --git a/icons.qrc b/icons.qrc
index c709a0eb9..82cfba322 100644
--- a/icons.qrc
+++ b/icons.qrc
@@ -14,6 +14,7 @@
     <file>icons/electrum_light_icon.png</file>
     <file>icons/electrum_dark_icon.png</file>
     <file>icons/electrumb.png</file>
+    <file>icons/eye1.png</file>
     <file>icons/file.png</file>
     <file>icons/info.png</file>
     <file>icons/keepkey.png</file>
diff --git a/icons/eye1.png b/icons/eye1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0bded339f0f49f4ebb530dde10d07c60302e4e8f
GIT binary patch
literal 2910
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
IM6N<$g56b-Pyhe`

literal 0
HcmV?d00001

diff --git a/plugins/hw_wallet/qt.py b/plugins/hw_wallet/qt.py
index 529dabbaf..b19650bc1 100644
--- a/plugins/hw_wallet/qt.py
+++ b/plugins/hw_wallet/qt.py
@@ -227,5 +227,4 @@ class QtPluginBase(object):
         def show_address():
             addr = receive_address_e.text()
             keystore.thread.add(partial(plugin.show_address, wallet, addr, keystore))
-        # TODO icon
-        receive_address_e.addButton(":icons/tab_console.png", show_address, _("Show on {}").format(plugin.device))
+        receive_address_e.addButton(":icons/eye1.png", show_address, _("Show on {}").format(plugin.device))