fix added change

Author: OBorce

wallet/src/account/mod.rs

@@ -444,6 +444,7 @@ impl<K: AccountKeyChains> Account<K> {
             selection_result = selection_result.add_change(
                 (total_fees_not_paid - new_total_fees_not_paid).unwrap_or(Amount::ZERO),
             )?;
+            let change_amount = selection_result.get_change();
             let change_output = match pay_fee_with_currency {
                 Currency::Coin => make_address_output(change_address.clone(), change_amount),
                 Currency::Token(token_id) => {

wallet/types/src/lib.rs

@@ -37,11 +37,12 @@ pub use currency::Currency;
 pub use keys::{KeyPurpose, KeychainUsageState, RootKeys};
 pub use wallet_tx::{BlockInfo, WalletTx};
 
+use std::collections::BTreeMap;
+
 use common::{
     chain::{SignedTransaction, Transaction},
     primitives::Amount,
 };
-use std::collections::BTreeMap;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct SignedTxWithFees {

wallet/wallet-cli-commands/src/command_handler/mod.rs

@@ -139,11 +139,7 @@ where
                 id_to_hex_string(*new_tx.tx_id.as_hash())
             )
         } else {
-            let hex = new_tx.tx.to_string();
-            let mut summary = new_tx.tx.take().transaction().text_summary(chain_config);
-            format_fees(&mut summary, &new_tx.fees);
-
-            format!("{summary}\nThe transaction was created and is ready to be submitted:\n{hex}",)
+            format_tx_to_be_broadcasted(new_tx.tx, &new_tx.fees, chain_config)
         };
 
         ConsoleCommand::Print(status_text)
@@ -1157,11 +1153,17 @@ where
                     )
                     .await?;
 
-                Ok(ConsoleCommand::Print(format!(
-                    "A new token has been issued with ID: {} in tx: {}",
-                    new_token.token_id,
-                    id_to_hex_string(*new_token.tx_id.as_hash())
-                )))
+                let result = if new_token.broadcasted {
+                    format!(
+                        "A new token has been issued with ID: {} in tx: {}",
+                        new_token.token_id,
+                        id_to_hex_string(*new_token.tx_id.as_hash())
+                    )
+                } else {
+                    format_tx_to_be_broadcasted(new_token.tx, &new_token.fees, chain_config)
+                };
+
+                Ok(ConsoleCommand::Print(result))
             }
 
             WalletCommand::IssueNewNft {
@@ -1191,11 +1193,17 @@ where
                     .issue_new_nft(selected_account, destination_address, metadata, self.config)
                     .await?;
 
-                Ok(ConsoleCommand::Print(format!(
-                    "A new NFT has been issued with ID: {} in tx: {}",
-                    new_token.token_id,
-                    id_to_hex_string(*new_token.tx_id.as_hash())
-                )))
+                let result = if new_token.broadcasted {
+                    format!(
+                        "A new NFT has been issued with ID: {} in tx: {}",
+                        new_token.token_id,
+                        id_to_hex_string(*new_token.tx_id.as_hash())
+                    )
+                } else {
+                    format_tx_to_be_broadcasted(new_token.tx, &new_token.fees, chain_config)
+                };
+
+                Ok(ConsoleCommand::Print(result))
             }
 
             WalletCommand::MintTokens {
@@ -1670,30 +1678,43 @@ where
 
             WalletCommand::CreateDelegation { owner, pool_id } => {
                 let (wallet, selected_account) = wallet_and_selected_acc(&mut self.wallet).await?;
-                let delegation_id = wallet
-                    .create_delegation(selected_account, owner, pool_id, self.config)
-                    .await?
-                    .delegation_id;
+                let new_delegation =
+                    wallet.create_delegation(selected_account, owner, pool_id, self.config).await?;
 
-                Ok(ConsoleCommand::Print(format!(
-                    "Success, the creation of delegation transaction was broadcast to the network. Delegation id: {}",
-                    delegation_id
-                )))
+                let result = if new_delegation.broadcasted {
+                    format!(
+                        "Success, the creation of delegation transaction was broadcast to the network. Delegation id: {} in tx: {}",
+                        new_delegation.delegation_id,
+                        id_to_hex_string(*new_delegation.tx_id.as_hash())
+                    )
+                } else {
+                    format_tx_to_be_broadcasted(
+                        new_delegation.tx,
+                        &new_delegation.fees,
+                        chain_config,
+                    )
+                };
+
+                Ok(ConsoleCommand::Print(result))
             }
 
             WalletCommand::DelegateStaking {
                 amount,
                 delegation_id,
             } => {
                 let (wallet, selected_account) = wallet_and_selected_acc(&mut self.wallet).await?;
-                wallet
+                let new_tx = wallet
                     .delegate_staking(selected_account, amount, delegation_id, self.config)
                     .await?;
 
-                Ok(ConsoleCommand::Print(
+                let result = if new_tx.broadcasted {
                     "Success, the delegation staking transaction was broadcast to the network"
-                        .to_owned(),
-                ))
+                        .to_owned()
+                } else {
+                    format_tx_to_be_broadcasted(new_tx.tx, &new_tx.fees, chain_config)
+                };
+
+                Ok(ConsoleCommand::Print(result))
             }
 
             WalletCommand::WithdrawFromDelegation {
@@ -1702,7 +1723,7 @@ where
                 delegation_id,
             } => {
                 let (wallet, selected_account) = wallet_and_selected_acc(&mut self.wallet).await?;
-                wallet
+                let new_tx = wallet
                     .withdraw_from_delegation(
                         selected_account,
                         address,
@@ -1711,9 +1732,8 @@ where
                         self.config,
                     )
                     .await?;
-                Ok(ConsoleCommand::Print(
-                    "Success. The transaction was broadcast to the network".to_owned(),
-                ))
+
+                Ok(Self::new_tx_command(new_tx, chain_config))
             }
 
             WalletCommand::CreateStakePool {
@@ -1953,6 +1973,18 @@ where
     }
 }
 
