Skip to content

Use LocalHTLCFailureReason in Onion Processing#3744

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
joostjager merged 4 commits into from
May 2, 2025
Merged

Use LocalHTLCFailureReason in Onion Processing #3744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27b1321
ln/refactor: remove err_str where LocalHTLCFailureReason sufficient
carlaKC Apr 16, 2025
81fb07d
ln/fix: remove legacy payment related error codes
carlaKC Apr 16, 2025
5e9ae6b
ln/refactor: use LocalHTLCFailureCodes in onion error processing
carlaKC Apr 16, 2025
935ffde
ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason
carlaKC Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

fn internal_htlc_satisfies_config(
&self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.
let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
.and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
(htlc.amount_msat - fee.unwrap()) < amt_to_forward {
return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
LocalHTLCFailureReason::FeeInsufficient));
return Err(LocalHTLCFailureReason::FeeInsufficient);
}
if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
LocalHTLCFailureReason::IncorrectCLTVExpiry));
return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
}
Ok(())
}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
/// unsuccessful, falls back to the previous one if one exists.
pub fn htlc_satisfies_config(
&self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
.or_else(|err| {
if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
/// this function determines whether to fail the HTLC, or forward / claim it.
pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
&self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
) -> Result<(), (&'static str, LocalHTLCFailureReason)>
) -> Result<(), LocalHTLCFailureReason>
where
F::Target: FeeEstimator,
L::Target: Logger
{
if self.context.channel_state.is_local_shutdown_sent() {
return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
return Err(LocalHTLCFailureReason::ChannelClosed)
}

let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
// Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
LocalHTLCFailureReason::DustLimitCounterparty))
return Err(LocalHTLCFailureReason::DustLimitCounterparty)
}
let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
return Err(("Exceeded our dust exposure limit on holder commitment tx",
LocalHTLCFailureReason::DustLimitHolder))
return Err(LocalHTLCFailureReason::DustLimitHolder)
}
}

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
}
if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
}
}

Expand Down
40 changes: 16 additions & 24 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

fn can_forward_htlc_to_outgoing_channel(
&self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
// Note that the behavior here should be identical to the above block - we
// should NOT reveal the existence or non-existence of a private channel if
// we don't allow forwards outbound over them.
return Err(("Refusing to forward to a private channel based on our config.",
LocalHTLCFailureReason::PrivateChannelForward));
return Err(LocalHTLCFailureReason::PrivateChannelForward);
}
if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
// `option_scid_alias` (referred to in LDK as `scid_privacy`) means
// "refuse to forward unless the SCID alias was used", so we pretend
// we don't have the channel here.
return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
LocalHTLCFailureReason::RealSCIDForward));
return Err(LocalHTLCFailureReason::RealSCIDForward);
}
} else {
return Err(("Cannot forward by Node ID without SCID.",
LocalHTLCFailureReason::InvalidTrampolineForward));
return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
}

// Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
// on a small/per-node/per-channel scale.
if !chan.context.is_live() {
if !chan.context.is_enabled() {
return Err(("Forwarding channel has been disconnected for some time.",
LocalHTLCFailureReason::ChannelDisabled));
return Err(LocalHTLCFailureReason::ChannelDisabled);
} else {
return Err(("Forwarding channel is not in a ready state.",
LocalHTLCFailureReason::ChannelNotReady));
return Err(LocalHTLCFailureReason::ChannelNotReady);
}
}
if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
return Err(("HTLC amount was below the htlc_minimum_msat",
LocalHTLCFailureReason::AmountBelowMinimum));
return Err(LocalHTLCFailureReason::AmountBelowMinimum);
}
chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

fn can_forward_htlc(
&self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
let outgoing_scid = match next_packet_details.outgoing_connector {
HopConnector::ShortChannelId(scid) => scid,
HopConnector::Trampoline(_) => {
return Err(("Cannot forward by Node ID without SCID.",
LocalHTLCFailureReason::InvalidTrampolineForward));
return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
}
};
match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
{} else {
return Err(("Don't have available channel for forwarding as requested.",
LocalHTLCFailureReason::UnknownNextPeer));
return Err(LocalHTLCFailureReason::UnknownNextPeer);
}
}
}
Expand All@@ -4444,7 +4436,7 @@ where
}

fn htlc_failure_from_update_add_err(
&self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
&self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
shared_secret: &[u8; 32]
) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

log_info!(
WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
"Failed to accept/forward incoming HTLC: {}", err_msg
"Failed to accept/forward incoming HTLC: {:?}", reason,
);
// If `msg.blinding_point` is set, we must always fail with malformed.
if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
)
}) {
Some(Ok(_)) => {},
Some(Err((err, reason))) => {
Some(Err(reason)) => {
let htlc_fail = self.htlc_failure_from_update_add_err(
&update_add_htlc, &incoming_counterparty_node_id, err, reason,
&update_add_htlc, &incoming_counterparty_node_id, reason,
is_intro_node_blinded_forward, &shared_secret,
);
let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

// Now process the HTLC on the outgoing channel if it's a forward.
if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
if let Err((err, reason)) = self.can_forward_htlc(
if let Err(reason) = self.can_forward_htlc(
&update_add_htlc, next_packet_details
) {
let htlc_fail = self.htlc_failure_from_update_add_err(
&update_add_htlc, &incoming_counterparty_node_id, err, reason,
&update_add_htlc, &incoming_counterparty_node_id, reason,
is_intro_node_blinded_forward, &shared_secret,
);
let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down
15 changes: 7 additions & 8 deletions lightning/src/ln/onion_payment.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
}),
};

if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
if let Err(reason) = check_incoming_htlc_cltv(
cur_height, outgoing_cltv_value, msg.cltv_expiry,
) {
return Err(InboundHTLCErr {
msg: err_msg,
msg: "incoming cltv check failed",

@carlaKCcarlaKCMay 1, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).

I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.

@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!

reason,
err_data: Vec::new(),
});
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.
if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
LocalHTLCFailureReason::IncorrectCLTVExpiry));
return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
}
// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
// but we want to be robust wrt to counterparty packet sanitization (see
// HTLC_FAIL_BACK_BUFFER rationale).
if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
}
if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
}
// If the HTLC expires ~now, don't bother trying to forward it to our
// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
// but there is no need to do that, and since we're a bit conservative with our
// risk threshold it just results in failing to forward payments.
if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
}

Ok(())
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Use LocalHTLCFailureReason in Onion Processing by carlaKC · Pull Request #3744 · lightningdevkit/rust-lightning · GitHub
Skip to content
Use LocalHTLCFailureReason in Onion Processing#3744

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

joostjager
merged 4 commits into

from

May 2, 2025
 Merged


Use LocalHTLCFailureReason in Onion Processing
#3744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27b1321

ln/refactor: remove err_str where LocalHTLCFailureReason sufficient


carlaKC Apr 16, 2025
81fb07d

ln/fix: remove legacy payment related error codes


carlaKC Apr 16, 2025
5e9ae6b

