DROPME: Bump Rust Lightning to unmerged LSPS2 APIs

Point the Rust Lightning overrides at the local branch carrying the
LSPS2 BOLT12 router changes and carry the temporary API updates needed
to compile LDK Node.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: Matt Corallo

Cargo.toml

@@ -183,16 +183,16 @@ harness = false
 #vss-client-ng = { path = "../vss-client" }
 #vss-client-ng = { git = "https://github.com/lightningdevkit/vss-client", branch = "main" }
 #
-#[patch."https://github.com/lightningdevkit/rust-lightning"]
-#lightning = { path = "../rust-lightning/lightning" }
-#lightning-types = { path = "../rust-lightning/lightning-types" }
-#lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
-#lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
-#lightning-persister = { path = "../rust-lightning/lightning-persister" }
-#lightning-background-processor = { path = "../rust-lightning/lightning-background-processor" }
-#lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
-#lightning-block-sync = { path = "../rust-lightning/lightning-block-sync" }
-#lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync" }
-#lightning-liquidity = { path = "../rust-lightning/lightning-liquidity" }
-#lightning-macros = { path = "../rust-lightning/lightning-macros" }
-#lightning-dns-resolver = { path = "../rust-lightning/lightning-dns-resolver" }
+[patch."https://github.com/lightningdevkit/rust-lightning"]
+lightning = { path = "../rust-lightning-3/lightning" }
+lightning-types = { path = "../rust-lightning-3/lightning-types" }
+lightning-invoice = { path = "../rust-lightning-3/lightning-invoice" }
+lightning-net-tokio = { path = "../rust-lightning-3/lightning-net-tokio" }
+lightning-persister = { path = "../rust-lightning-3/lightning-persister" }
+lightning-background-processor = { path = "../rust-lightning-3/lightning-background-processor" }
+lightning-rapid-gossip-sync = { path = "../rust-lightning-3/lightning-rapid-gossip-sync" }
+lightning-block-sync = { path = "../rust-lightning-3/lightning-block-sync" }
+lightning-transaction-sync = { path = "../rust-lightning-3/lightning-transaction-sync" }
+lightning-liquidity = { path = "../rust-lightning-3/lightning-liquidity" }
+lightning-macros = { path = "../rust-lightning-3/lightning-macros" }
+lightning-dns-resolver = { path = "../rust-lightning-3/lightning-dns-resolver" }

src/builder.rs

