WIP cache peers in Flow

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -8025,6 +8025,8 @@ where
 
 			should_persist
 		});
+
+		self.flow.set_peers(self.get_peers_for_blinded_path());
 	}
 
 	/// Indicates that the preimage for payment_hash is unknown or the received amount is incorrect
@@ -10407,16 +10409,20 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 						emit_initial_channel_ready_event!(pending_events, chan);
 					}
 
-					Ok(())
 				} else {
 					try_channel_entry!(self, peer_state, Err(ChannelError::close(
 						"Got a channel_ready message for an unfunded channel!".into())), chan_entry)
 				}
 			},
 			hash_map::Entry::Vacant(_) => {
-				Err(MsgHandleErrInternal::send_err_msg_no_close(format!("Got a message for a channel from the wrong node! No such channel for the passed counterparty_node_id {}", counterparty_node_id), msg.channel_id))
+				return Err(MsgHandleErrInternal::send_err_msg_no_close(format!("Got a message for a channel from the wrong node! No such channel for the passed counterparty_node_id {}", counterparty_node_id), msg.channel_id))
 			}
 		}
+		core::mem::drop(peer_state_lock);
+		core::mem::drop(per_peer_state);
+
+		self.flow.set_peers(self.get_peers_for_blinded_path());
+		Ok(())
 	}
 
 	fn internal_shutdown(
@@ -10509,6 +10515,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 			self.fail_htlc_backwards_internal(&htlc_source.0, &htlc_source.1, &reason, receiver);
 		}
 
+		self.flow.set_peers(self.get_peers_for_blinded_path());
 		Ok(())
 	}
 
@@ -13267,7 +13274,7 @@ where
 			let _ = handle_error!(self, err, counterparty_node_id);
 		}
 
-		let _ = self.flow.peer_disconnected(counterparty_node_id);
+		self.flow.set_peers(self.get_peers_for_blinded_path());
 	}
 
 	#[rustfmt::skip]
@@ -13382,7 +13389,7 @@ where
 		// until we have some peer connection(s) to receive onion messages over, so as a minor optimization
 		// refresh the cache when a peer connects.
 		self.check_refresh_async_receive_offer_cache(false);
-		let _ = self.flow.peer_connected(counterparty_node_id, &init_msg.features, peer_has_live_channel);
+		self.flow.set_peers(self.get_peers_for_blinded_path());
 		res
 	}
 

lightning/src/offers/flow.rs

@@ -61,7 +61,6 @@ use crate::sign::{EntropySource, NodeSigner, ReceiveAuthKey};
 
 use crate::offers::static_invoice::{StaticInvoice, StaticInvoiceBuilder};
 use crate::sync::{Mutex, RwLock};
-use crate::types::features::InitFeatures;
 use crate::types::payment::{PaymentHash, PaymentSecret};
 use crate::util::logger::Logger;
 use crate::util::ser::Writeable;
@@ -1712,42 +1711,12 @@ where
 		self.async_receive_offer_cache.encode()
 	}
 
-	/// Indicates that a peer was connected to our node. Useful for the [`OffersMessageFlow`] to keep
-	/// track of which peers are connected, which allows for methods that can create blinded paths
-	/// without requiring a fresh set of [`MessageForwardNode`]s to be passed in.
+	/// Provides a set of peers of this node that can be used in [`BlindedMessagePath`]s created by
+	/// the [`OffersMessageFlow`].
 	///
-	/// `live_channel` should be set if we have an open, usable channel with this peer that has at
-	/// least six onchain confirmations.
-	///
-	/// MUST be called by always-online nodes that support holding HTLCs on behalf of often-offline
-	/// senders.
-	///
-	/// Errors if the peer does not support onion messages or we don't have a channel with them.
-	pub fn peer_connected(
-		&self, peer_node_id: PublicKey, features: &InitFeatures, live_channel: bool,
-	) -> Result<(), ()> {
-		if !features.supports_onion_messages() || !live_channel {
-			return Err(());
-		}
-
+	/// All provided peers MUST advertise support for onion messages in their [`InitFeatures`].
+	pub fn set_peers(&self, mut peers: Vec<MessageForwardNode>) {
 		let mut peers_cache = self.peers_cache.lock().unwrap();
-		let peer = MessageForwardNode { node_id: peer_node_id, short_channel_id: None };
-		peers_cache.push(peer);
-
-		Ok(())
-	}
-
-	/// Indicates that a peer was disconnected from our node. See [`Self::peer_connected`].
-	///
-	/// Errors if the peer is unknown.
-	pub fn peer_disconnected(&self, peer_node_id: PublicKey) -> Result<(), ()> {
-		let mut peers_cache = self.peers_cache.lock().unwrap();
-		let peer_idx = match peers_cache.iter().position(|peer| peer.node_id == peer_node_id) {
-			Some(idx) => idx,
-			None => return Err(()),
-		};
-		peers_cache.swap_remove(peer_idx);
-
-		Ok(())
+		core::mem::swap(&mut *peers_cache, &mut peers);
 	}
 }