ln/refactor: use LocalHTLCFailureCodes in onion error processing


carlaKC Apr 16, 2025
935ffde

ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason


carlaKC Apr 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 9 additions & 13 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

	fn internal_htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.

 let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
 .and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
 if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
 (htlc.amount_msat - fee.unwrap()) < amt_to_forward {
 return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
 LocalHTLCFailureReason::FeeInsufficient));
 return Err(LocalHTLCFailureReason::FeeInsufficient);
 }
 if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
 }
 Ok(())
	}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
	/// unsuccessful, falls back to the previous one if one exists.
	pub fn htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
 .or_else(|err| {
 if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
	/// this function determines whether to fail the HTLC, or forward / claim it.
	pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
 &self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
	) -> Result<(), (&'static str, LocalHTLCFailureReason)>
	) -> Result<(), LocalHTLCFailureReason>
	where
 F::Target: FeeEstimator,
 L::Target: Logger
	{
 if self.context.channel_state.is_local_shutdown_sent() {
 return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
 return Err(LocalHTLCFailureReason::ChannelClosed)
 }

 let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
 // Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
 log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
 on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
 LocalHTLCFailureReason::DustLimitCounterparty))
 return Err(LocalHTLCFailureReason::DustLimitCounterparty)
 }
 let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
 0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
 log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
 on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our dust exposure limit on holder commitment tx",
 LocalHTLCFailureReason::DustLimitHolder))
 return Err(LocalHTLCFailureReason::DustLimitHolder)
 }
 }

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
 }
 if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
 log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
 return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
 return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
 }
 }

Expand Down

40 changes: 16 additions & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

	fn can_forward_htlc_to_outgoing_channel(
 &self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 // Note that the behavior here should be identical to the above block - we
 // should NOT reveal the existence or non-existence of a private channel if
 // we don't allow forwards outbound over them.
 return Err(("Refusing to forward to a private channel based on our config.",
 LocalHTLCFailureReason::PrivateChannelForward));
 return Err(LocalHTLCFailureReason::PrivateChannelForward);
 }
 if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
 if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
 // `option_scid_alias` (referred to in LDK as `scid_privacy`) means
 // "refuse to forward unless the SCID alias was used", so we pretend
 // we don't have the channel here.
 return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
 LocalHTLCFailureReason::RealSCIDForward));
 return Err(LocalHTLCFailureReason::RealSCIDForward);
 }
 } else {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }

 // Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
 // on a small/per-node/per-channel scale.
 if !chan.context.is_live() {
 if !chan.context.is_enabled() {
 return Err(("Forwarding channel has been disconnected for some time.",
 LocalHTLCFailureReason::ChannelDisabled));
 return Err(LocalHTLCFailureReason::ChannelDisabled);
 } else {
 return Err(("Forwarding channel is not in a ready state.",
 LocalHTLCFailureReason::ChannelNotReady));
 return Err(LocalHTLCFailureReason::ChannelNotReady);
 }
 }
 if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
 return Err(("HTLC amount was below the htlc_minimum_msat",
 LocalHTLCFailureReason::AmountBelowMinimum));
 return Err(LocalHTLCFailureReason::AmountBelowMinimum);
 }
 chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

	fn can_forward_htlc(
 &self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 let outgoing_scid = match next_packet_details.outgoing_connector {
 HopConnector::ShortChannelId(scid) => scid,
 HopConnector::Trampoline(_) => {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }
 };
 match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {} else {
 return Err(("Don't have available channel for forwarding as requested.",
 LocalHTLCFailureReason::UnknownNextPeer));
 return Err(LocalHTLCFailureReason::UnknownNextPeer);
 }
 }
 }
Expand All@@ -4444,7 +4436,7 @@ where
	}

	fn htlc_failure_from_update_add_err(
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
 reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
 shared_secret: &[u8; 32]
	) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

 log_info!(
 WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
 "Failed to accept/forward incoming HTLC: {}", err_msg
 "Failed to accept/forward incoming HTLC: {:?}", reason,
 );
 // If `msg.blinding_point` is set, we must always fail with malformed.
 if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
 )
 }) {
 Some(Ok(_)) => {},
 Some(Err((err, reason))) => {
 Some(Err(reason)) => {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

 // Now process the HTLC on the outgoing channel if it's a forward.
 if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
 if let Err((err, reason)) = self.can_forward_htlc(
 if let Err(reason) = self.can_forward_htlc(
 &update_add_htlc, next_packet_details
 ) {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down

15 changes: 7 additions & 8 deletions
lightning/src/ln/onion_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
 }),
 };

 if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
 if let Err(reason) = check_incoming_htlc_cltv(
 cur_height, outgoing_cltv_value, msg.cltv_expiry,
 ) {
 return Err(InboundHTLCErr {
 msg: err_msg,
 msg: "incoming cltv check failed",
@carlaKCcarlaKCMay 1, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).
I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.
@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!
 reason,
 err_data: Vec::new(),
 });
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
	cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.

	if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
	}
	// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
	// but we want to be robust wrt to counterparty packet sanitization (see
	// HTLC_FAIL_BACK_BUFFER rationale).
	if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
 return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
	}
	if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
 return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
	}
	// If the HTLC expires ~now, don't bother trying to forward it to our
	// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
	// but there is no need to do that, and since we're a bit conservative with our
	// risk threshold it just results in failing to forward payments.
	if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
 return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
 return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
	}

	Ok(())
Expand Down
Loading

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

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

joostjager
merged 4 commits into

from

May 2, 2025
 Merged


Use LocalHTLCFailureReason in Onion Processing
#3744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27b1321

ln/refactor: remove err_str where LocalHTLCFailureReason sufficient


carlaKC Apr 16, 2025
81fb07d

ln/fix: remove legacy payment related error codes


carlaKC Apr 16, 2025
5e9ae6b

ln/refactor: use LocalHTLCFailureCodes in onion error processing


carlaKC Apr 16, 2025
935ffde

ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason


carlaKC Apr 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 9 additions & 13 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

	fn internal_htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.

 let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
 .and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
 if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
 (htlc.amount_msat - fee.unwrap()) < amt_to_forward {
 return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
 LocalHTLCFailureReason::FeeInsufficient));
 return Err(LocalHTLCFailureReason::FeeInsufficient);
 }
 if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
 }
 Ok(())
	}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
	/// unsuccessful, falls back to the previous one if one exists.
	pub fn htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
 .or_else(|err| {
 if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
	/// this function determines whether to fail the HTLC, or forward / claim it.
	pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
 &self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
	) -> Result<(), (&'static str, LocalHTLCFailureReason)>
	) -> Result<(), LocalHTLCFailureReason>
	where
 F::Target: FeeEstimator,
 L::Target: Logger
	{
 if self.context.channel_state.is_local_shutdown_sent() {
 return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
 return Err(LocalHTLCFailureReason::ChannelClosed)
 }

 let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
 // Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
 log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
 on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
 LocalHTLCFailureReason::DustLimitCounterparty))
 return Err(LocalHTLCFailureReason::DustLimitCounterparty)
 }
 let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
 0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
 log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
 on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our dust exposure limit on holder commitment tx",
 LocalHTLCFailureReason::DustLimitHolder))
 return Err(LocalHTLCFailureReason::DustLimitHolder)
 }
 }

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
 }
 if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
 log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
 return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
 return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
 }
 }

