Skip to content

Update channel_reestablish for splicing#3886

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
wpaulino merged 13 commits into from
Sep 5, 2025
Merged

Update channel_reestablish for splicing #3886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3f4356a
Add features for splicing
jkczyz Jun 19, 2025
857432b
Add funding_locked_txid TLVs to channel_reestablish
jkczyz Jun 5, 2025
d8f421e
Set funding_locked_txid TLVs in channel_reestablish
jkczyz Jun 8, 2025
df80eb0
Retransmit commitment_signed before tx_signatures
jkczyz Aug 28, 2025
a0b6dd6
Correctly order channel_ready on channel_reestablish
jkczyz Aug 29, 2025
73639c3
Don't retransmit tx_signatures pending monitor update
jkczyz Sep 2, 2025
77747c0
Update next_funding_txid logic for channel_reestablish
jkczyz Jun 23, 2025
976381a
Remove unnecessary next_funding check
jkczyz Aug 28, 2025
7050856
Clear announcement_sigs on FundingScope promotion
jkczyz Jun 25, 2025
d4ddbc4
Handle implicit splice_locked during channel_reestablish
jkczyz Jun 27, 2025
734452c
Request announcement_signatures retransmission
jkczyz Aug 19, 2025
ff98bbf
Retransmit announcement_signatures if requested
jkczyz Aug 19, 2025
a3a3a55
Use HolderCommitmentPoint::current_transaction_number
jkczyz Aug 28, 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 numberDiff line numberDiff 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 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 DownExpand 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Update `channel_reestablish` for splicing by jkczyz · Pull Request #3886 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update channel_reestablish for splicing#3886

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wpaulino
merged 13 commits into

from

Sep 5, 2025
 Merged


Update channel_reestablish for splicing
#3886
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3f4356a

Add features for splicing


jkczyz Jun 19, 2025
857432b

Add funding_locked_txid TLVs to channel_reestablish


jkczyz Jun 5, 2025
d8f421e

Set funding_locked_txid TLVs in channel_reestablish


jkczyz Jun 8, 2025
df80eb0

Retransmit commitment_signed before tx_signatures


jkczyz Aug 28, 2025
a0b6dd6

Correctly order channel_ready on channel_reestablish


jkczyz Aug 29, 2025
73639c3

Don't retransmit tx_signatures pending monitor update


jkczyz Sep 2, 2025
77747c0

Update next_funding_txid logic for channel_reestablish


jkczyz Jun 23, 2025
976381a

Remove unnecessary next_funding check


jkczyz Aug 28, 2025
7050856

Clear announcement_sigs on FundingScope promotion


jkczyz Jun 25, 2025
d4ddbc4

Handle implicit splice_locked during channel_reestablish


jkczyz Jun 27, 2025
734452c

Request announcement_signatures retransmission


jkczyz Aug 19, 2025
ff98bbf

Retransmit announcement_signatures if requested


jkczyz Aug 19, 2025
a3a3a55

Use HolderCommitmentPoint::current_transaction_number


jkczyz Aug 28, 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 numberDiff line numberDiff 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 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update `channel_reestablish` for splicing by jkczyz · Pull Request #3886 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update channel_reestablish for splicing#3886

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wpaulino
merged 13 commits into

from

Sep 5, 2025
 Merged


Update channel_reestablish for splicing
#3886
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3f4356a

Add features for splicing


jkczyz Jun 19, 2025
857432b

Add funding_locked_txid TLVs to channel_reestablish


jkczyz Jun 5, 2025
d8f421e

Set funding_locked_txid TLVs in channel_reestablish


jkczyz Jun 8, 2025
df80eb0

Retransmit commitment_signed before tx_signatures


jkczyz Aug 28, 2025
a0b6dd6

Correctly order channel_ready on channel_reestablish


jkczyz Aug 29, 2025
73639c3

Don't retransmit tx_signatures pending monitor update


jkczyz Sep 2, 2025
77747c0

Update next_funding_txid logic for channel_reestablish


jkczyz Jun 23, 2025
976381a

Remove unnecessary next_funding check


jkczyz Aug 28, 2025
7050856

Clear announcement_sigs on FundingScope promotion


jkczyz Jun 25, 2025
d4ddbc4

Handle implicit splice_locked during channel_reestablish


jkczyz Jun 27, 2025
734452c

Request announcement_signatures retransmission


jkczyz Aug 19, 2025
ff98bbf

Retransmit announcement_signatures if requested


jkczyz Aug 19, 2025
a3a3a55

Use HolderCommitmentPoint::current_transaction_number


jkczyz Aug 28, 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 numberDiff line numberDiff 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 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update `channel_reestablish` for splicing by jkczyz · Pull Request #3886 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update channel_reestablish for splicing#3886

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wpaulino
merged 13 commits into

from

Sep 5, 2025
 Merged


Update channel_reestablish for splicing
#3886
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3f4356a

Add features for splicing


jkczyz Jun 19, 2025
857432b

Add funding_locked_txid TLVs to channel_reestablish


jkczyz Jun 5, 2025
d8f421e

Set funding_locked_txid TLVs in channel_reestablish


jkczyz Jun 8, 2025
df80eb0

Retransmit commitment_signed before tx_signatures


jkczyz Aug 28, 2025
a0b6dd6

Correctly order channel_ready on channel_reestablish


jkczyz Aug 29, 2025
73639c3

Don't retransmit tx_signatures pending monitor update


jkczyz Sep 2, 2025
77747c0

