Skip to content

Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into from
Jun 20, 2025
Merged

Follow-ups #3741: Exchange splice_locked messages #3873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ac090a4
Don't set sent_funding_txid in maybe_promote_splice_funding
jkczyz Jun 17, 2025
eeee50e
Don't inline call to FundedChannel::splice_locked
jkczyz Jun 17, 2025
5170373
rustfmt ChannelManager::internal_splice_locked
jkczyz Jun 17, 2025
22b578b
Return new funding_txo with splice_locked
jkczyz Jun 17, 2025
db69ec7
Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY
jkczyz Jun 17, 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
167 changes: 99 additions & 68 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
fn check_get_splice_locked<SP: Deref>(
&mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
) -> Option<msgs::SpliceLocked>
where
SP::Target: SignerProvider,
{
if !context.check_funding_meets_minimum_depth(funding, height) {
return None;
}

let confirmed_funding_txid = match funding.get_funding_txid() {
Some(funding_txid) => funding_txid,
None => {
debug_assert!(false);
return None;
},
};

match self.sent_funding_txid {
Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
_ => {
let splice_locked = msgs::SpliceLocked {
channel_id: context.channel_id(),
splice_txid: confirmed_funding_txid,
};
self.sent_funding_txid = Some(splice_locked.splice_txid);
Some(splice_locked)
},
}
}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
self.get_initial_counterparty_commitment_signature(funding, logger)
}

fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
let minimum_depth = self
.minimum_depth(funding)
.expect("ChannelContext::minimum_depth should be set for FundedChannel");

// Zero-conf channels always meet the minimum depth.
if minimum_depth == 0 {
return true;
}

if funding.funding_tx_confirmation_height == 0 {
return false;
}

let funding_tx_confirmations =
height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
if funding_tx_confirmations < minimum_depth as i64 {
return false;
}

return true;
}

#[rustfmt::skip]
fn check_for_funding_tx_confirmed<L: Deref>(
&mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
}
}

#[cfg(splicing)]
fn check_get_splice_locked(
&self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
) -> Option<msgs::SpliceLocked> {
if !self.check_funding_meets_minimum_depth(funding, height) {
return None;
}

let confirmed_funding_txid = match funding.get_funding_txid() {
Some(funding_txid) => funding_txid,
None => {
debug_assert!(false);
return None;
},
};

match pending_splice.sent_funding_txid {
Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
_ => Some(msgs::SpliceLocked {
channel_id: self.context.channel_id(),
splice_txid: confirmed_funding_txid,
}),
}
}

fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
let minimum_depth = self
.context
.minimum_depth(funding)
.expect("ChannelContext::minimum_depth should be set for FundedChannel");

// Zero-conf channels always meet the minimum depth.
if minimum_depth == 0 {
return true;
}

if funding.funding_tx_confirmation_height == 0 {
return false;
}

let funding_tx_confirmations =
height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
if funding_tx_confirmations < minimum_depth as i64 {
return false;
}

return true;
self.context.check_funding_meets_minimum_depth(funding, height)
}

#[cfg(splicing)]
fn maybe_promote_splice_funding<L: Deref>(
&mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
&mut self, confirmed_funding_index: usize, logger: &L,
) -> bool
where
L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
debug_assert!(confirmed_funding_index < self.pending_funding.len());

let pending_splice = self.pending_splice.as_mut().unwrap();
pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.
let splice_txid = match pending_splice.sent_funding_txid {
Some(sent_funding_txid) => sent_funding_txid,
None => {
debug_assert!(false);
return false;
},
};

if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
);

let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
promote_splice_funding!(self, funding);

return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

#[cfg(splicing)]
if let Some(confirmed_funding_index) = confirmed_funding_index {
let pending_splice = match self.pending_splice.as_ref() {
let pending_splice = match self.pending_splice.as_mut() {
Some(pending_splice) => pending_splice,
None => {
// TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
};
let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
for &(idx, tx) in txdata.iter() {
if idx > index_in_block {
self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
&self.context.channel_id,
);

let announcement_sigs = self
.maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
let funding_promoted =
self.maybe_promote_splice_funding(confirmed_funding_index, logger);
let funding_txo = funding_promoted.then(|| {
self.funding
.get_funding_txo()
.expect("Splice FundingScope should always have a funding_txo")
});
let announcement_sigs = funding_promoted
.then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
.flatten();

return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
}
}

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
}
}

let pending_splice = self.pending_splice.as_ref().unwrap();
let pending_splice = self.pending_splice.as_mut().unwrap();
let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

let announcement_sigs = self
.maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
let funding_promoted =
self.maybe_promote_splice_funding(confirmed_funding_index, logger);
let funding_txo = funding_promoted.then(|| {
self.funding
.get_funding_txo()
.expect("Splice FundingScope should always have a funding_txo")
});
let announcement_sigs = funding_promoted
.then(|| chain_node_signer
.and_then(|(chain_hash, node_signer, user_config)|
self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
)
)
.flatten();

