f - take the SCID of the oldest channel

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1403,7 +1403,7 @@ pub(super) struct ChannelContext<SP: Deref> where SP::Target: SignerProvider {
 	/// Either the height at which this channel was created or the height at which it was last
 	/// serialized if it was serialized by versions prior to 0.0.103.
 	/// We use this to close if funding is never broadcasted.
-	channel_creation_height: u32,
+	pub(super) channel_creation_height: u32,
 
 	counterparty_dust_limit_satoshis: u64,
 

lightning/src/ln/channelmanager.rs

@@ -9007,7 +9007,8 @@ where
 				node_id: *node_id,
 				short_channel_id: peer.channel_by_id
 					.iter()
-					.find(|(_, channel)| channel.context().is_usable())
+					.filter(|(_, channel)| channel.context().is_usable())
+					.min_by_key(|(_, channel)| channel.context().channel_creation_height)
 					.and_then(|(_, channel)| channel.context().get_short_channel_id()),
 			})
 			.collect::<Vec<_>>();