Add Counterparty ChannelMonitorUpdateStep variant

Author: jurvis

lightning/src/chain/channelmonitor.rs

@@ -471,6 +471,9 @@ pub(crate) enum ChannelMonitorUpdateStep {
 	ShutdownScript {
 		scriptpubkey: Script,
 	},
+	Counterparty {
+		counterparty_node_id: PublicKey,
+	}
 }
 
 impl ChannelMonitorUpdateStep {
@@ -482,6 +485,7 @@ impl ChannelMonitorUpdateStep {
 			ChannelMonitorUpdateStep::CommitmentSecret { .. } => "CommitmentSecret",
 			ChannelMonitorUpdateStep::ChannelForceClosed { .. } => "ChannelForceClosed",
 			ChannelMonitorUpdateStep::ShutdownScript { .. } => "ShutdownScript",
+			ChannelMonitorUpdateStep::Counterparty { .. } => "Counterparty",
 		}
 	}
 }
@@ -510,6 +514,9 @@ impl_writeable_tlv_based_enum_upgradable!(ChannelMonitorUpdateStep,
 	(5, ShutdownScript) => {
 		(0, scriptpubkey, required),
 	},
+	(6, Counterparty) => {
+		(0, counterparty_node_id, required)
+	}
 );
 
 /// Details about the balance(s) available for spending once the channel appears on chain.
@@ -2005,6 +2012,9 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 						panic!("Attempted to replace shutdown script {} with {}", shutdown_script, scriptpubkey);
 					}
 				},
+				ChannelMonitorUpdateStep::Counterparty { counterparty_node_id } => {
+					log_trace!(logger, "Updating ChannelMonitor with counterparty_node_id {}", counterparty_node_id);
+				}
 			}
 		}
 		self.latest_update_id = updates.update_id;

lightning/src/ln/channel.rs

@@ -4187,6 +4187,8 @@ impl<Signer: Sign> Channel<Signer> {
 				update_id: self.latest_monitor_update_id,
 				updates: vec![ChannelMonitorUpdateStep::ShutdownScript {
 					scriptpubkey: self.get_closing_scriptpubkey(),
+				}, ChannelMonitorUpdateStep::Counterparty {
+					counterparty_node_id: self.counterparty_node_id,
 				}],
 			})
 		} else { None };
@@ -5730,6 +5732,8 @@ impl<Signer: Sign> Channel<Signer> {
 				update_id: self.latest_monitor_update_id,
 				updates: vec![ChannelMonitorUpdateStep::ShutdownScript {
 					scriptpubkey: self.get_closing_scriptpubkey(),
+				}, ChannelMonitorUpdateStep::Counterparty {
+					counterparty_node_id: self.counterparty_node_id,
 				}],
 			})
 		} else { None };