ln+events: add htlc failure reason to HTLCHandlingFailed

Author: carlaKC

Diff for: lightning/src/events/mod.rs

@@ -24,7 +24,7 @@ use crate::chain::transaction;
 use crate::ln::channelmanager::{InterceptId, PaymentId, RecipientOnionFields};
 use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
 use crate::types::features::ChannelTypeFeatures;
-use crate::ln::msgs;
+use crate::ln::{msgs, LocalHTLCFailureReason};
 use crate::ln::types::ChannelId;
 use crate::types::payment::{PaymentPreimage, PaymentHash, PaymentSecret};
 use crate::offers::invoice::Bolt12Invoice;
@@ -524,6 +524,25 @@ impl_writeable_tlv_based_enum_upgradable!(HTLCHandlingType,
 	},
 );
 
+/// The reason for HTLC failures in [`Event::HTLCHandlingFailed`].
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum HTLCHandlingFailureReason {
+	/// The forwarded HTLC was failed back by the downstream node with an encrypted error reason.
+	Downstream,
+	/// The HTLC was failed locally by our node.
+	Local {
+		/// The reason that our node chose to fail the HTLC.
+		reason: LocalHTLCFailureReason,
+	},
+}
+
+impl_writeable_tlv_based_enum!(HTLCHandlingFailureReason,
+	(1, Downstream) => {},
+	(3, Local) => {
+		(0, reason, required),
+	},
+);
+
 /// Will be used in [`Event::HTLCIntercepted`] to identify the next hop in the HTLC's path.
 /// Currently only used in serialization for the sake of maintaining compatibility. More variants
 /// will be added for general-purpose HTLC forward intercepts as well as trampoline forward
@@ -1449,6 +1468,10 @@ pub enum Event {
 		prev_channel_id: ChannelId,
 		/// The type of HTLC that was handled.
 		handling_type: HTLCHandlingType,
+		/// The reason that the HTLC failed.
+		///
+		/// This field will be `None` only for objects serialized prior to LDK 0.2.0.
+		handling_failure: Option<HTLCHandlingFailureReason>
 	},
 	/// Indicates that a transaction originating from LDK needs to have its fee bumped. This event
 	/// requires confirmed external funds to be readily available to spend.
@@ -1752,10 +1775,11 @@ impl Writeable for Event {
 					(8, path.blinded_tail, option),
 				})
 			},
-			&Event::HTLCHandlingFailed { ref prev_channel_id, ref handling_type } => {
+			&Event::HTLCHandlingFailed { ref prev_channel_id, ref handling_type, ref handling_failure } => {
 				25u8.write(writer)?;
 				write_tlv_fields!(writer, {
 					(0, prev_channel_id, required),
+					(1, handling_failure, option),
 					(2, handling_type, required),
 				})
 			},
@@ -2201,14 +2225,17 @@ impl MaybeReadable for Event {
 			25u8 => {
 				let mut f = || {
 					let mut prev_channel_id = ChannelId::new_zero();
+					let mut handling_failure = None;
 					let mut handling_type_opt = UpgradableRequired(None);
 					read_tlv_fields!(reader, {
 						(0, prev_channel_id, required),
+						(1, handling_failure, option),
 						(2, handling_type_opt, upgradable_required),
 					});
 					Ok(Some(Event::HTLCHandlingFailed {
 						prev_channel_id,
 						handling_type: _init_tlv_based_struct_field!(handling_type_opt, upgradable_required),
+						handling_failure,
 					}))
 				};
 				f()

Diff for: lightning/src/ln/channelmanager.rs

@@ -5784,8 +5784,8 @@ where
 					&update_add_htlc, &*self.node_signer, &*self.logger, &self.secp_ctx
 				) {
 					Ok(decoded_onion) => decoded_onion,
-					Err((htlc_fail, _)) => {
-						htlc_fails.push((htlc_fail, HTLCHandlingType::InvalidOnion));
+					Err((htlc_fail, reason)) => {
+						htlc_fails.push((htlc_fail, HTLCHandlingType::InvalidOnion, reason.into()));
 						continue;
 					},
 				};
@@ -5813,7 +5813,7 @@ where
 							is_intro_node_blinded_forward, &shared_secret,
 						);
 						let handling_type = get_failed_htlc_type(outgoing_scid_opt, update_add_htlc.payment_hash);
-						htlc_fails.push((htlc_fail, handling_type));
+						htlc_fails.push((htlc_fail, handling_type, reason.into()));
 						continue;
 					},
 					// The incoming channel no longer exists, HTLCs should be resolved onchain instead.
@@ -5830,7 +5830,7 @@ where
 							is_intro_node_blinded_forward, &shared_secret,
 						);
 						let handling_type = get_failed_htlc_type(outgoing_scid_opt, update_add_htlc.payment_hash);
