Skip to content

Commit 8199c26

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 ff7a37f commit 8199c26

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
@@ -9644,7 +9644,14 @@ impl<SP: Deref> Writeable for FundedChannel<SP> where SP::Target: SignerProvider
96449644
self.context.channel_id.write(writer)?;
96459645
{
96469646
let mut channel_state = self.context.channel_state;
9647-
if matches!(channel_state, ChannelState::AwaitingChannelReady(_)|ChannelState::ChannelReady(_)) {
9647+
if matches!(channel_state, ChannelState::AwaitingChannelReady(_)|ChannelState::ChannelReady(_))
9648+
{
9649+
channel_state.set_peer_disconnected();
9650+
} else if matches!(channel_state, ChannelState::FundingNegotiated) &&
9651+
self.holder_commitment_point.transaction_number() == INITIAL_COMMITMENT_NUMBER - 1 {
9652+
// This is a V2 session which has an active signing session
9653+
// TODO(dual_funding): When we allow contributing funds to dual-funded channels,
9654+
// we will need to handle persisting appropriate signing session state.
96489655
channel_state.set_peer_disconnected();
96499656
} else {
96509657
debug_assert!(false, "Pre-funded/shutdown channels should not be written");

0 commit comments

Comments
 (0)