Fix minor miscellaneous splicing issues#4060

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
TheBlueMatt merged 10 commits into from
Sep 9, 2025
Merged

Fix minor miscellaneous splicing issues #4060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3023e2f
Don't process alternative funding confirmations duplicatively
wpaulino Sep 4, 2025
c40d1e8
Update OnchainTxHandler channel parameters on renegotiated funding lo…
wpaulino Sep 4, 2025
ea42df4
Prune HTLC sources from pending funding scopes
wpaulino Sep 4, 2025
d4bba8a
Fail interactive-tx negotiation on abort
wpaulino Sep 4, 2025
33079be
Fix incorrect weight estimation for splice shared input
wpaulino Sep 4, 2025
4cc8d5a
Detect splice out as local contribution
wpaulino Sep 4, 2025
5c6b637
Remove stale TODO for quiescence check on incoming splice_init
wpaulino Sep 4, 2025
bb0f5ab
Remove splicing rust cfg flag
wpaulino Sep 4, 2025
1bda3eb
Remove useless use of format! throughout splicing errors
wpaulino Sep 8, 2025
1dc190d
Remove let binding for unit values in splice test
wpaulino Sep 8, 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
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
"cfg(ldk_test_vectors)",
"cfg(taproot)",
"cfg(require_route_graph_test)",
"cfg(splicing)",
"cfg(simple_close)",
"cfg(peer_storage)",
]
2 changes: 0 additions & 2 deletions ci/ci-tests.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down
3 changes: 0 additions & 3 deletions lightning-net-tokio/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
#[cfg(splicing)]
fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
#[cfg(splicing)]
fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
#[cfg(splicing)]
fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down
46 changes: 30 additions & 16 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

// Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
// events for now-revoked/fulfilled HTLCs.
if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
&self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
if let Some(source) = source_opt {
if !cur_claimables.iter()
.any(|(_, cur_source_opt)| cur_source_opt == source_opt)
{
self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
let mut removed_fulfilled_htlcs = false;
let prune_htlc_sources = |funding: &mut FundingScope| {
if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
if funding.current_counterparty_commitment_txid.unwrap() != txid {
let cur_claimables = funding.counterparty_claimable_outpoints.get(
&funding.current_counterparty_commitment_txid.unwrap()).unwrap();
// We only need to remove fulfilled HTLCs once for the first `FundingScope` we
// come across since all `FundingScope`s share the same set of HTLC sources.
if !removed_fulfilled_htlcs {
for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
if let Some(source) = source_opt {
if !cur_claimables.iter()
.any(|(_, cur_source_opt)| cur_source_opt == source_opt)
{
self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
}
}
}
removed_fulfilled_htlcs = true;

@jkczyzjkczyzSep 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?

@wpaulinowpaulinoSep 8, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.

@jkczyzjkczyzSep 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.

@jkczyzjkczyzSep 8, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.

}
for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
*source_opt = None;
}
} else {
assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
}
for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
*source_opt = None;
}
} else {
assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
}
}
};
core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

if !self.payment_preimages.is_empty() {
let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

mem::swap(&mut self.funding, &mut new_funding);
self.onchain_tx_handler.update_after_renegotiated_funding_locked(
self.funding.channel_parameters.clone(),
self.funding.current_holder_commitment_tx.clone(),
self.funding.prev_holder_commitment_tx.clone(),
);
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let txid = tx.compute_txid();
log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
// If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
continue 'tx_iter;
}
if Some(txid) == self.funding_spend_confirmed {
log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
continue 'tx_iter;
Expand Down
9 changes: 6 additions & 3 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
}

/// Replaces the current/prev holder commitment transactions spending the currently confirmed
/// funding outpoint with those spending the new funding outpoint.
/// Replaces all the data pertaining to the currently locked funding transaction after a new
/// funding transaction has been renegotiated and locked.
pub(crate) fn update_after_renegotiated_funding_locked(
&mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
&mut self, channel_parameters: ChannelTransactionParameters,
current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
) {
self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
self.channel_transaction_parameters = channel_parameters;
self.holder_commitment = current;
self.prev_holder_commitment = prev;
}
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" + '

