Skip to content

Commit bb2c97b

Browse files
committed
Merge remote-tracking branch 'benma/v9-16'
2 parents 7ae7e1e + 2dc85ab commit bb2c97b

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
77
## Firmware
88

99
### [Unreleased]
10+
11+
### 9.16.0
1012
- Disable screensaver when displaying a receive address, confirming a transaction, and other interactive actions
1113
- Add Sepolia testnet for Ethereum
1214
- Added a disclaimer screen before the recovery words are displayed

src/rust/bitbox02-rust/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ app-cardano = [
107107
"ed25519"
108108
]
109109

110+
app-bip85 = []
111+
110112
testing = [
111113
# enable these deps
112114
"lazy_static",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ pub mod bitcoin;
2626
mod cardano;
2727

2828
mod backup;
29+
#[cfg(feature = "app-bip85")]
2930
mod bip85;
3031
mod device_info;
3132
mod electrum;
@@ -183,6 +184,9 @@ async fn process_api(request: &Request) -> Result<Response, Error> {
183184
.map(|r| Response::Cardano(pb::CardanoResponse { response: Some(r) })),
184185
#[cfg(not(feature = "app-cardano"))]
185186
Request::Cardano(_) => Err(Error::Disabled),
187+
#[cfg(not(feature = "app-bip85"))]
188+
Request::Bip85(_) => Err(Error::Disabled),
189+
#[cfg(feature = "app-bip85")]
186190
Request::Bip85(ref request) => bip85::process(request).await,
187191
_ => Err(Error::InvalidInput),
188192
}

0 commit comments

Comments
 (0)