Merge pull request #1080 from valentinewallace/2021-09-dup-chan-outpoint

Fix fuzzer-found panic from duplicate channel outpoint

Author: TheBlueMatt

lightning/src/chain/mod.rs

@@ -203,6 +203,9 @@ pub trait Watch<ChannelSigner: Sign> {
 	/// with any spends of outputs returned by [`get_outputs_to_watch`]. In practice, this means
 	/// calling [`block_connected`] and [`block_disconnected`] on the monitor.
 	///
+	/// Note: this interface MUST error with `ChannelMonitorUpdateErr::PermanentFailure` if
+	/// the given `funding_txo` has previously been registered via `watch_channel`.
+	///
 	/// [`get_outputs_to_watch`]: channelmonitor::ChannelMonitor::get_outputs_to_watch
 	/// [`block_connected`]: channelmonitor::ChannelMonitor::block_connected
 	/// [`block_disconnected`]: channelmonitor::ChannelMonitor::block_disconnected

lightning/src/ln/channelmanager.rs

@@ -3431,7 +3431,16 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 						Err(e) => try_chan_entry!(self, Err(e), channel_state, chan),
 					};
 					if let Err(e) = self.chain_monitor.watch_channel(chan.get().get_funding_txo().unwrap(), monitor) {
-						return_monitor_err!(self, e, channel_state, chan, RAACommitmentOrder::RevokeAndACKFirst, false, false);
+						let mut res = handle_monitor_err!(self, e, channel_state, chan, RAACommitmentOrder::RevokeAndACKFirst, false, false);
+						if let Err(MsgHandleErrInternal { ref mut shutdown_finish, .. }) = res {
+							// We weren't able to watch the channel to begin with, so no updates should be made on
+							// it. Previously, full_stack_target found an (unreachable) panic when the
+							// monitor update contained within `shutdown_finish` was applied.
+							if let Some((ref mut shutdown_finish, _)) = shutdown_finish {
+								shutdown_finish.0.take();
+							}
+						}
+						return res
 					}
 					funding_tx
 				},