fixup! Expose API to update a channel's ChannelConfig

Author: wpaulino

lightning/src/ln/channelmanager.rs

@@ -2972,9 +2972,12 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					continue;
 				}
 				if let Ok(msg) = self.get_channel_update_for_broadcast(channel) {
-					channel_state.pending_msg_events.push(
-						events::MessageSendEvent::BroadcastChannelUpdate { msg },
-					);
+					channel_state.pending_msg_events.push(events::MessageSendEvent::BroadcastChannelUpdate { msg });
+				} else if let Ok(msg) = self.get_channel_update_for_unicast(channel) {
+					channel_state.pending_msg_events.push(events::MessageSendEvent::SendChannelUpdate {
+							node_id: channel.get_counterparty_node_id(),
+							msg,
+					});
 				}
 			}
 		}

lightning/src/ln/onion_route_tests.rs

@@ -593,43 +593,83 @@ fn test_onion_failure() {
 	}, true, Some(23), None, None);
 }
 
-#[test]
-fn test_onion_failure_stale_channel_update() {
+fn do_test_onion_failure_stale_channel_update(announced_channel: bool) {
 	// Create a network of three nodes and two channels connecting them. We'll be updating the
 	// HTLC relay policy of the second channel, causing forwarding failures at the first hop.
+	let mut config = UserConfig::default();
+	config.channel_handshake_config.announced_channel = announced_channel;
+	config.channel_handshake_limits.force_announced_channel_preference = false;
+	config.accept_forwards_to_priv_channels = !announced_channel;
 	let chanmon_cfgs = create_chanmon_cfgs(3);
 	let node_cfgs = create_node_cfgs(3, &chanmon_cfgs);
-	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, None, None]);
+	let node_chanmgrs = create_node_chanmgrs(3, &node_cfgs, &[None, Some(config), None]);
 	let mut nodes = create_network(3, &node_cfgs, &node_chanmgrs);
 