Expand Down

40 changes: 16 additions & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

	fn can_forward_htlc_to_outgoing_channel(
 &self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 // Note that the behavior here should be identical to the above block - we
 // should NOT reveal the existence or non-existence of a private channel if
 // we don't allow forwards outbound over them.
 return Err(("Refusing to forward to a private channel based on our config.",
 LocalHTLCFailureReason::PrivateChannelForward));
 return Err(LocalHTLCFailureReason::PrivateChannelForward);
 }
 if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
 if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
 // `option_scid_alias` (referred to in LDK as `scid_privacy`) means
 // "refuse to forward unless the SCID alias was used", so we pretend
 // we don't have the channel here.
 return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
 LocalHTLCFailureReason::RealSCIDForward));
 return Err(LocalHTLCFailureReason::RealSCIDForward);
 }
 } else {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }

 // Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
 // on a small/per-node/per-channel scale.
 if !chan.context.is_live() {
 if !chan.context.is_enabled() {
 return Err(("Forwarding channel has been disconnected for some time.",
 LocalHTLCFailureReason::ChannelDisabled));
 return Err(LocalHTLCFailureReason::ChannelDisabled);
 } else {
 return Err(("Forwarding channel is not in a ready state.",
 LocalHTLCFailureReason::ChannelNotReady));
 return Err(LocalHTLCFailureReason::ChannelNotReady);
 }
 }
 if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
 return Err(("HTLC amount was below the htlc_minimum_msat",
 LocalHTLCFailureReason::AmountBelowMinimum));
 return Err(LocalHTLCFailureReason::AmountBelowMinimum);
 }
 chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

	fn can_forward_htlc(
 &self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 let outgoing_scid = match next_packet_details.outgoing_connector {
 HopConnector::ShortChannelId(scid) => scid,
 HopConnector::Trampoline(_) => {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }
 };
 match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {} else {
 return Err(("Don't have available channel for forwarding as requested.",
 LocalHTLCFailureReason::UnknownNextPeer));
 return Err(LocalHTLCFailureReason::UnknownNextPeer);
 }
 }
 }
Expand All@@ -4444,7 +4436,7 @@ where
	}

	fn htlc_failure_from_update_add_err(
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
 reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
 shared_secret: &[u8; 32]
	) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

 log_info!(
 WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
 "Failed to accept/forward incoming HTLC: {}", err_msg
 "Failed to accept/forward incoming HTLC: {:?}", reason,
 );
 // If `msg.blinding_point` is set, we must always fail with malformed.
 if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
 )
 }) {
 Some(Ok(_)) => {},
 Some(Err((err, reason))) => {
 Some(Err(reason)) => {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

 // Now process the HTLC on the outgoing channel if it's a forward.
 if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
 if let Err((err, reason)) = self.can_forward_htlc(
 if let Err(reason) = self.can_forward_htlc(
 &update_add_htlc, next_packet_details
 ) {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down

15 changes: 7 additions & 8 deletions
lightning/src/ln/onion_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
 }),
 };

 if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
 if let Err(reason) = check_incoming_htlc_cltv(
 cur_height, outgoing_cltv_value, msg.cltv_expiry,
 ) {
 return Err(InboundHTLCErr {
 msg: err_msg,
 msg: "incoming cltv check failed",
@carlaKCcarlaKCMay 1, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).
I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.
@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!
 reason,
 err_data: Vec::new(),
 });
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
	cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.

	if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
	}
	// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
	// but we want to be robust wrt to counterparty packet sanitization (see
	// HTLC_FAIL_BACK_BUFFER rationale).
	if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
 return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
	}
	if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
 return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
	}
	// If the HTLC expires ~now, don't bother trying to forward it to our
	// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
	// but there is no need to do that, and since we're a bit conservative with our
	// risk threshold it just results in failing to forward payments.
	if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
 return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
 return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
	}

	Ok(())
Expand Down
Loading

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

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

joostjager
merged 4 commits into

from

May 2, 2025
 Merged


Use LocalHTLCFailureReason in Onion Processing
#3744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27b1321

ln/refactor: remove err_str where LocalHTLCFailureReason sufficient


carlaKC Apr 16, 2025
81fb07d

ln/fix: remove legacy payment related error codes


carlaKC Apr 16, 2025
5e9ae6b

ln/refactor: use LocalHTLCFailureCodes in onion error processing


carlaKC Apr 16, 2025
935ffde

ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason


carlaKC Apr 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 9 additions & 13 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

	fn internal_htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.

 let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
 .and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
 if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
 (htlc.amount_msat - fee.unwrap()) < amt_to_forward {
 return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
 LocalHTLCFailureReason::FeeInsufficient));
 return Err(LocalHTLCFailureReason::FeeInsufficient);
 }
 if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
 }
 Ok(())
	}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
	/// unsuccessful, falls back to the previous one if one exists.
	pub fn htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
 .or_else(|err| {
 if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
	/// this function determines whether to fail the HTLC, or forward / claim it.
	pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
 &self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
	) -> Result<(), (&'static str, LocalHTLCFailureReason)>
	) -> Result<(), LocalHTLCFailureReason>
	where
 F::Target: FeeEstimator,
 L::Target: Logger
	{
 if self.context.channel_state.is_local_shutdown_sent() {
 return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
 return Err(LocalHTLCFailureReason::ChannelClosed)
 }

 let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
 // Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
 log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
 on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
 LocalHTLCFailureReason::DustLimitCounterparty))
 return Err(LocalHTLCFailureReason::DustLimitCounterparty)
 }
 let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
 0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
 log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
 on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our dust exposure limit on holder commitment tx",
 LocalHTLCFailureReason::DustLimitHolder))
 return Err(LocalHTLCFailureReason::DustLimitHolder)
 }
 }

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
 }
 if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
 log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
 return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
 return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
 }
 }

Expand Down

