From 470b79385bcde3b4c999daf6a8debb00072ad967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Fri, 27 Jan 2017 13:23:24 +0200
Subject: accounts/usbwallet: support Ledger app version <1.0.2
---
accounts/usbwallet/ledger.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
(limited to 'accounts/usbwallet')
diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go
index 8f502c58e..cc64ccb42 100644
--- a/accounts/usbwallet/ledger.go
+++ b/accounts/usbwallet/ledger.go
@@ -330,9 +330,13 @@ func (hub *LedgerHub) rescan() {
id := uint16(device.Bus)<<8 + uint16(device.Address)
hub.wallets[id] = wallet
- if wallet.resolveVersion() != nil || wallet.resolveAddress() != nil {
+ if wallet.resolveAddress() != nil {
glog.V(logger.Info).Infof("ledger wallet [%s] connected, Ethereum app not started", wallet.url)
} else {
+ // Try to resolve the Ethereum app's version, will fail prior to v1.0.2
+ if wallet.resolveVersion() != nil {
+ wallet.version = [3]byte{1, 0, 0} // Assume worst case, can't verify if v1.0.0 or v1.0.1
+ }
hub.accounts = append(hub.accounts, accounts.Account{
Address: wallet.address,
URL: wallet.url,
--
cgit v1.2.3