Locktimed packages fixes#3923

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 5 commits into from
Jul 15, 2025
Merged

Locktimed packages fixes #3923

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
c915c99
Add a test utility to provide nodes with anchor reserves
TheBlueMatt Jul 10, 2025
92fe3aa
Prune locktimed packages when inputs are spent
whfuyn Jul 10, 2025
f916e13
Track outpoint creation height in `PackageSolvingData`
TheBlueMatt Jul 10, 2025
9a95544
Use outpoint creation height when restoring locktimed packages
TheBlueMatt Jul 10, 2025
d7726ef
Add a test case for the issues fixed in the previous few commits
TheBlueMatt Jul 10, 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
51 changes: 32 additions & 19 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
(payment_preimage.clone(), payment_info.clone().into_iter().collect())
});

let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
_ => None,
})
});
let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
txid
} else {
return;
};
let confirmed_spend_info = self.funding_spend_confirmed
.map(|txid| (txid, None))
.or_else(|| {
self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
_ => None,
})
});
let (confirmed_spend_txid, confirmed_spend_height) =
if let Some((txid, height)) = confirmed_spend_info {
(txid, height)
} else {
return;
};

// If the channel is force closed, try to claim the output from this preimage.
// First check if a counterparty commitment transaction has been broadcasted:
macro_rules! claim_htlcs {
($commitment_number: expr, $txid: expr, $htlcs: expr) => {
let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
let conf_target = self.closure_conf_target();
self.onchain_tx_handler.update_claims_view_from_requests(
htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
per_commitment_point, per_commitment_key, outp.value,
self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
self.funding.channel_parameters.clone(),
height,
);
let justice_package = PackageTemplate::build_package(
commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let revk_htlc_outp = RevokedHTLCOutput::build(
per_commitment_point, per_commitment_key, htlc.clone(),
self.funding.channel_parameters.clone(),
height,
);
let counterparty_spendable_height = if htlc.offered {
htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
(htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
), logger);
let (htlc_claim_reqs, counterparty_output_info) =
self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
to_counterparty_output_info = counterparty_output_info;
for req in htlc_claim_reqs {
claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

/// Returns the HTLC claim package templates and the counterparty output info
#[rustfmt::skip]
fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
fn get_counterparty_output_claim_info(
&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
confirmation_height: Option<u32>,
) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
let mut claimable_outpoints = Vec::new();
let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let counterparty_htlc_outp = if htlc.offered {
PackageSolvingData::CounterpartyOfferedHTLCOutput(
CounterpartyOfferedHTLCOutput::build(
*per_commitment_point, preimage.unwrap(), htlc.clone(),
*per_commitment_point, preimage.unwrap(),
htlc.clone(),
self.funding.channel_parameters.clone(),
confirmation_height,
)
)
} else {
PackageSolvingData::CounterpartyReceivedHTLCOutput(
CounterpartyReceivedHTLCOutput::build(
*per_commitment_point, htlc.clone(),
*per_commitment_point,
htlc.clone(),
self.funding.channel_parameters.clone(),
confirmation_height,
)
)
};
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let revk_outp = RevokedOutput::build(
per_commitment_point, per_commitment_key, tx.output[idx].value, false,
self.funding.channel_parameters.clone(),
height,
);
let justice_package = PackageTemplate::build_package(
htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
.expect("Expected transaction output index for non-dust HTLC");
PackageTemplate::build_package(
tx.txid(), transaction_output_index,
PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
counterparty_spendable_height,
)
})
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
let txid = self.funding.current_holder_commitment_tx.trust().txid();
let vout = htlc_descriptor.htlc.transaction_output_index
.expect("Expected transaction output index for non-dust HTLC");
let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
&mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
) {
Expand Down
54 changes: 39 additions & 15 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
#[cfg(not(any(test, feature = "_test_utils")))]
claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

#[cfg(any(test, feature = "_test_utils"))]
pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
#[cfg(not(any(test, feature = "_test_utils")))]
locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
// Because fuzzing can cause hash collisions, we can end up with conflicting claim
// ids here, so we only assert when not fuzzing.
debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
for k in req.outpoints() {
log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.
for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));

@wpaulinowpaulinoJul 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.

@wpaulinowpaulinoJul 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.

@TheBlueMattTheBlueMattJul 11, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?

}
self.pending_claim_requests.insert(claim_id, req);
}
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
}
}

// Also remove/split any locktimed packages whose inputs have been spent by this transaction.
self.locktimed_packages.retain(|_locktime, packages|{
packages.retain_mut(|package| {
if let Some(p) = package.split_package(&inp.previous_output) {
claimed_outputs_material.push(p);
}
!package.outpoints().is_empty()
});
!packages.is_empty()
});
}
for package in claimed_outputs_material.drain(..) {
let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
//- resurect outpoint back in its claimable set and regenerate tx
match entry.event {
OnchainEvent::ContentiousOutpoint { package } => {
// We pass 0 to `package_locktime` to get the actual required locktime.
let package_locktime = package.package_locktime(0);
if package_locktime >= height {
self.locktimed_packages.entry(package_locktime).or_default().push(package);
continue;
}

if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
holder_commit_txid,
htlc.transaction_output_index.unwrap(),
PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
channel_derivation_parameters: ChannelDerivationParameters {
value_satoshis: tx_handler.channel_value_satoshis,
keys_id: tx_handler.channel_keys_id,
transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
channel_derivation_parameters: ChannelDerivationParameters {
value_satoshis: tx_handler.channel_value_satoshis,
keys_id: tx_handler.channel_keys_id,
transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
},
commitment_txid: holder_commit_txid,
per_commitment_number: holder_commit.commitment_number(),
per_commitment_point: holder_commit.per_commitment_point(),
feerate_per_kw: holder_commit.feerate_per_kw(),
htlc: htlc.clone(),
preimage: None,
counterparty_sig: *counterparty_sig,
},
commitment_txid: holder_commit_txid,
per_commitment_number: holder_commit.commitment_number(),
per_commitment_point: holder_commit.per_commitment_point(),
feerate_per_kw: holder_commit.feerate_per_kw(),
htlc: htlc.clone(),
preimage: None,
counterparty_sig: *counterparty_sig,
})),
0
)),
0,
));
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Locktimed packages fixes#3923

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Jul 15, 2025
 Merged


