review comments

hansieodendaal · Jul 24, 2024 · 200b7dd · 200b7dd
1 parent 9378393
commit 200b7dd
Show file tree

Hide file tree

Showing 42 changed files with 592 additions and 254 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,7 @@ members = [
     "applications/minotari_merge_mining_proxy",
     "applications/minotari_miner",
     "applications/minotari_ledger_wallet/comms",
+#    "applications/minotari_ledger_wallet/common",
     "integration_tests",
     "hashing",
 ]

diff --git a/applications/minotari_console_wallet/src/automation/commands.rs b/applications/minotari_console_wallet/src/automation/commands.rs
@@ -971,7 +971,7 @@ pub async fn command_runner(
 
                 let mut script_signature = Signature::default();
                 match key_manager_service
-                    .sign_with_challenge_and_message(
+                    .sign_with_nonce_and_challenge(
                         &party_info.wallet_spend_key_id,
                         &party_info.script_nonce_key_id,
                         &challenge,
@@ -1007,7 +1007,7 @@ pub async fn command_runner(
 
                 let mut metadata_signature = Signature::default();
                 match key_manager_service
-                    .sign_with_challenge_and_message(
+                    .sign_with_nonce_and_challenge(
                         &party_info.sender_offset_key_id,
                         &party_info.sender_offset_nonce_key_id,
                         &challenge,

diff --git a/applications/minotari_console_wallet/src/init/mod.rs b/applications/minotari_console_wallet/src/init/mod.rs
@@ -27,7 +27,7 @@ use std::{fs, io, path::PathBuf, str::FromStr, sync::Arc, time::Instant};
 use log::*;
 use minotari_app_utilities::{consts, identity_management::setup_node_identity};
 #[cfg(feature = "ledger")]
-use minotari_ledger_wallet_comms::accessor_methods::{ledger_get_public_alpha, ledger_get_view_key};
+use minotari_ledger_wallet_comms::accessor_methods::{ledger_get_public_spend_key, ledger_get_view_key};
 use minotari_wallet::{
     error::{WalletError, WalletStorageError},
     output_manager_service::storage::database::OutputManagerDatabase,
@@ -827,7 +827,7 @@ pub fn prompt_wallet_type(
                 if prompt(connected_hardware_msg) {
                     print!("Scanning for connected Ledger hardware device... ");
                     let account = prompt_ledger_account(boot_mode).expect("An account value");
-                    match ledger_get_public_alpha(account) {
+                    match ledger_get_public_spend_key(account) {
                         Ok(public_alpha) => match ledger_get_view_key(account) {
                             Ok(view_key) => {
                                 let ledger = LedgerWallet::new(

diff --git a/applications/minotari_ledger_wallet/common/Cargo.toml b/applications/minotari_ledger_wallet/common/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "minotari_ledger_wallet_common"
+version = "1.0.0-pre.16"
+authors = ["The Tari Development Community"]
+license = "BSD-3-Clause"
+edition = "2021"
+
+[dependencies]