return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
}
}

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
pub fn splice_locked<NS: Deref, L: Deref>(
&mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
user_config: &UserConfig, best_block: &BestBlock, logger: &L,
) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
where
NS::Target: NodeSigner,
L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
&self.context.channel_id,
);
promote_splice_funding!(self, funding);
return Ok(self.get_announcement_sigs(
let funding_txo = self
.funding
.get_funding_txo()
.expect("Splice FundingScope should always have a funding_txo");
let announcement_sigs = self.get_announcement_sigs(
node_signer,
chain_hash,
user_config,
best_block.height,
logger,
));
);
return Ok((Some(funding_txo), announcement_sigs));
}

let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
}

pending_splice.received_funding_txid = Some(msg.splice_txid);
Ok(None)
Ok((None, None))
}

// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
}
}

#[cfg(splicing)]
pub fn has_pending_splice(&self) -> bool {
self.pending_splice.is_some()
}

pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
let end = self
.funding
Expand Down
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" + '
Follow-ups #3741: Exchange `splice_locked` messages by jkczyz · Pull Request #3873 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into

from

Jun 20, 2025
 Merged


Follow-ups #3741: Exchange splice_locked messages
#3873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ac090a4

Don't set sent_funding_txid in maybe_promote_splice_funding


jkczyz Jun 17, 2025
eeee50e

Don't inline call to FundedChannel::splice_locked


jkczyz Jun 17, 2025
5170373

rustfmt ChannelManager::internal_splice_locked


jkczyz Jun 17, 2025
22b578b

Return new funding_txo with splice_locked


jkczyz Jun 17, 2025
db69ec7

Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY


jkczyz Jun 17, 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


167 changes: 99 additions & 68 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
	update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
	received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
	fn check_get_splice_locked<SP: Deref>(
 &mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked>
	where
 SP::Target: SignerProvider,
	{
 if !context.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match self.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => {
 let splice_locked = msgs::SpliceLocked {
 channel_id: context.channel_id(),
 splice_txid: confirmed_funding_txid,
 };
 self.sent_funding_txid = Some(splice_locked.splice_txid);
 Some(splice_locked)
 },
 }
	}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
	tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
 self.get_initial_counterparty_commitment_signature(funding, logger)
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
	}

	#[rustfmt::skip]
	fn check_for_funding_tx_confirmed<L: Deref>(
 &mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
 }
	}

	#[cfg(splicing)]
	fn check_get_splice_locked(
 &self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked> {
 if !self.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => Some(msgs::SpliceLocked {
 channel_id: self.context.channel_id(),
 splice_txid: confirmed_funding_txid,
 }),
 }
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .context
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
 self.context.check_funding_meets_minimum_depth(funding, height)
	}

	#[cfg(splicing)]
	fn maybe_promote_splice_funding<L: Deref>(
 &mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
 &mut self, confirmed_funding_index: usize, logger: &L,
	) -> bool
	where
 L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
 debug_assert!(confirmed_funding_index < self.pending_funding.len());

 let pending_splice = self.pending_splice.as_mut().unwrap();
 pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.

 let splice_txid = match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) => sent_funding_txid,
 None => {
 debug_assert!(false);
 return false;
 },
 };

 if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
 );

 let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
 debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
 promote_splice_funding!(self, funding);

 return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

 #[cfg(splicing)]
 if let Some(confirmed_funding_index) = confirmed_funding_index {
 let pending_splice = match self.pending_splice.as_ref() {
 let pending_splice = match self.pending_splice.as_mut() {
 Some(pending_splice) => pending_splice,
 None => {
 // TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
 };
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 for &(idx, tx) in txdata.iter() {
 if idx > index_in_block {
 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
 &self.context.channel_id,
 );

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
 }
 }

 let pending_splice = self.pending_splice.as_ref().unwrap();
 let pending_splice = self.pending_splice.as_mut().unwrap();
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| chain_node_signer
 .and_then(|(chain_hash, node_signer, user_config)|
 self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
 )
 )
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
	pub fn splice_locked<NS: Deref, L: Deref>(
 &mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
 user_config: &UserConfig, best_block: &BestBlock, logger: &L,
	) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
	) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
	where
 NS::Target: NodeSigner,
 L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
 &self.context.channel_id,
 );
 promote_splice_funding!(self, funding);
 return Ok(self.get_announcement_sigs(
 let funding_txo = self
 .funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo");
 let announcement_sigs = self.get_announcement_sigs(
 node_signer,
 chain_hash,
 user_config,
 best_block.height,
 logger,
 ));
 );
 return Ok((Some(funding_txo), announcement_sigs));
 }

 let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
 }

 pending_splice.received_funding_txid = Some(msg.splice_txid);
 Ok(None)
 Ok((None, None))
	}

	// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
 }
	}

	#[cfg(splicing)]
	pub fn has_pending_splice(&self) -> bool {
 self.pending_splice.is_some()
	}

	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
 let end = self
 .funding