40 changes: 16 additions & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

	fn can_forward_htlc_to_outgoing_channel(
 &self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 // Note that the behavior here should be identical to the above block - we
 // should NOT reveal the existence or non-existence of a private channel if
 // we don't allow forwards outbound over them.
 return Err(("Refusing to forward to a private channel based on our config.",
 LocalHTLCFailureReason::PrivateChannelForward));
 return Err(LocalHTLCFailureReason::PrivateChannelForward);
 }
 if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
 if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
 // `option_scid_alias` (referred to in LDK as `scid_privacy`) means
 // "refuse to forward unless the SCID alias was used", so we pretend
 // we don't have the channel here.
 return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
 LocalHTLCFailureReason::RealSCIDForward));
 return Err(LocalHTLCFailureReason::RealSCIDForward);
 }
 } else {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }

 // Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
 // on a small/per-node/per-channel scale.
 if !chan.context.is_live() {
 if !chan.context.is_enabled() {
 return Err(("Forwarding channel has been disconnected for some time.",
 LocalHTLCFailureReason::ChannelDisabled));
 return Err(LocalHTLCFailureReason::ChannelDisabled);
 } else {
 return Err(("Forwarding channel is not in a ready state.",
 LocalHTLCFailureReason::ChannelNotReady));
 return Err(LocalHTLCFailureReason::ChannelNotReady);
 }
 }
 if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
 return Err(("HTLC amount was below the htlc_minimum_msat",
 LocalHTLCFailureReason::AmountBelowMinimum));
 return Err(LocalHTLCFailureReason::AmountBelowMinimum);
 }
 chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

	fn can_forward_htlc(
 &self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 let outgoing_scid = match next_packet_details.outgoing_connector {
 HopConnector::ShortChannelId(scid) => scid,
 HopConnector::Trampoline(_) => {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }
 };
 match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {} else {
 return Err(("Don't have available channel for forwarding as requested.",
 LocalHTLCFailureReason::UnknownNextPeer));
 return Err(LocalHTLCFailureReason::UnknownNextPeer);
 }
 }
 }
Expand All@@ -4444,7 +4436,7 @@ where
	}

	fn htlc_failure_from_update_add_err(
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
 reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
 shared_secret: &[u8; 32]
	) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

 log_info!(
 WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
 "Failed to accept/forward incoming HTLC: {}", err_msg
 "Failed to accept/forward incoming HTLC: {:?}", reason,
 );
 // If `msg.blinding_point` is set, we must always fail with malformed.
 if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
 )
 }) {
 Some(Ok(_)) => {},
 Some(Err((err, reason))) => {
 Some(Err(reason)) => {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

 // Now process the HTLC on the outgoing channel if it's a forward.
 if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
 if let Err((err, reason)) = self.can_forward_htlc(
 if let Err(reason) = self.can_forward_htlc(
 &update_add_htlc, next_packet_details
 ) {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down

15 changes: 7 additions & 8 deletions
lightning/src/ln/onion_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
 }),
 };

 if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
 if let Err(reason) = check_incoming_htlc_cltv(
 cur_height, outgoing_cltv_value, msg.cltv_expiry,
 ) {
 return Err(InboundHTLCErr {
 msg: err_msg,
 msg: "incoming cltv check failed",
@carlaKCcarlaKCMay 1, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).
I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.
@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!
 reason,
 err_data: Vec::new(),
 });
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
	cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.

	if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
	}
	// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
	// but we want to be robust wrt to counterparty packet sanitization (see
	// HTLC_FAIL_BACK_BUFFER rationale).
	if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
 return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
	}
	if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
 return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
	}
	// If the HTLC expires ~now, don't bother trying to forward it to our
	// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
	// but there is no need to do that, and since we're a bit conservative with our
	// risk threshold it just results in failing to forward payments.
	if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
 return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
 return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
	}

	Ok(())
Expand Down
Loading

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

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

joostjager
merged 4 commits into

from

May 2, 2025
 Merged


Use LocalHTLCFailureReason in Onion Processing
#3744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27b1321

ln/refactor: remove err_str where LocalHTLCFailureReason sufficient


carlaKC Apr 16, 2025
81fb07d

ln/fix: remove legacy payment related error codes


carlaKC Apr 16, 2025
5e9ae6b

ln/refactor: use LocalHTLCFailureCodes in onion error processing


carlaKC Apr 16, 2025
935ffde

ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason


carlaKC Apr 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 9 additions & 13 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

	fn internal_htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.

 let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
 .and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
 if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
 (htlc.amount_msat - fee.unwrap()) < amt_to_forward {
 return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
 LocalHTLCFailureReason::FeeInsufficient));
 return Err(LocalHTLCFailureReason::FeeInsufficient);
 }
 if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
 }
 Ok(())
	}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
	/// unsuccessful, falls back to the previous one if one exists.
	pub fn htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
 .or_else(|err| {
 if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
	/// this function determines whether to fail the HTLC, or forward / claim it.
	pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
 &self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
	) -> Result<(), (&'static str, LocalHTLCFailureReason)>
	) -> Result<(), LocalHTLCFailureReason>
	where
 F::Target: FeeEstimator,
 L::Target: Logger
	{
 if self.context.channel_state.is_local_shutdown_sent() {
 return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
 return Err(LocalHTLCFailureReason::ChannelClosed)
 }

 let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
 // Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
 log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
 on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
 LocalHTLCFailureReason::DustLimitCounterparty))
 return Err(LocalHTLCFailureReason::DustLimitCounterparty)
 }
 let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
 0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
 log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
 on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our dust exposure limit on holder commitment tx",
 LocalHTLCFailureReason::DustLimitHolder))
 return Err(LocalHTLCFailureReason::DustLimitHolder)
 }
 }

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
 }
 if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
 log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
 return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
 return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
 }
 }

Expand Down

40 changes: 16 additions & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

	fn can_forward_htlc_to_outgoing_channel(
 &self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 // Note that the behavior here should be identical to the above block - we
 // should NOT reveal the existence or non-existence of a private channel if
 // we don't allow forwards outbound over them.
 return Err(("Refusing to forward to a private channel based on our config.",
 LocalHTLCFailureReason::PrivateChannelForward));
 return Err(LocalHTLCFailureReason::PrivateChannelForward);
 }
 if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
 if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
 // `option_scid_alias` (referred to in LDK as `scid_privacy`) means
 // "refuse to forward unless the SCID alias was used", so we pretend
 // we don't have the channel here.
 return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
 LocalHTLCFailureReason::RealSCIDForward));
 return Err(LocalHTLCFailureReason::RealSCIDForward);
 }
 } else {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }

 // Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
 // on a small/per-node/per-channel scale.
 if !chan.context.is_live() {
 if !chan.context.is_enabled() {
 return Err(("Forwarding channel has been disconnected for some time.",
 LocalHTLCFailureReason::ChannelDisabled));
 return Err(LocalHTLCFailureReason::ChannelDisabled);
 } else {
 return Err(("Forwarding channel is not in a ready state.",
 LocalHTLCFailureReason::ChannelNotReady));
 return Err(LocalHTLCFailureReason::ChannelNotReady);
 }
 }
 if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
 return Err(("HTLC amount was below the htlc_minimum_msat",
 LocalHTLCFailureReason::AmountBelowMinimum));
 return Err(LocalHTLCFailureReason::AmountBelowMinimum);
 }
 chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

	fn can_forward_htlc(
 &self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 let outgoing_scid = match next_packet_details.outgoing_connector {
 HopConnector::ShortChannelId(scid) => scid,
 HopConnector::Trampoline(_) => {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }
 };
 match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {} else {
 return Err(("Don't have available channel for forwarding as requested.",
 LocalHTLCFailureReason::UnknownNextPeer));
 return Err(LocalHTLCFailureReason::UnknownNextPeer);
 }
 }
 }