Skip to content
Fix minor miscellaneous splicing issues#4060

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

TheBlueMatt
merged 10 commits into

from

Sep 9, 2025
 Merged


Fix minor miscellaneous splicing issues
#4060
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3023e2f

Don't process alternative funding confirmations duplicatively


wpaulino Sep 4, 2025
c40d1e8

Update OnchainTxHandler channel parameters on renegotiated funding lo…


wpaulino Sep 4, 2025
ea42df4

Prune HTLC sources from pending funding scopes


wpaulino Sep 4, 2025
d4bba8a

Fail interactive-tx negotiation on abort


wpaulino Sep 4, 2025
33079be

Fix incorrect weight estimation for splice shared input


wpaulino Sep 4, 2025
4cc8d5a

Detect splice out as local contribution


wpaulino Sep 4, 2025
5c6b637

Remove stale TODO for quiescence check on incoming splice_init


wpaulino Sep 4, 2025
bb0f5ab

Remove splicing rust cfg flag


wpaulino Sep 4, 2025
1bda3eb

Remove useless use of format! throughout splicing errors


wpaulino Sep 8, 2025
1dc190d

Remove let binding for unit values in splice test


wpaulino Sep 8, 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


1 change: 0 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
 "cfg(ldk_test_vectors)",
 "cfg(taproot)",
 "cfg(require_route_graph_test)",
 "cfg(splicing)",
 "cfg(simple_close)",
 "cfg(peer_storage)",
]

2 changes: 0 additions & 2 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down

3 changes: 0 additions & 3 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
 fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
 fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
 fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
 #[cfg(splicing)]
 fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
 #[cfg(splicing)]
 fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
 #[cfg(splicing)]
 fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
 fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
 fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down

46 changes: 30 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 // Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 // events for now-revoked/fulfilled HTLCs.
 if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
 if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
 &self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 let mut removed_fulfilled_htlcs = false;
 let prune_htlc_sources = |funding: &mut FundingScope| {
 if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
 if funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = funding.counterparty_claimable_outpoints.get(
 &funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 // We only need to remove fulfilled HTLCs once for the first `FundingScope` we
 // come across since all `FundingScope`s share the same set of HTLC sources.
 if !removed_fulfilled_htlcs {
 for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 }
 }
 }
 removed_fulfilled_htlcs = true;
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?
@wpaulinowpaulinoSep 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.
 }
 for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 }
 };
 core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

 if !self.payment_preimages.is_empty() {
 let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 mem::swap(&mut self.funding, &mut new_funding);
 self.onchain_tx_handler.update_after_renegotiated_funding_locked(
 self.funding.channel_parameters.clone(),
 self.funding.current_holder_commitment_tx.clone(),
 self.funding.prev_holder_commitment_tx.clone(),
 );
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = tx.compute_txid();
 log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 // If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
 }
 if Some(txid) == self.funding_spend_confirmed {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
	}

	/// Replaces the current/prev holder commitment transactions spending the currently confirmed
	/// funding outpoint with those spending the new funding outpoint.
	/// Replaces all the data pertaining to the currently locked funding transaction after a new
	/// funding transaction has been renegotiated and locked.
	pub(crate) fn update_after_renegotiated_funding_locked(
 &mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
 &mut self, channel_parameters: ChannelTransactionParameters,
 current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
	) {
 self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
 self.channel_transaction_parameters = channel_parameters;
 self.holder_commitment = current;
 self.prev_holder_commitment = prev;
	}
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('^' + ".*" + '

Skip to content
Fix minor miscellaneous splicing issues#4060

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

TheBlueMatt
merged 10 commits into

from

Sep 9, 2025
 Merged


Fix minor miscellaneous splicing issues
#4060
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3023e2f

Don't process alternative funding confirmations duplicatively


wpaulino Sep 4, 2025
c40d1e8

Update OnchainTxHandler channel parameters on renegotiated funding lo…


wpaulino Sep 4, 2025
ea42df4

Prune HTLC sources from pending funding scopes


wpaulino Sep 4, 2025
d4bba8a

Fail interactive-tx negotiation on abort


wpaulino Sep 4, 2025
33079be

Fix incorrect weight estimation for splice shared input


wpaulino Sep 4, 2025
4cc8d5a

Detect splice out as local contribution


wpaulino Sep 4, 2025
5c6b637

Remove stale TODO for quiescence check on incoming splice_init


wpaulino Sep 4, 2025
bb0f5ab

Remove splicing rust cfg flag


wpaulino Sep 4, 2025
1bda3eb

Remove useless use of format! throughout splicing errors


wpaulino Sep 8, 2025
1dc190d

Remove let binding for unit values in splice test


wpaulino Sep 8, 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


1 change: 0 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
 "cfg(ldk_test_vectors)",
 "cfg(taproot)",
 "cfg(require_route_graph_test)",
 "cfg(splicing)",
 "cfg(simple_close)",
 "cfg(peer_storage)",
]

