Merge branch 'xpubs'

Author: benma

CHANGELOG-npm.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.11.0
+- Add `btcXpubs()`
+
 ## 0.10.1
 - package.json: use "main" instead of "module" to fix compatiblity with vitest
 

CHANGELOG-rust.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.10.0
+- Add `btc_xpubs()`
+
 ## 0.9.0
 - Add support for BitBox02 Nova
 

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "bitbox-api"
 authors = ["Marko Bencun <benma@bitbox.swiss>"]
-version = "0.9.0"
+version = "0.10.0"
 homepage = "https://bitbox.swiss/"
 repository = "https://github.com/BitBoxSwiss/bitbox-api-rs/"
 readme = "README-rust.md"

Cargo.toml

@@ -1 +1 @@
-0.10.1
+0.11.0

NPM_VERSION

@@ -27,7 +27,7 @@ Use `--nocapture` to also see some useful simulator output.
 If you want to test against a custom simulator build (e.g. when developing new firmware features),
 you can run:
 
-    SIMULATOR=/path/to/simulator cargo test --features=simulator,tokio
+    SIMULATOR=/path/to/simulator cargo test --features=simulator,tokio -- --test-threads 1
 
 In this case, only the given simulator will be used, and the ones defined in simulators.json will be
 ignored.

README-rust.md

@@ -26,13 +26,23 @@ message DeviceInfoRequest {
 }
 
 message DeviceInfoResponse {
+  message Bluetooth {
+    // Hash of the currently active Bluetooth firmware on the device.
+    bytes firmware_hash = 1;
+    // Firmware version, formated as an unsigned integer "1", "2", etc.
+    string firmware_version = 2;
+    // True if Bluetooth is enabled
+    bool enabled = 3;
+  }
   string name = 1;
   bool initialized = 2;
   string version = 3;
   bool mnemonic_passphrase_enabled = 4;
   uint32 monotonic_increments_remaining = 5;
   // From v9.6.0: "ATECC608A" or "ATECC608B".
   string securechip_model = 6;
+  // Only present in Bluetooth-enabled devices.
+  optional Bluetooth bluetooth = 7;
 }
 
 message InsertRemoveSDCardRequest {

messages/bitbox02_system.proto

@@ -0,0 +1,50 @@
+// Copyright 2025 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+package shiftcrypto.bitbox02;
+
+message BluetoothToggleEnabledRequest {
+}
+
+message BluetoothUpgradeInitRequest {
+  uint32 firmware_length = 1;
+}
+
+message BluetoothChunkRequest {
+  bytes data = 1;
+}
+
+message BluetoothSuccess {
+}
+
+message BluetoothRequestChunkResponse {
+  uint32 offset = 1;
+  uint32 length = 2;
+}
+
+message BluetoothRequest {
+  oneof request {
+    BluetoothUpgradeInitRequest upgrade_init = 1;
+    BluetoothChunkRequest chunk = 2;
+    BluetoothToggleEnabledRequest toggle_enabled = 3;
+  }
+}
+
+message BluetoothResponse {
+  oneof response {
+    BluetoothSuccess success = 1;
+    BluetoothRequestChunkResponse request_chunk = 2;
+  }
+}

messages/bluetooth.proto

@@ -93,6 +93,17 @@ message BTCPubRequest {
   bool display = 5;
 }
 
+message BTCXpubsRequest{
+  enum XPubType {
+    UNKNOWN = 0;
+    XPUB = 1;
+    TPUB = 2;
+  }
+  BTCCoin coin = 1;
+  XPubType xpub_type = 2;
+  repeated Keypath keypaths = 3;
+}
+
 message BTCScriptConfigWithKeypath {
   BTCScriptConfig script_config = 2;
   repeated uint32 keypath = 3;
@@ -281,6 +292,7 @@ message BTCRequest {
     BTCSignMessageRequest sign_message = 6;
     AntiKleptoSignatureRequest antiklepto_signature = 7;
     BTCPaymentRequestRequest payment_request = 8;
+    BTCXpubsRequest xpubs = 9;
   }
 }
 
@@ -291,5 +303,6 @@ message BTCResponse {
     BTCSignNextResponse sign_next = 3;
     BTCSignMessageResponse sign_message = 4;
     AntiKleptoSignerCommitment antiklepto_signer_commitment = 5;
+    PubsResponse pubs = 6;
   }
 }

messages/btc.proto

@@ -19,6 +19,10 @@ message PubResponse {
   string pub = 1;
 }
 
+message PubsResponse {
+  repeated string pubs = 1;
+}
+
 message RootFingerprintRequest {
 }