Expand Down
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('^' + ".*" + '
Follow-ups #3741: Exchange `splice_locked` messages by jkczyz · Pull Request #3873 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into

from

Jun 20, 2025
 Merged


Follow-ups #3741: Exchange splice_locked messages
#3873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ac090a4

Don't set sent_funding_txid in maybe_promote_splice_funding


jkczyz Jun 17, 2025
eeee50e

Don't inline call to FundedChannel::splice_locked


jkczyz Jun 17, 2025
5170373

rustfmt ChannelManager::internal_splice_locked


jkczyz Jun 17, 2025
22b578b

Return new funding_txo with splice_locked


jkczyz Jun 17, 2025
db69ec7

Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY


jkczyz Jun 17, 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


167 changes: 99 additions & 68 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
	update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
	received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
	fn check_get_splice_locked<SP: Deref>(
 &mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked>
	where
 SP::Target: SignerProvider,
	{
 if !context.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match self.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => {
 let splice_locked = msgs::SpliceLocked {
 channel_id: context.channel_id(),
 splice_txid: confirmed_funding_txid,
 };
 self.sent_funding_txid = Some(splice_locked.splice_txid);
 Some(splice_locked)
 },
 }
	}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
	tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
 self.get_initial_counterparty_commitment_signature(funding, logger)
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
	}

	#[rustfmt::skip]
	fn check_for_funding_tx_confirmed<L: Deref>(
 &mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
 }
	}

	#[cfg(splicing)]
	fn check_get_splice_locked(
 &self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked> {
 if !self.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => Some(msgs::SpliceLocked {
 channel_id: self.context.channel_id(),
 splice_txid: confirmed_funding_txid,
 }),
 }
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .context
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
 self.context.check_funding_meets_minimum_depth(funding, height)
	}

	#[cfg(splicing)]
	fn maybe_promote_splice_funding<L: Deref>(
 &mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
 &mut self, confirmed_funding_index: usize, logger: &L,
	) -> bool
	where
 L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
 debug_assert!(confirmed_funding_index < self.pending_funding.len());

 let pending_splice = self.pending_splice.as_mut().unwrap();
 pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.

 let splice_txid = match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) => sent_funding_txid,
 None => {
 debug_assert!(false);
 return false;
 },
 };

 if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
 );

 let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
 debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
 promote_splice_funding!(self, funding);

 return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

 #[cfg(splicing)]
 if let Some(confirmed_funding_index) = confirmed_funding_index {
 let pending_splice = match self.pending_splice.as_ref() {
 let pending_splice = match self.pending_splice.as_mut() {
 Some(pending_splice) => pending_splice,
 None => {
 // TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
 };
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 for &(idx, tx) in txdata.iter() {
 if idx > index_in_block {
 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
 &self.context.channel_id,
 );

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
 }
 }

 let pending_splice = self.pending_splice.as_ref().unwrap();
 let pending_splice = self.pending_splice.as_mut().unwrap();
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| chain_node_signer
 .and_then(|(chain_hash, node_signer, user_config)|
 self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
 )
 )
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
	pub fn splice_locked<NS: Deref, L: Deref>(
 &mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
 user_config: &UserConfig, best_block: &BestBlock, logger: &L,
	) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
	) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
	where
 NS::Target: NodeSigner,
 L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
 &self.context.channel_id,
 );
 promote_splice_funding!(self, funding);
 return Ok(self.get_announcement_sigs(
 let funding_txo = self
 .funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo");
 let announcement_sigs = self.get_announcement_sigs(
 node_signer,
 chain_hash,
 user_config,
 best_block.height,
 logger,
 ));
 );
 return Ok((Some(funding_txo), announcement_sigs));
 }

 let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
 }

 pending_splice.received_funding_txid = Some(msg.splice_txid);
 Ok(None)
 Ok((None, None))
	}

	// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
 }
	}

	#[cfg(splicing)]
	pub fn has_pending_splice(&self) -> bool {
 self.pending_splice.is_some()
	}

	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
 let end = self
 .funding