2 changes: 0 additions & 2 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down

3 changes: 0 additions & 3 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
 fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
 fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
 fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
 #[cfg(splicing)]
 fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
 #[cfg(splicing)]
 fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
 #[cfg(splicing)]
 fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
 fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
 fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down

46 changes: 30 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 // Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 // events for now-revoked/fulfilled HTLCs.
 if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
 if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
 &self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 let mut removed_fulfilled_htlcs = false;
 let prune_htlc_sources = |funding: &mut FundingScope| {
 if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
 if funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = funding.counterparty_claimable_outpoints.get(
 &funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 // We only need to remove fulfilled HTLCs once for the first `FundingScope` we
 // come across since all `FundingScope`s share the same set of HTLC sources.
 if !removed_fulfilled_htlcs {
 for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 }
 }
 }
 removed_fulfilled_htlcs = true;
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?
@wpaulinowpaulinoSep 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.
 }
 for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 }
 };
 core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

 if !self.payment_preimages.is_empty() {
 let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 mem::swap(&mut self.funding, &mut new_funding);
 self.onchain_tx_handler.update_after_renegotiated_funding_locked(
 self.funding.channel_parameters.clone(),
 self.funding.current_holder_commitment_tx.clone(),
 self.funding.prev_holder_commitment_tx.clone(),
 );
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = tx.compute_txid();
 log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 // If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
 }
 if Some(txid) == self.funding_spend_confirmed {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
	}

	/// Replaces the current/prev holder commitment transactions spending the currently confirmed
	/// funding outpoint with those spending the new funding outpoint.
	/// Replaces all the data pertaining to the currently locked funding transaction after a new
	/// funding transaction has been renegotiated and locked.
	pub(crate) fn update_after_renegotiated_funding_locked(
 &mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
 &mut self, channel_parameters: ChannelTransactionParameters,
 current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
	) {
 self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
 self.channel_transaction_parameters = channel_parameters;
 self.holder_commitment = current;
 self.prev_holder_commitment = prev;
	}
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('^' + ".*" + '

Skip to content
Fix minor miscellaneous splicing issues#4060

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

TheBlueMatt
merged 10 commits into

from

Sep 9, 2025
 Merged


Fix minor miscellaneous splicing issues
#4060
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3023e2f

Don't process alternative funding confirmations duplicatively


wpaulino Sep 4, 2025
c40d1e8

Update OnchainTxHandler channel parameters on renegotiated funding lo…


wpaulino Sep 4, 2025
ea42df4

Prune HTLC sources from pending funding scopes


wpaulino Sep 4, 2025
d4bba8a

Fail interactive-tx negotiation on abort


wpaulino Sep 4, 2025
33079be

Fix incorrect weight estimation for splice shared input


wpaulino Sep 4, 2025
4cc8d5a

Detect splice out as local contribution


wpaulino Sep 4, 2025
5c6b637

Remove stale TODO for quiescence check on incoming splice_init


wpaulino Sep 4, 2025
bb0f5ab

Remove splicing rust cfg flag


wpaulino Sep 4, 2025
1bda3eb

Remove useless use of format! throughout splicing errors


wpaulino Sep 8, 2025
1dc190d

Remove let binding for unit values in splice test


wpaulino Sep 8, 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


1 change: 0 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
 "cfg(ldk_test_vectors)",
 "cfg(taproot)",
 "cfg(require_route_graph_test)",
 "cfg(splicing)",
 "cfg(simple_close)",
 "cfg(peer_storage)",
]

