f Still hold total_conistency_lock during monitor event processing

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -1690,10 +1690,16 @@ macro_rules! process_events_body {
 
 			let mut result = NotifyOption::SkipPersist;
 
-			// TODO: This behavior should be documented. It's unintuitive that we query
-			// ChannelMonitors when clearing other events.
-			if $self.process_pending_monitor_events() {
-				result = NotifyOption::DoPersist;
+			{
+				// We'll acquire our total consistency lock so that we can be sure no other
+				// persists happen while processing monitor events.
+				let _read_guard = $self.total_consistency_lock.read().unwrap();
+
+				// TODO: This behavior should be documented. It's unintuitive that we query
+				// ChannelMonitors when clearing other events.
+				if $self.process_pending_monitor_events() {
+					result = NotifyOption::DoPersist;
+				}
 			}
 
 			let pending_events = $self.pending_events.lock().unwrap().clone();
@@ -4384,6 +4390,7 @@ where
 	}
 
 	fn channel_monitor_updated(&self, funding_txo: &OutPoint, highest_applied_update_id: u64, counterparty_node_id: Option<&PublicKey>) {
+		debug_assert!(self.total_consistency_lock.try_write().is_err()); // Caller holds read lock
 		let counterparty_node_id = match counterparty_node_id {
 			Some(cp_id) => cp_id.clone(),
 			None => {