Expand Down
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('^' + ".*" + '
Follow-ups #3741: Exchange `splice_locked` messages by jkczyz · Pull Request #3873 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into

from

Jun 20, 2025
 Merged


Follow-ups #3741: Exchange splice_locked messages
#3873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ac090a4

Don't set sent_funding_txid in maybe_promote_splice_funding


jkczyz Jun 17, 2025
eeee50e

Don't inline call to FundedChannel::splice_locked


jkczyz Jun 17, 2025
5170373

rustfmt ChannelManager::internal_splice_locked


jkczyz Jun 17, 2025
22b578b

Return new funding_txo with splice_locked


jkczyz Jun 17, 2025
db69ec7

Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY


jkczyz Jun 17, 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


167 changes: 99 additions & 68 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
	update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
	received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
	fn check_get_splice_locked<SP: Deref>(
 &mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked>
	where
 SP::Target: SignerProvider,
	{
 if !context.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match self.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => {
 let splice_locked = msgs::SpliceLocked {
 channel_id: context.channel_id(),
 splice_txid: confirmed_funding_txid,
 };
 self.sent_funding_txid = Some(splice_locked.splice_txid);
 Some(splice_locked)
 },
 }
	}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
	tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
 self.get_initial_counterparty_commitment_signature(funding, logger)
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
	}

	#[rustfmt::skip]
	fn check_for_funding_tx_confirmed<L: Deref>(
 &mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
 }
	}

	#[cfg(splicing)]
	fn check_get_splice_locked(
 &self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked> {
 if !self.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => Some(msgs::SpliceLocked {
 channel_id: self.context.channel_id(),
 splice_txid: confirmed_funding_txid,
 }),
 }
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .context
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
 self.context.check_funding_meets_minimum_depth(funding, height)
	}

	#[cfg(splicing)]
	fn maybe_promote_splice_funding<L: Deref>(
 &mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
 &mut self, confirmed_funding_index: usize, logger: &L,
	) -> bool
	where
 L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
 debug_assert!(confirmed_funding_index < self.pending_funding.len());

 let pending_splice = self.pending_splice.as_mut().unwrap();
 pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.

 let splice_txid = match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) => sent_funding_txid,
 None => {
 debug_assert!(false);
 return false;
 },
 };

 if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
 );

 let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
 debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
 promote_splice_funding!(self, funding);

 return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

 #[cfg(splicing)]
 if let Some(confirmed_funding_index) = confirmed_funding_index {
 let pending_splice = match self.pending_splice.as_ref() {
 let pending_splice = match self.pending_splice.as_mut() {
 Some(pending_splice) => pending_splice,
 None => {
 // TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
 };
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 for &(idx, tx) in txdata.iter() {
 if idx > index_in_block {
 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
 &self.context.channel_id,
 );

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
 }
 }

 let pending_splice = self.pending_splice.as_ref().unwrap();
 let pending_splice = self.pending_splice.as_mut().unwrap();
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| chain_node_signer
 .and_then(|(chain_hash, node_signer, user_config)|
 self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
 )
 )
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
	pub fn splice_locked<NS: Deref, L: Deref>(
 &mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
 user_config: &UserConfig, best_block: &BestBlock, logger: &L,
	) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
	) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
	where
 NS::Target: NodeSigner,
 L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
 &self.context.channel_id,
 );
 promote_splice_funding!(self, funding);
 return Ok(self.get_announcement_sigs(
 let funding_txo = self
 .funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo");
 let announcement_sigs = self.get_announcement_sigs(
 node_signer,
 chain_hash,
 user_config,
 best_block.height,
 logger,
 ));
 );
 return Ok((Some(funding_txo), announcement_sigs));
 }

 let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
 }

 pending_splice.received_funding_txid = Some(msg.splice_txid);
 Ok(None)
 Ok((None, None))
	}

	// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
 }
	}

	#[cfg(splicing)]
	pub fn has_pending_splice(&self) -> bool {
 self.pending_splice.is_some()
	}

	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
 let end = self
 .funding
Expand Down
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" + '
Follow-ups #3741: Exchange `splice_locked` messages by jkczyz · Pull Request #3873 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into

from

Jun 20, 2025
 Merged


Follow-ups #3741: Exchange splice_locked messages
#3873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ac090a4

Don't set sent_funding_txid in maybe_promote_splice_funding


jkczyz Jun 17, 2025
eeee50e

Don't inline call to FundedChannel::splice_locked


jkczyz Jun 17, 2025
5170373

rustfmt ChannelManager::internal_splice_locked


jkczyz Jun 17, 2025
22b578b

Return new funding_txo with splice_locked


jkczyz Jun 17, 2025
db69ec7

Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY


jkczyz Jun 17, 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


