diff --git a/plugins/keepkey.py b/plugins/keepkey.py index 199d8221..c8cfc6c2 100644 --- a/plugins/keepkey.py +++ b/plugins/keepkey.py @@ -283,13 +283,14 @@ class Plugin(BasePlugin): ) # find which key is mine for x_pubkey in x_pubkeys: - xpub, s = BIP32_Account.parse_xpubkey(x_pubkey) - if xpub in self.xpub_path: - xpub_n = self.get_client().expand_path(self.xpub_path[xpub]) - txinputtype.address_n.extend(xpub_n + s) - break - else: - raise + if is_extended_pubkey(x_pubkey): + xpub, s = BIP32_Account.parse_xpubkey(x_pubkey) + if xpub in self.xpub_path: + xpub_n = self.get_client().expand_path(self.xpub_path[xpub]) + txinputtype.address_n.extend(xpub_n + s) + break + else: + raise prev_hash = unhexlify(txin['prevout_hash']) prev_index = txin['prevout_n'] diff --git a/plugins/trezor.py b/plugins/trezor.py index cbaa7e80..18485347 100644 --- a/plugins/trezor.py +++ b/plugins/trezor.py @@ -282,13 +282,14 @@ class Plugin(BasePlugin): ) # find which key is mine for x_pubkey in x_pubkeys: - xpub, s = BIP32_Account.parse_xpubkey(x_pubkey) - if xpub in self.xpub_path: - xpub_n = self.get_client().expand_path(self.xpub_path[xpub]) - txinputtype.address_n.extend(xpub_n + s) - break - else: - raise + if is_extended_pubkey(x_pubkey): + xpub, s = BIP32_Account.parse_xpubkey(x_pubkey) + if xpub in self.xpub_path: + xpub_n = self.get_client().expand_path(self.xpub_path[xpub]) + txinputtype.address_n.extend(xpub_n + s) + break + else: + raise prev_hash = unhexlify(txin['prevout_hash']) prev_index = txin['prevout_n']