Locktimed packages fixes
#3923
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
c915c99

Add a test utility to provide nodes with anchor reserves


TheBlueMatt Jul 10, 2025
92fe3aa

Prune locktimed packages when inputs are spent


whfuyn Jul 10, 2025
f916e13

Track outpoint creation height in `PackageSolvingData`


TheBlueMatt Jul 10, 2025
9a95544

Use outpoint creation height when restoring locktimed packages


TheBlueMatt Jul 10, 2025
d7726ef

Add a test case for the issues fixed in the previous few commits


TheBlueMatt Jul 10, 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


51 changes: 32 additions & 19 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (payment_preimage.clone(), payment_info.clone().into_iter().collect())
 });

 let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
 _ => None,
 })
 });
 let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
 txid
 } else {
 return;
 };
 let confirmed_spend_info = self.funding_spend_confirmed
 .map(|txid| (txid, None))
 .or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
 _ => None,
 })
 });
 let (confirmed_spend_txid, confirmed_spend_height) =
 if let Some((txid, height)) = confirmed_spend_info {
 (txid, height)
 } else {
 return;
 };

 // If the channel is force closed, try to claim the output from this preimage.
 // First check if a counterparty commitment transaction has been broadcasted:
 macro_rules! claim_htlcs {
 ($commitment_number: expr, $txid: expr, $htlcs: expr) => {
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
 let conf_target = self.closure_conf_target();
 self.onchain_tx_handler.update_claims_view_from_requests(
 htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 per_commitment_point, per_commitment_key, outp.value,
 self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_htlc_outp = RevokedHTLCOutput::build(
 per_commitment_point, per_commitment_key, htlc.clone(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let counterparty_spendable_height = if htlc.offered {
 htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 let (htlc_claim_reqs, counterparty_output_info) =
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
 to_counterparty_output_info = counterparty_output_info;
 for req in htlc_claim_reqs {
 claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	/// Returns the HTLC claim package templates and the counterparty output info
	#[rustfmt::skip]
	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
	-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
	fn get_counterparty_output_claim_info(
 &self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
 per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
 confirmation_height: Option<u32>,
	) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 let mut claimable_outpoints = Vec::new();
 let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let counterparty_htlc_outp = if htlc.offered {
 PackageSolvingData::CounterpartyOfferedHTLCOutput(
 CounterpartyOfferedHTLCOutput::build(
 *per_commitment_point, preimage.unwrap(), htlc.clone(),
 *per_commitment_point, preimage.unwrap(),
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(
 *per_commitment_point, htlc.clone(),
 *per_commitment_point,
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 };
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_outp = RevokedOutput::build(
 per_commitment_point, per_commitment_key, tx.output[idx].value, false,
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 .expect("Expected transaction output index for non-dust HTLC");
 PackageTemplate::build_package(
 tx.txid(), transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
 counterparty_spendable_height,
 )
 })
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = self.funding.current_holder_commitment_tx.trust().txid();
 let vout = htlc_descriptor.htlc.transaction_output_index
 .expect("Expected transaction output index for non-dust HTLC");
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
 if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
 &mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
 ) {
Expand Down

54 changes: 39 additions & 15 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	#[cfg(not(any(test, feature = "_test_utils")))]
	claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
	#[cfg(not(any(test, feature = "_test_utils")))]
	locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

	onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.

 for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
 let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
 log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.
@TheBlueMattTheBlueMattJul 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?
 }
 self.pending_claim_requests.insert(claim_id, req);
 }
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 }
 }

 // Also remove/split any locktimed packages whose inputs have been spent by this transaction.
 self.locktimed_packages.retain(|_locktime, packages|{
 packages.retain_mut(|package| {
 if let Some(p) = package.split_package(&inp.previous_output) {
 claimed_outputs_material.push(p);
 }
 !package.outpoints().is_empty()
 });
 !packages.is_empty()
 });
 }
 for package in claimed_outputs_material.drain(..) {
 let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 //- resurect outpoint back in its claimable set and regenerate tx
 match entry.event {
 OnchainEvent::ContentiousOutpoint { package } => {
 // We pass 0 to `package_locktime` to get the actual required locktime.
 let package_locktime = package.package_locktime(0);
 if package_locktime >= height {
 self.locktimed_packages.entry(package_locktime).or_default().push(package);
 continue;
 }

 if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
 if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
 assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
 holder_commit_txid,
 htlc.transaction_output_index.unwrap(),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 })),
 0
 )),
 0,
 ));
 }
Expand Down
Loading

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

Skip to content
Locktimed packages fixes#3923

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Jul 15, 2025
 Merged


Locktimed packages fixes
#3923
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
c915c99

Add a test utility to provide nodes with anchor reserves