167 changes: 99 additions & 68 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
	update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
	received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
	fn check_get_splice_locked<SP: Deref>(
 &mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked>
	where
 SP::Target: SignerProvider,
	{
 if !context.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match self.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => {
 let splice_locked = msgs::SpliceLocked {
 channel_id: context.channel_id(),
 splice_txid: confirmed_funding_txid,
 };
 self.sent_funding_txid = Some(splice_locked.splice_txid);
 Some(splice_locked)
 },
 }
	}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
	tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
 self.get_initial_counterparty_commitment_signature(funding, logger)
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
	}

	#[rustfmt::skip]
	fn check_for_funding_tx_confirmed<L: Deref>(
 &mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
 }
	}

	#[cfg(splicing)]
	fn check_get_splice_locked(
 &self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked> {
 if !self.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => Some(msgs::SpliceLocked {
 channel_id: self.context.channel_id(),
 splice_txid: confirmed_funding_txid,
 }),
 }
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .context
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
 self.context.check_funding_meets_minimum_depth(funding, height)
	}

	#[cfg(splicing)]
	fn maybe_promote_splice_funding<L: Deref>(
 &mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
 &mut self, confirmed_funding_index: usize, logger: &L,
	) -> bool
	where
 L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
 debug_assert!(confirmed_funding_index < self.pending_funding.len());

 let pending_splice = self.pending_splice.as_mut().unwrap();
 pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.

 let splice_txid = match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) => sent_funding_txid,
 None => {
 debug_assert!(false);
 return false;
 },
 };

 if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
 );

 let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
 debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
 promote_splice_funding!(self, funding);

 return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

 #[cfg(splicing)]
 if let Some(confirmed_funding_index) = confirmed_funding_index {
 let pending_splice = match self.pending_splice.as_ref() {
 let pending_splice = match self.pending_splice.as_mut() {
 Some(pending_splice) => pending_splice,
 None => {
 // TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
 };
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 for &(idx, tx) in txdata.iter() {
 if idx > index_in_block {
 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
 &self.context.channel_id,
 );

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
 }
 }

 let pending_splice = self.pending_splice.as_ref().unwrap();
 let pending_splice = self.pending_splice.as_mut().unwrap();
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| chain_node_signer
 .and_then(|(chain_hash, node_signer, user_config)|
 self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
 )
 )
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
	pub fn splice_locked<NS: Deref, L: Deref>(
 &mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
 user_config: &UserConfig, best_block: &BestBlock, logger: &L,
	) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
	) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
	where
 NS::Target: NodeSigner,
 L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
 &self.context.channel_id,
 );
 promote_splice_funding!(self, funding);
 return Ok(self.get_announcement_sigs(
 let funding_txo = self
 .funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo");
 let announcement_sigs = self.get_announcement_sigs(
 node_signer,
 chain_hash,
 user_config,
 best_block.height,
 logger,
 ));
 );
 return Ok((Some(funding_txo), announcement_sigs));
 }

 let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
 }

 pending_splice.received_funding_txid = Some(msg.splice_txid);
 Ok(None)
 Ok((None, None))
	}

	// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
 }
	}

	#[cfg(splicing)]
	pub fn has_pending_splice(&self) -> bool {
 self.pending_splice.is_some()
	}

	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
 let end = self
 .funding
Expand Down
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('^' + ".*" + '
Follow-ups #3741: Exchange `splice_locked` messages by jkczyz · Pull Request #3873 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into

from

Jun 20, 2025
 Merged


Follow-ups #3741: Exchange splice_locked messages
#3873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ac090a4

Don't set sent_funding_txid in maybe_promote_splice_funding


jkczyz Jun 17, 2025
eeee50e

Don't inline call to FundedChannel::splice_locked


jkczyz Jun 17, 2025
5170373

rustfmt ChannelManager::internal_splice_locked


jkczyz Jun 17, 2025
22b578b

Return new funding_txo with splice_locked


jkczyz Jun 17, 2025
db69ec7

Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY


jkczyz Jun 17, 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


167 changes: 99 additions & 68 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
	update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
	received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
	fn check_get_splice_locked<SP: Deref>(
 &mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked>
	where
 SP::Target: SignerProvider,
	{
 if !context.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match self.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => {
 let splice_locked = msgs::SpliceLocked {
 channel_id: context.channel_id(),
 splice_txid: confirmed_funding_txid,
 };
 self.sent_funding_txid = Some(splice_locked.splice_txid);
 Some(splice_locked)
 },
 }
	}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
	tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
 self.get_initial_counterparty_commitment_signature(funding, logger)
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
	}

	#[rustfmt::skip]
	fn check_for_funding_tx_confirmed<L: Deref>(
 &mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
 }
	}

	#[cfg(splicing)]
	fn check_get_splice_locked(
 &self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked> {
 if !self.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => Some(msgs::SpliceLocked {
 channel_id: self.context.channel_id(),
 splice_txid: confirmed_funding_txid,
 }),
 }
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .context
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
 self.context.check_funding_meets_minimum_depth(funding, height)
	}

	#[cfg(splicing)]
	fn maybe_promote_splice_funding<L: Deref>(
 &mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
 &mut self, confirmed_funding_index: usize, logger: &L,
	) -> bool
	where
 L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
 debug_assert!(confirmed_funding_index < self.pending_funding.len());

 let pending_splice = self.pending_splice.as_mut().unwrap();
 pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.

 let splice_txid = match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) => sent_funding_txid,
 None => {
 debug_assert!(false);
 return false;
 },
 };

 if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
 );

 let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
 debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
 promote_splice_funding!(self, funding);

 return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

 #[cfg(splicing)]
 if let Some(confirmed_funding_index) = confirmed_funding_index {
 let pending_splice = match self.pending_splice.as_ref() {
 let pending_splice = match self.pending_splice.as_mut() {
 Some(pending_splice) => pending_splice,
 None => {
 // TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
 };
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 for &(idx, tx) in txdata.iter() {
 if idx > index_in_block {
 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
 &self.context.channel_id,
 );

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
 }
 }

 let pending_splice = self.pending_splice.as_ref().unwrap();
 let pending_splice = self.pending_splice.as_mut().unwrap();
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| chain_node_signer
 .and_then(|(chain_hash, node_signer, user_config)|
 self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
 )
 )
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
	pub fn splice_locked<NS: Deref, L: Deref>(
 &mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
 user_config: &UserConfig, best_block: &BestBlock, logger: &L,
	) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
	) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
	where
 NS::Target: NodeSigner,
 L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
 &self.context.channel_id,
 );
 promote_splice_funding!(self, funding);
 return Ok(self.get_announcement_sigs(
 let funding_txo = self
 .funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo");
 let announcement_sigs = self.get_announcement_sigs(
 node_signer,
 chain_hash,
 user_config,
 best_block.height,
 logger,
 ));
 );
 return Ok((Some(funding_txo), announcement_sigs));
 }

 let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
 }

 pending_splice.received_funding_txid = Some(msg.splice_txid);
 Ok(None)
 Ok((None, None))
	}

	// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
 }
	}

	#[cfg(splicing)]
	pub fn has_pending_splice(&self) -> bool {
 self.pending_splice.is_some()
	}

	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
 let end = self
 .funding
