Compact a BlindedPath's introduction node

Add a method to BlindedPath that given a network graph will compact the
IntroductionNode as the DirectedShortChannelId variant. Call this method
from DefaultMessageRouter so that Offer paths use the compact
representation (along with reply paths). This leaves payment paths in
Bolt12Invoice using the NodeId variant, as the compact representation
isn't as useful there.

WIP: Compact introduction node

Author: jkczyz

lightning/src/blinded_path/mod.rs

@@ -200,6 +200,30 @@ impl BlindedPath {
 			},
 		}
 	}
+
+	/// Attempts to a use a compact representation for the [`IntroductionNode`] by using a directed
+	/// short channel id from a channel in `network_graph` leading to the introduction node.
+	pub fn compact_introduction_node(&mut self, network_graph: &ReadOnlyNetworkGraph) {
+		if let IntroductionNode::NodeId(pubkey) = &self.introduction_node {
+			let node_id = NodeId::from_pubkey(pubkey);
+			if let Some(node_info) = network_graph.node(&node_id) {
+				if let Some((scid, channel_info)) = node_info
+					.channels
+					.iter()
+					.find_map(|scid| network_graph.channel(*scid).map(|info| (*scid, info)))
+				{
+					let direction = if node_id == channel_info.node_one {
+						Direction::NodeOne
+					} else {
+						debug_assert_eq!(node_id, channel_info.node_two);
+						Direction::NodeTwo
+					};
+					self.introduction_node =
+						IntroductionNode::DirectedShortChannelId(direction, scid);
+				}
+			}
+		}
+	}
 }
 
 impl Writeable for BlindedPath {

lightning/src/ln/offers_tests.rs

@@ -41,6 +41,7 @@
 //! blinded paths are used.
 
 use bitcoin::network::constants::Network;
+use bitcoin::secp256k1::PublicKey;
 use core::time::Duration;
 use crate::blinded_path::{BlindedPath, IntroductionNode};
 use crate::blinded_path::payment::{Bolt12OfferContext, Bolt12RefundContext, PaymentContext};
@@ -134,6 +135,12 @@ fn announce_node_address<'a, 'b, 'c>(
 	}
 }
 
+fn resolve_introduction_node<'a, 'b, 'c>(node: &Node<'a, 'b, 'c>, path: &BlindedPath) -> PublicKey {
+	path.public_introduction_node_id(&node.network_graph.read_only())
+		.and_then(|node_id| node_id.as_pubkey().ok())
+		.unwrap()
+}
+
 fn route_bolt12_payment<'a, 'b, 'c>(
 	node: &Node<'a, 'b, 'c>, path: &[&Node<'a, 'b, 'c>], invoice: &Bolt12Invoice
 ) {
@@ -274,8 +281,9 @@ fn prefers_non_tor_nodes_in_blinded_paths() {
 	assert_ne!(offer.signing_pubkey(), bob_id);
 	assert!(!offer.paths().is_empty());
 	for path in offer.paths() {
-		assert_ne!(path.introduction_node, IntroductionNode::NodeId(bob_id));
-		assert_ne!(path.introduction_node, IntroductionNode::NodeId(charlie_id));
+		let introduction_node_id = resolve_introduction_node(david, &path);
+		assert_ne!(introduction_node_id, bob_id);
+		assert_ne!(introduction_node_id, charlie_id);
 	}
 
 	// Use a one-hop blinded path when Bob is announced and all his peers are Tor-only.
@@ -289,7 +297,8 @@ fn prefers_non_tor_nodes_in_blinded_paths() {
 	assert_ne!(offer.signing_pubkey(), bob_id);
 	assert!(!offer.paths().is_empty());
 	for path in offer.paths() {
-		assert_eq!(path.introduction_node, IntroductionNode::NodeId(bob_id));
+		let introduction_node_id = resolve_introduction_node(david, &path);
+		assert_eq!(introduction_node_id, bob_id);
 	}
 }
 
@@ -339,7 +348,8 @@ fn prefers_more_connected_nodes_in_blinded_paths() {
 	assert_ne!(offer.signing_pubkey(), bob_id);
 	assert!(!offer.paths().is_empty());
 	for path in offer.paths() {
-		assert_eq!(path.introduction_node, IntroductionNode::NodeId(nodes[4].node.get_our_node_id()));
+		let introduction_node_id = resolve_introduction_node(david, &path);
+		assert_eq!(introduction_node_id, nodes[4].node.get_our_node_id());
 	}
 }
 
@@ -389,7 +399,9 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 	assert_ne!(offer.signing_pubkey(), alice_id);
 	assert!(!offer.paths().is_empty());
 	for path in offer.paths() {
-		assert_eq!(path.introduction_node, IntroductionNode::NodeId(bob_id));
+		let introduction_node_id = resolve_introduction_node(david, &path);
+		assert_eq!(introduction_node_id, bob_id);
+		assert!(matches!(path.introduction_node, IntroductionNode::DirectedShortChannelId(..)));
 	}
 
 	let payment_id = PaymentId([1; 32]);
@@ -418,9 +430,11 @@ fn creates_and_pays_for_offer_using_two_hop_blinded_path() {
 			payer_note_truncated: None,
 		},
 	});