Update next_funding_txid logic for channel_reestablish


jkczyz Jun 23, 2025
976381a

Remove unnecessary next_funding check


jkczyz Aug 28, 2025
7050856

Clear announcement_sigs on FundingScope promotion


jkczyz Jun 25, 2025
d4ddbc4

Handle implicit splice_locked during channel_reestablish


jkczyz Jun 27, 2025
734452c

Request announcement_signatures retransmission


jkczyz Aug 19, 2025
ff98bbf

Retransmit announcement_signatures if requested


jkczyz Aug 19, 2025
a3a3a55

Use HolderCommitmentPoint::current_transaction_number


jkczyz Aug 28, 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 numberDiff line numberDiff 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 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Update `channel_reestablish` for splicing by jkczyz · Pull Request #3886 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update channel_reestablish for splicing#3886

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wpaulino
merged 13 commits into

from

Sep 5, 2025
 Merged


Update channel_reestablish for splicing
#3886
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3f4356a

Add features for splicing


jkczyz Jun 19, 2025
857432b

Add funding_locked_txid TLVs to channel_reestablish


jkczyz Jun 5, 2025
d8f421e

Set funding_locked_txid TLVs in channel_reestablish


jkczyz Jun 8, 2025
df80eb0

Retransmit commitment_signed before tx_signatures


jkczyz Aug 28, 2025
a0b6dd6

Correctly order channel_ready on channel_reestablish


jkczyz Aug 29, 2025
73639c3

Don't retransmit tx_signatures pending monitor update


jkczyz Sep 2, 2025
77747c0

Update next_funding_txid logic for channel_reestablish


jkczyz Jun 23, 2025
976381a

Remove unnecessary next_funding check


jkczyz Aug 28, 2025
7050856

Clear announcement_sigs on FundingScope promotion


jkczyz Jun 25, 2025
d4ddbc4

Handle implicit splice_locked during channel_reestablish


jkczyz Jun 27, 2025
734452c

Request announcement_signatures retransmission


jkczyz Aug 19, 2025
ff98bbf

Retransmit announcement_signatures if requested


jkczyz Aug 19, 2025
a3a3a55

Use HolderCommitmentPoint::current_transaction_number


jkczyz Aug 28, 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 numberDiff line numberDiff 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 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update `channel_reestablish` for splicing by jkczyz · Pull Request #3886 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update channel_reestablish for splicing#3886

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wpaulino
merged 13 commits into

from

Sep 5, 2025
 Merged


Update channel_reestablish for splicing
#3886
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3f4356a

Add features for splicing


jkczyz Jun 19, 2025
857432b

Add funding_locked_txid TLVs to channel_reestablish


jkczyz Jun 5, 2025
d8f421e

Set funding_locked_txid TLVs in channel_reestablish


jkczyz Jun 8, 2025
df80eb0

Retransmit commitment_signed before tx_signatures


jkczyz Aug 28, 2025
a0b6dd6

Correctly order channel_ready on channel_reestablish


jkczyz Aug 29, 2025
73639c3

Don't retransmit tx_signatures pending monitor update


jkczyz Sep 2, 2025
77747c0

Update next_funding_txid logic for channel_reestablish


jkczyz Jun 23, 2025
976381a

Remove unnecessary next_funding check


jkczyz Aug 28, 2025
7050856

Clear announcement_sigs on FundingScope promotion


jkczyz Jun 25, 2025
d4ddbc4

Handle implicit splice_locked during channel_reestablish


jkczyz Jun 27, 2025
734452c

Request announcement_signatures retransmission


jkczyz Aug 19, 2025
ff98bbf

Retransmit announcement_signatures if requested


jkczyz Aug 19, 2025
a3a3a55

Use HolderCommitmentPoint::current_transaction_number


jkczyz Aug 28, 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 numberDiff line numberDiff 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 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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Update `channel_reestablish` for splicing by jkczyz · Pull Request #3886 · lightningdevkit/rust-lightning · GitHub
Skip to content
Update channel_reestablish for splicing#3886

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

wpaulino
merged 13 commits into

from

Sep 5, 2025
 Merged


Update channel_reestablish for splicing
#3886
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
3f4356a

Add features for splicing


jkczyz Jun 19, 2025
857432b

Add funding_locked_txid TLVs to channel_reestablish


jkczyz Jun 5, 2025
d8f421e

Set funding_locked_txid TLVs in channel_reestablish


jkczyz Jun 8, 2025
df80eb0

Retransmit commitment_signed before tx_signatures


jkczyz Aug 28, 2025
a0b6dd6

Correctly order channel_ready on channel_reestablish


jkczyz Aug 29, 2025
73639c3

Don't retransmit tx_signatures pending monitor update


jkczyz Sep 2, 2025
77747c0

Update next_funding_txid logic for channel_reestablish


jkczyz Jun 23, 2025
976381a

Remove unnecessary next_funding check


jkczyz Aug 28, 2025
7050856

Clear announcement_sigs on FundingScope promotion


jkczyz Jun 25, 2025
d4ddbc4

Handle implicit splice_locked during channel_reestablish


jkczyz Jun 27, 2025
734452c

Request announcement_signatures retransmission


jkczyz Aug 19, 2025
ff98bbf

Retransmit announcement_signatures if requested


jkczyz Aug 19, 2025
a3a3a55

Use HolderCommitmentPoint::current_transaction_number


jkczyz Aug 28, 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 numberDiff line numberDiff 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 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 DownExpand 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 DownExpand 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 DownExpand 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