Add missing pending channel maps checks in ChannelManager

One of a series of follow-up commits to address some issues found
in PR 2077, where we split channels up into different maps and structs
depending on phase in their life.

Author: dunxen

lightning/src/ln/channelmanager.rs

@@ -691,6 +691,18 @@ impl <Signer: ChannelSigner> PeerState<Signer> {
 			self.outbound_v1_channel_by_id.contains_key(channel_id) ||
 			self.inbound_v1_channel_by_id.contains_key(channel_id)
 	}
+
+	/// Returns a bool indicating if the given `channel_id` matches a channel we have with this peer
+	/// that is in one of our pending (unfunded) channel maps.
+	///
+	/// NOTE: Although V1 established channels will always have a `temporary_channel_id` if they're
+	///       in `(outbound/inbound)_v1_channel_by_id`, we use the more general `channel_id` as V2
+	///       established channels will have a fixed `channel_id` already after the `accept_channel2`
+	///       message is sent/received.
+	fn has_pending_channel(&self, channel_id: &[u8; 32]) -> bool {
+		self.outbound_v1_channel_by_id.contains_key(channel_id) ||
+			self.inbound_v1_channel_by_id.contains_key(channel_id)
+	}
 }
 
 /// Stores a PaymentSecret and any other data we may need to validate an inbound payment is
@@ -2190,6 +2202,7 @@ where
 			for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 				let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 				let peer_state = &mut *peer_state_lock;
+				// Only `Channels` in the channel_by_id map can be considered funded.
 				for (_channel_id, channel) in peer_state.channel_by_id.iter().filter(f) {
 					let details = ChannelDetails::from_channel_context(&channel.context, best_block_height,
 						peer_state.latest_features.clone());
@@ -2216,20 +2229,18 @@ where
 			for (_cp_id, peer_state_mutex) in per_peer_state.iter() {
 				let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 				let peer_state = &mut *peer_state_lock;
-				for (_channel_id, channel) in peer_state.channel_by_id.iter() {
-					let details = ChannelDetails::from_channel_context(&channel.context, best_block_height,
-						peer_state.latest_features.clone());
-					res.push(details);
+				let chan_context_to_details = |context| {
+					ChannelDetails::from_channel_context(context, best_block_height,
+						peer_state.latest_features.clone())
+				};
+				for (_, channel) in peer_state.channel_by_id.iter() {
+					res.push(chan_context_to_details(&channel.context));
 				}
-				for (_channel_id, channel) in peer_state.inbound_v1_channel_by_id.iter() {
-					let details = ChannelDetails::from_channel_context(&channel.context, best_block_height,
-						peer_state.latest_features.clone());
-					res.push(details);
+				for (_, channel) in peer_state.inbound_v1_channel_by_id.iter() {
+					res.push(chan_context_to_details(&channel.context));
 				}
-				for (_channel_id, channel) in peer_state.outbound_v1_channel_by_id.iter() {
-					let details = ChannelDetails::from_channel_context(&channel.context, best_block_height,
-						peer_state.latest_features.clone());
-					res.push(details);
+				for (_, channel) in peer_state.outbound_v1_channel_by_id.iter() {
+					res.push(chan_context_to_details(&channel.context));
 				}
 			}
 		}
@@ -2258,10 +2269,14 @@ where
 			let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 			let peer_state = &mut *peer_state_lock;
 			let features = &peer_state.latest_features;
+			let chan_context_to_details = |context| {
+				ChannelDetails::from_channel_context(context, best_block_height, features.clone())
+			};
 			return peer_state.channel_by_id
 				.iter()
-				.map(|(_, channel)|
-					ChannelDetails::from_channel_context(&channel.context, best_block_height, features.clone()))
+				.map(|(_, channel)| chan_context_to_details(&channel.context))
+				.chain(peer_state.outbound_v1_channel_by_id.iter().map(|(_, channel)| chan_context_to_details(&channel.context)))
+				.chain(peer_state.inbound_v1_channel_by_id.iter().map(|(_, channel)| chan_context_to_details(&channel.context)))
 				.collect();
 		}
 		vec![]
@@ -7097,23 +7112,22 @@ where
 			let mut peer_state_lock = peer_state_mutex.lock().unwrap();
 			let peer_state = &mut *peer_state_lock;
 			let pending_msg_events = &mut peer_state.pending_msg_events;
-			peer_state.channel_by_id.retain(|_, chan| {
-				let retain = if chan.context.get_counterparty_node_id() == *counterparty_node_id {
-					if !chan.context.have_received_message() {
-						// If we created this (outbound) channel while we were disconnected from the
-						// peer we probably failed to send the open_channel message, which is now
-						// lost. We can't have had anything pending related to this channel, so we just
-						// drop it.
-						false
-					} else {
-						pending_msg_events.push(events::MessageSendEvent::SendChannelReestablish {
-							node_id: chan.context.get_counterparty_node_id(),
-							msg: chan.get_channel_reestablish(&self.logger),
-						});
-						true
-					}
-				} else { true };
-				if retain && chan.context.get_counterparty_node_id() != *counterparty_node_id {
+			peer_state.outbound_v1_channel_by_id.retain(|_, chan| {
+				if chan.context.get_counterparty_node_id() == *counterparty_node_id {
+					// If we created this (outbound) channel while we were disconnected from the
+					// peer we probably failed to send the open_channel message, which is now
+					// lost. We can't have had anything pending related to this channel, so we just
+					// drop it.
+					chan.context.have_received_message()
+				} else { true }
+			});
+			peer_state.channel_by_id.iter_mut().for_each(|(_, chan)| {
+				if chan.context.get_counterparty_node_id() == *counterparty_node_id {
+					pending_msg_events.push(events::MessageSendEvent::SendChannelReestablish {
+						node_id: chan.context.get_counterparty_node_id(),
+						msg: chan.get_channel_reestablish(&self.logger),
+					});
+				} else {
 					if let Some(msg) = chan.get_signed_channel_announcement(&self.node_signer, self.genesis_hash.clone(), self.best_block.read().unwrap().height(), &self.default_configuration) {
 						if let Ok(update_msg) = self.get_channel_update_for_broadcast(chan) {
 							pending_msg_events.push(events::MessageSendEvent::SendChannelAnnouncement {
@@ -7123,7 +7137,6 @@ where
 						}
 					}
 				}
-				retain
 			});
 		}
 		//TODO: Also re-broadcast announcement_signatures