f Insert pending inb. payment, emit event on claim

Author: tnull

src/event.rs

@@ -298,24 +298,37 @@ impl LdkEventHandler for LdkLiteEventHandler {
 					hex_utils::to_string(&payment_hash.0),
 					amount_msat,
 				);
-				let payment_preimage = match purpose {
+				let (payment_preimage, payment_secret) = match purpose {
 					PaymentPurpose::InvoicePayment { payment_preimage, payment_secret } => {
 						if payment_preimage.is_some() {
-							*payment_preimage
+							(*payment_preimage, *payment_secret)
 						} else {
 							(self.channel_manager.get_payment_preimage(*payment_hash, *payment_secret).ok(), *payment_secret)
 						}
 					}
 					PaymentPurpose::SpontaneousPayment(preimage) => (Some(*preimage), None),
 				};
+
+				let mut payments = self.inbound_payments.lock().unwrap();
+				match payments.entry(*payment_hash) {
+					hash_map::Entry::Occupied(mut e) => {
+						let payment = e.get_mut();
+						payment.status = PaymentStatus::Pending;
+						payment.preimage = payment_preimage;
+						payment.secret = payment_secret;
+					}
+					hash_map::Entry::Vacant(e) => {
+						e.insert(PaymentInfo {
+							preimage: payment_preimage,
+							secret: payment_secret,
+							status: PaymentStatus::Pending,
+							amount_msat: Some(*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,
@@ -358,6 +371,12 @@ impl LdkEventHandler for LdkLiteEventHandler {
 						});
 					}
 				}
+				self.event_queue
+					.add_event(LdkLiteEvent::PaymentReceived {
+						payment_hash: *payment_hash,
+						amount_msat: *amount_msat,
+					})
+				.unwrap();
 			}
 			LdkEvent::PaymentSent {
 				payment_preimage,