Merge branch 'mock_unlocked'

Author: benma

src/rust/bitbox02-rust/src/bip39.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 use alloc::string::{String, ToString};
+use alloc::vec::Vec;
 
 /// `idx` must be smaller than BIP39_WORDLIST_LEN.
 pub fn get_word(idx: u16) -> Result<zeroize::Zeroizing<String>, ()> {
@@ -25,6 +26,20 @@ pub fn get_word(idx: u16) -> Result<zeroize::Zeroizing<String>, ()> {
     ))
 }
 
+/// Encode a seed as a BIP39 mnemonic.
+pub fn mnemonic_from_seed(seed: &[u8]) -> Result<zeroize::Zeroizing<String>, ()> {
+    let mnemonic = bip39::Mnemonic::from_entropy(seed).map_err(|_| ())?;
+    Ok(zeroize::Zeroizing::new(mnemonic.to_string()))
+}
+
+/// Decode a BIP39 mnemonic.
+pub fn mnemonic_to_seed(mnemonic: &str) -> Result<zeroize::Zeroizing<Vec<u8>>, ()> {
+    let mnemonic =
+        bip39::Mnemonic::parse_in_normalized(bip39::Language::English, mnemonic).map_err(|_| ())?;
+    let (seed, seed_len) = mnemonic.to_entropy_array();
+    Ok(zeroize::Zeroizing::new(seed[..seed_len].to_vec()))
+}
+
 // C API
 
 #[unsafe(no_mangle)]
@@ -93,4 +108,64 @@ mod tests {
         assert_eq!(get_word(2047).unwrap().as_ref() as &str, "zoo");
         assert_eq!(get_word(563).unwrap().as_ref() as &str, "edit");
     }
+
+    #[test]
+    fn test_mnemonic_from_seed() {
+        // 12 words
+        let seed = b"\xae\x6a\x40\x26\x1f\x0a\xcc\x16\x57\x04\x9c\xb2\x1a\xf5\xfb\xf7";
+        assert_eq!(
+            mnemonic_from_seed(seed).unwrap().as_str(),
+            "purpose faith another dignity proud arctic foster near rare stumble leave urge",
+        );
+
+        // 18 words
+        let seed = b"\x2a\x3e\x07\xa9\xe7\x5e\xd7\x3a\xa6\xb2\xe1\xaf\x90\x3d\x50\x17\xde\x80\x4f\xdf\x2b\x45\xc2\x4b";
+        assert_eq!(
+            mnemonic_from_seed(seed).unwrap().as_str(),
+            "clay usual tuna solid uniform outer onion found question limit favorite cook trend child lake hamster seat foot",
+        );
+
+        // 24 words
+        let seed = b"\x24\x1d\x5b\x78\x35\x90\xc2\x1f\x79\x69\x8e\x7c\xe8\x92\xdd\x03\xfb\x2c\x8f\xad\xc2\x44\x0e\xc2\x3a\xa5\xde\x9e\x2d\x23\x81\xb0";
+        assert_eq!(
+            mnemonic_from_seed(seed).unwrap().as_str(),
+            "catch turn task hen around autumn toss crack language duty resemble among ready elephant require embrace attract balcony practice rule tissue mushroom almost athlete",
+        );
+
+        // Invalid seed side
+        assert!(mnemonic_from_seed(b"foo").is_err());
+    }
+
+    #[test]
+    fn test_mnemonic_to_seed() {
+        assert!(mnemonic_to_seed("invalid").is_err());
+
+        // Zero seed
+        assert_eq!(
+            mnemonic_to_seed("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about").unwrap().as_ref() as &[u8],
+            &[0u8; 16],
+        );
+
+        // 12 words
+        assert_eq!(
+            mnemonic_to_seed(
+                "trust cradle viable innocent stand equal little small junior frost laundry room"
+            )
+            .unwrap()
+            .as_ref() as &[u8],
+            b"\xe9\xa6\x3f\xcd\x3a\x4d\x48\x98\x20\xa6\x63\x79\x2b\xad\xf6\xdd",
+        );
+
+        // 18 words
+        assert_eq!(
+            mnemonic_to_seed("pupil parent toe bright slam plastic spy suspect verb battle nominee loan call crystal upset razor luggage join").unwrap().as_ref() as &[u8],
+            b"\xad\xf4\x07\x8e\x0e\x0c\xb1\x4c\x34\xd6\xd6\xf2\x82\x6a\x57\xc1\x82\x06\x6a\xbb\xcd\x95\x84\xcf",
+        );
+
+        // 24 words
+        assert_eq!(
+            mnemonic_to_seed("purity concert above invest pigeon category peace tuition hazard vivid latin since legal speak nation session onion library travel spell region blast estate stay").unwrap().as_ref() as &[u8],
+            b"\xae\x45\xd4\x02\x3a\xfa\x4a\x48\x68\x77\x51\x69\xfe\xa5\xf5\xe4\x97\xf7\xa1\xa4\xd6\x22\x9a\xd0\x23\x9e\x68\x9b\x48\x2e\xd3\x5e",
+        );
+    }
 }

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