Expand All@@ -4444,7 +4436,7 @@ where
	}

	fn htlc_failure_from_update_add_err(
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
 reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
 shared_secret: &[u8; 32]
	) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

 log_info!(
 WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
 "Failed to accept/forward incoming HTLC: {}", err_msg
 "Failed to accept/forward incoming HTLC: {:?}", reason,
 );
 // If `msg.blinding_point` is set, we must always fail with malformed.
 if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
 )
 }) {
 Some(Ok(_)) => {},
 Some(Err((err, reason))) => {
 Some(Err(reason)) => {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

 // Now process the HTLC on the outgoing channel if it's a forward.
 if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
 if let Err((err, reason)) = self.can_forward_htlc(
 if let Err(reason) = self.can_forward_htlc(
 &update_add_htlc, next_packet_details
 ) {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down

15 changes: 7 additions & 8 deletions
lightning/src/ln/onion_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
 }),
 };

 if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
 if let Err(reason) = check_incoming_htlc_cltv(
 cur_height, outgoing_cltv_value, msg.cltv_expiry,
 ) {
 return Err(InboundHTLCErr {
 msg: err_msg,
 msg: "incoming cltv check failed",
@carlaKCcarlaKCMay 1, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).
I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.
@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!
 reason,
 err_data: Vec::new(),
 });
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
	cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.

	if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
	}
	// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
	// but we want to be robust wrt to counterparty packet sanitization (see
	// HTLC_FAIL_BACK_BUFFER rationale).
	if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
 return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
	}
	if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
 return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
	}
	// If the HTLC expires ~now, don't bother trying to forward it to our
	// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
	// but there is no need to do that, and since we're a bit conservative with our
	// risk threshold it just results in failing to forward payments.
	if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
 return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
 return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
	}

	Ok(())
Expand Down
Loading

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

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

joostjager
merged 4 commits into

from

May 2, 2025
 Merged


Use LocalHTLCFailureReason in Onion Processing
#3744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27b1321

ln/refactor: remove err_str where LocalHTLCFailureReason sufficient


carlaKC Apr 16, 2025
81fb07d

ln/fix: remove legacy payment related error codes


carlaKC Apr 16, 2025
5e9ae6b

ln/refactor: use LocalHTLCFailureCodes in onion error processing


carlaKC Apr 16, 2025
935ffde

ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason


carlaKC Apr 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 9 additions & 13 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

	fn internal_htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.

 let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
 .and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
 if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
 (htlc.amount_msat - fee.unwrap()) < amt_to_forward {
 return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
 LocalHTLCFailureReason::FeeInsufficient));
 return Err(LocalHTLCFailureReason::FeeInsufficient);
 }
 if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
 }
 Ok(())
	}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
	/// unsuccessful, falls back to the previous one if one exists.
	pub fn htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
 .or_else(|err| {
 if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
	/// this function determines whether to fail the HTLC, or forward / claim it.
	pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
 &self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
	) -> Result<(), (&'static str, LocalHTLCFailureReason)>
	) -> Result<(), LocalHTLCFailureReason>
	where
 F::Target: FeeEstimator,
 L::Target: Logger
	{
 if self.context.channel_state.is_local_shutdown_sent() {
 return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
 return Err(LocalHTLCFailureReason::ChannelClosed)
 }

 let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
 // Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
 log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
 on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
 LocalHTLCFailureReason::DustLimitCounterparty))
 return Err(LocalHTLCFailureReason::DustLimitCounterparty)
 }
 let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
 0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
 log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
 on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our dust exposure limit on holder commitment tx",
 LocalHTLCFailureReason::DustLimitHolder))
 return Err(LocalHTLCFailureReason::DustLimitHolder)
 }
 }

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
 }
 if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
 log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
 return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
 return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
 }
 }

Expand Down

40 changes: 16 additions & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

	fn can_forward_htlc_to_outgoing_channel(
 &self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 // Note that the behavior here should be identical to the above block - we
 // should NOT reveal the existence or non-existence of a private channel if
 // we don't allow forwards outbound over them.
 return Err(("Refusing to forward to a private channel based on our config.",
 LocalHTLCFailureReason::PrivateChannelForward));
 return Err(LocalHTLCFailureReason::PrivateChannelForward);
 }
 if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
 if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
 // `option_scid_alias` (referred to in LDK as `scid_privacy`) means
 // "refuse to forward unless the SCID alias was used", so we pretend
 // we don't have the channel here.
 return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
 LocalHTLCFailureReason::RealSCIDForward));
 return Err(LocalHTLCFailureReason::RealSCIDForward);
 }
 } else {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }

 // Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
 // on a small/per-node/per-channel scale.
 if !chan.context.is_live() {
 if !chan.context.is_enabled() {
 return Err(("Forwarding channel has been disconnected for some time.",
 LocalHTLCFailureReason::ChannelDisabled));
 return Err(LocalHTLCFailureReason::ChannelDisabled);
 } else {
 return Err(("Forwarding channel is not in a ready state.",
 LocalHTLCFailureReason::ChannelNotReady));
 return Err(LocalHTLCFailureReason::ChannelNotReady);
 }
 }
 if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
 return Err(("HTLC amount was below the htlc_minimum_msat",
 LocalHTLCFailureReason::AmountBelowMinimum));
 return Err(LocalHTLCFailureReason::AmountBelowMinimum);
 }
 chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

	fn can_forward_htlc(
 &self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 let outgoing_scid = match next_packet_details.outgoing_connector {
 HopConnector::ShortChannelId(scid) => scid,
 HopConnector::Trampoline(_) => {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }
 };
 match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {} else {
 return Err(("Don't have available channel for forwarding as requested.",
 LocalHTLCFailureReason::UnknownNextPeer));
 return Err(LocalHTLCFailureReason::UnknownNextPeer);
 }
 }
 }
Expand All@@ -4444,7 +4436,7 @@ where
	}

	fn htlc_failure_from_update_add_err(
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
 reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
 shared_secret: &[u8; 32]
	) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

 log_info!(
 WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
 "Failed to accept/forward incoming HTLC: {}", err_msg
 "Failed to accept/forward incoming HTLC: {:?}", reason,
 );
 // If `msg.blinding_point` is set, we must always fail with malformed.
 if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
 )
 }) {
 Some(Ok(_)) => {},
 Some(Err((err, reason))) => {
 Some(Err(reason)) => {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

 // Now process the HTLC on the outgoing channel if it's a forward.
 if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
 if let Err((err, reason)) = self.can_forward_htlc(
 if let Err(reason) = self.can_forward_htlc(
 &update_add_htlc, next_packet_details
 ) {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down

15 changes: 7 additions & 8 deletions
lightning/src/ln/onion_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
 }),
 };

 if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
 if let Err(reason) = check_incoming_htlc_cltv(
 cur_height, outgoing_cltv_value, msg.cltv_expiry,
 ) {
 return Err(InboundHTLCErr {
 msg: err_msg,
 msg: "incoming cltv check failed",
@carlaKCcarlaKCMay 1, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).
I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.
@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!
 reason,
 err_data: Vec::new(),
 });
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
	cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.

	if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
	}
	// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
	// but we want to be robust wrt to counterparty packet sanitization (see
	// HTLC_FAIL_BACK_BUFFER rationale).
	if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
 return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
	}
	if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
 return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
	}
	// If the HTLC expires ~now, don't bother trying to forward it to our
	// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
	// but there is no need to do that, and since we're a bit conservative with our
	// risk threshold it just results in failing to forward payments.
	if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
 return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
 return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
	}

	Ok(())