Expand Down
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('^' + ".*" + '
Follow-ups #3741: Exchange `splice_locked` messages by jkczyz · Pull Request #3873 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into

from

Jun 20, 2025
 Merged


Follow-ups #3741: Exchange splice_locked messages
#3873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ac090a4

Don't set sent_funding_txid in maybe_promote_splice_funding


jkczyz Jun 17, 2025
eeee50e

Don't inline call to FundedChannel::splice_locked


jkczyz Jun 17, 2025
5170373

rustfmt ChannelManager::internal_splice_locked


jkczyz Jun 17, 2025
22b578b

Return new funding_txo with splice_locked


jkczyz Jun 17, 2025
db69ec7

Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY


jkczyz Jun 17, 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


167 changes: 99 additions & 68 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
	update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
	received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
	fn check_get_splice_locked<SP: Deref>(
 &mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked>
	where
 SP::Target: SignerProvider,
	{
 if !context.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match self.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => {
 let splice_locked = msgs::SpliceLocked {
 channel_id: context.channel_id(),
 splice_txid: confirmed_funding_txid,
 };
 self.sent_funding_txid = Some(splice_locked.splice_txid);
 Some(splice_locked)
 },
 }
	}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
	tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
 self.get_initial_counterparty_commitment_signature(funding, logger)
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
	}

	#[rustfmt::skip]
	fn check_for_funding_tx_confirmed<L: Deref>(
 &mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
 }
	}

	#[cfg(splicing)]
	fn check_get_splice_locked(
 &self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked> {
 if !self.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => Some(msgs::SpliceLocked {
 channel_id: self.context.channel_id(),
 splice_txid: confirmed_funding_txid,
 }),
 }
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .context
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
 self.context.check_funding_meets_minimum_depth(funding, height)
	}

	#[cfg(splicing)]
	fn maybe_promote_splice_funding<L: Deref>(
 &mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
 &mut self, confirmed_funding_index: usize, logger: &L,
	) -> bool
	where
 L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
 debug_assert!(confirmed_funding_index < self.pending_funding.len());

 let pending_splice = self.pending_splice.as_mut().unwrap();
 pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.

 let splice_txid = match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) => sent_funding_txid,
 None => {
 debug_assert!(false);
 return false;
 },
 };

 if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
 );

 let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
 debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
 promote_splice_funding!(self, funding);

 return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

 #[cfg(splicing)]
 if let Some(confirmed_funding_index) = confirmed_funding_index {
 let pending_splice = match self.pending_splice.as_ref() {
 let pending_splice = match self.pending_splice.as_mut() {
 Some(pending_splice) => pending_splice,
 None => {
 // TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
 };
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 for &(idx, tx) in txdata.iter() {
 if idx > index_in_block {
 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
 &self.context.channel_id,
 );

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
 }
 }

 let pending_splice = self.pending_splice.as_ref().unwrap();
 let pending_splice = self.pending_splice.as_mut().unwrap();
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| chain_node_signer
 .and_then(|(chain_hash, node_signer, user_config)|
 self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
 )
 )
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
	pub fn splice_locked<NS: Deref, L: Deref>(
 &mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
 user_config: &UserConfig, best_block: &BestBlock, logger: &L,
	) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
	) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
	where
 NS::Target: NodeSigner,
 L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
 &self.context.channel_id,
 );
 promote_splice_funding!(self, funding);
 return Ok(self.get_announcement_sigs(
 let funding_txo = self
 .funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo");
 let announcement_sigs = self.get_announcement_sigs(
 node_signer,
 chain_hash,
 user_config,
 best_block.height,
 logger,
 ));
 );
 return Ok((Some(funding_txo), announcement_sigs));
 }

 let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
 }

 pending_splice.received_funding_txid = Some(msg.splice_txid);
 Ok(None)
 Ok((None, None))
	}

	// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
 }
	}

	#[cfg(splicing)]
	pub fn has_pending_splice(&self) -> bool {
 self.pending_splice.is_some()
	}

	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
 let end = self
 .funding