-						htlc_fails.push((htlc_fail, handling_type));
+						htlc_fails.push((htlc_fail, handling_type, reason.into()));
 						continue;
 					}
 				}
@@ -5842,7 +5842,9 @@ where
 					Ok(info) => htlc_forwards.push((info, update_add_htlc.htlc_id)),
 					Err(inbound_err) => {
 						let handling_type = get_failed_htlc_type(outgoing_scid_opt, update_add_htlc.payment_hash);
-						htlc_fails.push((self.construct_pending_htlc_fail_msg(&update_add_htlc, &incoming_counterparty_node_id, shared_secret, inbound_err), handling_type));
+						let htlc_failure = inbound_err.reason.into();
+						htlc_fails.push((self.construct_pending_htlc_fail_msg(&update_add_htlc, &incoming_counterparty_node_id,
+							shared_secret, inbound_err), handling_type, htlc_failure));
 					},
 				}
 			}
@@ -5854,7 +5856,7 @@ where
 				incoming_channel_id, incoming_user_channel_id, htlc_forwards.drain(..).collect()
 			);
 			self.forward_htlcs_without_forward_event(&mut [pending_forwards]);
-			for (htlc_fail, handling_type) in htlc_fails.drain(..) {
+			for (htlc_fail, handling_type, handling_failure) in htlc_fails.drain(..) {
 				let failure = match htlc_fail {
 					HTLCFailureMsg::Relay(fail_htlc) => HTLCForwardInfo::FailHTLC {
 						htlc_id: fail_htlc.htlc_id,
@@ -5870,6 +5872,7 @@ where
 				self.pending_events.lock().unwrap().push_back((events::Event::HTLCHandlingFailed {
 					prev_channel_id: incoming_channel_id,
 					handling_type,
+					handling_failure: Some(handling_failure),
 				}, None));
 			}
 		}
@@ -7053,6 +7056,7 @@ where
 				pending_events.push_back((events::Event::HTLCHandlingFailed {
 					prev_channel_id: *channel_id,
 					handling_type,
+					handling_failure: Some(onion_error.into()),
 				}, None));
 			},
 		}

Diff for: lightning/src/ln/onion_utils.rs

@@ -11,6 +11,7 @@ use super::msgs::OnionErrorPacket;
 use crate::blinded_path::BlindedHop;
 use crate::crypto::chacha20::ChaCha20;
 use crate::crypto::streams::ChaChaReader;
+use crate::events::HTLCHandlingFailureReason;
 use crate::ln::channel::TOTAL_BITCOIN_SUPPLY_SATOSHIS;
 use crate::ln::channelmanager::{HTLCSource, RecipientOnionFields};
 use crate::ln::msgs;
@@ -1728,6 +1729,12 @@ impl Into<LocalHTLCFailureReason> for u16 {
 	}
 }
 
+impl Into<HTLCHandlingFailureReason> for LocalHTLCFailureReason {
+	fn into(self) -> HTLCHandlingFailureReason {
+		HTLCHandlingFailureReason::Local { reason: self }
+	}
+}
+
 impl_writeable_tlv_based_enum!(LocalHTLCFailureReason,
 	(1, TemporaryNodeFailure) => {},
 	(3, PermanentNodeFailure) => {},
@@ -2032,6 +2039,17 @@ impl HTLCFailReason {
 	}
 }
 
+impl Into<HTLCHandlingFailureReason> for &HTLCFailReason {
+	fn into(self) -> HTLCHandlingFailureReason {
+		match self.0 {
+			HTLCFailReasonRepr::LightningError { .. } => HTLCHandlingFailureReason::Downstream,
+			HTLCFailReasonRepr::Reason { reason, .. } => {
+				HTLCHandlingFailureReason::Local { reason }
+			},
+		}
+	}
+}
+
 /// Allows `decode_next_hop` to return the next hop packet bytes for either payments or onion
 /// message forwards.
 pub(crate) trait NextPacketBytes: AsMut<[u8]> {