From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Sun, 7 Apr 2024 19:10:29 +0000 (+0200)
Subject: Resolve blinded path when creating onion message
X-Git-Tag: v0.0.123-beta~10^2~1
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b7f73fa18866324017406dd7003b2dde86108d16;p=rust-lightning

Resolve blinded path when creating onion message

Add a version of the create_onion_message utility function that attempts
to resolved the introduction node of the destination's BlindedPath using
a ReadOnlyNetworkGraph`. Otherwise, if given a path using the compact
representation, using create_onion_message would fail. Keep the current
version for use internally and for external uses where the blinded path
is known to be resolved.
---

diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index 3074ee64b..1ce0b1805 100644
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -577,11 +577,42 @@ pub enum PeeledOnion<T: OnionMessageContents> {
 	Receive(ParsedOnionMessageContents<T>, Option<[u8; 32]>, Option<BlindedPath>)
 }
 
+
+/// Creates an [`OnionMessage`] with the given `contents` for sending to the destination of
+/// `path`, first calling [`Destination::resolve`] on `path.destination` with the given
+/// [`ReadOnlyNetworkGraph`].
+///
+/// Returns the node id of the peer to send the message to, the message itself, and any addresses
+/// needed to connect to the first node.
+pub fn create_onion_message_resolving_destination<
+	ES: Deref, NS: Deref, NL: Deref, T: OnionMessageContents
+>(
+	entropy_source: &ES, node_signer: &NS, node_id_lookup: &NL,
+	network_graph: &ReadOnlyNetworkGraph, secp_ctx: &Secp256k1<secp256k1::All>,
+	mut path: OnionMessagePath, contents: T, reply_path: Option<BlindedPath>,
+) -> Result<(PublicKey, OnionMessage, Option<Vec<SocketAddress>>), SendError>
+where
+	ES::Target: EntropySource,
+	NS::Target: NodeSigner,
+	NL::Target: NodeIdLookUp,
+{
+	path.destination.resolve(network_graph);
+	create_onion_message(
+		entropy_source, node_signer, node_id_lookup, secp_ctx, path, contents, reply_path,
+	)
+}
+
 /// Creates an [`OnionMessage`] with the given `contents` for sending to the destination of
 /// `path`.
 ///
 /// Returns the node id of the peer to send the message to, the message itself, and any addresses
 /// need to connect to the first node.
+///
+/// Returns [`SendError::UnresolvedIntroductionNode`] if:
+/// - `destination` contains a blinded path with an [`IntroductionNode::DirectedShortChannelId`],
+/// - unless it can be resolved by [`NodeIdLookUp::next_node_id`].
+/// Use [`create_onion_message_resolving_destination`] instead to resolve the introduction node
+/// first with a [`ReadOnlyNetworkGraph`].
 pub fn create_onion_message<ES: Deref, NS: Deref, NL: Deref, T: OnionMessageContents>(
 	entropy_source: &ES, node_signer: &NS, node_id_lookup: &NL,
 	secp_ctx: &Secp256k1<secp256k1::All>, path: OnionMessagePath, contents: T,