Skip to content

Update channel_reestablish for splicing #3886

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+446 −98
Open

Update channel_reestablish for splicing #3886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0fd2037
Add features for splicing
jkczyz Jun 19, 2025
b7db324
Add funding_locked_txid TLVs to channel_reestablish
jkczyz Jun 5, 2025
798bbc4
Set funding_locked_txid TLVs in channel_reestablish
jkczyz Jun 8, 2025
725be21
Update channel_reestablish logic for channel_ready
jkczyz Jun 19, 2025
a9e5607
Update next_funding_txid logic for channel_reestablish
jkczyz Jun 23, 2025
555ab97
Update next_commitment_number logic for channel_reestablish
jkczyz Jun 23, 2025
c661cb5
Send splice_locked on channel_reestablish
jkczyz Jun 20, 2025
f45f83b
Retransmit channel_ready / splice_locked awaiting announcement_sigs
jkczyz Jun 25, 2025
66ec81d
Clear announcement_sigs on FundingScope promotion
jkczyz Jun 25, 2025
cc1f3b9
Send channel_ready on channel_reestablish
jkczyz Jun 27, 2025
e2ea3bf
Handle implicit splice_locked during channel_reestablish
jkczyz Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions lightning-types/src/features.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@
//! (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#channel-quiescence) for more information).
//! - `ZeroFeeCommitments` - A channel type which always uses zero transaction fee on commitment transactions.
//! (see [BOLT PR #1228](https://github.com/lightning/bolts/pull/1228) for more info).
//! - `Splice` - Allows replacing the funding transaction with a new one
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//! - `Splice` - Allows replacing the funding transaction with a new one
//! - `Splice` - Allows replacing the currently-locked funding transaction with a new one

//! (see [BOLT PR #1160](https://github.com/lightning/bolts/pull/1160) for more information).
//!
//! LDK knows about the following features, but does not support them:
//! - `AnchorsNonzeroFeeHtlcTx` - the initial version of anchor outputs, which was later found to be
Expand Down Expand Up @@ -163,7 +165,7 @@ mod sealed {
// Byte 6
ZeroConf,
// Byte 7
Trampoline | SimpleClose,
Trampoline | SimpleClose | Splice,
]
);
define_context!(
Expand All @@ -184,7 +186,7 @@ mod sealed {
// Byte 6
ZeroConf | Keysend,
// Byte 7
Trampoline | SimpleClose,
Trampoline | SimpleClose | Splice,
// Byte 8 - 31
,,,,,,,,,,,,,,,,,,,,,,,,
// Byte 32
Expand Down Expand Up @@ -673,9 +675,20 @@ mod sealed {
supports_simple_close,
requires_simple_close
);
// By default, allocate enough bytes to cover up to SimpleClose. Update this as new features are
define_feature!(
63,
Splice,
[InitContext, NodeContext],
"Feature flags for channel splicing.",
set_splicing_optional,
set_splicing_required,
clear_splicing,
supports_splicing,
requires_splicing
);
// By default, allocate enough bytes to cover up to Splice. Update this as new features are
// added which we expect to appear commonly across contexts.
pub(super) const MIN_FEATURES_ALLOCATION_BYTES: usize = (61 + 7) / 8;
pub(super) const MIN_FEATURES_ALLOCATION_BYTES: usize = (63 + 7) / 8;
define_feature!(
259,
DnsResolver,
Expand Down Expand Up @@ -1369,6 +1382,7 @@ mod tests {
init_features.set_zero_conf_optional();
init_features.set_quiescence_optional();
init_features.set_simple_close_optional();
init_features.set_splicing_optional();

assert!(init_features.initial_routing_sync());
assert!(!init_features.supports_upfront_shutdown_script());
Expand All @@ -1384,7 +1398,7 @@ mod tests {
// - onion_messages
// - option_channel_type | option_scid_alias
// - option_zeroconf
// - option_simple_close
// - option_simple_close | option_splice
assert_eq!(node_features.flags.len(), 8);
assert_eq!(node_features.flags[0], 0b00000001);
assert_eq!(node_features.flags[1], 0b01010001);
Expand All @@ -1393,7 +1407,7 @@ mod tests {
assert_eq!(node_features.flags[4], 0b10001000);
assert_eq!(node_features.flags[5], 0b10100000);
assert_eq!(node_features.flags[6], 0b00001000);
assert_eq!(node_features.flags[7], 0b00100000);
assert_eq!(node_features.flags[7], 0b10100000);
}

// Check that cleared flags are kept blank when converting back:
Expand Down
Loading
Loading