Use LocalHTLCFailureReason in Onion Processing #3744
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
👋 Hi! I see this is a draft PR. |
|
@joostjager anything else that you'd like to add here? |
In some places where we have LocalHTLCFailureReason, the string we're passing around is redundant. This isn't the case in all uses of LocalHTLCFailureReason, for example InboundHTLCError provides additional information about payload and blinding related errors that isn't captured in LocalHTLCFailureReason. In these cases we keep the error string, tolerating some duplication.
These error codes were removed from the specification seven years ago to prevent probing, so we don't need to handle these cases anymore.
De-duplicate use of u16 failure codes by using a macro that will match against each variant's failure_code instead.
joostjager
reviewed
Apr 21, 2025
There was a problem hiding this comment.
The only comment that I think may not be in this PR is #3601 (comment)
If that one still applies now of course.
| @@ -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> { | |||
There was a problem hiding this comment.
In decode_incoming_update_add_htlc_onion, encode_malformed_error could have its message param dropped perhaps.
| @@ -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> { | |||
There was a problem hiding this comment.
Is there more in FundedChannel.send_htlc?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains some of the follow ups that didn't make it into #3601:
DisplayforLocalHTLCFailureReasonLocalHTLCFailureReasonin onion error processing, removing the last few places where we were using raw u16 valuesfailure_codeandfrom<u16>to dedup codes