2 changes: 0 additions & 2 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down

3 changes: 0 additions & 3 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
 fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
 fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
 fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
 #[cfg(splicing)]
 fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
 #[cfg(splicing)]
 fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
 #[cfg(splicing)]
 fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
 fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
 fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down

46 changes: 30 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 // Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 // events for now-revoked/fulfilled HTLCs.
 if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
 if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
 &self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 let mut removed_fulfilled_htlcs = false;
 let prune_htlc_sources = |funding: &mut FundingScope| {
 if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
 if funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = funding.counterparty_claimable_outpoints.get(
 &funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 // We only need to remove fulfilled HTLCs once for the first `FundingScope` we
 // come across since all `FundingScope`s share the same set of HTLC sources.
 if !removed_fulfilled_htlcs {
 for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 }
 }
 }
 removed_fulfilled_htlcs = true;
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?
@wpaulinowpaulinoSep 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.
 }
 for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 }
 };
 core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

 if !self.payment_preimages.is_empty() {
 let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 mem::swap(&mut self.funding, &mut new_funding);
 self.onchain_tx_handler.update_after_renegotiated_funding_locked(
 self.funding.channel_parameters.clone(),
 self.funding.current_holder_commitment_tx.clone(),
 self.funding.prev_holder_commitment_tx.clone(),
 );
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = tx.compute_txid();
 log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 // If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
 }
 if Some(txid) == self.funding_spend_confirmed {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
	}

	/// Replaces the current/prev holder commitment transactions spending the currently confirmed
	/// funding outpoint with those spending the new funding outpoint.
	/// Replaces all the data pertaining to the currently locked funding transaction after a new
	/// funding transaction has been renegotiated and locked.
	pub(crate) fn update_after_renegotiated_funding_locked(
 &mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
 &mut self, channel_parameters: ChannelTransactionParameters,
 current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
	) {
 self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
 self.channel_transaction_parameters = channel_parameters;
 self.holder_commitment = current;
 self.prev_holder_commitment = prev;
	}
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" + '

Skip to content
Fix minor miscellaneous splicing issues#4060

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

TheBlueMatt
merged 10 commits into

from

Sep 9, 2025
 Merged


Fix minor miscellaneous splicing issues
#4060
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3023e2f

Don't process alternative funding confirmations duplicatively


wpaulino Sep 4, 2025
c40d1e8

Update OnchainTxHandler channel parameters on renegotiated funding lo…


wpaulino Sep 4, 2025
ea42df4

Prune HTLC sources from pending funding scopes


wpaulino Sep 4, 2025
d4bba8a

Fail interactive-tx negotiation on abort


wpaulino Sep 4, 2025
33079be

Fix incorrect weight estimation for splice shared input


wpaulino Sep 4, 2025
4cc8d5a

Detect splice out as local contribution


wpaulino Sep 4, 2025
5c6b637

Remove stale TODO for quiescence check on incoming splice_init


wpaulino Sep 4, 2025
bb0f5ab

Remove splicing rust cfg flag


wpaulino Sep 4, 2025
1bda3eb

Remove useless use of format! throughout splicing errors


wpaulino Sep 8, 2025
1dc190d

Remove let binding for unit values in splice test


wpaulino Sep 8, 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


1 change: 0 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
 "cfg(ldk_test_vectors)",
 "cfg(taproot)",
 "cfg(require_route_graph_test)",
 "cfg(splicing)",
 "cfg(simple_close)",
 "cfg(peer_storage)",
]

2 changes: 0 additions & 2 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down

3 changes: 0 additions & 3 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
 fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
 fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
 fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
 #[cfg(splicing)]
 fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
 #[cfg(splicing)]
 fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
 #[cfg(splicing)]
 fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
 fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
 fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down

