X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fonion_message%2Fmessenger.rs;h=d333eb2103c5ca516217518ab144dab2f84b9807;hb=7d1745e7210975cc0fdc17b31072e33f0dfbf8e3;hp=ee49d00e99dea2de48c8a9c2fa76e92c2c2b9b27;hpb=1d0c6c60c6802126b3b29d6a2aa026c1aa33db02;p=rust-lightning

diff --git a/lightning/src/onion_message/messenger.rs b/lightning/src/onion_message/messenger.rs
index ee49d00e..d333eb21 100644
--- a/lightning/src/onion_message/messenger.rs
+++ b/lightning/src/onion_message/messenger.rs
@@ -325,12 +325,18 @@ impl OnionMessageRecipient {
 
 /// The `Responder` struct creates an appropriate [`ResponseInstruction`]
 /// for responding to a message.
+#[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Responder {
 	/// The path along which a response can be sent.
 	reply_path: BlindedPath,
 	path_id: Option<[u8; 32]>
 }
 
+impl_writeable_tlv_based!(Responder, {
+	(0, reply_path, required),
+	(2, path_id, option),
+});
+
 impl Responder {
 	/// Creates a new [`Responder`] instance with the provided reply path.
 	pub(super) fn new(reply_path: BlindedPath, path_id: Option<[u8; 32]>) -> Self {
@@ -483,7 +489,7 @@ where
 	}
 
 	fn create_blinded_paths_from_iter<
-		I: Iterator<Item = ForwardNode>,
+		I: ExactSizeIterator<Item = ForwardNode>,
 		T: secp256k1::Signing + secp256k1::Verification
 	>(
 		&self, recipient: PublicKey, peers: I, secp_ctx: &Secp256k1<T>, compact_paths: bool
@@ -499,13 +505,18 @@ where
 		let is_recipient_announced =
 			network_graph.nodes().contains_key(&NodeId::from_pubkey(&recipient));
 
+		let has_one_peer = peers.len() == 1;
 		let mut peer_info = peers
-			// Limit to peers with announced channels
+			// Limit to peers with announced channels unless the recipient is unannounced.
 			.filter_map(|peer|
 				network_graph
 					.node(&NodeId::from_pubkey(&peer.node_id))
 					.filter(|info| info.channels.len() >= MIN_PEER_CHANNELS)
 					.map(|info| (peer, info.is_tor_only(), info.channels.len()))
+					// Allow messages directly with the only peer when unannounced.
+					.or_else(|| (!is_recipient_announced && has_one_peer)
+						.then(|| (peer, false, 0))
+					)
 			)
 			// Exclude Tor-only nodes when the recipient is announced.
 			.filter(|(_, is_tor_only, _)| !(*is_tor_only && is_recipient_announced))