TheBlueMatt Jul 10, 2025
92fe3aa

Prune locktimed packages when inputs are spent


whfuyn Jul 10, 2025
f916e13

Track outpoint creation height in `PackageSolvingData`


TheBlueMatt Jul 10, 2025
9a95544

Use outpoint creation height when restoring locktimed packages


TheBlueMatt Jul 10, 2025
d7726ef

Add a test case for the issues fixed in the previous few commits


TheBlueMatt Jul 10, 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


51 changes: 32 additions & 19 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (payment_preimage.clone(), payment_info.clone().into_iter().collect())
 });

 let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
 _ => None,
 })
 });
 let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
 txid
 } else {
 return;
 };
 let confirmed_spend_info = self.funding_spend_confirmed
 .map(|txid| (txid, None))
 .or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
 _ => None,
 })
 });
 let (confirmed_spend_txid, confirmed_spend_height) =
 if let Some((txid, height)) = confirmed_spend_info {
 (txid, height)
 } else {
 return;
 };

 // If the channel is force closed, try to claim the output from this preimage.
 // First check if a counterparty commitment transaction has been broadcasted:
 macro_rules! claim_htlcs {
 ($commitment_number: expr, $txid: expr, $htlcs: expr) => {
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
 let conf_target = self.closure_conf_target();
 self.onchain_tx_handler.update_claims_view_from_requests(
 htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 per_commitment_point, per_commitment_key, outp.value,
 self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_htlc_outp = RevokedHTLCOutput::build(
 per_commitment_point, per_commitment_key, htlc.clone(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let counterparty_spendable_height = if htlc.offered {
 htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 let (htlc_claim_reqs, counterparty_output_info) =
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
 to_counterparty_output_info = counterparty_output_info;
 for req in htlc_claim_reqs {
 claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	/// Returns the HTLC claim package templates and the counterparty output info
	#[rustfmt::skip]
	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
	-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
	fn get_counterparty_output_claim_info(
 &self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
 per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
 confirmation_height: Option<u32>,
	) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 let mut claimable_outpoints = Vec::new();
 let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let counterparty_htlc_outp = if htlc.offered {
 PackageSolvingData::CounterpartyOfferedHTLCOutput(
 CounterpartyOfferedHTLCOutput::build(
 *per_commitment_point, preimage.unwrap(), htlc.clone(),
 *per_commitment_point, preimage.unwrap(),
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(
 *per_commitment_point, htlc.clone(),
 *per_commitment_point,
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 };
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_outp = RevokedOutput::build(
 per_commitment_point, per_commitment_key, tx.output[idx].value, false,
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 .expect("Expected transaction output index for non-dust HTLC");
 PackageTemplate::build_package(
 tx.txid(), transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
 counterparty_spendable_height,
 )
 })
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = self.funding.current_holder_commitment_tx.trust().txid();
 let vout = htlc_descriptor.htlc.transaction_output_index
 .expect("Expected transaction output index for non-dust HTLC");
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
 if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
 &mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
 ) {
Expand Down

54 changes: 39 additions & 15 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	#[cfg(not(any(test, feature = "_test_utils")))]
	claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
	#[cfg(not(any(test, feature = "_test_utils")))]
	locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

	onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.

 for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
 let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
 log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.
@TheBlueMattTheBlueMattJul 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?
 }
 self.pending_claim_requests.insert(claim_id, req);
 }
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 }
 }

 // Also remove/split any locktimed packages whose inputs have been spent by this transaction.
 self.locktimed_packages.retain(|_locktime, packages|{
 packages.retain_mut(|package| {
 if let Some(p) = package.split_package(&inp.previous_output) {
 claimed_outputs_material.push(p);
 }
 !package.outpoints().is_empty()
 });
 !packages.is_empty()
 });
 }
 for package in claimed_outputs_material.drain(..) {
 let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 //- resurect outpoint back in its claimable set and regenerate tx
 match entry.event {
 OnchainEvent::ContentiousOutpoint { package } => {
 // We pass 0 to `package_locktime` to get the actual required locktime.
 let package_locktime = package.package_locktime(0);
 if package_locktime >= height {
 self.locktimed_packages.entry(package_locktime).or_default().push(package);
 continue;
 }

 if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
 if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
 assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
 holder_commit_txid,
 htlc.transaction_output_index.unwrap(),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 })),
 0
 )),
 0,
 ));
 }
Expand Down
Loading

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

Skip to content
Locktimed packages fixes#3923

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Jul 15, 2025
 Merged


Locktimed packages fixes
#3923
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
c915c99

Add a test utility to provide nodes with anchor reserves


TheBlueMatt Jul 10, 2025
92fe3aa

Prune locktimed packages when inputs are spent


whfuyn Jul 10, 2025
f916e13

Track outpoint creation height in `PackageSolvingData`


TheBlueMatt Jul 10, 2025
9a95544

Use outpoint creation height when restoring locktimed packages


TheBlueMatt Jul 10, 2025
d7726ef

Add a test case for the issues fixed in the previous few commits


TheBlueMatt Jul 10, 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


