hww: factor out part of hid scan code to HW_PluginBase
so that bitbox02 can override it
This commit is contained in:
committed by
TheCharlatan
parent
66c264f613
commit
e830ef309f
@@ -546,7 +546,7 @@ class BitBox02Plugin(HW_PluginBase):
|
||||
self.libraries_available = self.check_libraries_available()
|
||||
if not self.libraries_available:
|
||||
return
|
||||
self.device_manager().register_devices(self.DEVICE_IDS)
|
||||
self.device_manager().register_devices(self.DEVICE_IDS, plugin=self)
|
||||
|
||||
def get_library_version(self):
|
||||
try:
|
||||
@@ -617,3 +617,10 @@ class BitBox02Plugin(HW_PluginBase):
|
||||
derivation = keystore.get_derivation_prefix()
|
||||
xtype = keystore.get_bip32_node_for_xpub().xtype
|
||||
client.get_xpub(derivation, xtype, display=True)
|
||||
|
||||
def create_device_from_hid_enumeration(self, d: dict, *, product_key) -> 'Device':
|
||||
device = super().create_device_from_hid_enumeration(d, product_key=product_key)
|
||||
# The BitBox02's product_id is not unique per device, thus use the path instead to
|
||||
# distinguish devices.
|
||||
id_ = str(d['path'])
|
||||
return device._replace(id_=id_)
|
||||
|
||||
@@ -477,7 +477,7 @@ class ColdcardPlugin(HW_PluginBase):
|
||||
if not self.libraries_available:
|
||||
return
|
||||
|
||||
self.device_manager().register_devices(self.DEVICE_IDS)
|
||||
self.device_manager().register_devices(self.DEVICE_IDS, plugin=self)
|
||||
self.device_manager().register_enumerate_func(self.detect_simulator)
|
||||
|
||||
def get_library_version(self):
|
||||
|
||||
@@ -675,7 +675,7 @@ class DigitalBitboxPlugin(HW_PluginBase):
|
||||
def __init__(self, parent, config, name):
|
||||
HW_PluginBase.__init__(self, parent, config, name)
|
||||
if self.libraries_available:
|
||||
self.device_manager().register_devices(self.DEVICE_IDS)
|
||||
self.device_manager().register_devices(self.DEVICE_IDS, plugin=self)
|
||||
|
||||
self.digitalbitbox_config = self.config.get('digitalbitbox', {})
|
||||
|
||||
|
||||
@@ -60,6 +60,22 @@ class HW_PluginBase(BasePlugin):
|
||||
def device_manager(self) -> 'DeviceMgr':
|
||||
return self.parent.device_manager
|
||||
|
||||
def create_device_from_hid_enumeration(self, d: dict, *, product_key) -> 'Device':
|
||||
# Older versions of hid don't provide interface_number
|
||||
interface_number = d.get('interface_number', -1)
|
||||
usage_page = d['usage_page']
|
||||
id_ = d['serial_number']
|
||||
if len(id_) == 0:
|
||||
id_ = str(d['path'])
|
||||
id_ += str(interface_number) + str(usage_page)
|
||||
device = Device(path=d['path'],
|
||||
interface_number=interface_number,
|
||||
id_=id_,
|
||||
product_key=product_key,
|
||||
usage_page=usage_page,
|
||||
transport_ui_string='hid')
|
||||
return device
|
||||
|
||||
@hook
|
||||
def close_wallet(self, wallet: 'Abstract_Wallet'):
|
||||
for keystore in wallet.get_keystores():
|
||||
|
||||
@@ -88,7 +88,7 @@ class KeepKeyPlugin(HW_PluginBase):
|
||||
self.DEVICE_IDS = (keepkeylib.transport_hid.DEVICE_IDS +
|
||||
keepkeylib.transport_webusb.DEVICE_IDS)
|
||||
# only "register" hid device id:
|
||||
self.device_manager().register_devices(keepkeylib.transport_hid.DEVICE_IDS)
|
||||
self.device_manager().register_devices(keepkeylib.transport_hid.DEVICE_IDS, plugin=self)
|
||||
# for webusb transport, use custom enumerate function:
|
||||
self.device_manager().register_enumerate_func(self.enumerate)
|
||||
self.libraries_available = True
|
||||
|
||||
@@ -578,7 +578,7 @@ class LedgerPlugin(HW_PluginBase):
|
||||
self.segwit = config.get("segwit")
|
||||
HW_PluginBase.__init__(self, parent, config, name)
|
||||
if self.libraries_available:
|
||||
self.device_manager().register_devices(self.DEVICE_IDS)
|
||||
self.device_manager().register_devices(self.DEVICE_IDS, plugin=self)
|
||||
|
||||
def get_btchip_device(self, device):
|
||||
ledger = False
|
||||
|
||||
Reference in New Issue
Block a user