Account for Path::blinded_tail when adding a shadow cltv offset

Author: valentinewallace

lightning/src/routing/router.rs

@@ -2131,6 +2131,8 @@ fn add_random_cltv_offset(route: &mut Route, payment_params: &PaymentParameters,
 	let network_nodes = network_graph.nodes();
 
 	for path in route.paths.iter_mut() {
+		if path.blinded_tail.as_ref().map_or(false, |tail| tail.path.blinded_hops.len() > 1) { continue }
+
 		let mut shadow_ctlv_expiry_delta_offset: u32 = 0;
 
 		// Remember the last three nodes of the random walk and avoid looping back on them.
@@ -2199,7 +2201,10 @@ fn add_random_cltv_offset(route: &mut Route, payment_params: &PaymentParameters,
 		shadow_ctlv_expiry_delta_offset = cmp::min(shadow_ctlv_expiry_delta_offset, max_path_offset);
 
 		// Add 'shadow' CLTV offset to the final hop
-		if let Some(last_hop) = path.hops.last_mut() {
+		if let Some(tail) = path.blinded_tail.as_mut() {
+			tail.cltv_expiry_delta = tail.cltv_expiry_delta
+				.checked_add(shadow_ctlv_expiry_delta_offset).unwrap_or(tail.cltv_expiry_delta);
+		} else if let Some(last_hop) = path.hops.last_mut() {
 			last_hop.cltv_expiry_delta = last_hop.cltv_expiry_delta
 				.checked_add(shadow_ctlv_expiry_delta_offset).unwrap_or(last_hop.cltv_expiry_delta);
 		}
@@ -2287,7 +2292,7 @@ fn build_route_from_hops_internal<L: Deref>(
 
 #[cfg(test)]
 mod tests {
-	use crate::blinded_path::BlindedPath;
+	use crate::blinded_path::{BlindedHop, BlindedPath};
 	use crate::routing::gossip::{NetworkGraph, P2PGossipSync, NodeId, EffectiveCapacity};
 	use crate::routing::utxo::UtxoResult;
 	use crate::routing::router::{get_route, build_route_from_hops_internal, add_random_cltv_offset, default_node_features,
@@ -5818,6 +5823,45 @@ mod tests {
 		assert_eq!(*inflight_htlcs.0.get(&(42, true)).unwrap(), 301);
 		assert_eq!(*inflight_htlcs.0.get(&(43, false)).unwrap(), 201);
 	}
+
+	#[test]
+	fn blinded_path_cltv_shadow_offset() {
+		// Don't add a shadow offset to blinded paths with more than 1 hop.
+		let mut route = Route { paths: vec![Path {
+			hops: vec![RouteHop {
+				pubkey: ln_test_utils::pubkey(42),
+				node_features: NodeFeatures::empty(),
+				short_channel_id: 42,
+				channel_features: ChannelFeatures::empty(),
+				fee_msat: 100,
+				cltv_expiry_delta: 0,
+			}],
+			blinded_tail: Some(BlindedTail {
+				path: BlindedPath {
+					introduction_node_id: ln_test_utils::pubkey(43),
+					blinding_point: ln_test_utils::pubkey(44),
+					blinded_hops: vec![
+						BlindedHop { blinded_node_id: ln_test_utils::pubkey(45), encrypted_payload: Vec::new() },
+						BlindedHop { blinded_node_id: ln_test_utils::pubkey(46), encrypted_payload: Vec::new() }
+					],
+				},
+				intro_node_scid: 43,
+				fee_msat: 1,
+				cltv_expiry_delta: 0,
+				final_value_msat: 200,
+			}),
+		}], payment_params: None};
+
+		let payment_params = PaymentParameters::from_node_id(ln_test_utils::pubkey(47), 18);
+		let (_, network_graph, _, _, _) = build_line_graph();
+		add_random_cltv_offset(&mut route, &payment_params, &network_graph.read_only(), &[0; 32]);
+		assert_eq!(route.paths[0].blinded_tail.as_ref().unwrap().cltv_expiry_delta, 0);
+
+		// Add a shadow offset if we're sending to a 1-hop blinded path.
+		route.paths[0].blinded_tail.as_mut().unwrap().path.blinded_hops.pop();
+		add_random_cltv_offset(&mut route, &payment_params, &network_graph.read_only(), &[0; 32]);
+		assert_eq!(route.paths[0].blinded_tail.as_ref().unwrap().cltv_expiry_delta, 40);
+	}
 }
 
 #[cfg(all(test, not(feature = "no-std")))]