Handle sending accept_channel when signer is unblocked

Author: alecchendev

lightning/src/ln/channel.rs

@@ -8306,6 +8306,29 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 
 		Ok((channel, funding_signed, channel_monitor))
 	}
+
+	/// Indicates that the signer may have some signatures for us, so we should retry if we're
+	/// blocked.
+	#[allow(unused)]
+	pub fn signer_maybe_unblocked<L: Deref>(&mut self, logger: &L) -> Option<msgs::AcceptChannel>
+	where L::Target: Logger
+	{
+		if self.unfunded_context.holder_commitment_point.is_none() {
+			self.unfunded_context.holder_commitment_point = HolderCommitmentPoint::new(&self.context.holder_signer, &self.context.secp_ctx);
+		}
+		if let Some(ref mut point) = self.unfunded_context.holder_commitment_point {
+			if !point.is_available() {
+				point.try_resolve_pending(&self.context.holder_signer, &self.context.secp_ctx, logger);
+			}
+		}
+		match self.unfunded_context.holder_commitment_point {
+			Some(ref mut point) if point.is_available() && self.signer_pending_accept_channel => {
+				log_trace!(logger, "Attempting to generate accept_channel...");
+				self.generate_accept_channel_message(logger)
+			}
+			_ => None
+		}
+	}
 }
 
 // A not-yet-funded outbound (from holder) channel using V2 channel establishment.

lightning/src/ln/channelmanager.rs

@@ -8887,7 +8887,16 @@ where
 					}
 					None
 				}
-				ChannelPhase::UnfundedInboundV1(_) => None,
+				ChannelPhase::UnfundedInboundV1(chan) => {
+					let logger = WithChannelContext::from(&self.logger, &chan.context, None);
+					if let Some(msg) = chan.signer_maybe_unblocked(&&logger) {
+						pending_msg_events.push(events::MessageSendEvent::SendAcceptChannel {
+							node_id,
+							msg,
+						});
+					}
+					None
+				},
 			}
 		};