chore: simplify premine spending process (#6845)

Description
---
simplyfies the prespend commands and process. 

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **New Features**
- Enhanced pre-mining operations with interactive prompts, including
dynamic alias validation and file path input.
- Introduced JSON serialization and deserialization for `TariAddress`
objects.

- **CLI Enhancements**
- Reorganized command-line options with improved defaults and
streamlined argument handling for pre-mining functions.

- **Refactor & Improvements**
- Upgraded session management with timestamp-based identifiers for
output directories.
- Improved error handling and descriptive messages for command
processing.
  - Adopted custom formatting for address display to ensure consistency.

- **Chores**
- Simplified and updated dependency configurations for easier
maintenance.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

Author: SWvheerden

Cargo.lock

@@ -38,6 +38,7 @@ clap = { version = "3.2", features = ["derive", "env"] }
 config = "0.14.0"
 crossterm = { version = "0.28" }
 digest = "0.10"
+dialoguer = { version = "0.10" }
 dirs-next = "2.0"
 futures = { version = "^0.3.16", default-features = false, features = [
     "alloc",

applications/minotari_console_wallet/Cargo.toml

@@ -51,6 +51,7 @@ struct PreMineSpendStep1SessionInfo {
 #[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
 struct RecipientInfo {
     output_to_be_spend: usize,
+    #[serde(with = "tari_common_types::tari_address::tari_address_json_bs58")]
     recipient_address: TariAddress,
 }
 

applications/minotari_console_wallet/src/automation/commands.rs

@@ -27,11 +27,8 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use digest::crypto_common::rand_core::OsRng;
+use chrono::Utc;
 use serde::{de::DeserializeOwned, Serialize};
-use tari_common_types::types::PrivateKey;
-use tari_crypto::keys::SecretKey;
-use tari_utilities::encoding::MBase58;
 
 use crate::automation::{
     commands::{FILE_EXTENSION, SPEND_SESSION_INFO},
@@ -133,8 +130,8 @@ fn append_to_json_file<P: AsRef<Path>, T: Serialize>(file: P, data: T) -> Result
 
 /// Create a unique session-based output directory
 pub(crate) fn create_pre_mine_output_dir(alias: Option<&str>) -> Result<(String, PathBuf), CommandError> {
-    let mut session_id = PrivateKey::random(&mut OsRng).to_monero_base58();
-    session_id.truncate(if alias.is_some() { 8 } else { 16 });
+    let date_time = Utc::now();
+    let mut session_id = format!("{}", date_time.format("%Y%m%d%H%M%S"));
     if let Some(alias) = alias {
         session_id.push('_');
         session_id.push_str(alias);

applications/minotari_console_wallet/src/automation/mod.rs

@@ -139,11 +139,11 @@ pub enum CliCommands {
     SendMinotari(SendMinotariArgs),
     BurnMinotari(BurnMinotariArgs),
     PreMineSpendGetOutputStatus,
-    PreMineSpendSessionInfo(PreMineSpendSessionInfoArgs),
-    PreMineSpendPartyDetails(PreMineSpendPartyDetailsArgs),
-    PreMineSpendEncumberAggregateUtxo(PreMineSpendEncumberAggregateUtxoArgs),
-    PreMineSpendInputOutputSigs(PreMineSpendInputOutputSigArgs),
-    PreMineSpendAggregateTransaction(PreMineSpendAggregateTransactionArgs),
+    PreMineStart(PreMineStartSessionArgs),
+    PreMineStartParty(PreMineSpendPartyDetailsArgs),
+    PreMineEncumber(PreMineSpendEncumberAggregateUtxoArgs),
+    PreMineSigs(PreMineSpendInputOutputSigArgs),
+    PreMineSpendTx(PreMineSpendAggregateTransactionArgs),
     PreMineSpendBackupUtxo(PreMineSpendBackupUtxoArgs),
     SendOneSidedToStealthAddress(SendMinotariArgs),
     MakeItRain(MakeItRainArgs),
@@ -190,8 +190,8 @@ pub struct BurnMinotariArgs {
 }
 
 #[derive(Debug, Args, Clone)]
-pub struct PreMineSpendSessionInfoArgs {
-    #[clap(long)]
+pub struct PreMineStartSessionArgs {
+    #[clap(long, default_value = "1")]
     pub fee_per_gram: MicroMinotari,
     #[clap(long)]
     pub recipient_info: Vec<CliRecipientInfo>,
@@ -251,21 +251,19 @@ impl FromStr for CliRecipientInfo {
 #[derive(Debug, Args, Clone)]
 pub struct PreMineSpendPartyDetailsArgs {
     #[clap(long)]
-    pub input_file: PathBuf,
+    pub input_file: Option<String>,
     #[clap(long)]
     pub pre_mine_file_path: Option<PathBuf>,
-    #[clap(long)]
-    pub recipient_info: Vec<CliRecipientInfo>,
-    #[clap(long)]
+    #[clap(long, default_value = "")]
     pub alias: String,
 }
 
 #[derive(Debug, Args, Clone)]
 pub struct PreMineSpendEncumberAggregateUtxoArgs {
-    #[clap(long)]
+    #[clap(long, default_value = "")]
     pub session_id: String,
     #[clap(long)]
-    pub input_file_names: Vec<String>,
+    pub member: Vec<String>,
     #[clap(long)]
     pub pre_mine_file_path: Option<PathBuf>,
     #[clap(short, long, default_value = "Spend pre-mine encumber aggregate UTXO")]
@@ -274,23 +272,23 @@ pub struct PreMineSpendEncumberAggregateUtxoArgs {
 
 #[derive(Debug, Args, Clone)]
 pub struct PreMineSpendInputOutputSigArgs {
-    #[clap(long)]
+    #[clap(long, default_value = "")]
     pub session_id: String,
     #[clap(long)]
     pub pre_mine_file_path: Option<PathBuf>,
 }
 
 #[derive(Debug, Args, Clone)]
 pub struct PreMineSpendAggregateTransactionArgs {
-    #[clap(long)]
+    #[clap(long, default_value = "")]
     pub session_id: String,
     #[clap(long)]
-    pub input_file_names: Vec<String>,
+    pub member: Vec<String>,
 }
 
 #[derive(Debug, Args, Clone)]
 pub struct PreMineSpendBackupUtxoArgs {
-    #[clap(long)]
+    #[clap(long, default_value = "1")]
     pub fee_per_gram: MicroMinotari,
     #[clap(long)]
     pub output_index: usize,

applications/minotari_console_wallet/src/automation/utils.rs

@@ -169,13 +169,13 @@ fn force_exit_for_pre_mine_commands(command: &CliCommands) -> (bool, bool) {
         matches!(
             command,
             CliCommands::PreMineSpendGetOutputStatus |
-                CliCommands::PreMineSpendSessionInfo(_) |
-                CliCommands::PreMineSpendEncumberAggregateUtxo(_) |
-                CliCommands::PreMineSpendPartyDetails(_) |
-                CliCommands::PreMineSpendInputOutputSigs(_) |
+                CliCommands::PreMineStart(_) |
+                CliCommands::PreMineEncumber(_) |
+                CliCommands::PreMineStartParty(_) |
+                CliCommands::PreMineSigs(_) |
                 CliCommands::PreMineSpendBackupUtxo(_)
         ),
-        matches!(command, CliCommands::PreMineSpendAggregateTransaction(_)),
+        matches!(command, CliCommands::PreMineSpendTx(_)),
     )
 }
 
@@ -534,8 +534,7 @@ mod test {
     #[test]
     #[allow(clippy::too_many_lines)]
     fn clap_parses_user_defined_commands_as_expected() {
-        let script =
-            "
+        let script = "
             # Beginning of script file
 
             get-balance
@@ -545,45 +544,37 @@ mod test {
             discover-peer f6b2ca781342a3ebe30ee1643655c96f1d7c14f4d49f077695395de98ae73665
 
             send-minotari --payment-id Our_secret! 125T \
-             f425UWsDp714RiN53c1G6ek57rfFnotB5NCMyrn4iDgbR8i2sXVHa4xSsedd66o9KmkRgErQnyDdCaAdNLzcKrj7eUb
+                      f425UWsDp714RiN53c1G6ek57rfFnotB5NCMyrn4iDgbR8i2sXVHa4xSsedd66o9KmkRgErQnyDdCaAdNLzcKrj7eUb
             
             burn-minotari --payment-id Ups_these_funds_will_be_burned! 100T
 
             pre-mine-spend-get-output-status
 
-            pre-mine-spend-session-info --fee-per-gram 2 \
-             --recipient-info=[1,123,313]:\
-             f4LR9f6WwwcPiKJjK5ciTkU1ocNhANa3FPw1wkyVUwbuKpgiihawCXy6PFszunUWQ4Te8KVFnyWVHHwsk9x5Cg7ZQiA \
-             --verify-unspent-outputs --use-pre-mine-input-file
+            pre-mine-start \
+                      --recipient-info=[1,123,313]:\
+                      f4LR9f6WwwcPiKJjK5ciTkU1ocNhANa3FPw1wkyVUwbuKpgiihawCXy6PFszunUWQ4Te8KVFnyWVHHwsk9x5Cg7ZQiA
 
-            pre-mine-spend-party-details --input-file ./step_1_session_info.txt --alias alice \
-             --recipient-info=[1,123,313]:\
-             f4LR9f6WwwcPiKJjK5ciTkU1ocNhANa3FPw1wkyVUwbuKpgiihawCXy6PFszunUWQ4Te8KVFnyWVHHwsk9x5Cg7ZQiA \
-             --pre-mine-file-path ./pre_mine_file.txt
+            pre-mine-start-party --alias alice --input-file './step_1_session_info.json'
 
-            pre-mine-spend-encumber-aggregate-utxo --session-id ee1643655c \
-             --input-file-names=step_2_for_leader_from_alice.txt --input-file-names=step_2_for_leader_from_bob.txt \
-             --input-file-names=step_2_for_leader_from_carol.txt
+            pre-mine-encumber --session-id 20250306070544 --member=alice --member=bob
 
-            pre-mine-spend-input-output-sigs --session-id ee1643655c
+            pre-mine-sigs --session-id 20250306070544
 
-            pre-mine-spend-aggregate-transaction --session-id ee1643655c \
-             --input-file-names=step_4_for_leader_from_alice.txt --input-file-names=step_4_for_leader_from_bob.txt \
-             --input-file-names=step_4_for_leader_from_carol.txt
+            pre-mine-spend-tx --session-id 20250306070544 --member=alice --member=bob
 
             coin-split --payment-id Make_many_dust_UTXOs! --fee-per-gram 2 0.001T 499
 
             make-it-rain --duration 100 --transactions-per-second 10 --start-amount 0.009200T --increase-amount 0T \
-             --start-time now --payment-id Stressing_it_a_bit...!_(from_Feeling-a-bit-Generous) \
-             f425UWsDp714RiN53c1G6ek57rfFnotB5NCMyrn4iDgbR8i2sXVHa4xSsedd66o9KmkRgErQnyDdCaAdNLzcKrj7eUb
+                      --start-time now --payment-id Stressing_it_a_bit...!_(from_Feeling-a-bit-Generous) \
+                      f425UWsDp714RiN53c1G6ek57rfFnotB5NCMyrn4iDgbR8i2sXVHa4xSsedd66o9KmkRgErQnyDdCaAdNLzcKrj7eUb
 
             export-tx 123456789 --output-file pie.txt
 
             import-tx --input-file pie_this_message.txt
 
             # End of script file
             "
-            .to_string();
+        .to_string();
 
         let commands = parse_command_file(script).unwrap();
 
@@ -608,11 +599,11 @@ mod test {
                 CliCommands::SendMinotari(_) => send_tari = true,
                 CliCommands::BurnMinotari(_) => burn_tari = true,
                 CliCommands::PreMineSpendGetOutputStatus => pre_mine_spend_get_output_status = true,
-                CliCommands::PreMineSpendSessionInfo(_) => pre_mine_spend_session_info = true,
-                CliCommands::PreMineSpendPartyDetails(_) => pre_mine_spend_party_details = true,
-                CliCommands::PreMineSpendEncumberAggregateUtxo(_) => pre_mine_spend_encumber_aggregate_utxo = true,
-                CliCommands::PreMineSpendInputOutputSigs(_) => pre_mine_spend_input_output_sigs = true,
-                CliCommands::PreMineSpendAggregateTransaction(_) => pre_mine_spend_aggregate_transaction = true,
+                CliCommands::PreMineStart(_) => pre_mine_spend_session_info = true,
+                CliCommands::PreMineStartParty(_) => pre_mine_spend_party_details = true,
+                CliCommands::PreMineEncumber(_) => pre_mine_spend_encumber_aggregate_utxo = true,
+                CliCommands::PreMineSigs(_) => pre_mine_spend_input_output_sigs = true,
+                CliCommands::PreMineSpendTx(_) => pre_mine_spend_aggregate_transaction = true,
                 CliCommands::SendOneSidedToStealthAddress(_) => {},
                 CliCommands::MakeItRain(_) => make_it_rain = true,
                 CliCommands::CoinSplit(_) => coin_split = true,

applications/minotari_console_wallet/src/cli.rs

@@ -212,7 +212,8 @@ mod tests {
         assert!(config.inner_config.allow_methods.contains(&GrpcMethod::GetConstants));
         assert!(!config.inner_config.allow_methods.contains(&GrpcMethod::GetBlocks)); // commented out in the config
         assert!(config.inner_config.allow_methods.contains(&GrpcMethod::Identify));
-        assert!(!config.inner_config.allow_methods.contains(&GrpcMethod::GetShardKey)); // commented out in the config
+        assert!(!config.inner_config.allow_methods.contains(&GrpcMethod::GetShardKey));
+        // commented out in the config
     }
 
     #[test]

applications/minotari_console_wallet/src/wallet_modes.rs

@@ -378,6 +378,70 @@ impl Default for TariAddress {
     }
 }
 
+pub mod tari_address_json_bs58 {
+    use std::fmt;
+
+    use serde::{
+        de::{Error, Visitor},
+        Deserializer,
+        Serializer,
+    };
+
+    use crate::tari_address::TariAddress;
+
+    /// Serializes a [`TariAddress`] to a base58 string or a binary array.
+    pub fn serialize<S>(address: &TariAddress, ser: S) -> Result<S::Ok, S::Error>
+    where S: Serializer {
+        if ser.is_human_readable() {
+            ser.serialize_str(&address.to_base58())
+        } else {
+            ser.serialize_bytes(&address.to_vec())
+        }
+    }
+
+    /// Serializes a [`TariAddress`] from a base58 string or a binary array.
+    pub fn deserialize<'de, D>(de: D) -> Result<TariAddress, D::Error>
+    where D: Deserializer<'de> {
+        let visitor = Base58Visitor::default();
+        if de.is_human_readable() {
+            de.deserialize_string(visitor)
+        } else {
+            de.deserialize_bytes(visitor)
+        }
+    }
+    #[derive(Default)]
+    struct Base58Visitor {}
+
+    impl<'de> Visitor<'de> for Base58Visitor {
+        type Value = TariAddress;
+
+        fn expecting(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+            fmt.write_str("Expecting a binary array or Base58 string")
+        }
+
+        fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+        where E: Error {
+            let address = TariAddress::from_base58(v).map_err(|e| E::custom(e.to_string()))?;
+            Ok(address)
+        }
+
+        fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+        where E: Error {
+            self.visit_str(&v)
+        }
+
+        fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
+        where E: Error {
+            TariAddress::from_bytes(v).map_err(|e| E::custom(e.to_string()))
+        }
+
+        fn visit_borrowed_bytes<E>(self, v: &'de [u8]) -> Result<Self::Value, E>
+        where E: Error {
+            self.visit_bytes(v)
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use tari_crypto::keys::SecretKey;

applications/minotari_node/src/grpc_method.rs

@@ -670,7 +670,7 @@ mod test {
             1u8, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
             29, 30, 31, 32,
         ]);
-        let bin =  "0000000100000010000000110000010000000101000001100000011100001000\
+        let bin = "0000000100000010000000110000010000000101000001100000011100001000\
                          0000100100001010000010110000110000001101000011100000111100010000\
                          0001000100010010000100110001010000010101000101100001011100011000\
                          0001100100011010000110110001110000011101000111100001111100100000";

base_layer/common_types/src/tari_address/mod.rs

@@ -551,8 +551,9 @@ where S: Service<DhtOutboundMessage, Response = (), Error = PipelineError>
                     );
                     let signature =
                         MessageSignature::new_signed(self.node_identity.secret_key().clone(), &binding_hash).to_proto();
-                    Ok((None, Some(signature.to_encoded_bytes().into()), body.freeze())) // this includes the signer
-                                                                                         // public key
+                    Ok((None, Some(signature.to_encoded_bytes().into()), body.freeze()))
+                // this includes the signer
+                // public key
                 } else {
                     Ok((None, None, body.freeze()))
                 }

base_layer/mmr/src/sparse_merkle_tree/node.rs

@@ -11,11 +11,9 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-tari_crypto = { workspace = true, default-features = false, features = [
-    "borsh",
-] }
-borsh = { version = "1.5", default-features = false }
-digest = { version = "0.10", default-features = false }
+tari_crypto = { workspace = true, features = ["borsh"] }
+borsh = { version = "1.5" }
+digest = { version = "0.10" }
 
 [dev-dependencies]
 blake2 = "0.10"

comms/dht/src/outbound/broadcast.rs

@@ -1593,8 +1593,9 @@ async fn wallet_with_tari_connected_to_base_node(
     while reward < amount {
         current_height += 1;
         num_blocks += 1;
-        reward += world.consensus_manager.get_block_reward_at(current_height).as_u64() / 1_000_000; // 1 T = 1_000_000
-                                                                                                    // uT
+        reward += world.consensus_manager.get_block_reward_at(current_height).as_u64() / 1_000_000;
+        // 1 T = 1_000_000
+        // uT
     }
 
     println!("Creating miner...");