Skip to content

fix: add product id for nanos+ when an app is opened #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emmanuelm41 merged 1 commit into from
Oct 9, 2024
Merged

fix: add product id for nanos+ when an app is opened #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions ledger_hid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ type LedgerDeviceHID struct {
}

// list of supported product ids as well as their corresponding interfaces
var supportedLedgerProductID = map[uint16]int{
0x4011: 0, // Ledger Nano X
0x1011: 0, // Ledger Nano S
0x1: 0, // Ledger Nano S
0x5011: 0, // Ledger Nano S Plus
0x5: 0, // Ledger Nano S Plus
// based on https://github.com/LedgerHQ/ledger-live/blob/develop/libs/ledgerjs/packages/devices/src/index.ts
var supportedLedgerProductID = map[uint8]int{
0x40: 0, // Ledger Nano X
0x10: 0, // Ledger Nano S
0x50: 0, // Ledger Nano S Plus
0x60: 0, // Ledger Stax
0x70: 0, // Ledger Flex
}

func NewLedgerAdmin() LedgerAdmin {
Expand Down Expand Up @@ -85,8 +86,10 @@ func logDeviceInfo(d hid.DeviceInfo) {

func isLedgerDevice(d hid.DeviceInfo) bool {
deviceFound := d.UsagePage == UsagePageLedgerNanoS

// Workarounds for possible empty usage pages
if interfaceID, supported := supportedLedgerProductID[d.ProductID]; deviceFound || (supported && (interfaceID == d.Interface)) {
productIDMM := uint8(d.ProductID >> 8)
if interfaceID, supported := supportedLedgerProductID[productIDMM]; deviceFound || (supported && (interfaceID == d.Interface)) {
return true
}

Expand Down