51 changes: 32 additions & 19 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (payment_preimage.clone(), payment_info.clone().into_iter().collect())
 });

 let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
 _ => None,
 })
 });
 let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
 txid
 } else {
 return;
 };
 let confirmed_spend_info = self.funding_spend_confirmed
 .map(|txid| (txid, None))
 .or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
 _ => None,
 })
 });
 let (confirmed_spend_txid, confirmed_spend_height) =
 if let Some((txid, height)) = confirmed_spend_info {
 (txid, height)
 } else {
 return;
 };

 // If the channel is force closed, try to claim the output from this preimage.
 // First check if a counterparty commitment transaction has been broadcasted:
 macro_rules! claim_htlcs {
 ($commitment_number: expr, $txid: expr, $htlcs: expr) => {
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
 let conf_target = self.closure_conf_target();
 self.onchain_tx_handler.update_claims_view_from_requests(
 htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 per_commitment_point, per_commitment_key, outp.value,
 self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_htlc_outp = RevokedHTLCOutput::build(
 per_commitment_point, per_commitment_key, htlc.clone(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let counterparty_spendable_height = if htlc.offered {
 htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 let (htlc_claim_reqs, counterparty_output_info) =
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
 to_counterparty_output_info = counterparty_output_info;
 for req in htlc_claim_reqs {
 claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	/// Returns the HTLC claim package templates and the counterparty output info
	#[rustfmt::skip]
	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
	-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
	fn get_counterparty_output_claim_info(
 &self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
 per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
 confirmation_height: Option<u32>,
	) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 let mut claimable_outpoints = Vec::new();
 let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let counterparty_htlc_outp = if htlc.offered {
 PackageSolvingData::CounterpartyOfferedHTLCOutput(
 CounterpartyOfferedHTLCOutput::build(
 *per_commitment_point, preimage.unwrap(), htlc.clone(),
 *per_commitment_point, preimage.unwrap(),
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(
 *per_commitment_point, htlc.clone(),
 *per_commitment_point,
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 };
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_outp = RevokedOutput::build(
 per_commitment_point, per_commitment_key, tx.output[idx].value, false,
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 .expect("Expected transaction output index for non-dust HTLC");
 PackageTemplate::build_package(
 tx.txid(), transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
 counterparty_spendable_height,
 )
 })
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = self.funding.current_holder_commitment_tx.trust().txid();
 let vout = htlc_descriptor.htlc.transaction_output_index
 .expect("Expected transaction output index for non-dust HTLC");
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
 if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
 &mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
 ) {
Expand Down

54 changes: 39 additions & 15 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	#[cfg(not(any(test, feature = "_test_utils")))]
	claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
	#[cfg(not(any(test, feature = "_test_utils")))]
	locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

	onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.

 for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
 let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
 log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.
@TheBlueMattTheBlueMattJul 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?
 }
 self.pending_claim_requests.insert(claim_id, req);
 }
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 }
 }

 // Also remove/split any locktimed packages whose inputs have been spent by this transaction.
 self.locktimed_packages.retain(|_locktime, packages|{
 packages.retain_mut(|package| {
 if let Some(p) = package.split_package(&inp.previous_output) {
 claimed_outputs_material.push(p);
 }
 !package.outpoints().is_empty()
 });
 !packages.is_empty()
 });
 }
 for package in claimed_outputs_material.drain(..) {
 let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 //- resurect outpoint back in its claimable set and regenerate tx
 match entry.event {
 OnchainEvent::ContentiousOutpoint { package } => {
 // We pass 0 to `package_locktime` to get the actual required locktime.
 let package_locktime = package.package_locktime(0);
 if package_locktime >= height {
 self.locktimed_packages.entry(package_locktime).or_default().push(package);
 continue;
 }

 if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
 if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
 assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
 holder_commit_txid,
 htlc.transaction_output_index.unwrap(),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 })),
 0
 )),
 0,
 ));
 }
Expand Down
Loading

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

Skip to content
Locktimed packages fixes#3923

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Jul 15, 2025
 Merged


Locktimed packages fixes
#3923
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
c915c99

Add a test utility to provide nodes with anchor reserves


TheBlueMatt Jul 10, 2025
92fe3aa

Prune locktimed packages when inputs are spent


whfuyn Jul 10, 2025
f916e13

Track outpoint creation height in `PackageSolvingData`


TheBlueMatt Jul 10, 2025
9a95544

Use outpoint creation height when restoring locktimed packages


TheBlueMatt Jul 10, 2025
d7726ef

Add a test case for the issues fixed in the previous few commits


TheBlueMatt Jul 10, 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


