f - revert to unfunded state

Author: jkczyz

lightning/src/ln/channel.rs

@@ -1402,6 +1402,29 @@ impl<SP: Deref> Channel<SP> where
 		debug_assert!(!matches!(self.phase, ChannelPhase::Undefined));
 		result.map(|monitor| (self.as_funded_mut().expect("Channel should be funded"), monitor))
 	}
+
+	pub fn unset_funding_info(&mut self, temporary_channel_id: ChannelId) {
+		let phase = core::mem::replace(&mut self.phase, ChannelPhase::Undefined);
+		if let ChannelPhase::Funded(mut funded_chan) = phase {
+			funded_chan.unset_funding_info(temporary_channel_id);
+
+			let context = funded_chan.context;
+			let unfunded_context = UnfundedChannelContext {
+				unfunded_channel_age_ticks: 0,
+				holder_commitment_point: HolderCommitmentPoint::new(&context.holder_signer, &context.secp_ctx),
+			};
+			let unfunded_chan = OutboundV1Channel {
+				context,
+				unfunded_context,
+				signer_pending_open_channel: false,
+			};
+			self.phase = ChannelPhase::UnfundedOutboundV1(unfunded_chan);
+		} else {
+			self.phase = phase;
+		};
+
+		debug_assert!(!matches!(self.phase, ChannelPhase::Undefined));
+	}
 }
 
 impl<SP: Deref> From<OutboundV1Channel<SP>> for Channel<SP>

lightning/src/ln/channelmanager.rs

@@ -8164,22 +8164,24 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					.and_then(|(funded_chan, monitor)| {
 						self.chain_monitor
 							.watch_channel(funded_chan.context.get_funding_txo().unwrap(), monitor)
+							.map(|persist_status| (funded_chan, persist_status))
 							.map_err(|()| {
-								// 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.
-								funded_chan.unset_funding_info(msg.channel_id);
 								ChannelError::close("Channel funding outpoint was a duplicate".to_owned())
 							})
-							.map(|persist_status| (funded_chan, persist_status))
 					})
 				{
 					Ok((funded_chan, persist_status)) => {
 						handle_new_monitor_update!(self, persist_status, peer_state_lock, peer_state, per_peer_state, funded_chan, INITIAL_MONITOR);
 						Ok(())
 					},
-					Err(e) => try_channel_entry!(self, peer_state, Err(e), chan_entry),
+					Err(e) => {
+						// 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.
+						chan.unset_funding_info(msg.channel_id);
+						try_channel_entry!(self, peer_state, Err(e), chan_entry)
+					},
 				}
 			},
 			hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))