Include funding TXO in outputs to watch

The funding TXO was never added to ChannelMonitor's outputs_to_watch in
73dce20. Include it when constructing a
ChannelMonitor.

Author: jkczyz

lightning/src/chain/channelmonitor.rs

@@ -1203,6 +1203,10 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 			feerate_per_kw: initial_local_commitment_tx.feerate_per_kw,
 			htlc_outputs: Vec::new(), // There are never any HTLCs in the initial commitment transactions
 		};
+
+		let mut outputs_to_watch = HashMap::new();
+		outputs_to_watch.insert(funding_info.0.txid, vec![funding_info.1.clone()]);
+
 		// Returning a monitor error before updating tracking points means in case of using
 		// a concurrent watchtower implementation for same channel, if this one doesn't
 		// reject update as we do, you MAY have the latest local valid commitment tx onchain
@@ -1246,7 +1250,7 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 			pending_events: Vec::new(),
 
 			onchain_events_waiting_threshold_conf: HashMap::new(),
-			outputs_to_watch: HashMap::new(),
+			outputs_to_watch,
 
 			onchain_tx_handler,
 

lightning/src/chain/mod.rs

@@ -66,9 +66,9 @@ pub trait Watch: Send + Sync {
 	/// Watches a channel identified by `funding_txo` using `monitor`.
 	///
 	/// Implementations are responsible for watching the chain for the funding transaction along
-	/// with spends of its output and any outputs returned by [`get_outputs_to_watch`]. In practice,
-	/// this means calling [`block_connected`] and [`block_disconnected`] on the monitor and
-	/// including all such transactions that meet this criteria.
+	/// with any spends of outputs returned by [`get_outputs_to_watch`]. In practice, this means
+	/// calling [`block_connected`] and [`block_disconnected`] on the monitor and including all such
+	/// transactions that meet this criteria.
 	///
 	/// [`get_outputs_to_watch`]: ../ln/channelmonitor/struct.ChannelMonitor.html#method.get_outputs_to_watch
 	/// [`block_connected`]: ../ln/channelmonitor/struct.ChannelMonitor.html#method.block_connected