51 changes: 32 additions & 19 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (payment_preimage.clone(), payment_info.clone().into_iter().collect())
 });

 let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
 _ => None,
 })
 });
 let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
 txid
 } else {
 return;
 };
 let confirmed_spend_info = self.funding_spend_confirmed
 .map(|txid| (txid, None))
 .or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
 _ => None,
 })
 });
 let (confirmed_spend_txid, confirmed_spend_height) =
 if let Some((txid, height)) = confirmed_spend_info {
 (txid, height)
 } else {
 return;
 };

 // If the channel is force closed, try to claim the output from this preimage.
 // First check if a counterparty commitment transaction has been broadcasted:
 macro_rules! claim_htlcs {
 ($commitment_number: expr, $txid: expr, $htlcs: expr) => {
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
 let conf_target = self.closure_conf_target();
 self.onchain_tx_handler.update_claims_view_from_requests(
 htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 per_commitment_point, per_commitment_key, outp.value,
 self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_htlc_outp = RevokedHTLCOutput::build(
 per_commitment_point, per_commitment_key, htlc.clone(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let counterparty_spendable_height = if htlc.offered {
 htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 let (htlc_claim_reqs, counterparty_output_info) =
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
 to_counterparty_output_info = counterparty_output_info;
 for req in htlc_claim_reqs {
 claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	/// Returns the HTLC claim package templates and the counterparty output info
	#[rustfmt::skip]
	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
	-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
	fn get_counterparty_output_claim_info(
 &self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
 per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
 confirmation_height: Option<u32>,
	) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 let mut claimable_outpoints = Vec::new();
 let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let counterparty_htlc_outp = if htlc.offered {
 PackageSolvingData::CounterpartyOfferedHTLCOutput(
 CounterpartyOfferedHTLCOutput::build(
 *per_commitment_point, preimage.unwrap(), htlc.clone(),
 *per_commitment_point, preimage.unwrap(),
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(
 *per_commitment_point, htlc.clone(),
 *per_commitment_point,
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 };
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_outp = RevokedOutput::build(
 per_commitment_point, per_commitment_key, tx.output[idx].value, false,
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 .expect("Expected transaction output index for non-dust HTLC");
 PackageTemplate::build_package(
 tx.txid(), transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
 counterparty_spendable_height,
 )
 })
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = self.funding.current_holder_commitment_tx.trust().txid();
 let vout = htlc_descriptor.htlc.transaction_output_index
 .expect("Expected transaction output index for non-dust HTLC");
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
 if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
 &mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
 ) {
Expand Down

54 changes: 39 additions & 15 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	#[cfg(not(any(test, feature = "_test_utils")))]
	claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
	#[cfg(not(any(test, feature = "_test_utils")))]
	locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

	onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.

 for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
 let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
 log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.
@TheBlueMattTheBlueMattJul 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?
 }
 self.pending_claim_requests.insert(claim_id, req);
 }
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 }
 }

 // Also remove/split any locktimed packages whose inputs have been spent by this transaction.
 self.locktimed_packages.retain(|_locktime, packages|{
 packages.retain_mut(|package| {
 if let Some(p) = package.split_package(&inp.previous_output) {
 claimed_outputs_material.push(p);
 }
 !package.outpoints().is_empty()
 });
 !packages.is_empty()
 });
 }
 for package in claimed_outputs_material.drain(..) {
 let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 //- resurect outpoint back in its claimable set and regenerate tx
 match entry.event {
 OnchainEvent::ContentiousOutpoint { package } => {
 // We pass 0 to `package_locktime` to get the actual required locktime.
 let package_locktime = package.package_locktime(0);
 if package_locktime >= height {
 self.locktimed_packages.entry(package_locktime).or_default().push(package);
 continue;
 }

 if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
 if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
 assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
 holder_commit_txid,
 htlc.transaction_output_index.unwrap(),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 })),
 0
 )),
 0,
 ));
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Locktimed packages fixes#3923

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Jul 15, 2025
 Merged


Locktimed packages fixes
#3923
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
c915c99

Add a test utility to provide nodes with anchor reserves


TheBlueMatt Jul 10, 2025
92fe3aa

Prune locktimed packages when inputs are spent


whfuyn Jul 10, 2025
f916e13

Track outpoint creation height in `PackageSolvingData`


TheBlueMatt Jul 10, 2025
9a95544

Use outpoint creation height when restoring locktimed packages


TheBlueMatt Jul 10, 2025
d7726ef

Add a test case for the issues fixed in the previous few commits


TheBlueMatt Jul 10, 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


51 changes: 32 additions & 19 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (payment_preimage.clone(), payment_info.clone().into_iter().collect())
 });

 let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
 _ => None,
 })
 });
 let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
 txid
 } else {
 return;
 };
 let confirmed_spend_info = self.funding_spend_confirmed
 .map(|txid| (txid, None))
 .or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
 _ => None,
 })
 });
 let (confirmed_spend_txid, confirmed_spend_height) =
 if let Some((txid, height)) = confirmed_spend_info {
 (txid, height)
 } else {
 return;
 };

 // If the channel is force closed, try to claim the output from this preimage.
 // First check if a counterparty commitment transaction has been broadcasted:
 macro_rules! claim_htlcs {
 ($commitment_number: expr, $txid: expr, $htlcs: expr) => {
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
 let conf_target = self.closure_conf_target();
 self.onchain_tx_handler.update_claims_view_from_requests(
 htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 per_commitment_point, per_commitment_key, outp.value,
 self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_htlc_outp = RevokedHTLCOutput::build(
 per_commitment_point, per_commitment_key, htlc.clone(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let counterparty_spendable_height = if htlc.offered {
 htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 let (htlc_claim_reqs, counterparty_output_info) =
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
 to_counterparty_output_info = counterparty_output_info;
 for req in htlc_claim_reqs {
 claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	/// Returns the HTLC claim package templates and the counterparty output info
	#[rustfmt::skip]
	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
	-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
	fn get_counterparty_output_claim_info(
 &self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
 per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
 confirmation_height: Option<u32>,
	) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 let mut claimable_outpoints = Vec::new();
 let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let counterparty_htlc_outp = if htlc.offered {
 PackageSolvingData::CounterpartyOfferedHTLCOutput(
 CounterpartyOfferedHTLCOutput::build(
 *per_commitment_point, preimage.unwrap(), htlc.clone(),
 *per_commitment_point, preimage.unwrap(),
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(
 *per_commitment_point, htlc.clone(),
 *per_commitment_point,
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 };
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_outp = RevokedOutput::build(
 per_commitment_point, per_commitment_key, tx.output[idx].value, false,
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 .expect("Expected transaction output index for non-dust HTLC");
 PackageTemplate::build_package(
 tx.txid(), transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
 counterparty_spendable_height,
 )
 })
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = self.funding.current_holder_commitment_tx.trust().txid();
 let vout = htlc_descriptor.htlc.transaction_output_index
 .expect("Expected transaction output index for non-dust HTLC");
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
 if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
 &mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
 ) {
Expand Down

54 changes: 39 additions & 15 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	#[cfg(not(any(test, feature = "_test_utils")))]
	claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
	#[cfg(not(any(test, feature = "_test_utils")))]
	locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

	onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.

 for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
 let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
 log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.
@TheBlueMattTheBlueMattJul 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?
 }
 self.pending_claim_requests.insert(claim_id, req);
 }
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 }
 }

 // Also remove/split any locktimed packages whose inputs have been spent by this transaction.
 self.locktimed_packages.retain(|_locktime, packages|{
 packages.retain_mut(|package| {
 if let Some(p) = package.split_package(&inp.previous_output) {
 claimed_outputs_material.push(p);
 }
 !package.outpoints().is_empty()
 });
 !packages.is_empty()
 });
 }
 for package in claimed_outputs_material.drain(..) {
 let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 //- resurect outpoint back in its claimable set and regenerate tx
 match entry.event {
 OnchainEvent::ContentiousOutpoint { package } => {
 // We pass 0 to `package_locktime` to get the actual required locktime.
 let package_locktime = package.package_locktime(0);
 if package_locktime >= height {
 self.locktimed_packages.entry(package_locktime).or_default().push(package);
 continue;
 }

 if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
 if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
 assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
 holder_commit_txid,
 htlc.transaction_output_index.unwrap(),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 })),
 0
 )),
 0,
 ));
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Locktimed packages fixes#3923

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Jul 15, 2025
 Merged


