diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-06-04 23:06:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 23:06:11 +0800 |
| commit | de38a1dbd429df258c43d93c7f24dc6591d0ab39 (patch) | |
| tree | afa0211bcff8daf3d658a99b789d77f51cc90480 /node | |
| parent | 42b81f94adba9aae7f7727951f35e92184b1eedb (diff) | |
| parent | 5d68400cad8cda3b265d2bc9d45223b303349023 (diff) | |
| download | go-tangerine-de38a1dbd429df258c43d93c7f24dc6591d0ab39.tar go-tangerine-de38a1dbd429df258c43d93c7f24dc6591d0ab39.tar.gz go-tangerine-de38a1dbd429df258c43d93c7f24dc6591d0ab39.tar.bz2 go-tangerine-de38a1dbd429df258c43d93c7f24dc6591d0ab39.tar.lz go-tangerine-de38a1dbd429df258c43d93c7f24dc6591d0ab39.tar.xz go-tangerine-de38a1dbd429df258c43d93c7f24dc6591d0ab39.tar.zst go-tangerine-de38a1dbd429df258c43d93c7f24dc6591d0ab39.zip | |
Merge pull request #19588 from gballet/trezor-fix-ownlib
accounts/usbwallet: add webusb trezor support
Diffstat (limited to 'node')
| -rw-r--r-- | node/config.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/node/config.go b/node/config.go index d76311ba6..31d36f203 100644 --- a/node/config.go +++ b/node/config.go @@ -501,9 +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.NewTrezorHubWithWebUSB(); err != nil { + log.Warn(fmt.Sprintf("Failed to start WebUSB Trezor hub, disabling: %v", err)) } else { backends = append(backends, trezorhub) } |