Skip to content

Commit 4c5751e

Browse files
committed
Allow writing V2 channels that are in a Funded phase
We allow persisting `Channel`s in a `ChannelState::FundingNegotiated` only if the holder commitment number has advanced to the second commitment number. Currently we don't need new persistence, but we will need to persist some information such as `tx_signatures` when we allow contributing funds to dual-funded channels.
1 parent ebde818 commit 4c5751e

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

lightning/src/ln/channel.rs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9548,7 +9548,14 @@ impl<SP: Deref> Writeable for FundedChannel<SP> where SP::Target: SignerProvider
95489548
self.context.channel_id.write(writer)?;
95499549
{
95509550
let mut channel_state = self.context.channel_state;
9551-
if matches!(channel_state, ChannelState::AwaitingChannelReady(_)|ChannelState::ChannelReady(_)) {
9551+
if matches!(channel_state, ChannelState::AwaitingChannelReady(_)|ChannelState::ChannelReady(_))
9552+
{
9553+
channel_state.set_peer_disconnected();
9554+
} else if matches!(channel_state, ChannelState::FundingNegotiated) &&
9555+
self.holder_commitment_point.transaction_number() == INITIAL_COMMITMENT_NUMBER - 1 {
9556+
// This is a V2 session which has an active signing session
9557+
// TODO(dual_funding): When we allow contributing funds to dual-funded channels,
9558+
// we will need to handle persisting appropriate signing session state.
95529559
channel_state.set_peer_disconnected();
95539560
} else {
95549561
debug_assert!(false, "Pre-funded/shutdown channels should not be written");

0 commit comments

Comments
 (0)