backend/usb: fix potential macOS communication issue with BitBox02

benma · benma · commit 08a7edddc66a · 2025-08-18T13:49:41.000+02:00
```
go get github.com/BitBoxSwiss/bitbox02-api-go@35af5fe
go mod tidy
go mod vendor
```
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## v4.48.4
+- macOS: fix potential USB communication issue with BitBox02 bootloaders <v1.1.2 and firmwares <v9.23.1
+
 ## v4.48.3
 - Linux: fix compatiblity with some versions of Mesa also when using the AppImage
 
diff --git a/backend/devices/usb/hid.go b/backend/devices/usb/hid.go
@@ -20,6 +20,7 @@ import (
 	"runtime"
 
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
+	"github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid"
 	"github.com/karalabe/hid"
 )
 
@@ -101,7 +102,7 @@ func (info hidDeviceInfo) Identifier() string {
 // singleThreadedDevice runs all hidapi functions in the same OS thread. See the docs of the
 // `funcCalls` variable for more info. Implements io.ReadWriteCloser, like `hid.Device`.
 type singleThreadedDevice struct {
-	device hid.Device
+	device io.ReadWriteCloser
 }
 
 // Write wraps hid.Device.Write to run in a dedicated OS thread.
@@ -147,9 +148,13 @@ func (info hidDeviceInfo) Open() (io.ReadWriteCloser, error) {
 		if result.err != nil {
 			return nil, result.err
 		}
-		return singleThreadedDevice{device: result.value}, nil
+		return singleThreadedDevice{device: u2fhid.NewHidDevice(result.value)}, nil
 	}
-	return info.DeviceInfo.Open()
+	hidDevice, err := info.DeviceInfo.Open()
+	if err != nil {
+		return nil, err
+	}
+	return u2fhid.NewHidDevice(hidDevice), nil
 }
 
 // DeviceInfos returns a slice of all recognized devices.
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/BitBoxSwiss/bitbox-wallet-app
 go 1.23
 
 require (
-	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250624081228-dba834f08d4b
+	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036
 	github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1
 	github.com/btcsuite/btcd v0.24.2
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250624081228-dba834f08d4b h1:b7btgkW7SJ/Q48ePS5ExybsP95YoaWidn0o2axt9Fws=
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250624081228-dba834f08d4b/go.mod h1:lyYwD22hA6TQ8XNXx37VE75Exp6qYdgZgUAO4+lyhSU=
+github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036 h1:odkevMKSWjMjdWoQHodlKjwgqtB6RXX5imQHZl2/9S4=
+github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036/go.mod h1:lyYwD22hA6TQ8XNXx37VE75Exp6qYdgZgUAO4+lyhSU=
 github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1 h1:5hjP8mYSVKFibesrz8L6U0Vp5zSJt0LwXB3DSZGhnSo=
 github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1/go.mod h1:SJTiQZU9ggBzVKMni97rpNS9GddPKErndFXNSDrfEGc=
 github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
diff --git a/vendor/github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid/hiddevice.go b/vendor/github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid/hiddevice.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1,4 +1,4 @@
-# github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250624081228-dba834f08d4b
+# github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036
 ## explicit; go 1.22
 github.com/BitBoxSwiss/bitbox02-api-go/api/bootloader
 github.com/BitBoxSwiss/bitbox02-api-go/api/common

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"runtime"`
`21`	`21`
`22`	`22`	`"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"`
	`23`	`+ "github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid"`
`23`	`24`	`"github.com/karalabe/hid"`
`24`	`25`	`)`
`25`	`26`
`@@ -101,7 +102,7 @@ func (info hidDeviceInfo) Identifier() string {`
`101`	`102`	`// singleThreadedDevice runs all hidapi functions in the same OS thread. See the docs of the`
`102`	`103`	// `funcCalls` variable for more info. Implements io.ReadWriteCloser, like `hid.Device`.
`103`	`104`	`type singleThreadedDevice struct {`
`104`		`- device hid.Device`
	`105`	`+ device io.ReadWriteCloser`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`// Write wraps hid.Device.Write to run in a dedicated OS thread.`
`@@ -147,9 +148,13 @@ func (info hidDeviceInfo) Open() (io.ReadWriteCloser, error) {`
`147`	`148`	`if result.err != nil {`
`148`	`149`	`return nil, result.err`
`149`	`150`	`}`
`150`		`- return singleThreadedDevice{device: result.value}, nil`
	`151`	`+ return singleThreadedDevice{device: u2fhid.NewHidDevice(result.value)}, nil`
`151`	`152`	`}`
`152`		`- return info.DeviceInfo.Open()`
	`153`	`+ hidDevice, err := info.DeviceInfo.Open()`
	`154`	`+ if err != nil {`
	`155`	`+ return nil, err`
	`156`	`+ }`
	`157`	`+ return u2fhid.NewHidDevice(hidDevice), nil`
`153`	`158`	`}`
`154`	`159`
`155`	`160`	`// DeviceInfos returns a slice of all recognized devices.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250624081228-dba834f08d4b`
	`1`	`+# github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036`
`2`	`2`	`## explicit; go 1.22`
`3`	`3`	`github.com/BitBoxSwiss/bitbox02-api-go/api/bootloader`
`4`	`4`	`github.com/BitBoxSwiss/bitbox02-api-go/api/common`