fixup! Update ldk-node dependency

Remove redundant payment patterns. Expose incoming and outgoing HTLC
amounts while preserving field numbers and the distinction between
unknown amounts and zero.

AI assistance: OpenAI Codex was used for this change.

Author: benthecarman

ldk-server-grpc/src/proto/types.proto

@@ -319,6 +319,11 @@ message HtlcLocator {
   // The node id of the counterparty for this HTLC.
   // This can be unset for older serialized events.
   optional string node_id = 3;
+
+  // The amount in millisatoshis of the HTLC that was sent or received, if known.
+  // This can be unset for events serialized by LDK Node v0.7.0 and prior,
+  // or forwarding records stored by LDK Server before this field was added.
+  optional uint64 amount_msat = 4;
 }
 
 // A forwarded payment through our node.

ldk-server-grpc/src/types.rs

@@ -453,6 +453,11 @@ pub struct HtlcLocator {
 	/// This can be unset for older serialized events.
 	#[prost(string, optional, tag = "3")]
 	pub node_id: ::core::option::Option<::prost::alloc::string::String>,
+	/// The amount in millisatoshis of the HTLC that was sent or received, if known.
+	/// This can be unset for events serialized by LDK Node v0.7.0 and prior,
+	/// or forwarding records stored by LDK Server before this field was added.
+	#[prost(uint64, optional, tag = "4")]
+	pub amount_msat: ::core::option::Option<u64>,
 }
 /// A forwarded payment through our node.
 ///

ldk-server-grpc/tests/htlc_locator_compatibility.rs

@@ -0,0 +1,41 @@
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+use ldk_server_grpc::types::HtlcLocator;
+use prost::Message;
+
+// Encoded with the original schema: channel_id = 1, user_channel_id = 2, node_id = 3.
+const LEGACY_LOCATOR: &[u8] = b"\x0a\x07channel\x12\x04user\x1a\x04node";
+
+#[test]
+fn legacy_locator_preserves_ids_and_unknown_amount() {
+	let locator = HtlcLocator::decode(LEGACY_LOCATOR).unwrap();
+
+	assert_eq!(locator.channel_id, "channel");
+	assert_eq!(locator.user_channel_id.as_deref(), Some("user"));
+	assert_eq!(locator.node_id.as_deref(), Some("node"));
+	assert_eq!(locator.amount_msat, None);
+	assert_eq!(locator.encode_to_vec(), LEGACY_LOCATOR);
+}
+
+#[test]
+fn locator_amount_uses_field_four_and_preserves_zero() {
+	for amount_msat in [0, 42] {
+		let mut encoded = LEGACY_LOCATOR.to_vec();
+		// Field 4 has varint wire type 0. Both test amounts use a single byte.
+		encoded.extend_from_slice(&[0x20, amount_msat]);
+		let locator = HtlcLocator::decode(encoded.as_slice()).unwrap();
+
+		assert_eq!(locator.channel_id, "channel");
+		assert_eq!(locator.user_channel_id.as_deref(), Some("user"));
+		assert_eq!(locator.node_id.as_deref(), Some("node"));
+		assert_eq!(locator.amount_msat, Some(u64::from(amount_msat)));
+		assert_eq!(locator.encode_to_vec(), encoded);
+	}
+}

ldk-server/src/main.rs

@@ -599,6 +599,7 @@ fn main() {
 									channel_id: htlc.channel_id.to_string(),
 									user_channel_id: htlc.user_channel_id.map(|u| u.0.to_string()),
 									node_id: htlc.node_id.map(|n| n.to_string()),
+									amount_msat: htlc.amount_msat,
 								})
 								.collect();
 							let next_htlcs = next_htlcs
@@ -607,6 +608,7 @@ fn main() {
 									channel_id: htlc.channel_id.to_string(),
 									user_channel_id: htlc.user_channel_id.map(|u| u.0.to_string()),
 									node_id: htlc.node_id.map(|n| n.to_string()),
+									amount_msat: htlc.amount_msat,
 								})
 								.collect();
 

ldk-server/src/util/proto_adapter.rs

@@ -266,7 +266,7 @@ pub(crate) fn payment_kind_to_proto(
 				tx_type: tx_type.map(transaction_type_to_proto),
 			})),
 		},
-		PaymentKind::Bolt11 { hash, preimage, secret, counterparty_skimmed_fee_msat, .. } => {
+		PaymentKind::Bolt11 { hash, preimage, secret, counterparty_skimmed_fee_msat } => {
 			ldk_server_grpc::types::PaymentKind {
 				kind: Some(Bolt11(ldk_server_grpc::types::Bolt11 {
 					hash: hash.to_string(),
@@ -276,19 +276,19 @@ pub(crate) fn payment_kind_to_proto(
 				})),
 			}
 		},
-		PaymentKind::Bolt12Offer {
-			hash, preimage, secret, offer_id, payer_note, quantity, ..
-		} => ldk_server_grpc::types::PaymentKind {
-			kind: Some(Bolt12Offer(ldk_server_grpc::types::Bolt12Offer {
-				hash: hash.map(|h| h.to_string()),
-				preimage: preimage.map(|p| p.to_string()),
-				secret: secret.map(|s| Bytes::copy_from_slice(&s.0)),
-				offer_id: offer_id.0.to_lower_hex_string(),
-				payer_note: payer_note.map(|s| s.to_string()),
-				quantity,
-			})),
+		PaymentKind::Bolt12Offer { hash, preimage, secret, offer_id, payer_note, quantity } => {
+			ldk_server_grpc::types::PaymentKind {
+				kind: Some(Bolt12Offer(ldk_server_grpc::types::Bolt12Offer {
+					hash: hash.map(|h| h.to_string()),
+					preimage: preimage.map(|p| p.to_string()),
+					secret: secret.map(|s| Bytes::copy_from_slice(&s.0)),
+					offer_id: offer_id.0.to_lower_hex_string(),
+					payer_note: payer_note.map(|s| s.to_string()),
+					quantity,
+				})),
+			}
 		},
-		PaymentKind::Bolt12Refund { hash, preimage, secret, payer_note, quantity, .. } => {
+		PaymentKind::Bolt12Refund { hash, preimage, secret, payer_note, quantity } => {
 			ldk_server_grpc::types::PaymentKind {
 				kind: Some(Bolt12Refund(ldk_server_grpc::types::Bolt12Refund {
 					hash: hash.map(|h| h.to_string()),
@@ -299,7 +299,7 @@ pub(crate) fn payment_kind_to_proto(
 				})),
 			}
 		},
-		PaymentKind::Spontaneous { hash, preimage, .. } => ldk_server_grpc::types::PaymentKind {
+		PaymentKind::Spontaneous { hash, preimage } => ldk_server_grpc::types::PaymentKind {
 			kind: Some(Spontaneous(ldk_server_grpc::types::Spontaneous {
 				hash: hash.to_string(),
 				preimage: preimage.map(|p| p.to_string()),