Locktimed packages fixes
#3923
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
c915c99

Add a test utility to provide nodes with anchor reserves


TheBlueMatt Jul 10, 2025
92fe3aa

Prune locktimed packages when inputs are spent


whfuyn Jul 10, 2025
f916e13

Track outpoint creation height in `PackageSolvingData`


TheBlueMatt Jul 10, 2025
9a95544

Use outpoint creation height when restoring locktimed packages


TheBlueMatt Jul 10, 2025
d7726ef

Add a test case for the issues fixed in the previous few commits


TheBlueMatt Jul 10, 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


51 changes: 32 additions & 19 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (payment_preimage.clone(), payment_info.clone().into_iter().collect())
 });

 let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
 _ => None,
 })
 });
 let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
 txid
 } else {
 return;
 };
 let confirmed_spend_info = self.funding_spend_confirmed
 .map(|txid| (txid, None))
 .or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
 _ => None,
 })
 });
 let (confirmed_spend_txid, confirmed_spend_height) =
 if let Some((txid, height)) = confirmed_spend_info {
 (txid, height)
 } else {
 return;
 };

 // If the channel is force closed, try to claim the output from this preimage.
 // First check if a counterparty commitment transaction has been broadcasted:
 macro_rules! claim_htlcs {
 ($commitment_number: expr, $txid: expr, $htlcs: expr) => {
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
 let conf_target = self.closure_conf_target();
 self.onchain_tx_handler.update_claims_view_from_requests(
 htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 per_commitment_point, per_commitment_key, outp.value,
 self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_htlc_outp = RevokedHTLCOutput::build(
 per_commitment_point, per_commitment_key, htlc.clone(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let counterparty_spendable_height = if htlc.offered {
 htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 let (htlc_claim_reqs, counterparty_output_info) =
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
 to_counterparty_output_info = counterparty_output_info;
 for req in htlc_claim_reqs {
 claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	/// Returns the HTLC claim package templates and the counterparty output info
	#[rustfmt::skip]
	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
	-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
	fn get_counterparty_output_claim_info(
 &self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
 per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
 confirmation_height: Option<u32>,
	) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 let mut claimable_outpoints = Vec::new();
 let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let counterparty_htlc_outp = if htlc.offered {
 PackageSolvingData::CounterpartyOfferedHTLCOutput(
 CounterpartyOfferedHTLCOutput::build(
 *per_commitment_point, preimage.unwrap(), htlc.clone(),
 *per_commitment_point, preimage.unwrap(),
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(
 *per_commitment_point, htlc.clone(),
 *per_commitment_point,
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 };
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_outp = RevokedOutput::build(
 per_commitment_point, per_commitment_key, tx.output[idx].value, false,
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 .expect("Expected transaction output index for non-dust HTLC");
 PackageTemplate::build_package(
 tx.txid(), transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
 counterparty_spendable_height,
 )
 })
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = self.funding.current_holder_commitment_tx.trust().txid();
 let vout = htlc_descriptor.htlc.transaction_output_index
 .expect("Expected transaction output index for non-dust HTLC");
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
 if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
 &mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
 ) {
Expand Down

54 changes: 39 additions & 15 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	#[cfg(not(any(test, feature = "_test_utils")))]
	claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
	#[cfg(not(any(test, feature = "_test_utils")))]
	locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

	onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.

 for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
 let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
 log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.
@TheBlueMattTheBlueMattJul 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?
 }
 self.pending_claim_requests.insert(claim_id, req);
 }
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 }
 }

 // Also remove/split any locktimed packages whose inputs have been spent by this transaction.
 self.locktimed_packages.retain(|_locktime, packages|{
 packages.retain_mut(|package| {
 if let Some(p) = package.split_package(&inp.previous_output) {
 claimed_outputs_material.push(p);
 }
 !package.outpoints().is_empty()
 });
 !packages.is_empty()
 });
 }
 for package in claimed_outputs_material.drain(..) {
 let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 //- resurect outpoint back in its claimable set and regenerate tx
 match entry.event {
 OnchainEvent::ContentiousOutpoint { package } => {
 // We pass 0 to `package_locktime` to get the actual required locktime.
 let package_locktime = package.package_locktime(0);
 if package_locktime >= height {
 self.locktimed_packages.entry(package_locktime).or_default().push(package);
 continue;
 }

 if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
 if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
 assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
 holder_commit_txid,
 htlc.transaction_output_index.unwrap(),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 })),
 0
 )),
 0,
 ));
 }