46 changes: 30 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 // Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 // events for now-revoked/fulfilled HTLCs.
 if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
 if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
 &self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 let mut removed_fulfilled_htlcs = false;
 let prune_htlc_sources = |funding: &mut FundingScope| {
 if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
 if funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = funding.counterparty_claimable_outpoints.get(
 &funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 // We only need to remove fulfilled HTLCs once for the first `FundingScope` we
 // come across since all `FundingScope`s share the same set of HTLC sources.
 if !removed_fulfilled_htlcs {
 for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 }
 }
 }
 removed_fulfilled_htlcs = true;
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?
@wpaulinowpaulinoSep 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.
 }
 for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 }
 };
 core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

 if !self.payment_preimages.is_empty() {
 let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 mem::swap(&mut self.funding, &mut new_funding);
 self.onchain_tx_handler.update_after_renegotiated_funding_locked(
 self.funding.channel_parameters.clone(),
 self.funding.current_holder_commitment_tx.clone(),
 self.funding.prev_holder_commitment_tx.clone(),
 );
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = tx.compute_txid();
 log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 // If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
 }
 if Some(txid) == self.funding_spend_confirmed {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
	}

	/// Replaces the current/prev holder commitment transactions spending the currently confirmed
	/// funding outpoint with those spending the new funding outpoint.
	/// Replaces all the data pertaining to the currently locked funding transaction after a new
	/// funding transaction has been renegotiated and locked.
	pub(crate) fn update_after_renegotiated_funding_locked(
 &mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
 &mut self, channel_parameters: ChannelTransactionParameters,
 current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
	) {
 self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
 self.channel_transaction_parameters = channel_parameters;
 self.holder_commitment = current;
 self.prev_holder_commitment = prev;
	}
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('^' + ".*" + '

Skip to content
Fix minor miscellaneous splicing issues#4060

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

TheBlueMatt
merged 10 commits into

from

Sep 9, 2025
 Merged


Fix minor miscellaneous splicing issues
#4060
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3023e2f

Don't process alternative funding confirmations duplicatively


wpaulino Sep 4, 2025
c40d1e8

Update OnchainTxHandler channel parameters on renegotiated funding lo…


wpaulino Sep 4, 2025
ea42df4

Prune HTLC sources from pending funding scopes


wpaulino Sep 4, 2025
d4bba8a

Fail interactive-tx negotiation on abort


wpaulino Sep 4, 2025
33079be

Fix incorrect weight estimation for splice shared input


wpaulino Sep 4, 2025
4cc8d5a

Detect splice out as local contribution


wpaulino Sep 4, 2025
5c6b637

Remove stale TODO for quiescence check on incoming splice_init


wpaulino Sep 4, 2025
bb0f5ab

Remove splicing rust cfg flag


wpaulino Sep 4, 2025
1bda3eb

Remove useless use of format! throughout splicing errors


wpaulino Sep 8, 2025
1dc190d

Remove let binding for unit values in splice test


wpaulino Sep 8, 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


1 change: 0 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
 "cfg(ldk_test_vectors)",
 "cfg(taproot)",
 "cfg(require_route_graph_test)",
 "cfg(splicing)",
 "cfg(simple_close)",
 "cfg(peer_storage)",
]

2 changes: 0 additions & 2 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down

3 changes: 0 additions & 3 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
 fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
 fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
 fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
 #[cfg(splicing)]
 fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
 #[cfg(splicing)]
 fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
 #[cfg(splicing)]
 fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
 fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
 fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down