Expand Down
Loading

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

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

joostjager
merged 4 commits into

from

May 2, 2025
 Merged


Use LocalHTLCFailureReason in Onion Processing
#3744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27b1321

ln/refactor: remove err_str where LocalHTLCFailureReason sufficient


carlaKC Apr 16, 2025
81fb07d

ln/fix: remove legacy payment related error codes


carlaKC Apr 16, 2025
5e9ae6b

ln/refactor: use LocalHTLCFailureCodes in onion error processing


carlaKC Apr 16, 2025
935ffde

ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason


carlaKC Apr 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 9 additions & 13 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

	fn internal_htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.

 let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
 .and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
 if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
 (htlc.amount_msat - fee.unwrap()) < amt_to_forward {
 return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
 LocalHTLCFailureReason::FeeInsufficient));
 return Err(LocalHTLCFailureReason::FeeInsufficient);
 }
 if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
 }
 Ok(())
	}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
	/// unsuccessful, falls back to the previous one if one exists.
	pub fn htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
 .or_else(|err| {
 if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
	/// this function determines whether to fail the HTLC, or forward / claim it.
	pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
 &self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
	) -> Result<(), (&'static str, LocalHTLCFailureReason)>
	) -> Result<(), LocalHTLCFailureReason>
	where
 F::Target: FeeEstimator,
 L::Target: Logger
	{
 if self.context.channel_state.is_local_shutdown_sent() {
 return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
 return Err(LocalHTLCFailureReason::ChannelClosed)
 }

 let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
 // Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
 log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
 on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
 LocalHTLCFailureReason::DustLimitCounterparty))
 return Err(LocalHTLCFailureReason::DustLimitCounterparty)
 }
 let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
 0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
 log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
 on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our dust exposure limit on holder commitment tx",
 LocalHTLCFailureReason::DustLimitHolder))
 return Err(LocalHTLCFailureReason::DustLimitHolder)
 }
 }

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
 }
 if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
 log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
 return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
 return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
 }
 }

Expand Down

40 changes: 16 additions & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

	fn can_forward_htlc_to_outgoing_channel(
 &self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 // Note that the behavior here should be identical to the above block - we
 // should NOT reveal the existence or non-existence of a private channel if
 // we don't allow forwards outbound over them.
 return Err(("Refusing to forward to a private channel based on our config.",
 LocalHTLCFailureReason::PrivateChannelForward));
 return Err(LocalHTLCFailureReason::PrivateChannelForward);
 }
 if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
 if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
 // `option_scid_alias` (referred to in LDK as `scid_privacy`) means
 // "refuse to forward unless the SCID alias was used", so we pretend
 // we don't have the channel here.
 return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
 LocalHTLCFailureReason::RealSCIDForward));
 return Err(LocalHTLCFailureReason::RealSCIDForward);
 }
 } else {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }

 // Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
 // on a small/per-node/per-channel scale.
 if !chan.context.is_live() {
 if !chan.context.is_enabled() {
 return Err(("Forwarding channel has been disconnected for some time.",
 LocalHTLCFailureReason::ChannelDisabled));
 return Err(LocalHTLCFailureReason::ChannelDisabled);
 } else {
 return Err(("Forwarding channel is not in a ready state.",
 LocalHTLCFailureReason::ChannelNotReady));
 return Err(LocalHTLCFailureReason::ChannelNotReady);
 }
 }
 if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
 return Err(("HTLC amount was below the htlc_minimum_msat",
 LocalHTLCFailureReason::AmountBelowMinimum));
 return Err(LocalHTLCFailureReason::AmountBelowMinimum);
 }
 chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

	fn can_forward_htlc(
 &self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 let outgoing_scid = match next_packet_details.outgoing_connector {
 HopConnector::ShortChannelId(scid) => scid,
 HopConnector::Trampoline(_) => {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }
 };
 match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {} else {
 return Err(("Don't have available channel for forwarding as requested.",
 LocalHTLCFailureReason::UnknownNextPeer));
 return Err(LocalHTLCFailureReason::UnknownNextPeer);
 }
 }
 }
Expand All@@ -4444,7 +4436,7 @@ where
	}

	fn htlc_failure_from_update_add_err(
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
 reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
 shared_secret: &[u8; 32]
	) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

 log_info!(
 WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
 "Failed to accept/forward incoming HTLC: {}", err_msg
 "Failed to accept/forward incoming HTLC: {:?}", reason,
 );
 // If `msg.blinding_point` is set, we must always fail with malformed.
 if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
 )
 }) {
 Some(Ok(_)) => {},
 Some(Err((err, reason))) => {
 Some(Err(reason)) => {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

 // Now process the HTLC on the outgoing channel if it's a forward.
 if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
 if let Err((err, reason)) = self.can_forward_htlc(
 if let Err(reason) = self.can_forward_htlc(
 &update_add_htlc, next_packet_details
 ) {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down

15 changes: 7 additions & 8 deletions
lightning/src/ln/onion_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
 }),
 };

 if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
 if let Err(reason) = check_incoming_htlc_cltv(
 cur_height, outgoing_cltv_value, msg.cltv_expiry,
 ) {
 return Err(InboundHTLCErr {
 msg: err_msg,
 msg: "incoming cltv check failed",
@carlaKCcarlaKCMay 1, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).
I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.
@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!
 reason,
 err_data: Vec::new(),
 });
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
	cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.

	if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
	}
	// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
	// but we want to be robust wrt to counterparty packet sanitization (see
	// HTLC_FAIL_BACK_BUFFER rationale).
	if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
 return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
	}
	if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
 return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
	}
	// If the HTLC expires ~now, don't bother trying to forward it to our
	// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
	// but there is no need to do that, and since we're a bit conservative with our
	// risk threshold it just results in failing to forward payments.
	if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
 return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
 return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
	}

	Ok(())
Expand Down
Loading

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

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

joostjager
merged 4 commits into

from

May 2, 2025
 Merged


Use LocalHTLCFailureReason in Onion Processing
#3744
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
27b1321

ln/refactor: remove err_str where LocalHTLCFailureReason sufficient


