Add payment_hash to payment details

Author: jurvis

lightning/src/ln/channelmanager.rs

@@ -1209,19 +1209,28 @@ impl ChannelDetails {
 pub enum PendingPaymentDetails {
 	/// When a payment is still being sent and awaiting successful delivery.
 	Retryable {
+		/// Hash of the payment that is currently being sent but has yet to be fulfilled or
+		/// abandoned.
+		payment_hash: PaymentHash,
 		/// Total amount (in msat) across all paths for this payment, not just the amount currently
 		/// inflight.
-		total_msat: u64
+		total_msat: u64,
 	},
 	/// When a pending payment is fulfilled, we continue tracking it until all pending HTLCs have
 	/// been resolved. These payments will only cease being tracked upon receiving or handling
 	/// [`Event::PaymentSent`].
-	Fulfilled,
+	Fulfilled {
+		/// Hash of the payment that was claimed.
+		payment_hash: Option<PaymentHash>,
+	},
 	/// After a payment is explicitly abandoned by calling [`ChannelManager::abandon_payment`], they
 	/// are marked as abandoned until an [`Event::PaymentFailed`] event is generated. A payment
 	/// could also be marked as abandoned if pathfinding fails repeatedly and we will no longer
 	/// retry sending.
-	Abandoned,
+	Abandoned {
+		/// Hash of the payment that we have given up trying to send.
+		payment_hash: PaymentHash,
+	},
 }
 
 /// If a payment fails to send, it can be in one of several states. This enum is returned as the
@@ -1795,14 +1804,17 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 	pub fn list_pending_payments(&self) -> Vec<PendingPaymentDetails> {
 		self.pending_outbound_payments.lock().unwrap().iter()
 			.filter_map(|(_, pending_outbound_payment)| match pending_outbound_payment {
-				PendingOutboundPayment::Retryable { total_msat, .. } => {
-					Some(PendingPaymentDetails::Retryable { total_msat: *total_msat })
+				PendingOutboundPayment::Retryable { payment_hash, total_msat, .. } => {
+					Some(PendingPaymentDetails::Retryable {
+						payment_hash: *payment_hash,
+						total_msat: *total_msat,
+					})
 				},
-				PendingOutboundPayment::Abandoned { .. } => {
-					Some(PendingPaymentDetails::Abandoned)
+				PendingOutboundPayment::Abandoned { payment_hash, .. } => {
+					Some(PendingPaymentDetails::Abandoned { payment_hash: *payment_hash })
 				},
-				PendingOutboundPayment::Fulfilled { .. } => {
-					Some(PendingPaymentDetails::Fulfilled)
+				PendingOutboundPayment::Fulfilled { payment_hash, .. } => {
+					Some(PendingPaymentDetails::Fulfilled { payment_hash: *payment_hash })
 				},
 				PendingOutboundPayment::Legacy { .. } => None
 			})