Skip to content

Commit 25fee09

Browse files
committed
Allow writing V2 channels that are in a Funded phase
We allow persisting `FundedChannel`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 beb1ec0 commit 25fee09

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

lightning/src/ln/channel.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -9598,7 +9598,14 @@ impl<SP: Deref> Writeable for FundedChannel<SP> where SP::Target: SignerProvider
95989598
self.context.channel_id.write(writer)?;
95999599
{
96009600
let mut channel_state = self.context.channel_state;
9601-
if matches!(channel_state, ChannelState::AwaitingChannelReady(_)|ChannelState::ChannelReady(_)) {
9601+
if matches!(channel_state, ChannelState::AwaitingChannelReady(_)|ChannelState::ChannelReady(_))
9602+
{
9603+
channel_state.set_peer_disconnected();
9604+
} else if matches!(channel_state, ChannelState::FundingNegotiated) &&
9605+
self.holder_commitment_point.transaction_number() == INITIAL_COMMITMENT_NUMBER - 1 {
9606+
// This is a V2 session which has an active signing session
9607+
// TODO(dual_funding): When we allow contributing funds to dual-funded channels,
9608+
// we will need to handle persisting appropriate signing session state.
96029609
channel_state.set_peer_disconnected();
96039610
} else {
96049611
debug_assert!(false, "Pre-funded/shutdown channels should not be written");

0 commit comments

Comments
 (0)