Skip to content

Commit 7e5bfbf

Browse files
committed
Merge branch 'hid' into release-v4.48.6
2 parents d3b1088 + 80856d7 commit 7e5bfbf

File tree

21 files changed

+4323
-10
lines changed

21 files changed

+4323
-10
lines changed

backend/devices/usb/hid.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"runtime"
2323

2424
"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
25-
"github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid"
25+
"github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid/hiddevice"
2626
"github.com/karalabe/hid"
2727
)
2828

@@ -150,13 +150,13 @@ func (info hidDeviceInfo) Open() (io.ReadWriteCloser, error) {
150150
if result.err != nil {
151151
return nil, result.err
152152
}
153-
return singleThreadedDevice{device: u2fhid.NewHidDevice(result.value)}, nil
153+
return singleThreadedDevice{device: hiddevice.New(result.value)}, nil
154154
}
155155
hidDevice, err := info.DeviceInfo.Open()
156156
if err != nil {
157157
return nil, err
158158
}
159-
return u2fhid.NewHidDevice(hidDevice), nil
159+
return hiddevice.New(hidDevice), nil
160160
}
161161

162162
// DeviceInfos returns a slice of all recognized devices.

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/BitBoxSwiss/bitbox-wallet-app
33
go 1.23
44

55
require (
6-
github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036
6+
github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250901094427-ae070b1d41bf
77
github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1
88
github.com/btcsuite/btcd v0.24.2
99
github.com/btcsuite/btcd/btcec/v2 v2.3.4
@@ -29,6 +29,7 @@ require (
2929
github.com/Microsoft/go-winio v0.6.2 // indirect
3030
github.com/aead/siphash v1.0.1 // indirect
3131
github.com/bits-and-blooms/bitset v1.13.0 // indirect
32+
github.com/btcsuite/btcd/btcutil/psbt v1.1.10 // indirect
3233
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
3334
github.com/cespare/cp v1.1.1 // indirect
3435
github.com/consensys/bavard v0.1.13 // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036 h1:odkevMKSWjMjdWoQHodlKjwgqtB6RXX5imQHZl2/9S4=
2-
github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250812130951-35af5fe7a036/go.mod h1:lyYwD22hA6TQ8XNXx37VE75Exp6qYdgZgUAO4+lyhSU=
1+
github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250901094427-ae070b1d41bf h1:SEWTQ2BvGol5d4kZFjHt1piftZX9wvEgmySdad/5pbo=
2+
github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250901094427-ae070b1d41bf/go.mod h1:8yjGNQve88PvbAm8DKOVYkrmDKTxDc4rVwTll4IcH2s=
33
github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1 h1:5hjP8mYSVKFibesrz8L6U0Vp5zSJt0LwXB3DSZGhnSo=
44
github.com/BitBoxSwiss/block-client-go v0.0.0-20241009081439-924dde98b9c1/go.mod h1:SJTiQZU9ggBzVKMni97rpNS9GddPKErndFXNSDrfEGc=
55
github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
@@ -28,6 +28,8 @@ github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUB
2828
github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00=
2929
github.com/btcsuite/btcd/btcutil v1.1.6 h1:zFL2+c3Lb9gEgqKNzowKUPQNb8jV7v5Oaodi/AYFd6c=
3030
github.com/btcsuite/btcd/btcutil v1.1.6/go.mod h1:9dFymx8HpuLqBnsPELrImQeTQfKBQqzqGbbV3jK55aE=
31+
github.com/btcsuite/btcd/btcutil/psbt v1.1.10 h1:TC1zhxhFfhnGqoPjsrlEpoqzh+9TPOHrCgnPR47Mj9I=
32+
github.com/btcsuite/btcd/btcutil/psbt v1.1.10/go.mod h1:ehBEvU91lxSlXtA+zZz3iFYx7Yq9eqnKx4/kSrnsvMY=
3133
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
3234
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
3335
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=

0 commit comments

Comments
 (0)