f Register BOLT12 payments in PaymentClaimable

Author: tnull

src/event.rs

@@ -433,15 +433,7 @@ where
 				onion_fields: _,
 				counterparty_skimmed_fee_msat,
 			} => {
-				let payment_id = match purpose {
-					PaymentPurpose::Bolt11InvoicePayment { .. } => PaymentId(payment_hash.0),
-					PaymentPurpose::Bolt12OfferPayment { ref payment_context, .. } => {
-						PaymentId(payment_context.offer_id.0)
-					},
-					PaymentPurpose::Bolt12RefundPayment { .. } => PaymentId(payment_hash.0),
-					PaymentPurpose::SpontaneousPayment(..) => PaymentId(payment_hash.0),
-				};
-
+				let payment_id = PaymentId(payment_hash.0);
 				if let Some(info) = self.payment_store.get(&payment_id) {
 					if info.status == PaymentStatus::Succeeded
 						|| matches!(info.kind, PaymentKind::Spontaneous { .. })
@@ -520,19 +512,91 @@ where
 							.ok())
 					},
 					PaymentPurpose::Bolt12OfferPayment {
-						payment_preimage, payment_secret, ..
-					} => payment_preimage.or(self
-						.channel_manager
-						.get_payment_preimage(payment_hash, payment_secret)
-						.ok()),
+						payment_preimage,
+						payment_secret,
+						payment_context,
+						..
+					} => {
+						let offer_id = payment_context.offer_id;
+						let payment = PaymentDetails {
+							id: payment_id,
+							kind: PaymentKind::Bolt12Offer {
+								hash: Some(payment_hash),
+								preimage: payment_preimage,
+								secret: Some(payment_secret),
+								offer_id,
+							},
+							amount_msat: Some(amount_msat),
+							direction: PaymentDirection::Inbound,
+							status: PaymentStatus::Pending,
+						};
+
+						match self.payment_store.insert(payment) {
+							Ok(false) => (),
+							Ok(true) => {
+								log_error!(
+									self.logger,
+									"Bolt12OfferPayment with ID {} was previously known",
+									payment_id,
+								);
+								debug_assert!(false);
+							},
+							Err(e) => {
+								log_error!(
+									self.logger,
+									"Failed to insert payment with ID {}: {}",
+									payment_id,
+									e
+								);
+								debug_assert!(false);
+							},
+						}
+						payment_preimage.or(self
+							.channel_manager
+							.get_payment_preimage(payment_hash, payment_secret)
+							.ok())
+					},
 					PaymentPurpose::Bolt12RefundPayment {
 						payment_preimage,
 						payment_secret,
 						..
-					} => payment_preimage.or(self
-						.channel_manager
-						.get_payment_preimage(payment_hash, payment_secret)
-						.ok()),
+					} => {
+						let payment = PaymentDetails {
+							id: payment_id,
+							kind: PaymentKind::Bolt12Refund {
+								hash: Some(payment_hash),
+								preimage: payment_preimage,
+								secret: Some(payment_secret),
+							},
+							amount_msat: Some(amount_msat),
+							direction: PaymentDirection::Inbound,
+							status: PaymentStatus::Pending,
+						};
+						match self.payment_store.insert(payment) {
+							Ok(false) => (),
+							Ok(true) => {
+								log_error!(
+									self.logger,
+									"Bolt12RefundPayment with ID {} was previously known",
+									payment_id,
+								);
+								debug_assert!(false);
+							},
+							Err(e) => {
+								log_error!(
+									self.logger,
+									"Failed to insert payment with ID {}: {}",
+									payment_id,
+									e
+								);
+								debug_assert!(false);
+							},
+						}
+						payment_preimage.or(self
+							.channel_manager
+							.get_payment_preimage(payment_hash, payment_secret)
+							.ok())
+					},
 					PaymentPurpose::SpontaneousPayment(preimage) => {
 						// Since it's spontaneous, we insert it now into our store.
 						let payment = PaymentDetails {
@@ -600,15 +664,7 @@ where
 				htlcs: _,
 				sender_intended_total_msat: _,
 			} => {
-				let payment_id = match purpose {
-					PaymentPurpose::Bolt11InvoicePayment { .. } => PaymentId(payment_hash.0),
-					PaymentPurpose::Bolt12OfferPayment { ref payment_context, .. } => {
-						PaymentId(payment_context.offer_id.0)
-					},
-					PaymentPurpose::Bolt12RefundPayment { .. } => PaymentId(payment_hash.0),
-					PaymentPurpose::SpontaneousPayment(..) => PaymentId(payment_hash.0),
-				};
-
+				let payment_id = PaymentId(payment_hash.0);
 				log_info!(
 					self.logger,
 					"Claimed payment with ID {} from payment hash {} of {}msat.",
@@ -623,7 +679,6 @@ where
 						payment_secret,
 						..
 					} => PaymentDetailsUpdate {
-						hash: Some(Some(payment_hash)),
 						preimage: Some(payment_preimage),
 						secret: Some(Some(payment_secret)),
 						amount_msat: Some(Some(amount_msat)),
@@ -633,7 +688,6 @@ where
 					PaymentPurpose::Bolt12OfferPayment {
 						payment_preimage, payment_secret, ..
 					} => PaymentDetailsUpdate {
-						hash: Some(Some(payment_hash)),
 						preimage: Some(payment_preimage),
 						secret: Some(Some(payment_secret)),
 						amount_msat: Some(Some(amount_msat)),
@@ -645,15 +699,13 @@ where
 						payment_secret,
 						..
 					} => PaymentDetailsUpdate {
-						hash: Some(Some(payment_hash)),
 						preimage: Some(payment_preimage),
 						secret: Some(Some(payment_secret)),
 						amount_msat: Some(Some(amount_msat)),
 						status: Some(PaymentStatus::Succeeded),
 						..PaymentDetailsUpdate::new(payment_id)
 					},
 					PaymentPurpose::SpontaneousPayment(preimage) => PaymentDetailsUpdate {
-						hash: Some(Some(payment_hash)),
 						preimage: Some(Some(preimage)),
 						amount_msat: Some(Some(amount_msat)),
 						status: Some(PaymentStatus::Succeeded),