f just call add_entry on blinded hints since they each have 1 hop

Author: valentinewallace

lightning/src/routing/router.rs

@@ -658,10 +658,17 @@ pub enum Hints {
 }
 
 impl Hints {
-	fn blinded_len(&self) -> usize {
+	fn blinded(&self) -> &[(BlindedPayInfo, BlindedPath)] {
 		match self {
-			Self::Blinded(hints) => hints.len(),
-			Self::Clear(_) => 0,
+			Self::Blinded(hints) => &hints[..],
+			Self::Clear(_) => &[]
+		}
+	}
+
+	fn clear(&self) -> &[RouteHint] {
+		match self {
+			Self::Blinded(_) => &[],
+			Self::Clear(hints) => &hints[..]
 		}
 	}
 }
@@ -1249,27 +1256,27 @@ where L::Target: Logger {
 		}
 	}
 
-	// Marshall route hints
-	let mut route_hints = Vec::with_capacity(payment_params.route_hints.blinded_len());
-	let route_hints_ref = match &payment_params.route_hints {
-		Hints::Clear(hints) => hints,
-		Hints::Blinded(blinded_hints) => {
-			for (blinded_payinfo, blinded_path) in blinded_hints {
-				route_hints.push(RouteHint(vec![RouteHintHop {
-					src_node_id: blinded_path.introduction_node_id,
-					short_channel_id: BLINDED_PATH_SCID,
-					fees: RoutingFees {
-						base_msat: blinded_payinfo.fee_base_msat,
-						proportional_millionths: blinded_payinfo.fee_proportional_millionths,
-					},
-					cltv_expiry_delta: blinded_payinfo.cltv_expiry_delta,
-					htlc_minimum_msat: Some(blinded_payinfo.htlc_minimum_msat),
-					htlc_maximum_msat: Some(blinded_payinfo.htlc_maximum_msat),
-				}]));
-			}
-			&route_hints
+	// Marshall blinded route hints
+	let mut blinded_route_hints = Vec::with_capacity(payment_params.route_hints.blinded().len());
+	for (blinded_payinfo, blinded_path) in payment_params.route_hints.blinded().iter() {
+		if blinded_path.blinded_hops.len() == 1 {
+			// If the introduction node is the destination, this hint is for a public node and we can just
+			// use the public network graph
+			blinded_route_hints = Vec::new();
+			break
 		}
-	};
+		blinded_route_hints.push(RouteHintHop {
+			src_node_id: blinded_path.introduction_node_id,
+			short_channel_id: BLINDED_PATH_SCID,
+			fees: RoutingFees {
+				base_msat: blinded_payinfo.fee_base_msat,
+				proportional_millionths: blinded_payinfo.fee_proportional_millionths,
+			},
+			cltv_expiry_delta: blinded_payinfo.cltv_expiry_delta,
+			htlc_minimum_msat: Some(blinded_payinfo.htlc_minimum_msat),
+			htlc_maximum_msat: Some(blinded_payinfo.htlc_maximum_msat),
+		});
+	}
 
 	// The main heap containing all candidate next-hops sorted by their score (max(fee,
 	// htlc_minimum)). Ideally this would be a heap which allowed cheap score reduction instead of
@@ -1683,7 +1690,20 @@ where L::Target: Logger {
 		// If a caller provided us with last hops, add them to routing targets. Since this happens
 		// earlier than general path finding, they will be somewhat prioritized, although currently
 		// it matters only if the fees are exactly the same.
-		for route in route_hints_ref.iter().filter(|route| !route.0.is_empty()) {
+		for hint in blinded_route_hints.iter() {
+			let have_hop_src_in_graph =
+				// Only add the hops in this route to our candidate set if either
+				// we have a direct channel to the first hop or the first hop is
+				// in the regular network graph.
+				first_hop_targets.get(&NodeId::from_pubkey(&hint.src_node_id)).is_some() ||
+				network_nodes.get(&NodeId::from_pubkey(&hint.src_node_id)).is_some();
+			if have_hop_src_in_graph {
+				add_entry!(CandidateRouteHop::PrivateHop { hint },
+					NodeId::from_pubkey(&hint.src_node_id),
+					NodeId::from_pubkey(&payment_params.payee_pubkey), 0, path_value_msat, 0, 0_u64, 0, 0);
+			}
+		}
+		for route in payment_params.route_hints.clear().iter().filter(|route| !route.0.is_empty()) {
 			let first_hop_in_route = &(route.0)[0];
 			let have_hop_src_in_graph =
 				// Only add the hops in this route to our candidate set if either
@@ -2102,15 +2122,12 @@ where L::Target: Logger {
 	for results_vec in selected_paths {
 		let mut hops = Vec::new();
 		for res in results_vec { hops.push(res?); }
-		let mut blinded_tail = None;
-		if let Hints::Blinded(hints) = &payment_params.route_hints {
-			blinded_tail = hints.iter()
-				.find(|(_, p)| {
-					let intro_node_idx = if p.blinded_hops.len() == 1 { hops.len() - 1 } else { hops.len() - 2 };
-					p.introduction_node_id == hops[intro_node_idx].pubkey
-				})
-				.map(|(_, p)| p.clone());
-		}
+		let blinded_tail = payment_params.route_hints.blinded().iter()
+			.find(|(_, p)| {
+				let intro_node_idx = if p.blinded_hops.len() == 1 { hops.len() - 1 } else { hops.len() - 2 };
+				p.introduction_node_id == hops[intro_node_idx].pubkey
+			})
+			.map(|(_, p)| p.clone());
 		paths.push(Path { hops, blinded_tail });
 	}
 	let route = Route {