f - update short_to_chan_info

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -3147,13 +3147,20 @@ macro_rules! send_channel_ready {
 		let outbound_alias_insert = short_to_chan_info.insert($channel.context.outbound_scid_alias(), ($channel.context.get_counterparty_node_id(), $channel.context.channel_id()));
 		assert!(outbound_alias_insert.is_none() || outbound_alias_insert.unwrap() == ($channel.context.get_counterparty_node_id(), $channel.context.channel_id()),
 			"SCIDs should never collide - ensure you weren't behind the chain tip by a full month when creating channels");
+		insert_short_channel_id!(short_to_chan_info, $channel);
+	}}
+}
+
+macro_rules! insert_short_channel_id {
+	($short_to_chan_info: ident, $channel: expr) => {{
 		if let Some(real_scid) = $channel.funding.get_short_channel_id() {
-			let scid_insert = short_to_chan_info.insert(real_scid, ($channel.context.get_counterparty_node_id(), $channel.context.channel_id()));
+			let scid_insert = $short_to_chan_info.insert(real_scid, ($channel.context.get_counterparty_node_id(), $channel.context.channel_id()));
 			assert!(scid_insert.is_none() || scid_insert.unwrap() == ($channel.context.get_counterparty_node_id(), $channel.context.channel_id()),
 				"SCIDs should never collide - ensure you weren't behind the chain tip by a full month when creating channels");
 		}
 	}}
 }
+
 macro_rules! emit_funding_tx_broadcast_safe_event {
 	($locked_events: expr, $channel: expr, $funding_txo: expr) => {
 		if !$channel.context.funding_tx_broadcast_safe_event_emitted() {
@@ -11729,6 +11736,11 @@ where
 									},
 									#[cfg(splicing)]
 									Some(FundingConfirmedMessage::Splice(splice_locked)) => {
+										if announcement_sigs.is_some() {
+											let mut short_to_chan_info = self.short_to_chan_info.write().unwrap();
+											insert_short_channel_id!(short_to_chan_info, funded_channel);
+										}
+
 										pending_msg_events.push(MessageSendEvent::SendSpliceLocked {
 											node_id: funded_channel.context.get_counterparty_node_id(),
 											msg: splice_locked,