Merge remote-tracking branch 'benma/update-deps'

Author: benma

CHANGELOG.md

@@ -7,8 +7,10 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 ## Firmware
 
 ### [Unreleased]
+- Display device name on screen before unlock
 - Bitcoin: add support for payment requests
 - Bitcoin: allow multisig accounts at arbitrary keypaths
+- Bitcoin: allow spendung UTXOs at very high BIP-44 address indices
 - Ethereum: allow signing EIP-712 messages containing multi-line strings
 
 ### 9.18.0

src/CMakeLists.txt

@@ -87,6 +87,7 @@ set(DBB-FIRMWARE-UI-SOURCES
     ${CMAKE_SOURCE_DIR}/src/ui/components/keyboard_switch.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/orientation_arrows.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/info_centered.c
+    ${CMAKE_SOURCE_DIR}/src/ui/components/lockscreen.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/menu.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/status.c
     ${CMAKE_SOURCE_DIR}/src/ui/components/image.c

src/memory/memory.c

@@ -36,6 +36,8 @@
 
 /********* Definitions and read/write helper functions ****************/
 
+const char* MEMORY_DEFAULT_DEVICE_NAME = "My BitBox";
+
 // Documentation of all appData chunks and their contents.  A chunk is defined as
 // 16 pages, which is the erase granularity: changing any byte in the page
 // involves erases and writing all 16 pages. One page is 512 bytes.  The MCU has

src/memory/memory.h

@@ -60,7 +60,8 @@ USE_RESULT bool memory_reset_hww(void);
  */
 USE_RESULT bool memory_cleanup_smarteeprom(void);
 
-#define MEMORY_DEFAULT_DEVICE_NAME "My BitBox"
+// Default device name if no name was set by the user.
+extern const char* MEMORY_DEFAULT_DEVICE_NAME;
 // Don't change this without proper memory layout migration! (see chunk_1_t in
 // memory.c)
 #define MEMORY_DEVICE_NAME_MAX_LEN (64)
@@ -69,7 +70,8 @@ USE_RESULT bool memory_cleanup_smarteeprom(void);
 // size (including the null terminator) is MEMORY_DEVICE_NAME_MAX_LEN bytes.
 USE_RESULT bool memory_set_device_name(const char* name);
 
-// name_out must have MEMORY_DEVICE_NAME_MAX_LEN bytes in size.
+// name_out must have MEMORY_DEVICE_NAME_MAX_LEN bytes in size. Returns `MEMORY_DEFAULT_DEVICE_NAME`
+// if no device name is set.
 void memory_get_device_name(char* name_out);
 
 /**

src/rust/Cargo.lock

@@ -27,7 +27,7 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-bitcoin = { version = "0.31.0", default-features = false, features = ["no-std"] }
+bitcoin = { version = "0.32.2", default-features = false }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
 lazy_static = { version = "1.4.0" }
 num-bigint = { version = "0.4.3", default-features = false }

src/rust/Cargo.toml

@@ -21,9 +21,6 @@ edition = "2021"
 description = "BitBox02 noise protocol primitives"
 license = "Apache-2.0"
 
-[dependencies]
-zeroize = "1.6.0"
-
 [dependencies.noise-protocol]
 version = "0.2.0"
 default-features = false

src/rust/bitbox02-noise/Cargo.toml

@@ -41,20 +41,20 @@ num-bigint = { workspace = true, optional = true }
 num-traits = { version = "0.2", default-features = false, optional = true }
 # If you change this, also change src/rust/.cargo/config.toml.
 bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.2", optional = true }
-bech32 = { version = "0.10.0-beta", default-features = false, optional = true }
+bech32 = { version = "0.11.0", default-features = false, features = ["alloc"], optional = true }
 blake2 = { version = "0.10.6", default-features = false, optional = true }
 minicbor = { version = "0.24.0", default-features = false, features = ["alloc"], optional = true }
 crc = { version = "3.0.1", optional = true }
 ed25519-dalek = { version = "2.0.0", default-features = false, features = ["hazmat"], optional = true }
 lazy_static = { workspace = true, optional = true }
 hmac = { version = "0.12.1", default-features = false, features = ["reset"] }
 
-miniscript = { version = "11.0.0", default-features = false, features = ["no-std"], optional = true }
+miniscript = { version = "12.0.0", default-features = false, features = ["no-std"], optional = true }
 bitcoin = { workspace = true, optional = true }
 # We don't rely on this dep directly, the miniscript/bitcoin deps do. We list it here to enable the
 # small-hash feature to reduce the binary size, saving around 2784 bytes (as measured at time of
 # writing, this might fluctuate over time).
-bitcoin_hashes = { version = "0.13.0", default-features = false, features = ["small-hash"] }
+bitcoin_hashes = { version = "0.14.0", default-features = false, features = ["small-hash"] }
 
 [dependencies.prost]
 # keep version in sync with tools/prost-build/Cargo.toml.

src/rust/bitbox02-rust/Cargo.toml

@@ -155,6 +155,7 @@ pub fn derive_address_simple(
         coin_params.bip44_coin,
         simple_type,
         coin_params.taproot_support,
+        keypath::ReceiveSpend::Receive,
     )
     .or(Err(Error::InvalidInput))?;
     Ok(common::Payload::from_simple(
@@ -194,7 +195,8 @@ pub async fn address_multisig(
     display: bool,
 ) -> Result<Response, Error> {
     let coin_params = params::get(coin);
-    keypath::validate_address_policy(keypath).or(Err(Error::InvalidInput))?;
+    keypath::validate_address_policy(keypath, keypath::ReceiveSpend::Receive)
+        .or(Err(Error::InvalidInput))?;
     let account_keypath = &keypath[..keypath.len() - 2];
     multisig::validate(multisig, account_keypath)?;
     let name = match multisig::get_name(coin, multisig, account_keypath)? {
@@ -233,7 +235,8 @@ async fn address_policy(
 ) -> Result<Response, Error> {
     let coin_params = params::get(coin);
 
-    keypath::validate_address_policy(keypath).or(Err(Error::InvalidInput))?;
+    keypath::validate_address_policy(keypath, keypath::ReceiveSpend::Receive)
+        .or(Err(Error::InvalidInput))?;
 
     let parsed = policies::parse(policy)?;
     parsed.validate(coin)?;

src/rust/bitbox02-rust/src/hww/api/bitcoin.rs

@@ -307,7 +307,7 @@ fn encode_segwit_addr(
         1 => bech32::segwit::VERSION_1,
         _ => return Err(()),
     };
-    bech32::segwit::encode(&bech32::Hrp::parse_unchecked(hrp), version, witness_program).or(Err(()))
+    bech32::segwit::encode(bech32::Hrp::parse_unchecked(hrp), version, witness_program).or(Err(()))
 }
 
 #[cfg(test)]