f Also persist for process_pending_update_add_htlcs

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -6124,7 +6124,8 @@ where
 		Ok(())
 	}
 
-	pub(crate) fn process_pending_update_add_htlcs(&self) {
+	pub(crate) fn process_pending_update_add_htlcs(&self) -> bool {
+		let mut should_persist = false;
 		let mut decode_update_add_htlcs = new_hash_map();
 		mem::swap(&mut decode_update_add_htlcs, &mut self.decode_update_add_htlcs.lock().unwrap());
 
@@ -6147,6 +6148,8 @@ where
 		};
 
 		'outer_loop: for (incoming_scid, update_add_htlcs) in decode_update_add_htlcs {
+			// If any decoded update_add_htlcs were processed, we need to persist.
+			should_persist = true;
 			let incoming_channel_details_opt =
 				self.do_funded_channel_callback(incoming_scid, |chan: &mut FundedChannel<SP>| {
 					let counterparty_node_id = chan.context.get_counterparty_node_id();
@@ -6310,6 +6313,7 @@ where
 				));
 			}
 		}
+		should_persist
 	}
 
 	/// Returns whether we have pending HTLC forwards that need to be processed via
@@ -6342,7 +6346,10 @@ where
 	// Returns whether or not we need to re-persist.
 	fn internal_process_pending_htlc_forwards(&self) -> NotifyOption {
 		let mut should_persist = NotifyOption::SkipPersistNoEvents;
-		self.process_pending_update_add_htlcs();
+
+		if self.process_pending_update_add_htlcs() {
+			should_persist = NotifyOption::DoPersist;
+		}
 
 		let mut new_events = VecDeque::new();
 		let mut failed_forwards = Vec::new();