f LDK: Account for PaymentForwarded event adding {prev,next}_node_id

Author: tnull

bindings/ldk_node.udl

@@ -280,7 +280,8 @@ interface Event {
 	PaymentFailed(PaymentId? payment_id, PaymentHash? payment_hash, PaymentFailureReason? reason);
 	PaymentReceived(PaymentId? payment_id, PaymentHash payment_hash, u64 amount_msat, sequence<CustomTlvRecord> custom_records);
 	PaymentClaimable(PaymentId payment_id, PaymentHash payment_hash, u64 claimable_amount_msat, u32? claim_deadline, sequence<CustomTlvRecord> custom_records);
-	PaymentForwarded(ChannelId prev_channel_id, ChannelId next_channel_id, UserChannelId? prev_user_channel_id, UserChannelId? next_user_channel_id, u64? total_fee_earned_msat, u64? skimmed_fee_msat, boolean claim_from_onchain_tx, u64? outbound_amount_forwarded_msat);
+	PaymentForwarded(ChannelId prev_channel_id, ChannelId next_channel_id, UserChannelId?
+	prev_user_channel_id, UserChannelId? next_user_channel_id, PublicKey? prev_node_id, PublicKey? next_node_id, u64? total_fee_earned_msat, u64? skimmed_fee_msat, boolean claim_from_onchain_tx, u64? outbound_amount_forwarded_msat);
 	ChannelPending(ChannelId channel_id, UserChannelId user_channel_id, ChannelId former_temporary_channel_id, PublicKey counterparty_node_id, OutPoint funding_txo);
 	ChannelReady(ChannelId channel_id, UserChannelId user_channel_id, PublicKey? counterparty_node_id);
 	ChannelClosed(ChannelId channel_id, UserChannelId user_channel_id, PublicKey? counterparty_node_id, ClosureReason? reason);

src/event.rs

@@ -120,6 +120,16 @@ pub enum Event {
 		/// This will be `None` if the payment was settled via an on-chain transaction. See the
 		/// caveat described for the `total_fee_earned_msat` field.
 		next_user_channel_id: Option<UserChannelId>,
+		/// The node id of the previous node.
+		///
+		/// This is only `None` for HTLCs received prior to LDK Node v0.5 or for events serialized by
+		/// versions prior to v0.5.
+		prev_node_id: Option<PublicKey>,
+		/// The node id of the next node.
+		///
+		/// This is only `None` for HTLCs received prior to LDK Node v0.5 or for events serialized by
+		/// versions prior to v0.5.
+		next_node_id: Option<PublicKey>,
 		/// The total fee, in milli-satoshis, which was earned as a result of the payment.
 		///
 		/// Note that if we force-closed the channel over which we forwarded an HTLC while the HTLC
@@ -257,7 +267,9 @@ impl_writeable_tlv_based_enum!(Event,
 	},
 	(7, PaymentForwarded) => {
 		(0, prev_channel_id, required),
+		(1, prev_node_id, option),
 		(2, next_channel_id, required),
+		(3, next_node_id, option),
 		(4, prev_user_channel_id, option),
 		(6, next_user_channel_id, option),
 		(8, total_fee_earned_msat, option),
@@ -1139,6 +1151,8 @@ where
 				next_channel_id,
 				prev_user_channel_id,
 				next_user_channel_id,
+				prev_node_id,
+				next_node_id,
 				total_fee_earned_msat,
 				skimmed_fee_msat,
 				claim_from_onchain_tx,
@@ -1149,6 +1163,8 @@ where
 					next_channel_id: next_channel_id.expect("next_channel_id expected for events generated by LDK versions greater than 0.0.107."),
 					prev_user_channel_id: prev_user_channel_id.map(UserChannelId),
 					next_user_channel_id: next_user_channel_id.map(UserChannelId),
+					prev_node_id,
+					next_node_id,
 					total_fee_earned_msat,
 					skimmed_fee_msat,
 					claim_from_onchain_tx,