Skip to content

kmd: upgrade karalabe/usb to karalabe/hid #6282

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
algorandskiy merged 1 commit into from
Mar 19, 2025
Merged

kmd: upgrade karalabe/usb to karalabe/hid #6282

Show file tree
Hide file tree
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
18 changes: 9 additions & 9 deletions daemon/kmd/wallet/driver/ledger_hid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"fmt"
"os"

"github.com/karalabe/usb"
"github.com/karalabe/hid"
)

const ledgerVendorID = 0x2c97
Expand All @@ -31,8 +31,8 @@
// the protocol used for sending messages to the application running on the
// Ledger hardware wallet.
type LedgerUSB struct {
hiddev usb.Device
info usb.DeviceInfo
hiddev hid.Device
info hid.DeviceInfo
}

// LedgerUSBError is a wrapper around the two-byte error code that the Ledger
Expand Down Expand Up @@ -197,23 +197,23 @@
}

// USBInfo returns information about the underlying USB device.
func (l *LedgerUSB) USBInfo() usb.DeviceInfo {
func (l *LedgerUSB) USBInfo() hid.DeviceInfo {

Check warning on line 200 in daemon/kmd/wallet/driver/ledger_hid.go

View check run for this annotation

Codecov / codecov/patch

daemon/kmd/wallet/driver/ledger_hid.go#L200 

Added line #L200 was not covered by tests
return l.info
}

// LedgerEnumerate returns all of the Ledger devices connected to this machine.
func LedgerEnumerate() ([]usb.DeviceInfo, error) {
if !usb.Supported() || os.Getenv("KMD_NOUSB") != "" {
func LedgerEnumerate() ([]hid.DeviceInfo, error) {
if !hid.Supported() || os.Getenv("KMD_NOUSB") != "" {

Check warning on line 206 in daemon/kmd/wallet/driver/ledger_hid.go

View check run for this annotation

Codecov / codecov/patch

daemon/kmd/wallet/driver/ledger_hid.go#L205-L206 

Added lines #L205 - L206 were not covered by tests
return nil, fmt.Errorf("HID not supported")
}

var infos []usb.DeviceInfo
var infos []hid.DeviceInfo

Check warning on line 210 in daemon/kmd/wallet/driver/ledger_hid.go

View check run for this annotation

Codecov / codecov/patch

daemon/kmd/wallet/driver/ledger_hid.go#L210 

Added line #L210 was not covered by tests
// The enumeration process is based on:
// https://github.com/LedgerHQ/blue-loader-python/blob/master/ledgerblue/comm.py#L212
// we search for the Ledger Vendor id and ignore devices that don't have specific usagepage or interface
hids, err := usb.EnumerateHid(ledgerVendorID, 0)
hids, err := hid.Enumerate(ledgerVendorID, 0)

Check warning on line 214 in daemon/kmd/wallet/driver/ledger_hid.go

View check run for this annotation

Codecov / codecov/patch

daemon/kmd/wallet/driver/ledger_hid.go#L214 

Added line #L214 was not covered by tests
if err != nil {
return []usb.DeviceInfo{}, err
return []hid.DeviceInfo{}, err

Check warning on line 216 in daemon/kmd/wallet/driver/ledger_hid.go

View check run for this annotation

Codecov / codecov/patch

daemon/kmd/wallet/driver/ledger_hid.go#L216 

Added line #L216 was not covered by tests
}
for _, info := range hids {
if info.UsagePage != ledgerUsagePage && info.Interface != 0 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ require (
github.com/ipfs/go-log/v2 v2.5.1
github.com/jmoiron/sqlx v1.2.0
github.com/jsimonetti/rtnetlink v1.4.2
github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c
github.com/karalabe/hid v1.0.1-0.20240919124526-821c38d2678e
github.com/klauspost/cpuid/v2 v2.2.8
github.com/labstack/echo/v4 v4.9.1
github.com/libp2p/go-libp2p v0.37.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@ github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPci
github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c h1:AqsttAyEyIEsNz5WLRwuRwjiT5CMDUfLk6cFJDVPebs=
github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
github.com/karalabe/hid v1.0.1-0.20240919124526-821c38d2678e h1:ryNJIEs1fyZNVwJ/Dsz7+EFZTow0ggBdnAIVo8SAs+A=
github.com/karalabe/hid v1.0.1-0.20240919124526-821c38d2678e/go.mod h1:qk1sX/IBgppQNcGCRoj90u6EGC056EBoIc1oEjCWla8=
github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk=
github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U=
github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw=
Expand Down
Loading