Inject payer offer into invoice requests for BLIP-42

Implements automatic injection of the payer's offer into invoice requests
to support BLIP-42 contact management. This allows recipients to identify
which specific offer is being paid, enabling better contact tracking and
payment relationship management.

Signed-off-by: Vincenzo Palazzo <[email protected]>

Author: vincenzopalazzo

lightning/src/ln/channelmanager.rs

@@ -13062,6 +13062,11 @@ where
 			Some(c) => c,
 		};
 		let builder = builder.contact_secrets(contacts.clone());
+		// Create a minimal offer for BLIP-42 contact exchange (just node_id, no description/paths)
+		// TODO: Create a better minimal offer with a single blinded path hop for privacy,
+		// while keeping the size small enough to fit in the onion packet.
+		let payer_offer = self.create_offer_builder()?.build()?;
+		let builder = builder.payer_offer(&payer_offer);
 
 		let invoice_request = builder.build_and_sign()?;
 		let _persistence_guard = PersistenceNotifierGuard::notify_on_drop(self);

lightning/src/ln/offers_tests.rs

@@ -51,6 +51,7 @@ use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, Paym
 use crate::blinded_path::message::OffersContext;
 use crate::events::{ClosureReason, Event, HTLCHandlingFailureType, PaidBolt12Invoice, PaymentFailureReason, PaymentPurpose};
 use crate::ln::channelmanager::{Bolt12PaymentError, PaymentId, RecentPaymentDetails, RecipientOnionFields, Retry, self};
+use crate::offers::offer::Offer;
 use crate::types::features::Bolt12InvoiceFeatures;
 use crate::ln::functional_test_utils::*;
 use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, Init, NodeAnnouncement, OnionMessage, OnionMessageHandler, RoutingMessageHandler, SocketAddress, UnsignedGossipMessage, UnsignedNodeAnnouncement};
@@ -2571,12 +2572,15 @@ fn pay_offer_and_add_contacts_info_blip42() {
 	});
 	assert_eq!(invoice_request.amount_msats(), Some(10_000_000));
 	assert_ne!(invoice_request.payer_signing_pubkey(), bob_id);
-	// Now we check that there are the contact secret and the
-	// contact secret is the same that we inject by bob.
 	assert!(invoice_request.contact_secret().is_some());
-	assert!(invoice_request.payer_offer().is_some());
 	// TODO: we should check also if the contact secret is the same that we inject by bob.
 
+	assert!(invoice_request.payer_offer().is_some());
+	// FIXME: this is wrong but make sure that we are following correctly the code path.
+	let payer_offer_bytes = invoice_request.payer_offer().unwrap();
+	let payer_offer = Offer::try_from(payer_offer_bytes.to_vec()).unwrap();
+	assert_eq!(payer_offer, offer);
+
 	let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
 	bob.onion_messenger.handle_onion_message(alice_id, &onion_message);
 

lightning/src/offers/invoice_request.rs

@@ -268,6 +268,17 @@ macro_rules! invoice_request_builder_methods { (
 		$return_value
 	}
 
+	/// Sets the payer's offer for BLIP-42 contact management.
+	///
+	/// This will include the serialized offer bytes in the invoice request,
+	/// allowing the recipient to identify which offer the payer is responding to.
+	///
+	/// Successive calls to this method will override the previous setting.
+	pub fn payer_offer($($self_mut)* $self: $self_type, offer: &Offer) -> $return_type {
+		$self.invoice_request.invreq_payer_offer = Some(offer.bytes.clone());
+		$return_value
+	}
+
 	fn build_with_checks($($self_mut)* $self: $self_type) -> Result<
 		(UnsignedInvoiceRequest, Option<Keypair>, Option<&'b Secp256k1<$secp_context>>),
 		Bolt12SemanticError