Partially address review

- Use `check_closed_event` instead of clearing pending events
- Write new property and read it from TLVs

Author: QPotato

lightning/src/chain/channelmonitor.rs

@@ -952,13 +952,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 
 		self.lockdown_from_offchain.write(writer)?;
 		self.holder_tx_signed.write(writer)?;
-		self.allow_automated_broadcast.write(writer)?;
 
 		write_tlv_fields!(writer, {
 			(1, self.funding_spend_confirmed, option),
 			(3, self.htlcs_resolved_on_chain, vec_type),
 			(5, self.pending_monitor_events, vec_type),
 			(7, self.funding_spend_seen, required),
+			(9, self.allow_automated_broadcast, required)
 		});
 
 		Ok(())
@@ -3354,7 +3354,6 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 
 		let lockdown_from_offchain = Readable::read(reader)?;
 		let holder_tx_signed = Readable::read(reader)?;
-		let allow_automated_broadcast: bool = Readable::read(reader)?;
 
 		if let Some(prev_commitment_tx) = prev_holder_signed_commitment_tx.as_mut() {
 			let prev_holder_value = onchain_tx_handler.get_prev_holder_commitment_to_self_value();
@@ -3376,11 +3375,14 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 		let mut funding_spend_confirmed = None;
 		let mut htlcs_resolved_on_chain = Some(Vec::new());
 		let mut funding_spend_seen = Some(false);
+		let mut allow_automated_broadcast = Some(true);
+		
 		read_tlv_fields!(reader, {
 			(1, funding_spend_confirmed, option),
 			(3, htlcs_resolved_on_chain, vec_type),
 			(5, pending_monitor_events, vec_type),
 			(7, funding_spend_seen, option),
+			(9, allow_automated_broadcast, option)
 		});
 
 		let mut secp_ctx = Secp256k1::new();
@@ -3438,7 +3440,7 @@ impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
 
 				secp_ctx,
 
-				allow_automated_broadcast,
+				allow_automated_broadcast: allow_automated_broadcast.unwrap(),
 			}),
 		}))
 	}

lightning/src/ln/functional_tests.rs

@@ -4821,8 +4821,7 @@ fn test_deserialize_monitor_force_closed_without_broadcasting_txn() {
 
 	assert!(nodes[0].chain_monitor.watch_channel(deserialized_chanmon.get_funding_txo().0, deserialized_chanmon).is_ok());
 	check_added_monitors!(nodes[0], 1);
-	nodes[0].node.get_and_clear_pending_msg_events();
-	nodes[0].node.get_and_clear_pending_events();
+	check_closed_event!(nodes[0], 1, ClosureReason::HolderForceClosed);
 }
 
 macro_rules! check_spendable_outputs {