46 changes: 30 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 // Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 // events for now-revoked/fulfilled HTLCs.
 if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
 if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
 &self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 let mut removed_fulfilled_htlcs = false;
 let prune_htlc_sources = |funding: &mut FundingScope| {
 if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
 if funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = funding.counterparty_claimable_outpoints.get(
 &funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 // We only need to remove fulfilled HTLCs once for the first `FundingScope` we
 // come across since all `FundingScope`s share the same set of HTLC sources.
 if !removed_fulfilled_htlcs {
 for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 }
 }
 }
 removed_fulfilled_htlcs = true;
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?
@wpaulinowpaulinoSep 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.
 }
 for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 }
 };
 core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

 if !self.payment_preimages.is_empty() {
 let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 mem::swap(&mut self.funding, &mut new_funding);
 self.onchain_tx_handler.update_after_renegotiated_funding_locked(
 self.funding.channel_parameters.clone(),
 self.funding.current_holder_commitment_tx.clone(),
 self.funding.prev_holder_commitment_tx.clone(),
 );
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = tx.compute_txid();
 log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 // If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
 }
 if Some(txid) == self.funding_spend_confirmed {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
	}

	/// Replaces the current/prev holder commitment transactions spending the currently confirmed
	/// funding outpoint with those spending the new funding outpoint.
	/// Replaces all the data pertaining to the currently locked funding transaction after a new
	/// funding transaction has been renegotiated and locked.
	pub(crate) fn update_after_renegotiated_funding_locked(
 &mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
 &mut self, channel_parameters: ChannelTransactionParameters,
 current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
	) {
 self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
 self.channel_transaction_parameters = channel_parameters;
 self.holder_commitment = current;
 self.prev_holder_commitment = prev;
	}
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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix minor miscellaneous splicing issues#4060

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

TheBlueMatt
merged 10 commits into

from

Sep 9, 2025
 Merged


Fix minor miscellaneous splicing issues
#4060
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3023e2f

Don't process alternative funding confirmations duplicatively


wpaulino Sep 4, 2025
c40d1e8

Update OnchainTxHandler channel parameters on renegotiated funding lo…


wpaulino Sep 4, 2025
ea42df4

Prune HTLC sources from pending funding scopes


wpaulino Sep 4, 2025
d4bba8a

Fail interactive-tx negotiation on abort


wpaulino Sep 4, 2025
33079be

Fix incorrect weight estimation for splice shared input


wpaulino Sep 4, 2025
4cc8d5a

Detect splice out as local contribution


wpaulino Sep 4, 2025
5c6b637

Remove stale TODO for quiescence check on incoming splice_init


wpaulino Sep 4, 2025
bb0f5ab

Remove splicing rust cfg flag


wpaulino Sep 4, 2025
1bda3eb

Remove useless use of format! throughout splicing errors


wpaulino Sep 8, 2025
1dc190d

Remove let binding for unit values in splice test


wpaulino Sep 8, 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


1 change: 0 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
 "cfg(ldk_test_vectors)",
 "cfg(taproot)",
 "cfg(require_route_graph_test)",
 "cfg(splicing)",
 "cfg(simple_close)",
 "cfg(peer_storage)",
]

2 changes: 0 additions & 2 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down

3 changes: 0 additions & 3 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
 fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
 fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
 fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
 #[cfg(splicing)]
 fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
 #[cfg(splicing)]
 fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
 #[cfg(splicing)]
 fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
 fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
 fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down

46 changes: 30 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 // Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 // events for now-revoked/fulfilled HTLCs.
 if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
 if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
 &self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 let mut removed_fulfilled_htlcs = false;
 let prune_htlc_sources = |funding: &mut FundingScope| {
 if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
 if funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = funding.counterparty_claimable_outpoints.get(
 &funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 // We only need to remove fulfilled HTLCs once for the first `FundingScope` we
 // come across since all `FundingScope`s share the same set of HTLC sources.
 if !removed_fulfilled_htlcs {
 for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 }
 }
 }
 removed_fulfilled_htlcs = true;
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?
@wpaulinowpaulinoSep 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.
 }
 for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 }
 };
 core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

 if !self.payment_preimages.is_empty() {
 let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 mem::swap(&mut self.funding, &mut new_funding);
 self.onchain_tx_handler.update_after_renegotiated_funding_locked(
 self.funding.channel_parameters.clone(),
 self.funding.current_holder_commitment_tx.clone(),
 self.funding.prev_holder_commitment_tx.clone(),
 );
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = tx.compute_txid();
 log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 // If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
 }
 if Some(txid) == self.funding_spend_confirmed {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
	}

	/// Replaces the current/prev holder commitment transactions spending the currently confirmed
	/// funding outpoint with those spending the new funding outpoint.
	/// Replaces all the data pertaining to the currently locked funding transaction after a new
	/// funding transaction has been renegotiated and locked.
	pub(crate) fn update_after_renegotiated_funding_locked(
 &mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
 &mut self, channel_parameters: ChannelTransactionParameters,
 current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
	) {
 self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
 self.channel_transaction_parameters = channel_parameters;
 self.holder_commitment = current;
 self.prev_holder_commitment = prev;
	}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix minor miscellaneous splicing issues#4060

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

