Skip to content

Commit

Permalink
Merge remote-tracking branch 'benma/v9-16'
Browse files Browse the repository at this point in the history
  • Loading branch information
benma committed Jan 22, 2024
2 parents 7ae7e1e + 2dc85ab commit bb2c97b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
## Firmware

### [Unreleased]

### 9.16.0
- Disable screensaver when displaying a receive address, confirming a transaction, and other interactive actions
- Add Sepolia testnet for Ethereum
- Added a disclaimer screen before the recovery words are displayed
Expand Down
2 changes: 2 additions & 0 deletions src/rust/bitbox02-rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ app-cardano = [
"ed25519"
]

app-bip85 = []

testing = [
# enable these deps
"lazy_static",
Expand Down
4 changes: 4 additions & 0 deletions src/rust/bitbox02-rust/src/hww/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pub mod bitcoin;
mod cardano;

mod backup;
#[cfg(feature = "app-bip85")]
mod bip85;
mod device_info;
mod electrum;
Expand Down Expand Up @@ -183,6 +184,9 @@ async fn process_api(request: &Request) -> Result<Response, Error> {
.map(|r| Response::Cardano(pb::CardanoResponse { response: Some(r) })),
#[cfg(not(feature = "app-cardano"))]
Request::Cardano(_) => Err(Error::Disabled),
#[cfg(not(feature = "app-bip85"))]
Request::Bip85(_) => Err(Error::Disabled),
#[cfg(feature = "app-bip85")]
Request::Bip85(ref request) => bip85::process(request).await,
_ => Err(Error::InvalidInput),
}
Expand Down

0 comments on commit bb2c97b

Please sign in to comment.