From 4799b5abd411631920e0fcc907aba59a9fd09237 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Thu, 16 May 2019 14:37:36 +0200 Subject: accounts/usbwallet: support webusb for Trezor wallets --- node/config.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'node') diff --git a/node/config.go b/node/config.go index d76311ba6..c864fea9c 100644 --- a/node/config.go +++ b/node/config.go @@ -507,6 +507,12 @@ func makeAccountManager(conf *Config) (*accounts.Manager, string, error) { } else { backends = append(backends, trezorhub) } + // Start a USB hub for Trezor hardware wallets (WebUSB version) + if trezorhub, err := usbwallet.NewWebUSBTrezorHub(); err != nil { + log.Warn(fmt.Sprintf("Failed to start Trezor hub, disabling: %v", err)) + } else { + backends = append(backends, trezorhub) + } } if len(conf.SmartCardDaemonPath) > 0 { // Start a smart card hub -- cgit v1.2.3 From 5d68400cad8cda3b265d2bc9d45223b303349023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Sat, 1 Jun 2019 17:19:47 +0300 Subject: accounts/usbwallet, vendor: switch from HID to generic USB lib --- node/config.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'node') diff --git a/node/config.go b/node/config.go index c864fea9c..31d36f203 100644 --- a/node/config.go +++ b/node/config.go @@ -501,15 +501,15 @@ func makeAccountManager(conf *Config) (*accounts.Manager, string, error) { } else { backends = append(backends, ledgerhub) } - // Start a USB hub for Trezor hardware wallets - if trezorhub, err := usbwallet.NewTrezorHub(); err != nil { - log.Warn(fmt.Sprintf("Failed to start Trezor hub, disabling: %v", err)) + // Start a USB hub for Trezor hardware wallets (HID version) + if trezorhub, err := usbwallet.NewTrezorHubWithHID(); err != nil { + log.Warn(fmt.Sprintf("Failed to start HID Trezor hub, disabling: %v", err)) } else { backends = append(backends, trezorhub) } // Start a USB hub for Trezor hardware wallets (WebUSB version) - if trezorhub, err := usbwallet.NewWebUSBTrezorHub(); err != nil { - log.Warn(fmt.Sprintf("Failed to start Trezor hub, disabling: %v", err)) + if trezorhub, err := usbwallet.NewTrezorHubWithWebUSB(); err != nil { + log.Warn(fmt.Sprintf("Failed to start WebUSB Trezor hub, disabling: %v", err)) } else { backends = append(backends, trezorhub) } -- cgit v1.2.3