carlaKC Apr 16, 2025
81fb07d

ln/fix: remove legacy payment related error codes


carlaKC Apr 16, 2025
5e9ae6b

ln/refactor: use LocalHTLCFailureCodes in onion error processing


carlaKC Apr 16, 2025
935ffde

ln/refactor: macro to impl From<u16> for LocalHTLCFailureReason


carlaKC Apr 17, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


22 changes: 9 additions & 13 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7838,17 +7838,15 @@ impl<SP: Deref> FundedChannel<SP> where

	fn internal_htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32, config: &ChannelConfig,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
Comment thread
joostjager marked this conversation as resolved.

 let fee = amt_to_forward.checked_mul(config.forwarding_fee_proportional_millionths as u64)
 .and_then(|prop_fee| (prop_fee / 1000000).checked_add(config.forwarding_fee_base_msat as u64));
 if fee.is_none() || htlc.amount_msat < fee.unwrap() ||
 (htlc.amount_msat - fee.unwrap()) < amt_to_forward {
 return Err(("Prior hop has deviated from specified fees parameters or origin node has obsolete ones",
 LocalHTLCFailureReason::FeeInsufficient));
 return Err(LocalHTLCFailureReason::FeeInsufficient);
 }
 if (htlc.cltv_expiry as u64) < outgoing_cltv_value as u64 + config.cltv_expiry_delta as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
 }
 Ok(())
	}
