Skip to content

Commit a1bab1d

Browse files
Add HTLCIntercepted event
Used in upcoming commit(s) so users can intercept forwarded HTLCs Co-authored-by: John Cantrell <johncantrell97@gmail.com> Co-authored-by: Valentine Wallace <vwallace@protonmail.com>
1 parent 4ea07cb commit a1bab1d

File tree

1 file changed

+62
-1
lines changed

1 file changed

+62
-1
lines changed

lightning/src/util/events.rs

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use crate::chain::keysinterface::SpendableOutputDescriptor;
1818
#[cfg(anchors)]
1919
use crate::ln::chan_utils::HTLCOutputInCommitment;
20-
use crate::ln::channelmanager::PaymentId;
20+
use crate::ln::channelmanager::{InterceptId, PaymentId};
2121
use crate::ln::channel::FUNDING_CONF_DEADLINE_BLOCKS;
2222
use crate::ln::features::ChannelTypeFeatures;
2323
use crate::ln::msgs;
@@ -288,6 +288,18 @@ pub enum BumpTransactionEvent {
288288
},
289289
}
290290

291+
/// Will be used in [`Event::HTLCIntercepted`] to identify the next hop in the HTLC's path.
292+
/// Currently only used in serialization for the sake of maintaining compatibility. More variants
293+
/// will be added for general-purpose HTLC forward intercepts as well as trampoline forward
294+
/// intercepts in upcoming work.
295+
enum InterceptNextHop {
296+
FakeScid(u64),
297+
}
298+
299+
impl_writeable_tlv_based_enum!(InterceptNextHop, ;
300+
(0, FakeScid)
301+
);
302+
291303
/// An Event which you should probably take some action in response to.
292304
///
293305
/// Note that while Writeable and Readable are implemented for Event, you probably shouldn't use
@@ -566,6 +578,20 @@ pub enum Event {
566578
/// now + 5*time_forwardable).
567579
time_forwardable: Duration,
568580
},
581+
/// Used to indicate that we've intercepted an HTLC forward.
582+
HTLCIntercepted {
583+
/// The fake scid that was programmed as the next hop's scid.
584+
requested_next_hop_scid: u64,
585+
/// The payment hash used for this HTLC.
586+
payment_hash: PaymentHash,
587+
/// How many msats are to be received on the inbound edge of this HTLC.
588+
inbound_amount_msat: u64,
589+
/// How many msats the payer intended to route to the next node. Depending on the reason you are
590+
/// intercepting this payment, you might take a fee by forwarding less than this amount.
591+
expected_outbound_amount_msat: u64,
592+
/// A id to help LDK identify which HTLC is being forwarded or failed.
593+
intercept_id: InterceptId
594+
},
569595
/// Used to indicate that an output which you should know how to spend was confirmed on chain
570596
/// and is now spendable.
571597
/// Such an output will *not* ever be spent by rust-lightning, and are not at risk of your
@@ -802,6 +828,17 @@ impl Writeable for Event {
802828
(0, WithoutLength(outputs), required),
803829
});
804830
},
831+
&Event::HTLCIntercepted { requested_next_hop_scid, payment_hash, inbound_amount_msat, expected_outbound_amount_msat, intercept_id } => {
832+
6u8.write(writer)?;
833+
let intercept_scid = InterceptNextHop::FakeScid(requested_next_hop_scid);
834+
write_tlv_fields!(writer, {
835+
(0, intercept_scid, required),
836+
(2, payment_hash, required),
837+
(4, inbound_amount_msat, required),
838+
(6, expected_outbound_amount_msat, required),
839+
(8, intercept_id, required)
840+
});
841+
}
805842
&Event::PaymentForwarded { fee_earned_msat, prev_channel_id, claim_from_onchain_tx, next_channel_id } => {
806843
7u8.write(writer)?;
807844
write_tlv_fields!(writer, {
@@ -1015,6 +1052,30 @@ impl MaybeReadable for Event {
10151052
};
10161053
f()
10171054
},
1055+
6u8 => {
1056+
let mut payment_hash = PaymentHash([0; 32]);
1057+
let mut intercept_id = InterceptId([0; 32]);
1058+
let mut requested_next_hop_scid = InterceptNextHop::FakeScid(0);
1059+
let mut inbound_amount_msat = 0;
1060+
let mut expected_outbound_amount_msat = 0;
1061+
read_tlv_fields!(reader, {
1062+
(0, requested_next_hop_scid, required),
1063+
(2, payment_hash, required),
1064+
(4, inbound_amount_msat, required),
1065+
(6, expected_outbound_amount_msat, required),
1066+
(8, intercept_id, required)
1067+
});
1068+
let next_scid = match requested_next_hop_scid {
1069+
InterceptNextHop::FakeScid(scid) => scid
1070+
};
1071+
Ok(Some(Event::HTLCIntercepted {
1072+
payment_hash,
1073+
requested_next_hop_scid: next_scid,
1074+
inbound_amount_msat,
1075+
expected_outbound_amount_msat,
1076+
intercept_id,
1077+
}))
1078+
},
10181079
7u8 => {
10191080
let f = || {
10201081
let mut fee_earned_msat = None;

0 commit comments

Comments
 (0)