TheBlueMatt
merged 10 commits into

from

Sep 9, 2025
 Merged


Fix minor miscellaneous splicing issues
#4060
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
3023e2f

Don't process alternative funding confirmations duplicatively


wpaulino Sep 4, 2025
c40d1e8

Update OnchainTxHandler channel parameters on renegotiated funding lo…


wpaulino Sep 4, 2025
ea42df4

Prune HTLC sources from pending funding scopes


wpaulino Sep 4, 2025
d4bba8a

Fail interactive-tx negotiation on abort


wpaulino Sep 4, 2025
33079be

Fix incorrect weight estimation for splice shared input


wpaulino Sep 4, 2025
4cc8d5a

Detect splice out as local contribution


wpaulino Sep 4, 2025
5c6b637

Remove stale TODO for quiescence check on incoming splice_init


wpaulino Sep 4, 2025
bb0f5ab

Remove splicing rust cfg flag


wpaulino Sep 4, 2025
1bda3eb

Remove useless use of format! throughout splicing errors


wpaulino Sep 8, 2025
1dc190d

Remove let binding for unit values in splice test


wpaulino Sep 8, 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


1 change: 0 additions & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,6 @@ check-cfg = [
 "cfg(ldk_test_vectors)",
 "cfg(taproot)",
 "cfg(require_route_graph_test)",
 "cfg(splicing)",
 "cfg(simple_close)",
 "cfg(peer_storage)",
]

2 changes: 0 additions & 2 deletions
ci/ci-tests.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,8 +151,6 @@ fi
echo -e "\n\nTest cfg-flag builds"
RUSTFLAGS="--cfg=taproot" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=splicing" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=async_payments" cargo test --verbose --color always -p lightning
[ "$CI_MINIMIZE_DISK_USAGE" != "" ] && cargo clean
RUSTFLAGS="--cfg=simple_close" cargo test --verbose --color always -p lightning
Expand Down

