Merge pull request #93 from utxostack/ln-activity-msat

Add amount_msat to LN activity

Author: duanyytop

mutiny-core/src/lib.rs

@@ -340,6 +340,7 @@ pub struct MutinyInvoice {
     pub preimage: Option<String>,
     pub payee_pubkey: Option<PublicKey>,
     pub amount_sats: Option<u64>,
+    pub amount_msat: Option<u64>,
     pub expire: u64,
     pub status: HTLCStatus,
     #[serde(default)]
@@ -361,6 +362,7 @@ impl Default for MutinyInvoice {
             preimage: None,
             payee_pubkey: None,
             amount_sats: None,
+            amount_msat: None,
             expire: 0,
             status: HTLCStatus::Pending,
             privacy_level: PrivacyLevel::NotAvailable,
@@ -398,6 +400,7 @@ impl From<Bolt11Invoice> for MutinyInvoice {
 
         let payment_hash = value.payment_hash().to_owned();
         let payee_pubkey = value.payee_pub_key().map(|p| p.to_owned());
+        let amount_msat = value.amount_milli_satoshis();
         let amount_sats = value.amount_milli_satoshis().map(|m| m / 1000);
 
         MutinyInvoice {
@@ -407,6 +410,7 @@ impl From<Bolt11Invoice> for MutinyInvoice {
             preimage: None,
             payee_pubkey,
             amount_sats,
+            amount_msat,
             expire: expiry,
             status: HTLCStatus::Pending,
             privacy_level: PrivacyLevel::NotAvailable,
@@ -483,6 +487,7 @@ impl MutinyInvoice {
                 })
             }
             None => {
+                let amount_msat: Option<u64> = i.amt_msat.0;
                 let amount_sats: Option<u64> = i.amt_msat.0.map(|s| s / 1_000);
                 let fees_paid = i.fee_paid_msat.map(|f| f / 1_000);
                 let preimage = i.preimage.map(|p| p.to_lower_hex_string());
@@ -494,6 +499,7 @@ impl MutinyInvoice {
                     preimage,
                     payee_pubkey: i.payee_pubkey,
                     amount_sats,
+                    amount_msat,
                     expire: i.last_update,
                     status: i.status,
                     privacy_level: i.privacy_level,

mutiny-core/src/nodemanager.rs

@@ -2317,6 +2317,7 @@ mod tests {
             preimage: Some(preimage.to_lower_hex_string()),
             payee_pubkey: None,
             amount_sats: Some(100_000),
+            amount_msat: Some(100_000_000),
             expire: 1681781649 + 86400,
             status: HTLCStatus::Succeeded,
             privacy_level: PrivacyLevel::Anonymous,
@@ -2373,6 +2374,7 @@ mod tests {
             preimage: Some(preimage.to_lower_hex_string()),
             payee_pubkey: Some(pubkey),
             amount_sats: Some(100),
+            amount_msat: Some(100_000),
             expire: 1681781585,
             status: HTLCStatus::Succeeded,
             privacy_level: PrivacyLevel::Anonymous,
@@ -2477,6 +2479,7 @@ mod tests {
             preimage: Some(preimage.to_lower_hex_string()),
             payee_pubkey: Some(pubkey),
             amount_sats: Some(100),
+            amount_msat: Some(100_000),
             expire: 1681781585,
             status: HTLCStatus::Succeeded,
             privacy_level: PrivacyLevel::NotAvailable,
@@ -2494,6 +2497,7 @@ mod tests {
             preimage: Some(preimage.to_lower_hex_string()),
             payee_pubkey: Some(pubkey),
             amount_sats: Some(100),
+            amount_msat: Some(100_000),
             expire: 1681781585,
             status: HTLCStatus::Succeeded,
             privacy_level: PrivacyLevel::NotAvailable,
@@ -2511,6 +2515,7 @@ mod tests {
             preimage: None,
             payee_pubkey: Some(pubkey),
             amount_sats: Some(101),
+            amount_msat: Some(101_000),
             expire: 1581781585,
             status: HTLCStatus::InFlight,
             privacy_level: PrivacyLevel::NotAvailable,
@@ -2528,6 +2533,7 @@ mod tests {
             preimage: None,
             payee_pubkey: Some(pubkey),
             amount_sats: Some(102),
+            amount_msat: Some(102_000),
             expire: 1581781585,
             status: HTLCStatus::InFlight,
             privacy_level: PrivacyLevel::NotAvailable,
@@ -2545,6 +2551,7 @@ mod tests {
             preimage: Some(preimage.to_lower_hex_string()),
             payee_pubkey: Some(pubkey),
             amount_sats: Some(100),
+            amount_msat: Some(100_000),
             expire: 1681781585,
             status: HTLCStatus::Succeeded,
             privacy_level: PrivacyLevel::NotAvailable,

mutiny-wasm/Cargo.toml

@@ -2,7 +2,7 @@ cargo-features = ["per-package-target"]
 
 [package]
 name = "mutiny-wasm"
-version = "1.12.1"
+version = "1.12.2"
 edition = "2021"
 authors = ["utxostack"]
 forced-target = "wasm32-unknown-unknown"

mutiny-wasm/src/models.rs

@@ -29,6 +29,7 @@ pub struct ActivityItem {
     pub kind: ActivityType,
     id: String,
     pub amount_sats: Option<u64>,
+    pub amount_msat: Option<u64>,
     pub inbound: bool,
     pub(crate) labels: Vec<String>,
     pub last_updated: Option<u64>,
@@ -98,6 +99,11 @@ impl From<mutiny_core::ActivityItem> for ActivityItem {
             mutiny_core::ActivityItem::ChannelClosed(_) => (false, None),
         };
 
+        let amount_msat = match a {
+            mutiny_core::ActivityItem::Lightning(ref ln) => ln.amount_msat,
+            _ => None,
+        };
+
         let fee_paid_msat = match a {
             mutiny_core::ActivityItem::Lightning(ref ln) => ln.fee_paid_msat,
             _ => None,
@@ -131,6 +137,7 @@ impl From<mutiny_core::ActivityItem> for ActivityItem {
             kind,
             id,
             amount_sats,
+            amount_msat,
             inbound,
             fee_paid_msat,
             labels: a.labels(),
@@ -150,6 +157,7 @@ pub struct MutinyInvoice {
     preimage: Option<String>,
     payee_pubkey: Option<String>,
     pub amount_sats: Option<u64>,
+    pub amount_msat: Option<u64>,
     pub expire: u64,
     pub expired: bool,
     status: String,
@@ -228,6 +236,7 @@ impl From<mutiny_core::MutinyInvoice> for MutinyInvoice {
             preimage: m.preimage,
             payee_pubkey: m.payee_pubkey.map(|p| p.serialize().to_lower_hex_string()),
             amount_sats: m.amount_sats,
+            amount_msat: m.amount_msat,
             expire: m.expire,
             expired: m.expire < now,
             status: m.status.to_string(),