+	let introduction_node_id = resolve_introduction_node(alice, &reply_path);
 	assert_eq!(invoice_request.amount_msats(), None);
 	assert_ne!(invoice_request.payer_id(), david_id);
-	assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(charlie_id));
+	assert_eq!(introduction_node_id, charlie_id);
+	assert!(matches!(reply_path.introduction_node, IntroductionNode::DirectedShortChannelId(..)));
 
 	let onion_message = alice.onion_messenger.next_onion_message_for_peer(charlie_id).unwrap();
 	charlie.onion_messenger.handle_onion_message(&alice_id, &onion_message);
@@ -494,7 +508,9 @@ fn creates_and_pays_for_refund_using_two_hop_blinded_path() {
 	assert_ne!(refund.payer_id(), david_id);
 	assert!(!refund.paths().is_empty());
 	for path in refund.paths() {
-		assert_eq!(path.introduction_node, IntroductionNode::NodeId(charlie_id));
+		let introduction_node_id = resolve_introduction_node(alice, &path);
+		assert_eq!(introduction_node_id, charlie_id);
+		assert!(matches!(path.introduction_node, IntroductionNode::DirectedShortChannelId(..)));
 	}
 	expect_recent_payment!(david, RecentPaymentDetails::AwaitingInvoice, payment_id);
 
@@ -550,7 +566,9 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 	assert_ne!(offer.signing_pubkey(), alice_id);
 	assert!(!offer.paths().is_empty());
 	for path in offer.paths() {
-		assert_eq!(path.introduction_node, IntroductionNode::NodeId(alice_id));
+		let introduction_node_id = resolve_introduction_node(bob, &path);
+		assert_eq!(introduction_node_id, alice_id);
+		assert!(matches!(path.introduction_node, IntroductionNode::DirectedShortChannelId(..)));
 	}
 
 	let payment_id = PaymentId([1; 32]);
@@ -571,9 +589,11 @@ fn creates_and_pays_for_offer_using_one_hop_blinded_path() {
 			payer_note_truncated: None,
 		},
 	});
+	let introduction_node_id = resolve_introduction_node(alice, &reply_path);
 	assert_eq!(invoice_request.amount_msats(), None);
 	assert_ne!(invoice_request.payer_id(), bob_id);
-	assert_eq!(reply_path.introduction_node, IntroductionNode::NodeId(bob_id));
+	assert_eq!(introduction_node_id, bob_id);
+	assert!(matches!(reply_path.introduction_node, IntroductionNode::DirectedShortChannelId(..)));
 
 	let onion_message = alice.onion_messenger.next_onion_message_for_peer(bob_id).unwrap();
 	bob.onion_messenger.handle_onion_message(&alice_id, &onion_message);
@@ -623,7 +643,9 @@ fn creates_and_pays_for_refund_using_one_hop_blinded_path() {
 	assert_ne!(refund.payer_id(), bob_id);
 	assert!(!refund.paths().is_empty());
 	for path in refund.paths() {
-		assert_eq!(path.introduction_node, IntroductionNode::NodeId(bob_id));
+		let introduction_node_id = resolve_introduction_node(alice, &path);
+		assert_eq!(introduction_node_id, bob_id);
+		assert!(matches!(path.introduction_node, IntroductionNode::DirectedShortChannelId(..)));
 	}
 	expect_recent_payment!(bob, RecentPaymentDetails::AwaitingInvoice, payment_id);
 

lightning/src/onion_message/messenger.rs

@@ -398,7 +398,7 @@ where
 			.take(MAX_PATHS)
 			.collect::<Result<Vec<_>, _>>();
 
-		match paths {
+		let mut paths = match paths {
 			Ok(paths) if !paths.is_empty() => Ok(paths),
 			_ => {
 				if is_recipient_announced {
@@ -408,7 +408,12 @@ where
 					Err(())
 				}
 			},
+		}?;
+		for path in &mut paths {
+			path.compact_introduction_node(&network_graph);
 		}
+
+		Ok(paths)
 	}
 }