f Try to retrieve preimage from channel manager

f

Author: tnull

src/event.rs

@@ -298,23 +298,37 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					amount_msat,
 				);
 				let payment_preimage = match purpose {
-					PaymentPurpose::InvoicePayment { payment_preimage, .. } => {
-						*payment_preimage
+					PaymentPurpose::InvoicePayment { payment_preimage, payment_secret } => {
+						if payment_preimage.is_some() {
+							*payment_preimage
+						} else {
+							self.channel_manager
+								.get_payment_preimage(*payment_hash, *payment_secret)
+								.ok()
+						}
 					}
 					PaymentPurpose::SpontaneousPayment(preimage) => Some(*preimage),
 				};
-				self.channel_manager.claim_funds(payment_preimage.unwrap());
-				self.event_queue
-					.add_event(LdkLiteEvent::PaymentReceived {
-						payment_hash: *payment_hash,
-						amount_msat: *amount_msat,
-					})
+				if let Some(preimage) = payment_preimage {
+					self.channel_manager.claim_funds(preimage);
+					self.event_queue
+						.add_event(LdkLiteEvent::PaymentReceived {
+							payment_hash: *payment_hash,
+							amount_msat: *amount_msat,
+						})
 					.unwrap();
+				} else {
+					log_error!(
+						self.logger,
+						"Failed to claim payment with hash {}: preimage unknown.",
+						hex_utils::to_string(&payment_hash.0),
+						);
+				}
 			}
 			LdkEvent::PaymentClaimed { payment_hash, purpose, amount_msat } => {
 				log_info!(
 					self.logger,
-					"Claimed payment from payment hash {} of {} millisatoshis",
+					"Claimed payment from payment hash {} of {} millisatoshis.",
 					hex_utils::to_string(&payment_hash.0),
 					amount_msat,
 				);