@@ -170,9 +170,10 @@ mod tests {
     use super::*;
 
     use crate::hal::testing::TestingHal;
+    use crate::keystore::testing::{mock_unlocked, mock_unlocked_using_mnemonic};
     use crate::workflow::testing::Screen;
     use alloc::boxed::Box;
-    use bitbox02::testing::{mock_memory, mock_unlocked, mock_unlocked_using_mnemonic};
+    use bitbox02::testing::mock_memory;
     use util::bb02_async::block_on;
 
     /// Test backup creation on a uninitialized keystore.

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

@@ -333,12 +333,11 @@ mod tests {
 
     use crate::bip32::parse_xpub;
     use crate::hal::testing::TestingHal;
+    use crate::keystore::testing::{TEST_MNEMONIC, mock_unlocked, mock_unlocked_using_mnemonic};
     use crate::workflow::testing::Screen;
     use alloc::boxed::Box;
     use alloc::vec::Vec;
-    use bitbox02::testing::{
-        TEST_MNEMONIC, mock_memory, mock_unlocked, mock_unlocked_using_mnemonic,
-    };
+    use bitbox02::testing::mock_memory;
     use pb::btc_script_config::multisig::ScriptType as MultisigScriptType;
     use util::bb02_async::block_on;
     use util::bip32::HARDENED;

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

@@ -318,7 +318,7 @@ fn encode_segwit_addr(
 mod tests {
     use super::*;
 
-    use bitbox02::testing::mock_unlocked_using_mnemonic;
+    use crate::keystore::testing::mock_unlocked_using_mnemonic;
     use util::bip32::HARDENED;
 
     #[test]

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

@@ -328,8 +328,9 @@ pub fn pkscript(
 mod tests {
     use super::*;
 
+    use crate::keystore::testing::mock_unlocked_using_mnemonic;
     use bip32::parse_xpub;
-    use bitbox02::testing::{mock_memory, mock_unlocked_using_mnemonic};
+    use bitbox02::testing::mock_memory;
     use util::bip32::HARDENED;
 
     #[test]

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

@@ -769,7 +769,7 @@ mod tests {
     use super::*;
 
     use crate::bip32::parse_xpub;
-    use bitbox02::testing::{mock_unlocked, mock_unlocked_using_mnemonic};
+    use crate::keystore::testing::{mock_unlocked, mock_unlocked_using_mnemonic};
 
     const SOME_XPUB_1: &str = "tpubDFj9SBQssRHA5EB1ox58mcgF9sB61br9RGz6UrBukcNKmFe4fPgskZ4wigxQ1jSUzLdjnvvDHL8Z6L3ey5Ev5FNNqrDrePxwXsNHiLZhBTc";
     const SOME_XPUB_2: &str = "tpubDCmDXtvJLH9yHLNLnGVRoXBvvacvWskjV4hq4WAmGXcRbfa5uaiybZ7kjGRAFbLaoiw1LcwV56H88avibGh7GC7nqqz2Jcs1dWu33cRKYm4";

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

@@ -190,7 +190,8 @@ mod tests {
     use super::*;
 
     use crate::bip32::parse_xpub;
-    use bitbox02::testing::{mock_memory, mock_unlocked_using_mnemonic};
+    use crate::keystore::testing::mock_unlocked_using_mnemonic;
+    use bitbox02::testing::mock_memory;
     use util::bip32::HARDENED;
 
     use pb::btc_script_config::{Multisig, multisig::ScriptType};

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

@@ -75,7 +75,8 @@ impl ValidatedScriptConfigWithKeypath<'_> {
 mod tests {
     use super::*;
     use crate::bip32::parse_xpub;
-    use bitbox02::testing::{mock_memory, mock_unlocked};
+    use crate::keystore::testing::mock_unlocked;
+    use bitbox02::testing::mock_memory;
 
     #[test]
     fn test_self_transfer_representation_simple_type() {

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

@@ -138,9 +138,9 @@ mod tests {
     use super::*;
 
     use crate::hal::testing::TestingHal;
+    use crate::keystore::testing::mock_unlocked;
     use crate::workflow::testing::Screen;
     use alloc::boxed::Box;
-    use bitbox02::testing::mock_unlocked;
     use util::bb02_async::block_on;
     use util::bip32::HARDENED;
 

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

@@ -1294,9 +1294,10 @@ mod tests {
     use super::*;
     use crate::bip32::parse_xpub;
     use crate::hal::testing::TestingHal;
+    use crate::keystore::testing::{mock_unlocked, mock_unlocked_using_mnemonic};
     use crate::workflow::testing::Screen;
     use alloc::boxed::Box;
-    use bitbox02::testing::{mock_memory, mock_unlocked, mock_unlocked_using_mnemonic};
+    use bitbox02::testing::mock_memory;
     use hex_lit::hex;
     use pb::btc_payment_request_request::{Memo, memo};
     use util::bb02_async::block_on;