f - take the SCID of the oldest channel

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1398,7 +1398,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

@@ -8992,7 +8992,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<_>>();

lightning/src/onion_message/messenger.rs

@@ -98,7 +98,7 @@ pub(super) const MAX_TIMER_TICKS: usize = 2;
 /// #         })
 /// #     }
 /// #     fn create_blinded_paths<T: secp256k1::Signing + secp256k1::Verification>(
-/// #         &self, _recipient: PublicKey, _peers: Vec<PublicKey>, _secp_ctx: &Secp256k1<T>
+/// #         &self, _recipient: PublicKey, _peers: Vec<ForwardNode>, _secp_ctx: &Secp256k1<T>
 /// #     ) -> Result<Vec<BlindedPath>, ()> {
 /// #         unreachable!()
 /// #     }