+fn format_tx_to_be_broadcasted(
+    tx: HexEncoded<SignedTransaction>,
+    fees: &Balances,
+    chain_config: &ChainConfig,
+) -> String {
+    let hex = tx.to_string();
+    let mut summary = tx.take().transaction().text_summary(chain_config);
+    format_fees(&mut summary, fees);
+
+    format!("{summary}\nThe transaction was created and is ready to be submitted:\n{hex}")
+}
+
 fn format_signature_status((idx, status): (usize, &RpcSignatureStatus)) -> String {
     let status = match status {
         RpcSignatureStatus::FullySigned => "FullySigned".to_owned(),

wallet/wallet-cli-commands/src/lib.rs

@@ -302,9 +302,9 @@ pub enum WalletCommand {
     #[command(flatten)]
     ColdCommands(ColdWalletCommand),
 
-    /// Configure broadcasting to Mempool to true or false.
+    /// Configure broadcasting to Mempool to yes or no.
     ///
-    /// If set to false, any command that creates a transaction will return it to the user and not submit it automatically.
+    /// If set to no, any command that creates a transaction will return it to the user and not submit it automatically.
     /// The transaction will need to be submitted manually with the command `node-submit-transaction`.
     ///
     /// The effect of this is not preserved when the CLI wallet is closed.
@@ -559,6 +559,13 @@ pub enum WalletCommand {
     },
 
     #[clap(name = "address-sweep-spendable")]
+    /// Sweep all spendable coins or tokens from an address or addresses specified in `addresses`
+    /// or all addresses from this account if all is set to true, to the given destination address.
+    /// Either 1 or more addresses need to be specified in `addresses` without `all` being set, or
+    /// `addresses` needs to be empty and --all being set.
+    ///
+    /// Spendable coins are any coins that are not locked, and tokens that are not frozen or locked.
+    /// The wallet will automatically calculate the required fees
     SweepFromAddress {
         /// The receiving address of the coins or tokens
         destination_address: String,
@@ -1100,20 +1107,23 @@ pub fn get_repl_command(cold_wallet: bool, mutable_wallet: bool) -> Command {
 
     // Customize the help template for all commands to make it more REPL friendly
     for subcommand in repl_command.get_subcommands_mut() {
-        if let Some(desc) =
-            COLD_WALLET_DESC.methods.iter().chain(WALLET_DESC.methods).find_map(|method| {
-                method
-                    .name
-                    .split('_')
-                    .zip(subcommand.get_name().split('-'))
-                    .all(|(x, y)| x == y)
-                    .then_some(method.description)
-            })
-        {
-            *subcommand = subcommand.clone().help_template(COMMAND_HELP_TEMPLATE).about(desc);
-        } else {
-            *subcommand = subcommand.clone().help_template(COMMAND_HELP_TEMPLATE);
+        let mut new_subcommand = subcommand.clone().help_template(COMMAND_HELP_TEMPLATE);
+        if new_subcommand.get_about().is_none() {
+            if let Some(desc) =
+                COLD_WALLET_DESC.methods.iter().chain(WALLET_DESC.methods).find_map(|method| {
+                    method
+                        .name
+                        .split('_')
+                        .zip(subcommand.get_name().split('-'))
+                        .all(|(x, y)| x == y)
+                        .then_some(method.description)
+                })
+            {
+                new_subcommand = new_subcommand.about(desc);
+            }
         }
+
+        *subcommand = new_subcommand;
     }
 
     repl_command