Expand Down
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); }
})();
})();
Follow-ups #3741: Exchange `splice_locked` messages by jkczyz · Pull Request #3873 · lightningdevkit/rust-lightning · GitHub
Skip to content
Follow-ups #3741: Exchange splice_locked messages#3873

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 5 commits into

from

Jun 20, 2025
 Merged


Follow-ups #3741: Exchange splice_locked messages
#3873
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ac090a4

Don't set sent_funding_txid in maybe_promote_splice_funding


jkczyz Jun 17, 2025
eeee50e

Don't inline call to FundedChannel::splice_locked


jkczyz Jun 17, 2025
5170373

rustfmt ChannelManager::internal_splice_locked


jkczyz Jun 17, 2025
22b578b

Return new funding_txo with splice_locked


jkczyz Jun 17, 2025
db69ec7

Increase CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY


jkczyz Jun 17, 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


167 changes: 99 additions & 68 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1424,7 +1424,7 @@ pub(crate) const COINBASE_MATURITY: u32 = 100;
/// The number of blocks to wait for a channel_announcement to propagate such that payments using an
/// older SCID can still be relayed. Once the spend of the previous funding transaction has reached
/// this number of confirmations, the corresponding SCID will be forgotten.
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 12;
const CHANNEL_ANNOUNCEMENT_PROPAGATION_DELAY: u32 = 144;

struct PendingChannelMonitorUpdate {
	update: ChannelMonitorUpdate,
Expand DownExpand Up@@ -2156,6 +2156,40 @@ struct PendingSplice {
	received_funding_txid: Option<Txid>,
}

#[cfg(splicing)]
impl PendingSplice {
	fn check_get_splice_locked<SP: Deref>(
 &mut self, context: &ChannelContext<SP>, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked>
	where
 SP::Target: SignerProvider,
	{
 if !context.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match self.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => {
 let splice_locked = msgs::SpliceLocked {
 channel_id: context.channel_id(),
 splice_txid: confirmed_funding_txid,
 };
 self.sent_funding_txid = Some(splice_locked.splice_txid);
 Some(splice_locked)
 },
 }
	}
}

/// Wrapper around a [`Transaction`] useful for caching the result of [`Transaction::compute_txid`].
struct ConfirmedTransaction<'a> {
	tx: &'a Transaction,
Expand DownExpand Up@@ -5525,6 +5559,29 @@ where
 self.get_initial_counterparty_commitment_signature(funding, logger)
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
	}

	#[rustfmt::skip]
	fn check_for_funding_tx_confirmed<L: Deref>(
 &mut self, funding: &mut FundingScope, block_hash: &BlockHash, height: u32,
Expand DownExpand Up@@ -9074,58 +9131,13 @@ where
 }
	}

	#[cfg(splicing)]
	fn check_get_splice_locked(
 &self, pending_splice: &PendingSplice, funding: &FundingScope, height: u32,
	) -> Option<msgs::SpliceLocked> {
 if !self.check_funding_meets_minimum_depth(funding, height) {
 return None;
 }

 let confirmed_funding_txid = match funding.get_funding_txid() {
 Some(funding_txid) => funding_txid,
 None => {
 debug_assert!(false);
 return None;
 },
 };

 match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) if confirmed_funding_txid == sent_funding_txid => None,
 _ => Some(msgs::SpliceLocked {
 channel_id: self.context.channel_id(),
 splice_txid: confirmed_funding_txid,
 }),
 }
	}

	fn check_funding_meets_minimum_depth(&self, funding: &FundingScope, height: u32) -> bool {
 let minimum_depth = self
 .context
 .minimum_depth(funding)
 .expect("ChannelContext::minimum_depth should be set for FundedChannel");

 // Zero-conf channels always meet the minimum depth.
 if minimum_depth == 0 {
 return true;
 }

 if funding.funding_tx_confirmation_height == 0 {
 return false;
 }

 let funding_tx_confirmations =
 height as i64 - funding.funding_tx_confirmation_height as i64 + 1;
 if funding_tx_confirmations < minimum_depth as i64 {
 return false;
 }

 return true;
 self.context.check_funding_meets_minimum_depth(funding, height)
	}

	#[cfg(splicing)]
	fn maybe_promote_splice_funding<L: Deref>(
 &mut self, splice_txid: Txid, confirmed_funding_index: usize, logger: &L,
 &mut self, confirmed_funding_index: usize, logger: &L,
	) -> bool
	where
 L::Target: Logger,
