Store fees for saved payments.

getAlby · May 6, 2024 · df5ce1d · df5ce1d
1 parent 42549ea
commit df5ce1d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/bindings/ldk_node.udl b/bindings/ldk_node.udl
@@ -259,6 +259,7 @@ dictionary PaymentDetails {
 	PaymentDirection direction;
 	PaymentStatus status;
 	u64 last_update;
+	u64? fee_msat;
 };
 
 // [NonExhaustive]

diff --git a/src/event.rs b/src/event.rs
@@ -590,6 +590,7 @@ where
 							direction: PaymentDirection::Inbound,
 							status: PaymentStatus::Succeeded,
 							last_update: 0,
+							fee_msat: None,
 						};
 
 						match self.payment_store.insert(payment) {
@@ -643,6 +644,7 @@ where
 				let update = PaymentDetailsUpdate {
 					preimage: Some(Some(payment_preimage)),
 					status: Some(PaymentStatus::Succeeded),
+					fee_msat: Some(fee_paid_msat),
 					..PaymentDetailsUpdate::new(payment_id)
 				};
 

diff --git a/src/payment/bolt11.rs b/src/payment/bolt11.rs
@@ -116,6 +116,7 @@ impl Bolt11Payment {
 					direction: PaymentDirection::Outbound,
 					status: PaymentStatus::Pending,
 					last_update: 0,
+					fee_msat: None,
 				};
 				self.payment_store.insert(payment)?;
 
@@ -139,6 +140,7 @@ impl Bolt11Payment {
 							direction: PaymentDirection::Outbound,
 							status: PaymentStatus::Failed,
 							last_update: 0,
+							fee_msat: None,
 						};
 
 						self.payment_store.insert(payment)?;
@@ -233,6 +235,7 @@ impl Bolt11Payment {
 					direction: PaymentDirection::Outbound,
 					status: PaymentStatus::Pending,
 					last_update: 0,
+					fee_msat: None,
 				};
 				self.payment_store.insert(payment)?;
 
@@ -258,6 +261,7 @@ impl Bolt11Payment {
 							direction: PaymentDirection::Outbound,
 							status: PaymentStatus::Failed,
 							last_update: 0,
+							fee_msat: None,
 						};
 						self.payment_store.insert(payment)?;
 
@@ -325,6 +329,7 @@ impl Bolt11Payment {
 			direction: PaymentDirection::Inbound,
 			status: PaymentStatus::Pending,
 			last_update: 0,
+			fee_msat: None,
 		};
 
 		self.payment_store.insert(payment)?;
@@ -457,6 +462,7 @@ impl Bolt11Payment {
 			direction: PaymentDirection::Inbound,
 			status: PaymentStatus::Pending,
 			last_update: 0,
+			fee_msat: None,
 		};
 
 		self.payment_store.insert(payment)?;

diff --git a/src/payment/payment_store.rs b/src/payment/payment_store.rs
@@ -36,6 +36,8 @@ pub struct PaymentDetails {
 	pub status: PaymentStatus,
 	/// Last update timestamp, as seconds since Unix epoch.
 	pub last_update: u64,
+	/// Fee paid.
+	pub fee_msat: Option<u64>,
 }
 
 impl Writeable for PaymentDetails {
@@ -53,7 +55,8 @@ impl Writeable for PaymentDetails {
 			(6, self.amount_msat, required),
 			(8, self.direction, required),
 			(10, self.status, required),
-			(131074, self.last_update, required)
+			(131074, self.last_update, required),
+			(131076, self.fee_msat, required),
 		});
 		Ok(())
 	}
@@ -71,6 +74,7 @@ impl Readable for PaymentDetails {
 			(8, direction, required),
 			(10, status, required),
 			(131074, last_update, option),
+			(131076, fee_msat, option),
 		});
 
 		let id: PaymentId = id.0.ok_or(DecodeError::InvalidValue)?;
@@ -108,7 +112,7 @@ impl Readable for PaymentDetails {
 			}
 		};
 
-		Ok(PaymentDetails { id, kind, amount_msat, direction, status, last_update })
+		Ok(PaymentDetails { id, kind, amount_msat, direction, status, last_update, fee_msat })
 	}
 }
 
@@ -241,11 +245,12 @@ pub(crate) struct PaymentDetailsUpdate {
 	pub amount_msat: Option<Option<u64>>,
 	pub direction: Option<PaymentDirection>,
 	pub status: Option<PaymentStatus>,
+	pub fee_msat: Option<Option<u64>>,
 }
 
 impl PaymentDetailsUpdate {
 	pub fn new(id: PaymentId) -> Self {
-		Self { id, preimage: None, secret: None, amount_msat: None, direction: None, status: None }
+		Self { id, preimage: None, secret: None, amount_msat: None, direction: None, status: None, fee_msat: None }
 	}
 }
 
@@ -444,6 +449,7 @@ mod tests {
 			direction: PaymentDirection::Inbound,
 			status: PaymentStatus::Pending,
 			last_update: 0,
+			fee_msat: None,
 		};
 
 		assert_eq!(Ok(false), payment_store.insert(payment.clone()));

diff --git a/src/payment/spontaneous.rs b/src/payment/spontaneous.rs
@@ -96,6 +96,7 @@ impl SpontaneousPayment {
 					direction: PaymentDirection::Outbound,
 					amount_msat: Some(amount_msat),
 					last_update: 0,
+					fee_msat: None,
 				};
 				self.payment_store.insert(payment)?;
 
@@ -119,6 +120,7 @@ impl SpontaneousPayment {
 							direction: PaymentDirection::Outbound,
 							amount_msat: Some(amount_msat),
 							last_update: 0,
+							fee_msat: None,
 						};
 
 						self.payment_store.insert(payment)?;