Move height update to the end.

Author: arik-so

lightning/src/chain/chainmonitor.rs

@@ -286,19 +286,6 @@ where C::Target: chain::Filter,
 	where
 		FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs>
 	{
-		{ // create nested block to release write lock upon completion
-			let _monitor_states = self.monitors.write().unwrap();
-			if let Some(height) = best_height {
-				// If the best block height is being updated, update highest_chain_height under the
-				// monitors write lock.
-				let old_height = self.highest_chain_height.load(Ordering::Acquire);
-				let new_height = height as usize;
-				if new_height > old_height {
-					self.highest_chain_height.store(new_height, Ordering::Release);
-				}
-			}
-		}
-
 		let funding_outpoints: HashSet<OutPoint> = HashSet::from_iter(self.monitors.read().unwrap().keys().cloned());
 		for funding_outpoint in funding_outpoints.iter() {
 			let monitor_lock = self.monitors.write().unwrap();
@@ -315,6 +302,16 @@ where C::Target: chain::Filter,
 				self.update_monitor_with_chain_data(header, best_height, txdata, &process, funding_outpoint, &monitor_state);
 			}
 		}
+
+		if let Some(height) = best_height {
+			// If the best block height is being updated, update highest_chain_height under the
+			// monitors write lock.
+			let old_height = self.highest_chain_height.load(Ordering::Acquire);
+			let new_height = height as usize;
+			if new_height > old_height {
+				self.highest_chain_height.store(new_height, Ordering::Release);
+			}
+		}
 	}
 
 	fn update_monitor_with_chain_data<FN>(&self, header: &BlockHeader, best_height: Option<u32>, txdata: &TransactionData, process: FN, funding_outpoint: &OutPoint, monitor_state: &&MonitorHolder<ChannelSigner>) where FN: Fn(&ChannelMonitor<ChannelSigner>, &TransactionData) -> Vec<TransactionOutputs> {