From: Valentine Wallace <vwallace@protonmail.com>
Date: Wed, 30 Jun 2021 18:05:53 +0000 (-0400)
Subject: Add PendingHTLCRouting variant for receiving keysend payments
X-Git-Tag: v0.0.100~21^2~7
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=rust-lightning;a=commitdiff_plain;h=f60a65fec32e8525f27b8b388b609c03489e87eb

Add PendingHTLCRouting variant for receiving keysend payments
---

diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 4d67d511..19a8ad08 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -99,6 +99,10 @@ enum PendingHTLCRouting {
 		payment_data: msgs::FinalOnionHopData,
 		incoming_cltv_expiry: u32, // Used to track when we should expire pending HTLCs that go unclaimed
 	},
+	ReceiveKeysend {
+		payment_preimage: PaymentPreimage,
+		incoming_cltv_expiry: u32, // Used to track when we should expire pending HTLCs that go unclaimed
+	},
 }
 
 #[derive(Clone)] // See Channel::revoke_and_ack for why, tl;dr: Rust bug
@@ -3318,6 +3322,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 					match channel_state.forward_htlcs.entry(match forward_info.routing {
 							PendingHTLCRouting::Forward { short_channel_id, .. } => short_channel_id,
 							PendingHTLCRouting::Receive { .. } => 0,
+							PendingHTLCRouting::ReceiveKeysend { .. } => 0,
 					}) {
 						hash_map::Entry::Occupied(mut entry) => {
 							entry.get_mut().push(HTLCForwardInfo::AddHTLC { prev_short_channel_id, prev_funding_outpoint,
@@ -4471,7 +4476,11 @@ impl_writeable_tlv_based_enum!(PendingHTLCRouting,
 	(1, Receive) => {
 		(0, payment_data, required),
 		(2, incoming_cltv_expiry, required),
-	}
+	},
+	(2, ReceiveKeysend) => {
+		(0, payment_preimage, required),
+		(2, incoming_cltv_expiry, required),
+	},
 ;);
 
 impl_writeable_tlv_based!(PendingHTLCInfo, {