3 changes: 0 additions & 3 deletions
lightning-net-tokio/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -742,11 +742,8 @@ mod tests {
 fn handle_open_channel_v2(&self, _their_node_id: PublicKey, _msg: &OpenChannelV2) {}
 fn handle_accept_channel_v2(&self, _their_node_id: PublicKey, _msg: &AcceptChannelV2) {}
 fn handle_stfu(&self, _their_node_id: PublicKey, _msg: &Stfu) {}
 #[cfg(splicing)]
 fn handle_splice_init(&self, _their_node_id: PublicKey, _msg: &SpliceInit) {}
 #[cfg(splicing)]
 fn handle_splice_ack(&self, _their_node_id: PublicKey, _msg: &SpliceAck) {}
 #[cfg(splicing)]
 fn handle_splice_locked(&self, _their_node_id: PublicKey, _msg: &SpliceLocked) {}
 fn handle_tx_add_input(&self, _their_node_id: PublicKey, _msg: &TxAddInput) {}
 fn handle_tx_add_output(&self, _their_node_id: PublicKey, _msg: &TxAddOutput) {}
Expand Down

46 changes: 30 additions & 16 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3399,26 +3399,35 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 // Prune HTLCs from the previous counterparty commitment tx so we don't generate failure/fulfill
 // events for now-revoked/fulfilled HTLCs.
 if let Some(txid) = self.funding.prev_counterparty_commitment_txid.take() {
 if self.funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = self.funding.counterparty_claimable_outpoints.get(
 &self.funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 for (_, ref source_opt) in self.funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 let mut removed_fulfilled_htlcs = false;
 let prune_htlc_sources = |funding: &mut FundingScope| {
 if let Some(txid) = funding.prev_counterparty_commitment_txid.take() {
 if funding.current_counterparty_commitment_txid.unwrap() != txid {
 let cur_claimables = funding.counterparty_claimable_outpoints.get(
 &funding.current_counterparty_commitment_txid.unwrap()).unwrap();
 // We only need to remove fulfilled HTLCs once for the first `FundingScope` we
 // come across since all `FundingScope`s share the same set of HTLC sources.
 if !removed_fulfilled_htlcs {
 for (_, ref source_opt) in funding.counterparty_claimable_outpoints.get(&txid).unwrap() {
 if let Some(source) = source_opt {
 if !cur_claimables.iter()
 .any(|(_, cur_source_opt)| cur_source_opt == source_opt)
 {
 self.counterparty_fulfilled_htlcs.remove(&SentHTLCId::from_source(source));
 }
 }
 }
 removed_fulfilled_htlcs = true;
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Could we just run the loop below at this point and return rather than needing this variable?
@wpaulinowpaulinoSep 8, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

It's just a small optimization to not remove HTLCs that have already been removed since we have duplicate data across FundingScopes. The loop below does need to run for every FundingScope though.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Right, but that is already inside the closure, which is called on each FundingScope.
@jkczyzjkczyzSep 8, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Oh, nevermind. Didn't see that removed_fulfilled_htlcs is used across all calls.
 }
 for &mut (_, ref mut source_opt) in funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 for &mut (_, ref mut source_opt) in self.funding.counterparty_claimable_outpoints.get_mut(&txid).unwrap() {
 *source_opt = None;
 }
 } else {
 assert!(cfg!(fuzzing), "Commitment txids are unique outside of fuzzing, where hashes can collide");
 }
 }
 };
 core::iter::once(&mut self.funding).chain(&mut self.pending_funding).for_each(prune_htlc_sources);

 if !self.payment_preimages.is_empty() {
 let min_idx = self.get_min_seen_secret();
Expand DownExpand Up@@ -4049,6 +4058,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

 mem::swap(&mut self.funding, &mut new_funding);
 self.onchain_tx_handler.update_after_renegotiated_funding_locked(
 self.funding.channel_parameters.clone(),
 self.funding.current_holder_commitment_tx.clone(),
 self.funding.prev_holder_commitment_tx.clone(),
 );
Expand DownExpand Up@@ -5164,6 +5174,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = tx.compute_txid();
 log_trace!(logger, "Transaction {} confirmed in block {}", txid , block_hash);
 // If a transaction has already been confirmed, ensure we don't bother processing it duplicatively.
 if self.alternative_funding_confirmed.map(|(alternative_funding_txid, _)| alternative_funding_txid == txid).unwrap_or(false) {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
 }
 if Some(txid) == self.funding_spend_confirmed {
 log_debug!(logger, "Skipping redundant processing of funding-spend tx {} as it was previously confirmed", txid);
 continue 'tx_iter;
Expand Down

9 changes: 6 additions & 3 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1236,11 +1236,14 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 self.prev_holder_commitment = Some(replace(&mut self.holder_commitment, tx));
	}

	/// Replaces the current/prev holder commitment transactions spending the currently confirmed
	/// funding outpoint with those spending the new funding outpoint.
	/// Replaces all the data pertaining to the currently locked funding transaction after a new
	/// funding transaction has been renegotiated and locked.
	pub(crate) fn update_after_renegotiated_funding_locked(
 &mut self, current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
 &mut self, channel_parameters: ChannelTransactionParameters,
 current: HolderCommitmentTransaction, prev: Option<HolderCommitmentTransaction>,
	) {
 self.channel_value_satoshis = channel_parameters.channel_value_satoshis;
 self.channel_transaction_parameters = channel_parameters;
 self.holder_commitment = current;
 self.prev_holder_commitment = prev;
	}
Expand Down
Loading
Loading