working

tari-project · Feb 25, 2025 · ea80f29 · ea80f29
1 parent 73682e6
commit ea80f29
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/applications/minotari_ledger_wallet/wallet/src/handlers/get_schnorr_signature.rs b/applications/minotari_ledger_wallet/wallet/src/handlers/get_schnorr_signature.rs
@@ -110,22 +110,20 @@ pub fn handler_get_script_schnorr_signature(comm: &mut Comm) -> Result<(), AppSW
         }
         return Err(AppSW::WrongApduLength);
     }
-
     let mut account_bytes = [0u8; 8];
     account_bytes.clone_from_slice(&data[0..8]);
     let account = u64::from_le_bytes(account_bytes);
 
     let mut private_key_index_bytes = [0u8; 8];
     private_key_index_bytes.clone_from_slice(&data[8..16]);
     let private_key_index = u64::from_le_bytes(private_key_index_bytes);
-
     let mut private_key_type_bytes = [0u8; 8];
+
     private_key_type_bytes.clone_from_slice(&data[16..24]);
     let key_type = u64::from_le_bytes(private_key_type_bytes);
     let private_key_type = KeyType::from_branch_key(key_type)?;
 
     let private_key = derive_from_bip32_key(account, private_key_index, private_key_type)?;
-
     let mut nonce_bytes = [0u8; 32];
     nonce_bytes.clone_from_slice(&data[24..56]);
 
@@ -149,7 +147,6 @@ pub fn handler_get_script_schnorr_signature(comm: &mut Comm) -> Result<(), AppSW
                 return Err(AppSW::SchnorrSignatureFail);
             },
         };
-
     comm.append(&[RESPONSE_VERSION]); // version
     comm.append(&signature.get_public_nonce().to_vec());
     comm.append(&signature.get_signature().to_vec());

diff --git a/applications/minotari_ledger_wallet/wallet/src/tari_crypto/hashing.rs b/applications/minotari_ledger_wallet/wallet/src/tari_crypto/hashing.rs
@@ -1,7 +1,6 @@
 use alloc::{format, string::String};
 use core::marker::PhantomData;
 
-use blake2::{Blake2b, Blake2bVar};
 use digest::{Digest, FixedOutput, FixedOutputReset, Output, OutputSizeUser, Update};
 
 use crate::hashing::DomainSeparatedHash;

diff --git a/applications/minotari_ledger_wallet/wallet/src/tari_crypto/keys.rs b/applications/minotari_ledger_wallet/wallet/src/tari_crypto/keys.rs
@@ -16,7 +16,6 @@ use curve25519_dalek::{
     constants::RISTRETTO_BASEPOINT_TABLE,
     ristretto::{CompressedRistretto, RistrettoPoint},
     scalar::Scalar,
-    traits::MultiscalarMul,
 };
 use digest::{consts::U64, Digest};
 use rand_core::{CryptoRng, RngCore};

diff --git a/applications/minotari_ledger_wallet/wallet/src/utils.rs b/applications/minotari_ledger_wallet/wallet/src/utils.rs
@@ -156,15 +156,17 @@ fn cx_error_to_string(e: CxError) -> String {
 //       ever used in a subsequent key derivation function.
 fn get_raw_bip32_key(path: &[u32]) -> Result<Zeroizing<[u8; 64]>, String> {
     let mut key_buffer = Zeroizing::new([0u8; 64]);
-    match bip32_derive(CurvesId::Secp256k1, path, key_buffer.as_mut(), Some(&mut [])) {
+    match bip32_derive(CurvesId::Secp256k1, path, key_buffer.as_mut(), None) {
         Ok(_) => {
             if key_buffer.deref() == &[0u8; 64] {
                 return Err(cx_error_to_string(CxError::InternalError));
             } else {
                 Ok(key_buffer)
             }
         },
-        Err(e) => return Err(cx_error_to_string(e)),
+        Err(e) => {
+            return Err(cx_error_to_string(e))
+        },
     }
 }
 
@@ -177,7 +179,6 @@ fn get_raw_key_hash(path: &[u32]) -> Result<Zeroizing<[u8; 64]>, String> {
     DomainSeparatedHasher::<Blake2b<U64>, LedgerHashDomain>::new_with_label("raw_key")
         .chain(&raw_key_64.as_ref())
         .finalize_into(raw_key_hashed.as_mut().into());
-
     Ok(raw_key_hashed)
 }