Expand Down
Loading

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

Skip to content
Locktimed packages fixes#3923

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 5 commits into

from

Jul 15, 2025
 Merged


Locktimed packages fixes
#3923
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
c915c99

Add a test utility to provide nodes with anchor reserves


TheBlueMatt Jul 10, 2025
92fe3aa

Prune locktimed packages when inputs are spent


whfuyn Jul 10, 2025
f916e13

Track outpoint creation height in `PackageSolvingData`


TheBlueMatt Jul 10, 2025
9a95544

Use outpoint creation height when restoring locktimed packages


TheBlueMatt Jul 10, 2025
d7726ef

Add a test case for the issues fixed in the previous few commits


TheBlueMatt Jul 10, 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


51 changes: 32 additions & 19 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3514,23 +3514,26 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (payment_preimage.clone(), payment_info.clone().into_iter().collect())
 });

 let confirmed_spend_txid = self.funding_spend_confirmed.or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some(event.txid),
 _ => None,
 })
 });
 let confirmed_spend_txid = if let Some(txid) = confirmed_spend_txid {
 txid
 } else {
 return;
 };
 let confirmed_spend_info = self.funding_spend_confirmed
 .map(|txid| (txid, None))
 .or_else(|| {
 self.onchain_events_awaiting_threshold_conf.iter().find_map(|event| match event.event {
 OnchainEvent::FundingSpendConfirmation { .. } => Some((event.txid, Some(event.height))),
 _ => None,
 })
 });
 let (confirmed_spend_txid, confirmed_spend_height) =
 if let Some((txid, height)) = confirmed_spend_info {
 (txid, height)
 } else {
 return;
 };

 // If the channel is force closed, try to claim the output from this preimage.
 // First check if a counterparty commitment transaction has been broadcasted:
 macro_rules! claim_htlcs {
 ($commitment_number: expr, $txid: expr, $htlcs: expr) => {
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs);
 let (htlc_claim_reqs, _) = self.get_counterparty_output_claim_info($commitment_number, $txid, None, $htlcs, confirmed_spend_height);
 let conf_target = self.closure_conf_target();
 self.onchain_tx_handler.update_claims_view_from_requests(
 htlc_claim_reqs, self.best_block.height, self.best_block.height, broadcaster,
Expand DownExpand Up@@ -4226,6 +4229,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 per_commitment_point, per_commitment_key, outp.value,
 self.funding.channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 commitment_txid, idx as u32,
Expand All@@ -4250,6 +4254,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_htlc_outp = RevokedHTLCOutput::build(
 per_commitment_point, per_commitment_key, htlc.clone(),
 self.funding.channel_parameters.clone(),
 height,
 );
 let counterparty_spendable_height = if htlc.offered {
 htlc.cltv_expiry
Expand DownExpand Up@@ -4304,7 +4309,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 (htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 ), logger);
 let (htlc_claim_reqs, counterparty_output_info) =
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option);
 self.get_counterparty_output_claim_info(commitment_number, commitment_txid, Some(tx), per_commitment_option, Some(height));
 to_counterparty_output_info = counterparty_output_info;
 for req in htlc_claim_reqs {
 claimable_outpoints.push(req);
Expand All@@ -4316,8 +4321,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {

	/// Returns the HTLC claim package templates and the counterparty output info
	#[rustfmt::skip]
	fn get_counterparty_output_claim_info(&self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>, per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>)
	-> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
	fn get_counterparty_output_claim_info(
 &self, commitment_number: u64, commitment_txid: Txid, tx: Option<&Transaction>,
 per_commitment_option: Option<&Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>>,
 confirmation_height: Option<u32>,
	) -> (Vec<PackageTemplate>, CommitmentTxCounterpartyOutputInfo) {
 let mut claimable_outpoints = Vec::new();
 let mut to_counterparty_output_info: CommitmentTxCounterpartyOutputInfo = None;

Expand DownExpand Up@@ -4374,15 +4382,19 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let counterparty_htlc_outp = if htlc.offered {
 PackageSolvingData::CounterpartyOfferedHTLCOutput(
 CounterpartyOfferedHTLCOutput::build(
 *per_commitment_point, preimage.unwrap(), htlc.clone(),
 *per_commitment_point, preimage.unwrap(),
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 } else {
 PackageSolvingData::CounterpartyReceivedHTLCOutput(
 CounterpartyReceivedHTLCOutput::build(
 *per_commitment_point, htlc.clone(),
 *per_commitment_point,
 htlc.clone(),
 self.funding.channel_parameters.clone(),
 confirmation_height,
 )
 )
 };
Expand DownExpand Up@@ -4426,6 +4438,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let revk_outp = RevokedOutput::build(
 per_commitment_point, per_commitment_key, tx.output[idx].value, false,
 self.funding.channel_parameters.clone(),
 height,
 );
 let justice_package = PackageTemplate::build_package(
 htlc_txid, idx as u32, PackageSolvingData::RevokedOutput(revk_outp),
Expand DownExpand Up@@ -4507,7 +4520,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 .expect("Expected transaction output index for non-dust HTLC");
 PackageTemplate::build_package(
 tx.txid(), transaction_output_index,
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor)),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(htlc_descriptor, conf_height)),
 counterparty_spendable_height,
 )
 })
Expand DownExpand Up@@ -4687,7 +4700,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 let txid = self.funding.current_holder_commitment_tx.trust().txid();
 let vout = htlc_descriptor.htlc.transaction_output_index
 .expect("Expected transaction output index for non-dust HTLC");
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor);
 let htlc_output = HolderHTLCOutput::build(htlc_descriptor, 0);
 if let Some(htlc_tx) = htlc_output.get_maybe_signed_htlc_tx(
 &mut self.onchain_tx_handler, &::bitcoin::OutPoint { txid, vout },
 ) {
Expand Down

54 changes: 39 additions & 15 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -269,6 +269,9 @@ pub struct OnchainTxHandler<ChannelSigner: EcdsaChannelSigner> {
	#[cfg(not(any(test, feature = "_test_utils")))]
	claimable_outpoints: HashMap<BitcoinOutPoint, (ClaimId, u32)>,

	#[cfg(any(test, feature = "_test_utils"))]
	pub(crate) locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,
	#[cfg(not(any(test, feature = "_test_utils")))]
	locktimed_packages: BTreeMap<u32, Vec<PackageTemplate>>,

	onchain_events_awaiting_threshold_conf: Vec<OnchainEventEntry>,
Expand DownExpand Up@@ -886,9 +889,10 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 // Because fuzzing can cause hash collisions, we can end up with conflicting claim
 // ids here, so we only assert when not fuzzing.
 debug_assert!(cfg!(fuzzing) || self.pending_claim_requests.get(&claim_id).is_none());
 for k in req.outpoints() {
 log_info!(logger, "Registering claiming request for {}:{}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, conf_height));
Comment thread
wpaulino marked this conversation as resolved.

 for (k, outpoint_confirmation_height) in req.outpoints_and_creation_heights() {
 let creation_height = outpoint_confirmation_height.unwrap_or(conf_height);
 log_info!(logger, "Registering claiming request for {}:{}, which exists as of height {creation_height}", k.txid, k.vout);
 self.claimable_outpoints.insert(k.clone(), (claim_id, creation_height));
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

Hm, shouldn't we prefer signed_locktime over creation_height for outpoints that have one though? While the outpoint hasn't been reorged out, claiming it is no longer possible once the block at signed_locktime is disconnected.
@wpaulinowpaulinoJul 11, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

In practice I think this would just result in us broadcasting things that cannot enter the mempool until we get back to the expected height. If we have any other claims that were merged into the same package for whatever reason, and they are still valid at the disconnected block height, then this would be a greater issue.
@TheBlueMattTheBlueMattJul 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Choose a reason for hiding this comment

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

The problem is that when things time out via claimable_outpoints, we don't stop claiming them, we remove them. We don't get them back after a reorg at that point. We could move to pushing things into the locked-packages vec after a block-disconnect, but that seems like a bigger change?
 }
 self.pending_claim_requests.insert(claim_id, req);
 }
Expand DownExpand Up@@ -994,6 +998,17 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 panic!("Inconsistencies between pending_claim_requests map and claimable_outpoints map");
 }
 }

 // Also remove/split any locktimed packages whose inputs have been spent by this transaction.
 self.locktimed_packages.retain(|_locktime, packages|{
 packages.retain_mut(|package| {
 if let Some(p) = package.split_package(&inp.previous_output) {
 claimed_outputs_material.push(p);
 }
 !package.outpoints().is_empty()
 });
 !packages.is_empty()
 });
 }
 for package in claimed_outputs_material.drain(..) {
 let entry = OnchainEventEntry {
Expand DownExpand Up@@ -1135,6 +1150,13 @@ impl<ChannelSigner: EcdsaChannelSigner> OnchainTxHandler<ChannelSigner> {
 //- resurect outpoint back in its claimable set and regenerate tx
 match entry.event {
 OnchainEvent::ContentiousOutpoint { package } => {
 // We pass 0 to `package_locktime` to get the actual required locktime.
 let package_locktime = package.package_locktime(0);
 if package_locktime >= height {
 self.locktimed_packages.entry(package_locktime).or_default().push(package);
 continue;
 }

 if let Some(pending_claim) = self.claimable_outpoints.get(package.outpoints()[0]) {
 if let Some(request) = self.pending_claim_requests.get_mut(&pending_claim.0) {
 assert!(request.merge_package(package, height).is_ok());
Expand DownExpand Up@@ -1358,19 +1380,21 @@ mod tests {
 holder_commit_txid,
 htlc.transaction_output_index.unwrap(),
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(HTLCDescriptor {
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 channel_derivation_parameters: ChannelDerivationParameters {
 value_satoshis: tx_handler.channel_value_satoshis,
 keys_id: tx_handler.channel_keys_id,
 transaction_parameters: tx_handler.channel_transaction_parameters.clone(),
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 },
 commitment_txid: holder_commit_txid,
 per_commitment_number: holder_commit.commitment_number(),
 per_commitment_point: holder_commit.per_commitment_point(),
 feerate_per_kw: holder_commit.feerate_per_kw(),
 htlc: htlc.clone(),
 preimage: None,
 counterparty_sig: *counterparty_sig,
 })),
 0
 )),
 0,
 ));
 }
Expand Down
Loading