f fix lockorder

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -5938,6 +5938,7 @@ where
 	}
 
 	fn handle_monitor_update_release(&self, counterparty_node_id: PublicKey, channel_funding_outpoint: OutPoint) {
+		let mut errors = Vec::new();
 		loop {
 			let per_peer_state = self.per_peer_state.read().unwrap();
 			if let Some(peer_state_mtx) = per_peer_state.get(&counterparty_node_id) {
@@ -5953,7 +5954,7 @@ where
 					// events be the ones that ultimately release the monitor update(s).
 					log_trace!(self.logger, "Delaying monitor unlock for channel {} as another event is pending",
 						log_bytes!(&channel_funding_outpoint.to_channel_id()[..]));
-					return;
+					break;
 				}
 				if let hash_map::Entry::Occupied(mut chan) = peer_state.channel_by_id.entry(channel_funding_outpoint.to_channel_id()) {
 					debug_assert_eq!(chan.get().get_funding_txo().unwrap(), channel_funding_outpoint);
@@ -5962,10 +5963,11 @@ where
 							log_bytes!(&channel_funding_outpoint.to_channel_id()[..]));
 						let update_res = self.chain_monitor.update_channel(channel_funding_outpoint, monitor_update);
 						let update_id = monitor_update.update_id;
-						let _ = handle_error!(self,
-							handle_new_monitor_update!(self, update_res, update_id,
-								peer_state_lck, peer_state, per_peer_state, chan),
-							counterparty_node_id);
+						if let Err(e) = handle_new_monitor_update!(self, update_res, update_id,
+							peer_state_lck, peer_state, per_peer_state, chan)
+						{
+							errors.push((e, counterparty_node_id));
+						}
 						if further_update_exists {
 							// If there are more `ChannelMonitorUpdate`s to process, restart at the
 							// top of the loop.
@@ -5983,6 +5985,10 @@ where
 			}
 			break;
 		}
+		for (err, counterparty_node_id) in errors {
+			let res = Err::<(), _>(err);
+			let _ = handle_error!(self, res, counterparty_node_id);
+		}
 	}
 
 	fn handle_post_event_actions(&self, actions: Vec<EventCompletionAction>) {