Merge branch 'optional-pairing'

Author: benma

backend/devices/bitbox02/device.go

@@ -51,6 +51,7 @@ func NewDevice(
 	product bitbox02common.Product,
 	config firmware.ConfigInterface,
 	communication firmware.Communication,
+	opts ...firmware.DeviceOption,
 ) *Device {
 	log := logging.Get().
 		WithGroup("device").
@@ -64,7 +65,9 @@ func NewDevice(
 			version,
 			&product,
 			config,
-			communication, logger{log},
+			communication,
+			logger{log},
+			opts...,
 		),
 		deviceID: deviceID,
 		log:      log,

backend/devices/usb/hid.go

@@ -53,6 +53,11 @@ type hidDeviceInfo struct {
 	hid.DeviceInfo
 }
 
+// IsBluetooth implements DeviceInfo.
+func (info hidDeviceInfo) IsBluetooth() bool {
+	return false
+}
+
 // VendorID implements DeviceInfo.
 func (info hidDeviceInfo) VendorID() int {
 	return int(info.DeviceInfo.VendorID)

backend/devices/usb/manager.go

@@ -28,6 +28,7 @@ import (
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/util/socksproxy"
 	bitbox02common "github.com/BitBoxSwiss/bitbox02-api-go/api/common"
+	"github.com/BitBoxSwiss/bitbox02-api-go/api/firmware"
 	"github.com/BitBoxSwiss/bitbox02-api-go/communication/u2fhid"
 	"github.com/BitBoxSwiss/bitbox02-api-go/util/semver"
 	"github.com/sirupsen/logrus"
@@ -46,6 +47,8 @@ const (
 
 // DeviceInfo contains the usb descriptor info and a way to open the device for reading and writing.
 type DeviceInfo interface {
+	// IsBluetooth means the communication layer is Bluetooth, otherwise USB.
+	IsBluetooth() bool
 	VendorID() int
 	ProductID() int
 	UsagePage() int
@@ -218,6 +221,7 @@ func (manager *Manager) makeBitBox02(deviceInfo DeviceInfo) (*bitbox02.Device, e
 		product,
 		bitbox02.NewConfig(manager.bitbox02ConfigDir),
 		u2fhid.NewCommunication(hidDevice, bitboxCMD),
+		firmware.WithOptionalNoisePairingConfirmation(deviceInfo.IsBluetooth()),
 	), nil
 }
 

backend/mobileserver/mobileserver.go

@@ -77,6 +77,7 @@ type GoReadWriteCloserInterface interface {
 
 // GoDeviceInfoInterface adapts usb.DeviceInfo's Open method to return the adapted ReadWriteCloser.
 type GoDeviceInfoInterface interface {
+	IsBluetooth() bool
 	VendorID() int
 	ProductID() int
 	UsagePage() int

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/GoViewModel.java

@@ -79,6 +79,9 @@ public long write(byte[] p0) throws Exception{
             throw new Exception("nope");
 
 
+        }
+        public boolean isBluetooth() {
+            return false;
         }
         public String product() {
             return device.getProductName();

frontends/ios/BitBoxApp/BitBoxApp/Bluetooth.swift

@@ -484,6 +484,10 @@ class BluetoothDeviceInfo: NSObject, MobileserverGoDeviceInfoInterfaceProtocol {
         return BluetoothReadWriteCloser(bluetoothManager: bluetoothManager)
     }
 
+    func isBluetooth() -> Bool {
+        return true
+    }
+
     func product() -> String {
         // TODO: return bluetoothManager.productStr() and have the backend identify and handle it
         return productInfo.product

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-20250508091842-e5b786c4a88d
+	github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250526110026-4c21ece5b081
 	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

go.sum

@@ -1,5 +1,5 @@
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250508091842-e5b786c4a88d h1:Zd6ISD5tzAFEsy+Td0XwmENqssuL+9aKHHBFyMpPUCg=
-github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250508091842-e5b786c4a88d/go.mod h1:lyYwD22hA6TQ8XNXx37VE75Exp6qYdgZgUAO4+lyhSU=
+github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250526110026-4c21ece5b081 h1:57aszTkvQz1aQcL9pbNUpyVepFuRlrBaoNyKV0rMdIM=
+github.com/BitBoxSwiss/bitbox02-api-go v0.0.0-20250526110026-4c21ece5b081/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=