Преглед на файлове

fix: ldk-node account for ln fee (#1312)

tsk преди 2 месеца
родител
ревизия
fd4557cca5
променени са 2 файла, в които са добавени 11 реда и са изтрити 3 реда
  1. 4 2
      crates/cdk-ldk-node/src/lib.rs
  2. 7 1
      crates/cdk-ldk-node/src/web/handlers/payments.rs

+ 4 - 2
crates/cdk-ldk-node/src/lib.rs

@@ -731,7 +731,8 @@ impl MintPayment for CdkLdkNode {
 
                 let total_spent = payment_details
                     .amount_msat
-                    .ok_or(Error::CouldNotGetAmountSpent)?;
+                    .ok_or(Error::CouldNotGetAmountSpent)?
+                    + payment_details.fee_paid_msat.unwrap_or_default();
 
                 let total_spent = to_unit(total_spent, &CurrencyUnit::Msat, unit)?;
 
@@ -805,7 +806,8 @@ impl MintPayment for CdkLdkNode {
 
                 let total_spent = payment_details
                     .amount_msat
-                    .ok_or(Error::CouldNotGetAmountSpent)?;
+                    .ok_or(Error::CouldNotGetAmountSpent)?
+                    + payment_details.fee_paid_msat.unwrap_or_default();
 
                 let total_spent = to_unit(total_spent, &CurrencyUnit::Msat, unit)?;
 

+ 7 - 1
crates/cdk-ldk-node/src/web/handlers/payments.rs

@@ -158,7 +158,13 @@ pub async fn payments_page(
                         get_invoice_status(payment.status, payment.direction, payment_type)
                     };
 
-                    @let amount_str = payment.amount_msat.map(format_msats_as_btc).unwrap_or_else(|| "Unknown".to_string());
+                    @let amount_str = {
+                        match (payment.amount_msat, payment.fee_paid_msat) {
+                            (Some(amount), Some(fee)) => format_msats_as_btc(amount + fee),
+                            (Some(amount), None) => format_msats_as_btc(amount),
+                            _ => "Unknown".to_string()
+                        }
+                    };
 
                     (payment_list_item(
                         &payment.id.to_string(),