@@ -1916,6 +1916,7 @@ fn build_with_store_internal(
 				Arc::clone(&channel_manager),
 				Arc::clone(&om_resolver),
 				IgnoringMessageHandler {},
+				false,
 			))
 		} else {
 			Arc::new(OnionMessenger::new(

src/data_store.rs

@@ -218,7 +218,7 @@ where
 
 #[cfg(test)]
 mod tests {
-	use lightning::impl_writeable_tlv_based;
+	use lightning::impl_ser_tlv_based;
 	use lightning::util::test_utils::TestLogger;
 
 	use super::*;
@@ -236,7 +236,7 @@ mod tests {
 			hex_utils::to_string(&self.id)
 		}
 	}
-	impl_writeable_tlv_based!(TestObjectId, { (0, id, required) });
+	impl_ser_tlv_based!(TestObjectId, { (0, id, required) });
 
 	struct TestObjectUpdate {
 		id: TestObjectId,
@@ -276,7 +276,7 @@ mod tests {
 		}
 	}
 
-	impl_writeable_tlv_based!(TestObject, {
+	impl_ser_tlv_based!(TestObject, {
 		(0, id, required),
 		(2, data, required),
 	});

src/event.rs

@@ -29,7 +29,7 @@ use lightning::util::config::{ChannelConfigOverrides, ChannelConfigUpdate};
 use lightning::util::errors::APIError;
 use lightning::util::persist::KVStore;
 use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
-use lightning::{impl_writeable_tlv_based, impl_writeable_tlv_based_enum};
+use lightning::{impl_ser_tlv_based, impl_ser_tlv_based_enum};
 use lightning_liquidity::lsps2::utils::compute_opening_fee;
 use lightning_types::payment::{PaymentHash, PaymentPreimage};
 
@@ -78,7 +78,7 @@ pub struct HTLCLocator {
 	pub node_id: Option<PublicKey>,
 }
 
-impl_writeable_tlv_based!(HTLCLocator, {
+impl_ser_tlv_based!(HTLCLocator, {
 	(1, channel_id, required),
 	(3, user_channel_id, option),
 	(5, node_id, option),
@@ -294,7 +294,7 @@ pub enum Event {
 	},
 }
 
-impl_writeable_tlv_based_enum!(Event,
+impl_ser_tlv_based_enum!(Event,
 	(0, PaymentSuccessful) => {
 		(0, payment_hash, required),
 		(1, fee_paid_msat, option),
@@ -1725,15 +1725,24 @@ where
 
 				self.bump_tx_event_handler.handle_event(&bte).await;
 			},
-			LdkEvent::OnionMessageIntercepted { peer_node_id, message } => {
-				if let Some(om_mailbox) = self.om_mailbox.as_ref() {
-					om_mailbox.onion_message_intercepted(peer_node_id, message);
-				} else {
+			LdkEvent::OnionMessageIntercepted { next_hop, message, .. } => match next_hop {
+				lightning::blinded_path::message::NextMessageHop::NodeId(peer_node_id) => {
+					if let Some(om_mailbox) = self.om_mailbox.as_ref() {
+						om_mailbox.onion_message_intercepted(peer_node_id, message);
+					} else {
+						log_trace!(
+							self.logger,
+							"Onion message intercepted, but no onion message mailbox available"
+						);
+					}
+				},
+				lightning::blinded_path::message::NextMessageHop::ShortChannelId(scid) => {
 					log_trace!(
 						self.logger,
-						"Onion message intercepted, but no onion message mailbox available"
+						"Onion message intercepted for unknown SCID {}, ignoring",
+						scid
 					);
-				}
+				},
 			},
 			LdkEvent::OnionMessagePeerConnected { peer_node_id } => {
 				if let Some(om_mailbox) = self.om_mailbox.as_ref() {

src/ffi/types.rs

@@ -1270,7 +1270,7 @@ impl Bolt11Invoice {
 	}
 
 	/// Recover the payee's public key (only to be used if none was included in the invoice)
-	pub fn recover_payee_pub_key(&self) -> PublicKey {
+	pub fn recover_payee_pub_key(&self) -> Option<PublicKey> {
 		self.inner.recover_payee_pub_key()
 	}
 }

src/io/vss_store.rs

@@ -21,7 +21,7 @@ use bitcoin::bip32::{ChildNumber, Xpriv};
 use bitcoin::hashes::{sha256, Hash, HashEngine, Hmac, HmacEngine};
 use bitcoin::key::Secp256k1;
 use bitcoin::Network;
-use lightning::impl_writeable_tlv_based_enum;
+use lightning::impl_ser_tlv_based_enum;
 use lightning::io::{self, Error, ErrorKind};
 use lightning::sign::{EntropySource as LdkEntropySource, RandomBytes};
 use lightning::util::persist::KVStore;
@@ -65,7 +65,7 @@ enum VssSchemaVersion {
 	V1,
 }
 
-impl_writeable_tlv_based_enum!(VssSchemaVersion,
+impl_ser_tlv_based_enum!(VssSchemaVersion,
 	(0, V0) => {},
 	(1, V1) => {},
 );

src/lib.rs

@@ -146,7 +146,7 @@ use graph::NetworkGraph;
 use io::utils::update_and_persist_node_metrics;
 pub use lightning;
 use lightning::chain::BlockLocator;
-use lightning::impl_writeable_tlv_based;
+use lightning::impl_ser_tlv_based;
 use lightning::ln::chan_utils::FUNDING_TRANSACTION_WITNESS_WEIGHT;
 use lightning::ln::channel_state::ChannelDetails as LdkChannelDetails;
 pub use lightning::ln::channel_state::ChannelShutdownState;
@@ -2268,7 +2268,7 @@ impl PersistedNodeMetrics {
 	}
 }
 
-impl_writeable_tlv_based!(NodeMetrics, {
+impl_ser_tlv_based!(NodeMetrics, {
 	(0, latest_lightning_wallet_sync_timestamp, option),
 	(1, latest_pathfinding_scores_sync_timestamp, option),
 	(2, latest_onchain_wallet_sync_timestamp, option),
@@ -2338,7 +2338,7 @@ mod tests {
 			latest_pathfinding_scores_sync_timestamp: Option<u64>,
 			latest_node_announcement_broadcast_timestamp: Option<u64>,
 		}
-		impl_writeable_tlv_based!(OldNodeMetrics, {
+		impl_ser_tlv_based!(OldNodeMetrics, {
 			(0, latest_lightning_wallet_sync_timestamp, option),
 			(1, latest_pathfinding_scores_sync_timestamp, option),
 			(2, latest_onchain_wallet_sync_timestamp, option),

src/payment/asynchronous/static_invoice_store.rs

@@ -13,7 +13,7 @@ use std::time::Duration;
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
 use lightning::blinded_path::message::BlindedMessagePath;
-use lightning::impl_writeable_tlv_based;
+use lightning::impl_ser_tlv_based;
 use lightning::offers::static_invoice::StaticInvoice;
 use lightning::util::persist::KVStore;
 use lightning::util::ser::{Readable, Writeable};
@@ -28,7 +28,7 @@ struct PersistedStaticInvoice {
 	request_path: BlindedMessagePath,
 }
 
-impl_writeable_tlv_based!(PersistedStaticInvoice, {
+impl_ser_tlv_based!(PersistedStaticInvoice, {
 	(0, invoice, required),
 	(2, request_path, required)
 });

src/payment/bolt11.rs

@@ -13,7 +13,7 @@ use std::sync::{Arc, RwLock};
 
 use bitcoin::hashes::sha256::Hash as Sha256;
 use bitcoin::hashes::Hash;
-use lightning::impl_writeable_tlv_based;
+use lightning::impl_ser_tlv_based;
 use lightning::ln::channelmanager::{
 	Bolt11InvoiceParameters, OptionalBolt11PaymentParams, PaymentId,
 };
@@ -55,7 +55,7 @@ pub(crate) struct PaymentMetadata {
 	pub(crate) lsps2_parameters: Option<LSPS2Parameters>,
 }
 
-impl_writeable_tlv_based!(PaymentMetadata, {
+impl_ser_tlv_based!(PaymentMetadata, {
 	(0, lsps2_parameters, option),
 });
 
@@ -309,7 +309,7 @@ impl Bolt11Payment {
 				let payee_pubkey = invoice.recover_payee_pub_key();
 				let amt_msat =
 					invoice.amount_milli_satoshis().expect("invoice amount should be set");
-				log_info!(self.logger, "Initiated sending {}msat to {}", amt_msat, payee_pubkey);
+				log_info!(self.logger, "Initiated sending {}msat to {:?}", amt_msat, payee_pubkey);
 
 				let kind = PaymentKind::Bolt11 {
 					hash: payment_hash,
@@ -422,7 +422,7 @@ impl Bolt11Payment {
 				let payee_pubkey = invoice.recover_payee_pub_key();
 				log_info!(
 					self.logger,
-					"Initiated sending {} msat to {}",
+					"Initiated sending {} msat to {:?}",
 					amount_msat,
 					payee_pubkey
 				);

src/payment/pending_payment_store.rs

@@ -6,7 +6,7 @@
 // accordance with one or both of these licenses.
 
 use bitcoin::Txid;
-use lightning::impl_writeable_tlv_based;
+use lightning::impl_ser_tlv_based;
 use lightning::ln::channelmanager::PaymentId;
 
 use crate::data_store::{StorableObject, StorableObjectUpdate};
@@ -33,7 +33,7 @@ impl PendingPaymentDetails {
 	}
 }
 
-impl_writeable_tlv_based!(PendingPaymentDetails, {
+impl_ser_tlv_based!(PendingPaymentDetails, {
 	(0, details, required),
 	(2, conflicting_txids, optional_vec),
 });