-	let other_channel = create_announced_chan_between_nodes(
-		&nodes, 0, 1, InitFeatures::known(), InitFeatures::known(),
-	);
-	let channel_to_update = create_announced_chan_between_nodes(
-		&nodes, 1, 2, InitFeatures::known(), InitFeatures::known(),
+	let other_channel = create_chan_between_nodes(
+		&nodes[0], &nodes[1], InitFeatures::known(), InitFeatures::known(),
 	);
+	let channel_to_update = if announced_channel {
+		let channel = create_announced_chan_between_nodes(
+			&nodes, 1, 2, InitFeatures::known(), InitFeatures::known(),
+		);
+		(channel.2, channel.0.contents.short_channel_id)
+	} else {
+		let channel = create_unannounced_chan_between_nodes_with_value(
+			&nodes, 1, 2, 100000, 10001, InitFeatures::known(), InitFeatures::known(),
+		);
+		(channel.0.channel_id, channel.0.short_channel_id_alias.unwrap())
+	};
 	let channel_to_update_counterparty = &nodes[2].node.get_our_node_id();
 
 	let default_config = ChannelConfig::default();
 
-	// A test payment should succeed as the HTLC relay paramters have not been changed yet.
+	// A test payment should succeed as the ChannelConfig has not been changed yet.
 	const PAYMENT_AMT: u64 = 40000;
-	send_payment(&nodes[0], &[&nodes[1], &nodes[2]], PAYMENT_AMT);
+	let (route, payment_hash, payment_preimage, payment_secret) = if announced_channel {
+		get_route_and_payment_hash!(nodes[0], nodes[2], PAYMENT_AMT)
+	} else {
+		let hop_hints = vec![RouteHint(vec![RouteHintHop {
+			src_node_id: nodes[1].node.get_our_node_id(),
+			short_channel_id: channel_to_update.1,
+			fees: RoutingFees {
+				base_msat: default_config.forwarding_fee_base_msat,
+				proportional_millionths: default_config.forwarding_fee_proportional_millionths,
+			},
+			cltv_expiry_delta: default_config.cltv_expiry_delta,
+			htlc_maximum_msat: None,
+			htlc_minimum_msat: None,
+		}])];
+		let payment_params = PaymentParameters::from_node_id(*channel_to_update_counterparty)
+			.with_features(InvoiceFeatures::known())
+			.with_route_hints(hop_hints);
+		get_route_and_payment_hash!(nodes[0], nodes[2], payment_params, PAYMENT_AMT, TEST_FINAL_CLTV)
+	};
+	send_along_route_with_secret(&nodes[0], route.clone(), &[&[&nodes[1], &nodes[2]]], PAYMENT_AMT,
+		payment_hash, payment_secret);
+	claim_payment(&nodes[0], &[&nodes[1], &nodes[2]], payment_preimage);
 
 	// Closure to update and retrieve the latest ChannelUpdate.
 	let update_and_get_channel_update = |config: &ChannelConfig, expect_new_update: bool,
 		prev_update: Option<&msgs::ChannelUpdate>| -> Option<msgs::ChannelUpdate> {
 		nodes[1].node.update_channel_config(
-			channel_to_update_counterparty, &[channel_to_update.2], config,
+			channel_to_update_counterparty, &[channel_to_update.0], config,
 		).unwrap();
 		let events = nodes[1].node.get_and_clear_pending_msg_events();
 		assert_eq!(events.len(), expect_new_update as usize);
 		if !expect_new_update {
 			return None;
 		}
 		let new_update = match &events[0] {
-			MessageSendEvent::BroadcastChannelUpdate { msg, .. } => msg.clone(),
-			_ => panic!("expected BroadcastChannelUpdate event"),
+			MessageSendEvent::BroadcastChannelUpdate { msg } => {
+				assert!(announced_channel);
+				msg.clone()
+			},
+			MessageSendEvent::SendChannelUpdate { node_id, msg } => {
+				assert_eq!(node_id, channel_to_update_counterparty);
+				assert!(!announced_channel);
+				msg.clone()
+			},
+			_ => panic!("expected Broadcast/SendChannelUpdate event"),
 		};
 		if prev_update.is_some() {
 			assert!(new_update.contents.timestamp > prev_update.unwrap().contents.timestamp)
@@ -638,13 +678,10 @@ fn test_onion_failure_stale_channel_update() {
 	};
 
 	// We'll be attempting to route payments using the default ChannelUpdate for channels. This will
-	// lead to onion failures at the first hop once we update the HTLC relay parameters for the
+	// lead to onion failures at the first hop once we update the ChannelConfig for the
 	// second hop.
-	let (route, payment_hash, _, payment_secret) = get_route_and_payment_hash!(
-		nodes[0], nodes[2], PAYMENT_AMT
-	);
 	let expect_onion_failure = |name: &str, error_code: u16, channel_update: &msgs::ChannelUpdate| {
-		let short_channel_id = channel_to_update.0.contents.short_channel_id;
+		let short_channel_id = channel_to_update.1;
 		let network_update = NetworkUpdate::ChannelUpdateMessage { msg: channel_update.clone() };
 		run_onion_failure_test(
 			name, 0, &nodes, &route, &payment_hash, &payment_secret, |_| {}, || {}, true,
@@ -656,15 +693,15 @@ fn test_onion_failure_stale_channel_update() {
 	let mut invalid_config = default_config.clone();
 	invalid_config.cltv_expiry_delta = 0;
 	match nodes[1].node.update_channel_config(
-		channel_to_update_counterparty, &[channel_to_update.2], &invalid_config,
+		channel_to_update_counterparty, &[channel_to_update.0], &invalid_config,
 	) {
 		Err(APIError::APIMisuseError{ .. }) => {},
 		_ => panic!("unexpected result applying invalid cltv_expiry_delta"),
 	}
 
 	// Increase the base fee which should trigger a new ChannelUpdate.
 	let mut config = nodes[1].node.list_usable_channels().iter()
-		.find(|channel| channel.channel_id == channel_to_update.2).unwrap()
+		.find(|channel| channel.channel_id == channel_to_update.0).unwrap()
 		.config.unwrap();
 	config.forwarding_fee_base_msat = u32::max_value();
 	let msg = update_and_get_channel_update(&config, true, None).unwrap();
@@ -700,10 +737,10 @@ fn test_onion_failure_stale_channel_update() {
 		);
 
 		let mut chanmon_1 = <(_, ChannelMonitor<_>)>::read(
-			&mut &get_monitor!(nodes[1], other_channel.2).encode()[..], nodes[1].keys_manager,
+			&mut &get_monitor!(nodes[1], other_channel.3).encode()[..], nodes[1].keys_manager,
 		).unwrap().1;
 		let mut chanmon_2 = <(_, ChannelMonitor<_>)>::read(
-			&mut &get_monitor!(nodes[1], channel_to_update.2).encode()[..], nodes[1].keys_manager,
+			&mut &get_monitor!(nodes[1], channel_to_update.0).encode()[..], nodes[1].keys_manager,
 		).unwrap().1;
 		let mut channel_monitors = HashMap::new();
 		channel_monitors.insert(chanmon_1.get_funding_txo().0, &mut chanmon_1);
@@ -721,12 +758,18 @@ fn test_onion_failure_stale_channel_update() {
 			},
 		).unwrap().1;
 		chanmgr.list_channels().iter()
-			.find(|channel| channel.channel_id == channel_to_update.2).unwrap()
+			.find(|channel| channel.channel_id == channel_to_update.0).unwrap()
 			.config.unwrap()
 	};
 	assert_eq!(config, config_after_restart);
 }
 
+#[test]
+fn test_onion_failure_stale_channel_update() {
+	do_test_onion_failure_stale_channel_update(false);
+	do_test_onion_failure_stale_channel_update(true);
+}
+
 #[test]
 fn test_default_to_onion_payload_tlv_format() {
 	// Tests that we default to creating tlv format onion payloads when no `NodeAnnouncementInfo`