From 1926c82b9ee570b3647cb832243e3e6f86d6fa2c Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Tue, 7 Nov 2023 15:08:55 -0500 Subject: [PATCH] Include counterparty skimmed fees in PaymentClaimed event. --- lightning/src/events/mod.rs | 6 ++++++ lightning/src/ln/channelmanager.rs | 1 + 2 files changed, 7 insertions(+) diff --git a/lightning/src/events/mod.rs b/lightning/src/events/mod.rs index 321922974..5ffea4ee6 100644 --- a/lightning/src/events/mod.rs +++ b/lightning/src/events/mod.rs @@ -102,9 +102,15 @@ pub struct ClaimedHTLC { pub cltv_expiry: u32, /// The amount (in msats) of this part of an MPP. pub value_msat: u64, + /// The extra fee our counterparty skimmed off the top of this HTLC, if any. + /// + /// This value will always be 0 for [`ClaimedHTLC`]s serialized with LDK versions prior to + /// 0.0.119. + pub counterparty_skimmed_fee_msat: u64, } impl_writeable_tlv_based!(ClaimedHTLC, { (0, channel_id, required), + (1, counterparty_skimmed_fee_msat, (default_value, 0u64)), (2, user_channel_id, required), (4, cltv_expiry, required), (6, value_msat, required), diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs index 6aff48788..3d6986035 100644 --- a/lightning/src/ln/channelmanager.rs +++ b/lightning/src/ln/channelmanager.rs @@ -238,6 +238,7 @@ impl From<&ClaimableHTLC> for events::ClaimedHTLC { user_channel_id: val.prev_hop.user_channel_id.unwrap_or(0), cltv_expiry: val.cltv_expiry, value_msat: val.value, + counterparty_skimmed_fee_msat: val.counterparty_skimmed_fee_msat.unwrap_or(0), } } } -- 2.39.5