balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Target only USB ledger with interface number 0"

Browse Source 
This reverts commit 02bc43b094 and
should restore compatibility with Ledgers on MacOS.
This commit is contained in:
Pierre Boutillier 2018-11-15 20:23:47 +01:00 committed by Benjamin Canou
parent 6895d7a87b
commit cb038afa42
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib_signer_backends/ledger.ml
View File

@ -315,18 +315,12 @@ let find_ledgers ?id () =
log_info "Found %d Ledger(s)" (List.length ledgers) ; log_info "Found %d Ledger(s)" (List.length ledgers) ;
filter_map_s begin fun device_info -> filter_map_s begin fun device_info ->
log_info "Processing Ledger at path [%s]" device_info.Hidapi.path ; log_info "Processing Ledger at path [%s]" device_info.Hidapi.path ;
if device_info.Hidapi.interface_number <> 0 match Hidapi.(open_path device_info.path) with
then | None -> return_none
(* HID interfaces get number 0: | Some h ->
https://github.com/LedgerHQ/ledger-nano-s/issues/48 *) Lwt.finalize
return_none (fun () -> Ledger.of_hidapi ?id device_info h)
else (fun () -> Hidapi.close h ; Lwt.return_unit)
match Hidapi.(open_path device_info.path) with
| None -> return_none
| Some h ->
Lwt.finalize
(fun () -> Ledger.of_hidapi ?id device_info h)
(fun () -> Hidapi.close h ; Lwt.return_unit)
end ledgers end ledgers
let with_ledger id f = let with_ledger id f =