Expand All@@ -7858,7 +7856,7 @@ impl<SP: Deref> FundedChannel<SP> where
	/// unsuccessful, falls back to the previous one if one exists.
	pub fn htlc_satisfies_config(
 &self, htlc: &msgs::UpdateAddHTLC, amt_to_forward: u64, outgoing_cltv_value: u32,
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 self.internal_htlc_satisfies_config(&htlc, amt_to_forward, outgoing_cltv_value, &self.context.config())
 .or_else(|err| {
 if let Some(prev_config) = self.context.prev_config() {
Expand All@@ -7873,13 +7871,13 @@ impl<SP: Deref> FundedChannel<SP> where
	/// this function determines whether to fail the HTLC, or forward / claim it.
	pub fn can_accept_incoming_htlc<F: Deref, L: Deref>(
 &self, msg: &msgs::UpdateAddHTLC, fee_estimator: &LowerBoundedFeeEstimator<F>, logger: L
	) -> Result<(), (&'static str, LocalHTLCFailureReason)>
	) -> Result<(), LocalHTLCFailureReason>
	where
 F::Target: FeeEstimator,
 L::Target: Logger
	{
 if self.context.channel_state.is_local_shutdown_sent() {
 return Err(("Shutdown was already sent", LocalHTLCFailureReason::ChannelClosed))
 return Err(LocalHTLCFailureReason::ChannelClosed)
 }

 let dust_exposure_limiting_feerate = self.context.get_dust_exposure_limiting_feerate(&fee_estimator);
Expand All@@ -7890,8 +7888,7 @@ impl<SP: Deref> FundedChannel<SP> where
 // Note that the total dust exposure includes both the dust HTLCs and the excess mining fees of the counterparty commitment transaction
 log_info!(logger, "Cannot accept value that would put our total dust exposure at {} over the limit {} on counterparty commitment tx",
 on_counterparty_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our total dust exposure limit on counterparty commitment tx",
 LocalHTLCFailureReason::DustLimitCounterparty))
 return Err(LocalHTLCFailureReason::DustLimitCounterparty)
 }
 let htlc_success_dust_limit = if self.funding.get_channel_type().supports_anchors_zero_fee_htlc_tx() {
 0
Expand All@@ -7905,8 +7902,7 @@ impl<SP: Deref> FundedChannel<SP> where
 if on_holder_tx_dust_htlc_exposure_msat > max_dust_htlc_exposure_msat {
 log_info!(logger, "Cannot accept value that would put our exposure to dust HTLCs at {} over the limit {} on holder commitment tx",
 on_holder_tx_dust_htlc_exposure_msat, max_dust_htlc_exposure_msat);
 return Err(("Exceeded our dust exposure limit on holder commitment tx",
 LocalHTLCFailureReason::DustLimitHolder))
 return Err(LocalHTLCFailureReason::DustLimitHolder)
 }
 }

Expand DownExpand Up@@ -7944,7 +7940,7 @@ impl<SP: Deref> FundedChannel<SP> where
 }
 if pending_remote_value_msat.saturating_sub(self.funding.holder_selected_channel_reserve_satoshis * 1000).saturating_sub(anchor_outputs_value_msat) < remote_fee_cost_incl_stuck_buffer_msat {
 log_info!(logger, "Attempting to fail HTLC due to fee spike buffer violation in channel {}. Rebalancing is required.", &self.context.channel_id());
 return Err(("Fee spike buffer violation", LocalHTLCFailureReason::FeeSpikeBuffer));
 return Err(LocalHTLCFailureReason::FeeSpikeBuffer);
 }
 }

Expand Down

40 changes: 16 additions & 24 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4343,25 +4343,22 @@ where

	fn can_forward_htlc_to_outgoing_channel(
 &self, chan: &mut FundedChannel<SP>, msg: &msgs::UpdateAddHTLC, next_packet: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 if !chan.context.should_announce() && !self.default_configuration.accept_forwards_to_priv_channels {
 // Note that the behavior here should be identical to the above block - we
 // should NOT reveal the existence or non-existence of a private channel if
 // we don't allow forwards outbound over them.
 return Err(("Refusing to forward to a private channel based on our config.",
 LocalHTLCFailureReason::PrivateChannelForward));
 return Err(LocalHTLCFailureReason::PrivateChannelForward);
 }
 if let HopConnector::ShortChannelId(outgoing_scid) = next_packet.outgoing_connector {
 if chan.funding.get_channel_type().supports_scid_privacy() && outgoing_scid != chan.context.outbound_scid_alias() {
 // `option_scid_alias` (referred to in LDK as `scid_privacy`) means
 // "refuse to forward unless the SCID alias was used", so we pretend
 // we don't have the channel here.
 return Err(("Refusing to forward over real channel SCID as our counterparty requested.",
 LocalHTLCFailureReason::RealSCIDForward));
 return Err(LocalHTLCFailureReason::RealSCIDForward);
 }
 } else {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }

 // Note that we could technically not return an error yet here and just hope
Expand All@@ -4371,16 +4368,13 @@ where
 // on a small/per-node/per-channel scale.
 if !chan.context.is_live() {
 if !chan.context.is_enabled() {
 return Err(("Forwarding channel has been disconnected for some time.",
 LocalHTLCFailureReason::ChannelDisabled));
 return Err(LocalHTLCFailureReason::ChannelDisabled);
 } else {
 return Err(("Forwarding channel is not in a ready state.",
 LocalHTLCFailureReason::ChannelNotReady));
 return Err(LocalHTLCFailureReason::ChannelNotReady);
 }
 }
 if next_packet.outgoing_amt_msat < chan.context.get_counterparty_htlc_minimum_msat() {
 return Err(("HTLC amount was below the htlc_minimum_msat",
 LocalHTLCFailureReason::AmountBelowMinimum));
 return Err(LocalHTLCFailureReason::AmountBelowMinimum);
 }
 chan.htlc_satisfies_config(msg, next_packet.outgoing_amt_msat, next_packet.outgoing_cltv_value)?;

Expand DownExpand Up@@ -4411,12 +4405,11 @@ where

	fn can_forward_htlc(
 &self, msg: &msgs::UpdateAddHTLC, next_packet_details: &NextPacketDetails
	) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
	) -> Result<(), LocalHTLCFailureReason> {
 let outgoing_scid = match next_packet_details.outgoing_connector {
 HopConnector::ShortChannelId(scid) => scid,
 HopConnector::Trampoline(_) => {
 return Err(("Cannot forward by Node ID without SCID.",
 LocalHTLCFailureReason::InvalidTrampolineForward));
 return Err(LocalHTLCFailureReason::InvalidTrampolineForward);
 }
 };
 match self.do_funded_channel_callback(outgoing_scid, |chan: &mut FundedChannel<SP>| {
Expand All@@ -4431,8 +4424,7 @@ where
 fake_scid::is_valid_intercept(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)) ||
 fake_scid::is_valid_phantom(&self.fake_scid_rand_bytes, outgoing_scid, &self.chain_hash)
 {} else {
 return Err(("Don't have available channel for forwarding as requested.",
 LocalHTLCFailureReason::UnknownNextPeer));
 return Err(LocalHTLCFailureReason::UnknownNextPeer);
 }
 }
 }
Expand All@@ -4444,7 +4436,7 @@ where
	}

	fn htlc_failure_from_update_add_err(
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey, err_msg: &'static str,
 &self, msg: &msgs::UpdateAddHTLC, counterparty_node_id: &PublicKey,
 reason: LocalHTLCFailureReason, is_intro_node_blinded_forward: bool,
 shared_secret: &[u8; 32]
	) -> HTLCFailureMsg {
Expand All@@ -4468,7 +4460,7 @@ where

 log_info!(
 WithContext::from(&self.logger, Some(*counterparty_node_id), Some(msg.channel_id), Some(msg.payment_hash)),
 "Failed to accept/forward incoming HTLC: {}", err_msg
 "Failed to accept/forward incoming HTLC: {:?}", reason,
 );
 // If `msg.blinding_point` is set, we must always fail with malformed.
 if msg.blinding_point.is_some() {
Expand DownExpand Up@@ -5810,9 +5802,9 @@ where
 )
 }) {
 Some(Ok(_)) => {},
 Some(Err((err, reason))) => {
 Some(Err(reason)) => {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand All@@ -5825,11 +5817,11 @@ where

 // Now process the HTLC on the outgoing channel if it's a forward.
 if let Some(next_packet_details) = next_packet_details_opt.as_ref() {
 if let Err((err, reason)) = self.can_forward_htlc(
 if let Err(reason) = self.can_forward_htlc(
 &update_add_htlc, next_packet_details
 ) {
 let htlc_fail = self.htlc_failure_from_update_add_err(
 &update_add_htlc, &incoming_counterparty_node_id, err, reason,
 &update_add_htlc, &incoming_counterparty_node_id, reason,
 is_intro_node_blinded_forward, &shared_secret,
 );
 let htlc_destination = get_failed_htlc_destination(outgoing_scid_opt, update_add_htlc.payment_hash);
Expand Down

15 changes: 7 additions & 8 deletions
lightning/src/ln/onion_payment.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -453,11 +453,11 @@ where
 }),
 };

 if let Err((err_msg, reason)) = check_incoming_htlc_cltv(
 if let Err(reason) = check_incoming_htlc_cltv(
 cur_height, outgoing_cltv_value, msg.cltv_expiry,
 ) {
 return Err(InboundHTLCErr {
 msg: err_msg,
 msg: "incoming cltv check failed",
@carlaKCcarlaKCMay 1, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Just a note here for review: this msg loses a bit of granularity - previously it had the descriptive string, and now it's just got this generic statement because we can't get a &str from format!({:?}, reason)'s String that lives long enough (afaik).
I think that this is okay because peel_payment_onion isn't used anywhere in the codebase, and the new reason is now available to provide the information that's lost in the string. If it's not ok, I can revert check_incoming_htlc_cltv to still return &str, LocalHTLCFailureReason.
@valentinewallacevalentinewallaceMay 1, 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.

Seems legit 👍 Thanks for the diligence!
 reason,
 err_data: Vec::new(),
 });
Expand DownExpand Up@@ -601,19 +601,18 @@ where

pub(super) fn check_incoming_htlc_cltv(
	cur_height: u32, outgoing_cltv_value: u32, cltv_expiry: u32
) -> Result<(), (&'static str, LocalHTLCFailureReason)> {
) -> Result<(), LocalHTLCFailureReason> {
Comment thread
carlaKC marked this conversation as resolved.

	if (cltv_expiry as u64) < (outgoing_cltv_value) as u64 + MIN_CLTV_EXPIRY_DELTA as u64 {
 return Err(("Forwarding node has tampered with the intended HTLC values or origin node has an obsolete cltv_expiry_delta",
 LocalHTLCFailureReason::IncorrectCLTVExpiry));
 return Err(LocalHTLCFailureReason::IncorrectCLTVExpiry);
	}
	// Theoretically, channel counterparty shouldn't send us a HTLC expiring now,
	// but we want to be robust wrt to counterparty packet sanitization (see
	// HTLC_FAIL_BACK_BUFFER rationale).
	if cltv_expiry <= cur_height + HTLC_FAIL_BACK_BUFFER as u32 {
 return Err(("CLTV expiry is too close", LocalHTLCFailureReason::CLTVExpiryTooSoon));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooSoon);
	}
	if cltv_expiry > cur_height + CLTV_FAR_FAR_AWAY as u32 {
 return Err(("CLTV expiry is too far in the future", LocalHTLCFailureReason::CLTVExpiryTooFar));
 return Err(LocalHTLCFailureReason::CLTVExpiryTooFar);
	}
	// If the HTLC expires ~now, don't bother trying to forward it to our
	// counterparty. They should fail it anyway, but we don't want to bother with
Expand All@@ -624,7 +623,7 @@ pub(super) fn check_incoming_htlc_cltv(
	// but there is no need to do that, and since we're a bit conservative with our
	// risk threshold it just results in failing to forward payments.
	if (outgoing_cltv_value) as u64 <= (cur_height + LATENCY_GRACE_PERIOD_BLOCKS) as u64 {
 return Err(("Outgoing CLTV value is too soon", LocalHTLCFailureReason::OutgoingCLTVTooSoon));
 return Err(LocalHTLCFailureReason::OutgoingCLTVTooSoon);
	}

	Ok(())
Expand Down
Loading