Introduce custom_data in handle_dnssec_proof

Author: shaavan

lightning-dns-resolver/src/lib.rs

@@ -107,9 +107,11 @@ impl<PH: Deref> DNSResolverMessageHandler for OMDomainResolver<PH>
 where
 	PH::Target: DNSResolverMessageHandler,
 {
-	fn handle_dnssec_proof(&self, proof: DNSSECProof, context: DNSResolverContext) {
+	fn handle_dnssec_proof(
+		&self, proof: DNSSECProof, context: DNSResolverContext, custom_data: Option<Vec<u8>>,
+	) {
 		if let Some(proof_handler) = &self.proof_handler {
-			proof_handler.handle_dnssec_proof(proof, context);
+			proof_handler.handle_dnssec_proof(proof, context, custom_data);
 		}
 	}
 
@@ -251,8 +253,11 @@ mod test {
 			panic!();
 		}
 
-		fn handle_dnssec_proof(&self, msg: DNSSECProof, context: DNSResolverContext) {
-			let mut proof = self.resolver.handle_dnssec_proof_for_uri(msg, context).unwrap();
+		fn handle_dnssec_proof(
+			&self, msg: DNSSECProof, context: DNSResolverContext, custom_data: Option<Vec<u8>>,
+		) {
+			let mut proof =
+				self.resolver.handle_dnssec_proof_for_uri(msg, context, custom_data).unwrap();
 			assert_eq!(proof.0.len(), 1);
 			let payment = proof.0.pop().unwrap();
 			let mut result = Some((payment.0, payment.1, proof.1));

lightning/src/ln/channelmanager.rs

@@ -12446,8 +12446,8 @@ where
 		None
 	}
 
-	fn handle_dnssec_proof(&self, message: DNSSECProof, context: DNSResolverContext) {
-		let offer_opt = self.hrn_resolver.handle_dnssec_proof_for_offer(message, context);
+	fn handle_dnssec_proof(&self, message: DNSSECProof, context: DNSResolverContext, custom_data: Option<Vec<u8>>) {
+		let offer_opt = self.hrn_resolver.handle_dnssec_proof_for_offer(message, context, custom_data);
 		#[cfg_attr(not(feature = "_test_utils"), allow(unused_mut))]
 		if let Some((completed_requests, mut offer)) = offer_opt {
 			for (name, payment_id) in completed_requests {

lightning/src/ln/peer_handler.rs

@@ -165,7 +165,7 @@ impl DNSResolverMessageHandler for IgnoringMessageHandler {
 	) -> Option<(DNSResolverMessage, ResponseInstruction)> {
 		None
 	}
-	fn handle_dnssec_proof(&self, _message: DNSSECProof, _context: DNSResolverContext) {}
+	fn handle_dnssec_proof(&self, _message: DNSSECProof, _context: DNSResolverContext, _custom_data: Option<Vec<u8>>) {}
 }
 impl CustomOnionMessageHandler for IgnoringMessageHandler {
 	type CustomMessage = Infallible;

lightning/src/onion_message/dns_resolution.rs

@@ -67,7 +67,9 @@ pub trait DNSResolverMessageHandler {
 	/// Handle a [`DNSSECProof`] message (in response to a [`DNSSECQuery`] we presumably sent).
 	///
 	/// With this, we should be able to validate the DNS record we requested.
-	fn handle_dnssec_proof(&self, message: DNSSECProof, context: DNSResolverContext);
+	fn handle_dnssec_proof(
+		&self, message: DNSSECProof, context: DNSResolverContext, custom_data: Option<Vec<u8>>,
+	);
 
 	/// Gets the node feature flags which this handler itself supports. Useful for setting the
 	/// `dns_resolver` flag if this handler supports returning [`DNSSECProof`] messages in response
@@ -362,9 +364,10 @@ impl OMNameResolver {
 	/// If an [`Offer`] is found, it, as well as the [`PaymentId`] and original `name` passed to
 	/// [`Self::resolve_name`] are returned.
 	pub fn handle_dnssec_proof_for_offer(
-		&self, msg: DNSSECProof, context: DNSResolverContext,
+		&self, msg: DNSSECProof, context: DNSResolverContext, custom_data: Option<Vec<u8>>,
 	) -> Option<(Vec<(HumanReadableName, PaymentId)>, Offer)> {
-		let (completed_requests, uri) = self.handle_dnssec_proof_for_uri(msg, context)?;
+		let (completed_requests, uri) =
+			self.handle_dnssec_proof_for_uri(msg, context, custom_data)?;
 		if let Some((_onchain, params)) = uri.split_once("?") {
 			for param in params.split("&") {
 				let (k, v) = if let Some(split) = param.split_once("=") {
@@ -395,7 +398,7 @@ impl OMNameResolver {
 	/// This method is useful for those who handle bitcoin: URIs already, handling more than just
 	/// BOLT12 [`Offer`]s.
 	pub fn handle_dnssec_proof_for_uri(
-		&self, msg: DNSSECProof, context: DNSResolverContext,
+		&self, msg: DNSSECProof, context: DNSResolverContext, _custom_data: Option<Vec<u8>>,
 	) -> Option<(Vec<(HumanReadableName, PaymentId)>, String)> {
 		let DNSSECProof { name: answer_name, proof } = msg;
 		let mut pending_resolves = self.pending_resolves.lock().unwrap();

lightning/src/onion_message/functional_tests.rs

@@ -107,7 +107,7 @@ impl DNSResolverMessageHandler for TestDNSResolverMessageHandler {
 	) -> Option<(DNSResolverMessage, ResponseInstruction)> {
 		None
 	}
-	fn handle_dnssec_proof(&self, _message: DNSSECProof, _context: DNSResolverContext) {}
+	fn handle_dnssec_proof(&self, _message: DNSSECProof, _context: DNSResolverContext, _custom_data: Option<Vec<u8>>) {}
 }
 
 #[derive(Clone, Debug, PartialEq)]

lightning/src/onion_message/messenger.rs

@@ -1903,7 +1903,7 @@ where
 							Some(MessageContext::DNSResolver(context)) => context,
 							_ => return,
 						};
-						self.dns_resolver_handler.handle_dnssec_proof(msg, context);
+						self.dns_resolver_handler.handle_dnssec_proof(msg, context, custom_data);
 					},
 					ParsedOnionMessageContents::Custom(msg) => {
 						let context = match context {