Merge pull request #637 from fluidvanadium/confirmed_summaries

added unconfirmed to summaries
zingolabs · Oct 27, 2023 · 6caa904 · 6caa904
2 parents fe9a81d + dfae8ed
commit 6caa904
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/zingolib/src/lightclient.rs b/zingolib/src/lightclient.rs
@@ -468,10 +468,11 @@ impl LightClient {
             match tx_fee_result {
                 Ok(tx_fee) => {
                     if transaction_md.is_outgoing_transaction() {
-                        let (block_height, datetime, price) = (
+                        let (block_height, datetime, price, unconfirmed) = (
                             transaction_md.block_height,
                             transaction_md.datetime,
                             transaction_md.price,
+                            transaction_md.unconfirmed,
                         );
                         summaries.push(ValueTransfer {
                             block_height,
@@ -480,6 +481,7 @@ impl LightClient {
                             memos: vec![],
                             price,
                             txid: *txid,
+                            unconfirmed,
                         });
                     }
                 }
@@ -1522,10 +1524,11 @@ impl LightClient {
         txid: TxId,
         transaction_md: &TransactionMetadata,
     ) {
-        let (block_height, datetime, price) = (
+        let (block_height, datetime, price, unconfirmed) = (
             transaction_md.block_height,
             transaction_md.datetime,
             transaction_md.price,
+            transaction_md.unconfirmed,
         );
         match (
             transaction_md.is_outgoing_transaction(),
@@ -1561,6 +1564,7 @@ impl LightClient {
                             memos,
                             price,
                             txid,
+                            unconfirmed,
                         });
                     }
                 }
@@ -1578,6 +1582,7 @@ impl LightClient {
                         memos: vec![],
                         price,
                         txid,
+                        unconfirmed,
                     });
                 }
                 for received_sapling in transaction_md.sapling_notes.iter() {
@@ -1596,6 +1601,7 @@ impl LightClient {
                         memos,
                         price,
                         txid,
+                        unconfirmed,
                     });
                 }
                 for received_orchard in transaction_md.orchard_notes.iter() {
@@ -1614,6 +1620,7 @@ impl LightClient {
                         memos,
                         price,
                         txid,
+                        unconfirmed,
                     });
                 }
             }
@@ -1644,6 +1651,7 @@ impl LightClient {
                         .collect(),
                     price,
                     txid,
+                    unconfirmed,
                 });
             }
         };

diff --git a/zingolib/src/wallet/data.rs b/zingolib/src/wallet/data.rs
@@ -784,6 +784,7 @@ pub mod summaries {
         pub memos: Vec<zcash_primitives::memo::TextMemo>,
         pub price: Option<f64>,
         pub txid: TxId,
+        pub unconfirmed: bool,
     }
     impl ValueTransfer {
         pub fn balance_delta(&self) -> i64 {
@@ -814,6 +815,7 @@ pub mod summaries {
                 )
                 .field("price", &self.price)
                 .field("txid", &self.txid)
+                .field("unconfirmed", &self.unconfirmed)
                 .finish()
         }
     }
@@ -854,6 +856,7 @@ pub mod summaries {
                     "pool": "",
                     "price": value.price,
                     "txid": value.txid.to_string(),
+                    "unconfirmed": value.unconfirmed,
             };
             match value.kind {
                 ValueTransferKind::Sent {