feat(cli): lists NTs/NFTs/Aliases/Foundries in addresses overview (#1179

) * add assets to addresses overview * match * clippy * extend vec * NativeTokensBuilder * slice * nit * changelog * Update cli/src/command/account.rs * Update cli/src/command/account.rs --------- Co-authored-by: Thibault Martinez <[email protected]>
iotaledger · Sep 12, 2023 · 3febeac · 3febeac
1 parent c3c0cf8
commit 3febeac
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 22 deletions.
diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Use `CommandFactory` to print help programmatically;
 - `print_wallet_help` changed to `WalletCli::print_help`;
 - `print_account_help` changed to `AccountCli::print_help`;
+- `AccountCommand::Addresses` now prints an overview that includes NTs, NFTs, Aliases and Foundries;
 
 ## 1.0.0 - 2023-07-27
 

diff --git a/cli/src/command/account.rs b/cli/src/command/account.rs
@@ -11,8 +11,8 @@ use iota_sdk::{
         block::{
             address::Bech32Address,
             output::{
-                unlock_condition::AddressUnlockCondition, AliasId, BasicOutputBuilder, FoundryId, NativeToken, NftId,
-                Output, OutputId, TokenId,
+                unlock_condition::AddressUnlockCondition, AliasId, BasicOutputBuilder, FoundryId, NativeToken,
+                NativeTokensBuilder, NftId, Output, OutputId, TokenId,
             },
             payload::transaction::TransactionId,
             ConvertTo,
@@ -926,40 +926,62 @@ async fn print_address(account: &Account, address: &AccountAddress) -> Result<()
     let addresses = account.addresses_with_unspent_outputs().await?;
     let current_time = iota_sdk::utils::unix_timestamp_now().as_secs() as u32;
 
+    let mut output_ids: &[OutputId] = &[];
+    let mut amount = 0;
+    let mut native_tokens = NativeTokensBuilder::new();
+    let mut nfts = Vec::new();
+    let mut aliases = Vec::new();
+    let mut foundries = Vec::new();
+
     if let Ok(index) = addresses.binary_search_by_key(&(address.key_index(), address.internal()), |a| {
         (a.key_index(), a.internal())
     }) {
-        let mut address_amount = 0;
-        for output_id in addresses[index].output_ids() {
+        output_ids = addresses[index].output_ids().as_slice();
+
+        for output_id in output_ids {
             if let Some(output_data) = account.get_output(output_id).await {
-                // Output might be associated with the address, but can't unlocked by it, so we check that here
-                let (required_address, _) =
-                    output_data
-                        .output
-                        .required_and_unlocked_address(current_time, output_id, None)?;
-                if *address.address().as_ref() == required_address {
+                // Output might be associated with the address, but can't be unlocked by it, so we check that here.
+                // Panic: cannot fail for outputs belonging to an account.
+                let (required_address, _) = output_data
+                    .output
+                    .required_and_unlocked_address(current_time, output_id, None)
+                    .unwrap();
+
+                if address.address().as_ref() == &required_address {
+                    if let Some(nts) = output_data.output.native_tokens() {
+                        native_tokens.add_native_tokens(nts.clone())?;
+                    }
+                    match &output_data.output {
+                        Output::Nft(nft) => nfts.push(nft.nft_id_non_null(output_id)),
+                        Output::Alias(alias) => aliases.push(alias.alias_id_non_null(output_id)),
+                        Output::Foundry(foundry) => foundries.push(foundry.id()),
+                        Output::Basic(_) | Output::Treasury(_) => {}
+                    }
                     let unlock_conditions = output_data
                         .output
                         .unlock_conditions()
                         .expect("output must have unlock conditions");
+                    let sdr_amount = unlock_conditions
+                        .storage_deposit_return()
+                        .map(|sdr| sdr.amount())
+                        .unwrap_or(0);
 
-                    if let Some(sdr) = unlock_conditions.storage_deposit_return() {
-                        address_amount += output_data.output.amount() - sdr.amount();
-                    } else {
-                        address_amount += output_data.output.amount();
-                    }
+                    amount += output_data.output.amount() - sdr_amount;
                 }
             }
         }
-        log = format!(
-            "{log}\nOutputs: {:#?}\nBase coin amount: {}\n",
-            addresses[index].output_ids(),
-            address_amount
-        );
-    } else {
-        log = format!("{log}\nOutputs: []\nBase coin amount: 0\n");
     }
 
+    log = format!(
+        "{log}\n Outputs: {:#?}\n Base coin amount: {}\n Native Tokens: {:?}\n NFTs: {:?}\n Aliases: {:?}\n Foundries: {:?}\n",
+        output_ids,
+        amount,
+        native_tokens.finish_vec()?,
+        nfts,
+        aliases,
+        foundries,
+    );
+
     println_log_info!("{log}");
 
     Ok(())