block height in TxInfo

Author: Ximik

client/src/wallets.rs

@@ -17,7 +17,7 @@ use spaces_protocol::{
 use spaces_wallet::{
     address::SpaceAddress,
     bdk_wallet::{
-        chain::{local_chain::CheckPoint, BlockId},
+        chain::{local_chain::CheckPoint, BlockId, ChainPosition},
         KeychainKind,
     },
     bitcoin,
@@ -69,8 +69,9 @@ pub struct ListSpacesResponse {
 #[derive(Tabled, Debug, Clone, Serialize, Deserialize)]
 #[tabled(rename_all = "UPPERCASE")]
 pub struct TxInfo {
+    #[tabled(display_with = "display_block_height")]
+    pub block_height: Option<u32>,
     pub txid: Txid,
-    pub confirmed: bool,
     pub sent: Amount,
     pub received: Amount,
     #[tabled(display_with = "display_fee")]
@@ -79,6 +80,13 @@ pub struct TxInfo {
     pub events: Vec<TxEvent>,
 }
 
+fn display_block_height(block_height: &Option<u32>) -> String {
+    match block_height {
+        None => "Unconfirmed".to_string(),
+        Some(block_height) => block_height.to_string(),
+    }
+}
+
 fn display_fee(fee: &Option<Amount>) -> String {
     match fee {
         None => "--".to_string(),
@@ -720,14 +728,17 @@ impl RpcWallet {
             .skip(skip)
             .take(count)
             .map(|ctx| {
+                let block_height = match ctx.chain_position {
+                    ChainPosition::Confirmed { anchor, .. } => Some(anchor.block_id.height),
+                    ChainPosition::Unconfirmed { .. } => None,
+                };
                 let tx = ctx.tx_node.tx.clone();
                 let txid = ctx.tx_node.txid.clone();
-                let confirmed = ctx.chain_position.is_confirmed();
                 let (sent, received) = wallet.sent_and_received(&tx);
                 let fee = wallet.calculate_fee(&tx).ok();
                 TxInfo {
+                    block_height,
                     txid,
-                    confirmed,
                     sent,
                     received,
                     fee,

client/tests/integration_tests.rs

@@ -689,7 +689,7 @@ async fn it_should_replace_mempool_bids(rig: &TestRig) -> anyhow::Result<()> {
         .wallet_list_transactions(ALICE, 1000, 0)
         .await
         .expect("list transactions");
-    let unconfirmed: Vec<_> = txs.iter().filter(|tx| !tx.confirmed).collect();
+    let unconfirmed: Vec<_> = txs.iter().filter(|tx| tx.block_height.is_none()).collect();
     for tx in &unconfirmed {
         println!("Alice's unconfiremd: {}", tx.txid);
     }
@@ -726,7 +726,7 @@ async fn it_should_replace_mempool_bids(rig: &TestRig) -> anyhow::Result<()> {
     assert!(
         eve_txs
             .iter()
-            .any(|tx| tx.txid == eve_replacement_txid && tx.confirmed),
+            .any(|tx| tx.txid == eve_replacement_txid && tx.block_height.is_some()),
         "Eve's tx should be confirmed"
     );