Expand All@@ -9134,7 +9146,13 @@ where
 debug_assert!(confirmed_funding_index < self.pending_funding.len());

 let pending_splice = self.pending_splice.as_mut().unwrap();
 pending_splice.sent_funding_txid = Some(splice_txid);
Comment thread
jkczyz marked this conversation as resolved.

 let splice_txid = match pending_splice.sent_funding_txid {
 Some(sent_funding_txid) => sent_funding_txid,
 None => {
 debug_assert!(false);
 return false;
 },
 };

 if pending_splice.sent_funding_txid == pending_splice.received_funding_txid {
 log_info!(
Expand All@@ -9145,6 +9163,7 @@ where
 );

 let funding = self.pending_funding.get_mut(confirmed_funding_index).unwrap();
 debug_assert_eq!(Some(splice_txid), funding.get_funding_txid());
 promote_splice_funding!(self, funding);

 return true;
Expand DownExpand Up@@ -9234,7 +9253,7 @@ where

 #[cfg(splicing)]
 if let Some(confirmed_funding_index) = confirmed_funding_index {
 let pending_splice = match self.pending_splice.as_ref() {
 let pending_splice = match self.pending_splice.as_mut() {
 Some(pending_splice) => pending_splice,
 None => {
 // TODO: Move pending_funding into pending_splice
Expand All@@ -9245,7 +9264,7 @@ where
 };
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();

 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 for &(idx, tx) in txdata.iter() {
 if idx > index_in_block {
 self.context.check_for_funding_tx_spent(funding, tx, logger)?;
Expand All@@ -9259,12 +9278,18 @@ where
 &self.context.channel_id,
 );

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger))
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9417,21 +9442,27 @@ where
 }
 }

 let pending_splice = self.pending_splice.as_ref().unwrap();
 let pending_splice = self.pending_splice.as_mut().unwrap();
 let funding = self.pending_funding.get(confirmed_funding_index).unwrap();
 if let Some(splice_locked) = self.check_get_splice_locked(pending_splice, funding, height) {
 if let Some(splice_locked) = pending_splice.check_get_splice_locked(&self.context, funding, height) {
 log_info!(logger, "Sending a splice_locked to our peer for channel {}", &self.context.channel_id);

 let announcement_sigs = self
 .maybe_promote_splice_funding(splice_locked.splice_txid, confirmed_funding_index, logger)
 let funding_promoted =
 self.maybe_promote_splice_funding(confirmed_funding_index, logger);
 let funding_txo = funding_promoted.then(|| {
 self.funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo")
 });
 let announcement_sigs = funding_promoted
 .then(|| chain_node_signer
 .and_then(|(chain_hash, node_signer, user_config)|
 self.get_announcement_sigs(node_signer, chain_hash, user_config, height, logger)
 )
 )
 .flatten();

 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked)), timed_out_htlcs, announcement_sigs));
 return Ok((Some(FundingConfirmedMessage::Splice(splice_locked, funding_txo)), timed_out_htlcs, announcement_sigs));
 }
 }

Expand DownExpand Up@@ -9925,7 +9956,7 @@ where
	pub fn splice_locked<NS: Deref, L: Deref>(
 &mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
 user_config: &UserConfig, best_block: &BestBlock, logger: &L,
	) -> Result<Option<msgs::AnnouncementSignatures>, ChannelError>
	) -> Result<(Option<OutPoint>, Option<msgs::AnnouncementSignatures>), ChannelError>
	where
 NS::Target: NodeSigner,
 L::Target: Logger,
Expand DownExpand Up@@ -9958,13 +9989,18 @@ where
 &self.context.channel_id,
 );
 promote_splice_funding!(self, funding);
 return Ok(self.get_announcement_sigs(
 let funding_txo = self
 .funding
 .get_funding_txo()
 .expect("Splice FundingScope should always have a funding_txo");
 let announcement_sigs = self.get_announcement_sigs(
 node_signer,
 chain_hash,
 user_config,
 best_block.height,
 logger,
 ));
 );
 return Ok((Some(funding_txo), announcement_sigs));
 }

 let err = "unknown splice funding txid";
Expand All@@ -9988,7 +10024,7 @@ where
 }

 pending_splice.received_funding_txid = Some(msg.splice_txid);
 Ok(None)
 Ok((None, None))
	}

	// Send stuff to our remote peers:
Expand DownExpand Up@@ -10715,11 +10751,6 @@ where
 }
	}

	#[cfg(splicing)]
	pub fn has_pending_splice(&self) -> bool {
 self.pending_splice.is_some()
	}

	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
 let end = self
 .funding
Expand Down
Loading