@@ -59,7 +59,7 @@ use crate::routing::gossip::NodeId;
5959use crate::routing::router::{BlindedTail, InFlightHtlcs, Path, Payee, PaymentParameters, RouteParameters, RouteParametersConfig, Router, FixedRouter, Route};
6060use crate::ln::onion_payment::{check_incoming_htlc_cltv, create_recv_pending_htlc_info, create_fwd_pending_htlc_info, decode_incoming_update_add_htlc_onion, InboundHTLCErr, NextPacketDetails};
6161use crate::ln::msgs;
62- use crate::ln::onion_utils;
62+ use crate::ln::onion_utils::{self, ATTRIBUTION_DATA_LEN} ;
6363use crate::ln::onion_utils::{HTLCFailReason, INVALID_ONION_BLINDING};
6464use crate::ln::msgs::{BaseMessageHandler, ChannelMessageHandler, CommitmentUpdate, DecodeError, LightningError, MessageSendEvent};
6565#[cfg(test)]
@@ -4433,6 +4433,7 @@ where
44334433 channel_id: msg.channel_id,
44344434 htlc_id: msg.htlc_id,
44354435 reason: failure.data.clone(),
4436+ attribution_data: failure.attribution_data,
44364437 })
44374438 }
44384439
@@ -4458,10 +4459,12 @@ where
44584459 }
44594460 let failure = HTLCFailReason::reason($err_code, $data.to_vec())
44604461 .get_encrypted_failure_packet(&shared_secret, &None);
4462+
44614463 return PendingHTLCStatus::Fail(HTLCFailureMsg::Relay(msgs::UpdateFailHTLC {
44624464 channel_id: msg.channel_id,
44634465 htlc_id: msg.htlc_id,
44644466 reason: failure.data,
4467+ attribution_data: failure.attribution_data,
44654468 }));
44664469 }
44674470 }
@@ -12852,11 +12855,15 @@ impl_writeable_tlv_based!(PendingHTLCInfo, {
1285212855impl Writeable for HTLCFailureMsg {
1285312856 fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
1285412857 match self {
12855- HTLCFailureMsg::Relay(msgs::UpdateFailHTLC { channel_id, htlc_id, reason }) => {
12858+ HTLCFailureMsg::Relay(msgs::UpdateFailHTLC { channel_id, htlc_id, reason, attribution_data }) => {
1285612859 0u8.write(writer)?;
1285712860 channel_id.write(writer)?;
1285812861 htlc_id.write(writer)?;
1285912862 reason.write(writer)?;
12863+
12864+ // This code will only ever be hit for legacy data that is re-serialized. It isn't necessary to try
12865+ // writing out attribution data, because it can never be present.
12866+ debug_assert!(attribution_data.is_none());
1286012867 },
1286112868 HTLCFailureMsg::Malformed(msgs::UpdateFailMalformedHTLC {
1286212869 channel_id, htlc_id, sha256_of_onion, failure_code
@@ -12881,6 +12888,7 @@ impl Readable for HTLCFailureMsg {
1288112888 channel_id: Readable::read(reader)?,
1288212889 htlc_id: Readable::read(reader)?,
1288312890 reason: Readable::read(reader)?,
12891+ attribution_data: None,
1288412892 }))
1288512893 },
1288612894 1 => {
@@ -13111,6 +13119,7 @@ impl Writeable for HTLCForwardInfo {
1311113119 write_tlv_fields!(w, {
1311213120 (0, htlc_id, required),
1311313121 (2, err_packet.data, required),
13122+ (5, err_packet.attribution_data, option),
1311413123 });
1311513124 },
1311613125 Self::FailMalformedHTLC { htlc_id, failure_code, sha256_of_onion } => {
@@ -13141,8 +13150,12 @@ impl Readable for HTLCForwardInfo {
1314113150 (1, malformed_htlc_failure_code, option),
1314213151 (2, err_packet, required),
1314313152 (3, sha256_of_onion, option),
13153+ (5, attribution_data, option),
1314413154 });
1314513155 if let Some(failure_code) = malformed_htlc_failure_code {
13156+ if attribution_data.is_some() {
13157+ return Err(DecodeError::InvalidValue);
13158+ }
1314613159 Self::FailMalformedHTLC {
1314713160 htlc_id: _init_tlv_based_struct_field!(htlc_id, required),
1314813161 failure_code,
@@ -13153,6 +13166,7 @@ impl Readable for HTLCForwardInfo {
1315313166 htlc_id: _init_tlv_based_struct_field!(htlc_id, required),
1315413167 err_packet: crate::ln::msgs::OnionErrorPacket {
1315513168 data: _init_tlv_based_struct_field!(err_packet, required),
13169+ attribution_data: _init_tlv_based_struct_field!(attribution_data, option),
1315613170 },
1315713171 }
1315813172 }
@@ -14852,6 +14866,7 @@ mod tests {
1485214866 use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
1485314867 use core::sync::atomic::Ordering;
1485414868 use crate::events::{Event, HTLCDestination, ClosureReason};
14869+ use crate::ln::onion_utils::ATTRIBUTION_DATA_LEN;
1485514870 use crate::ln::types::ChannelId;
1485614871 use crate::types::payment::{PaymentPreimage, PaymentHash, PaymentSecret};
1485714872 use crate::ln::channelmanager::{RAACommitmentOrder, create_recv_pending_htlc_info, inbound_payment, ChannelConfigOverrides, HTLCForwardInfo, InterceptId, PaymentId, RecipientOnionFields};
@@ -15325,6 +15340,80 @@ mod tests {
1532515340 nodes[1].logger.assert_log_contains("lightning::ln::channelmanager", "Payment preimage didn't match payment hash", 1);
1532615341 }
1532715342
15343+ #[test]
15344+ fn test_htlc_localremoved_persistence() {
15345+ let chanmon_cfgs: Vec<TestChanMonCfg> = create_chanmon_cfgs(2);
15346+ let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
15347+
15348+ let persister;
15349+ let chain_monitor;
15350+ let deserialized_chanmgr;
15351+
15352+ // Send a keysend payment that fails because of a preimage mismatch.
15353+ let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
15354+ let mut nodes = create_network(2, &node_cfgs, &node_chanmgrs);
15355+
15356+ let payer_pubkey = nodes[0].node.get_our_node_id();
15357+ let payee_pubkey = nodes[1].node.get_our_node_id();
15358+
15359+ let _chan = create_chan_between_nodes(&nodes[0], &nodes[1]);
15360+ let route_params = RouteParameters::from_payment_params_and_value(
15361+ PaymentParameters::for_keysend(payee_pubkey, 40, false), 10_000);
15362+ let network_graph = nodes[0].network_graph;
15363+ let first_hops = nodes[0].node.list_usable_channels();
15364+ let scorer = test_utils::TestScorer::new();
15365+ let random_seed_bytes = chanmon_cfgs[1].keys_manager.get_secure_random_bytes();
15366+ let route = find_route(
15367+ &payer_pubkey, &route_params, &network_graph, Some(&first_hops.iter().collect::<Vec<_>>()),
15368+ nodes[0].logger, &scorer, &Default::default(), &random_seed_bytes
15369+ ).unwrap();
15370+
15371+ let test_preimage = PaymentPreimage([42; 32]);
15372+ let mismatch_payment_hash = PaymentHash([43; 32]);
15373+ let session_privs = nodes[0].node.test_add_new_pending_payment(mismatch_payment_hash,
15374+ RecipientOnionFields::spontaneous_empty(), PaymentId(mismatch_payment_hash.0), &route).unwrap();
15375+ nodes[0].node.test_send_payment_internal(&route, mismatch_payment_hash,
15376+ RecipientOnionFields::spontaneous_empty(), Some(test_preimage), PaymentId(mismatch_payment_hash.0), None, session_privs).unwrap();
15377+ check_added_monitors!(nodes[0], 1);
15378+
15379+ let updates = get_htlc_update_msgs!(nodes[0], nodes[1].node.get_our_node_id());
15380+ nodes[1].node.handle_update_add_htlc(nodes[0].node.get_our_node_id(), &updates.update_add_htlcs[0]);
15381+ commitment_signed_dance!(nodes[1], nodes[0], &updates.commitment_signed, false);
15382+ expect_pending_htlcs_forwardable!(nodes[1]);
15383+ expect_htlc_handling_failed_destinations!(nodes[1].node.get_and_clear_pending_events(), &[HTLCDestination::FailedPayment { payment_hash: mismatch_payment_hash }]);
15384+ check_added_monitors(&nodes[1], 1);
15385+
15386+ // Save the update_fail_htlc message for later comparison.
15387+ let msgs = get_htlc_update_msgs!(nodes[1], nodes[0].node.get_our_node_id());
15388+ let htlc_fail_msg = msgs.update_fail_htlcs[0].clone();
15389+
15390+ // Reload node.
15391+ nodes[0].node.peer_disconnected(nodes[1].node.get_our_node_id());
15392+ nodes[1].node.peer_disconnected(nodes[0].node.get_our_node_id());
15393+
15394+ let monitor_encoded = get_monitor!(nodes[1], _chan.3).encode();
15395+ reload_node!(nodes[1], nodes[1].node.encode(), &[&monitor_encoded], persister, chain_monitor, deserialized_chanmgr);
15396+
15397+ nodes[0].node.peer_connected(nodes[1].node.get_our_node_id(), &msgs::Init {
15398+ features: nodes[1].node.init_features(), networks: None, remote_network_address: None
15399+ }, true).unwrap();
15400+ let reestablish_1 = get_chan_reestablish_msgs!(nodes[0], nodes[1]);
15401+ assert_eq!(reestablish_1.len(), 1);
15402+ nodes[1].node.peer_connected(nodes[0].node.get_our_node_id(), &msgs::Init {
15403+ features: nodes[0].node.init_features(), networks: None, remote_network_address: None
15404+ }, false).unwrap();
15405+ let reestablish_2 = get_chan_reestablish_msgs!(nodes[1], nodes[0]);
15406+ assert_eq!(reestablish_2.len(), 1);
15407+ nodes[0].node.handle_channel_reestablish(nodes[1].node.get_our_node_id(), &reestablish_2[0]);
15408+ handle_chan_reestablish_msgs!(nodes[0], nodes[1]);
15409+ nodes[1].node.handle_channel_reestablish(nodes[0].node.get_our_node_id(), &reestablish_1[0]);
15410+
15411+ // Assert that same failure message is resent after reload.
15412+ let msgs = handle_chan_reestablish_msgs!(nodes[1], nodes[0]);
15413+ let htlc_fail_msg_after_reload = msgs.2.unwrap().update_fail_htlcs[0].clone();
15414+ assert_eq!(htlc_fail_msg, htlc_fail_msg_after_reload);
15415+ }
15416+
1532815417 #[test]
1532915418 fn test_multi_hop_missing_secret() {
1533015419 let chanmon_cfgs = create_chanmon_cfgs(4);
@@ -16283,7 +16372,7 @@ mod tests {
1628316372 let mut nodes = create_network(1, &node_cfg, &chanmgrs);
1628416373
1628516374 let dummy_failed_htlc = |htlc_id| {
16286- HTLCForwardInfo::FailHTLC { htlc_id, err_packet: msgs::OnionErrorPacket { data: vec![42] } }
16375+ HTLCForwardInfo::FailHTLC { htlc_id, err_packet: msgs::OnionErrorPacket { data: vec![42], attribution_data: Some([0; ATTRIBUTION_DATA_LEN]) } }
1628716376 };
1628816377 let dummy_malformed_htlc = |htlc_id| {
1628916378 HTLCForwardInfo::FailMalformedHTLC { htlc_id, failure_code: 0x4000, sha256_of_onion: [0; 32] }
0 commit comments