Merge branch 'bip85'

Author: benma

CHANGELOG.md

@@ -7,6 +7,8 @@ customers cannot upgrade their bootloader, its changes are recorded separately.
 ## Firmware
 
 ### [Unreleased]
+
+### 9.18.0
 - Add support for deriving BIP-39 mnemonics according to BIP-85
 
 ### 9.17.0

CMakeLists.txt

@@ -96,8 +96,8 @@ endif()
 #
 # Versions MUST contain three parts and start with lowercase 'v'.
 # Example 'v1.0.0'. They MUST not contain a pre-release label such as '-beta'.
-set(FIRMWARE_VERSION "v9.17.0")
-set(FIRMWARE_BTC_ONLY_VERSION "v9.17.0")
+set(FIRMWARE_VERSION "v9.18.0")
+set(FIRMWARE_BTC_ONLY_VERSION "v9.18.0")
 set(BOOTLOADER_VERSION "v1.0.5")
 
 find_package(PythonInterp 3.6 REQUIRED)

py/bitbox02/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 - Accept EIP1559 transactions in `eth_sign()` - requires BitBox02 firmware v9.16.0
+- Add `bip85_bip39()` and `bip85_ln()`
 
 ## 6.2.0
 - btc_sign: allow displaying BTC values in the 'sat' unit

py/bitbox02/bitbox02/bitbox02/bitbox02.py

@@ -681,7 +681,7 @@ def electrum_encryption_key(self, keypath: Sequence[int]) -> str:
 
     def bip85_bip39(self) -> None:
         """Invokes the BIP85-BIP39 workflow on the device"""
-        self._require_atleast(semver.VersionInfo(9, 17, 0))
+        self._require_atleast(semver.VersionInfo(9, 18, 0))
 
         # pylint: disable=no-member
         request = hww.Request()

src/rust/bitbox02-rust/Cargo.toml

@@ -107,8 +107,6 @@ app-cardano = [
   "ed25519"
 ]
 
-app-bip85-bip39 = []
-
 testing = [
   # enable these deps
   "lazy_static",

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

@@ -27,9 +27,6 @@ use alloc::vec::Vec;
 pub async fn process(request: &pb::Bip85Request) -> Result<Response, Error> {
     match &request.app {
         None => Err(Error::InvalidInput),
-        #[cfg(not(feature = "app-bip85-bip39"))]
-        Some(pb::bip85_request::App::Bip39(())) => Err(Error::Disabled),
-        #[cfg(feature = "app-bip85-bip39")]
         Some(pb::bip85_request::App::Bip39(())) => Ok(Response::Bip85(pb::Bip85Response {
             app: Some(pb::bip85_response::App::Bip39(process_bip39().await?)),
         })),
@@ -41,7 +38,6 @@ pub async fn process(request: &pb::Bip85Request) -> Result<Response, Error> {
 
 /// Derives and displays a BIP-39 seed according to BIP-85:
 /// https://github.com/bitcoin/bips/blob/master/bip-0085.mediawiki#bip39.
-#[cfg(feature = "app-bip85-bip39")]
 async fn process_bip39() -> Result<(), Error> {
     use crate::workflow::trinary_choice::{choose, TrinaryChoice};
     use crate::workflow::{menu, mnemonic, status, trinary_input_string};