From 7e3a4289a5327ed0fa3044755ababfa91fd7ee2e Mon Sep 17 00:00:00 2001 From: Mason Yonkers Date: Fri, 23 Aug 2024 08:17:09 -0700 Subject: [PATCH] No longer display withdrawn auction NFTs when viewing balance in pcli (#4826) ## Describe your changes pcli no longer displays withdrawn auction NFTs when running ```pcli view balance``` ## Issue ticket number and link #4820 ## Checklist before requesting a review - [x] If this code contains consensus-breaking changes, I have added the "consensus-breaking" label. Otherwise, I declare my belief that there are not consensus-breaking changes, for the following reason: I have only modified what pcli filters out before displaying balances and added a function in denom_metadata that matches a similar function for LPNFTs. > After completing a number of auctions, viewing my balances through pcli has become increasingly difficult due to all of my previously withdrawn auction NFTs. I decided to not filter out closed auction positions so they can serve as a reminder to withdraw them, matching the default behavior of the swap frontend. --- crates/bin/pcli/src/command/view/balance.rs | 6 ++++-- crates/core/asset/src/asset/denom_metadata.rs | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/crates/bin/pcli/src/command/view/balance.rs b/crates/bin/pcli/src/command/view/balance.rs index d6a04139f7..b8946fe1ef 100644 --- a/crates/bin/pcli/src/command/view/balance.rs +++ b/crates/bin/pcli/src/command/view/balance.rs @@ -80,10 +80,12 @@ impl BalanceCmd { (*index, asset.value(sum.into())) }) }) - // Exclude withdrawn LPNFTs. + // Exclude withdrawn LPNFTs and withdrawn auction NFTs. .filter(|(_, value)| match asset_cache.get(&value.asset_id) { None => true, - Some(denom) => !denom.is_withdrawn_position_nft(), + Some(denom) => { + !denom.is_withdrawn_position_nft() && !denom.is_withdrawn_auction_nft() + } }); for (index, value) in rows { diff --git a/crates/core/asset/src/asset/denom_metadata.rs b/crates/core/asset/src/asset/denom_metadata.rs index 8b2b489f59..4e059468dc 100644 --- a/crates/core/asset/src/asset/denom_metadata.rs +++ b/crates/core/asset/src/asset/denom_metadata.rs @@ -345,6 +345,10 @@ impl Metadata { self.starts_with("auctionnft_") } + pub fn is_withdrawn_auction_nft(&self) -> bool { + self.starts_with("auctionnft_2") + } + pub fn is_opened_position_nft(&self) -> bool { let prefix = "lpnft_opened_".to_string();