Skip to content

Commit aa81d97

Browse files
committed
f - fix setting need_channel_ready in funding_created/signed
1 parent 3e37bff commit aa81d97

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

lightning/src/ln/channel.rs

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7349,17 +7349,6 @@ impl<SP: Deref> Channel<SP> where
73497349
return None;
73507350
}
73517351

7352-
// If we're still pending the signature on a funding transaction, then we're not ready to send a
7353-
// channel_ready yet.
7354-
if self.context.signer_pending_funding {
7355-
log_debug!(logger, "Can't produce channel_ready: the signer is pending funding.");
7356-
// We make sure to set the channel ready flag here so that we try to
7357-
// generate a channel ready for 0conf channels once our signer unblocked
7358-
// for funding.
7359-
self.context.signer_pending_channel_ready = true;
7360-
return None;
7361-
}
7362-
73637352
self.get_channel_ready(logger)
73647353
}
73657354

@@ -8533,7 +8522,8 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
85338522
holder_commitment_point,
85348523
};
85358524

8536-
let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some();
8525+
let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
8526+
|| channel.context.signer_pending_channel_ready;
85378527
channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new(), Vec::new());
85388528
Ok((channel, channel_monitor))
85398529
}
@@ -8802,7 +8792,8 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
88028792
interactive_tx_signing_session: None,
88038793
holder_commitment_point,
88048794
};
8805-
let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some();
8795+
let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
8796+
|| channel.context.signer_pending_channel_ready;
88068797
channel.monitor_updating_paused(false, false, need_channel_ready, Vec::new(), Vec::new(), Vec::new());
88078798

88088799
Ok((channel, funding_signed, channel_monitor))

0 commit comments

Comments
 (0)