DROPME Patch LDK Confirm refactor

Point rust-lightning dependencies at the Confirm refactor branch so this
branch can exercise the pending LDK API changes.

Keep these compatibility updates separate because the patch is not meant
to land as-is.

Co-Authored-By: HAL 9000

Author: tnull

Cargo.toml

@@ -197,3 +197,18 @@ harness = false
 #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 = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-types = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-invoice = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-net-tokio = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-persister = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-background-processor = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-rapid-gossip-sync = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-block-sync = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-transaction-sync = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-liquidity = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-macros = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+lightning-dns-resolver = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }
+possiblyrandom = { git = "https://git.rust-bitcoin.org/tnull/rust-lightning", rev = "e076821425a4aceb9006bcac6e252417b1b9f8bd" }

src/builder.rs

@@ -2012,6 +2012,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

@@ -223,7 +223,7 @@ where
 
 #[cfg(test)]
 mod tests {
-	use lightning::impl_writeable_tlv_based;
+	use lightning::impl_ser_tlv_based as impl_writeable_tlv_based;
 	use lightning::io;
 	use lightning::util::persist::{PageToken, PaginatedKVStore, PaginatedListResponse};
 	use lightning::util::test_utils::TestLogger;

src/event.rs

@@ -14,6 +14,7 @@ use std::sync::{Arc, Mutex};
 use bitcoin::blockdata::locktime::absolute::LockTime;
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::{Amount, OutPoint};
+use lightning::blinded_path::message::NextMessageHop;
 use lightning::events::bump_transaction::BumpTransactionEvent;
 #[cfg(not(feature = "uniffi"))]
 use lightning::events::PaidBolt12Invoice;
@@ -29,7 +30,10 @@ 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 as impl_writeable_tlv_based,
+	impl_ser_tlv_based_enum as impl_writeable_tlv_based_enum,
+};
 use lightning_liquidity::lsps2::utils::compute_opening_fee;
 use lightning_types::payment::{PaymentHash, PaymentPreimage};
 
@@ -1725,7 +1729,11 @@ where
 
 				self.bump_tx_event_handler.handle_event(&bte).await;
 			},
-			LdkEvent::OnionMessageIntercepted { peer_node_id, message } => {
+			LdkEvent::OnionMessageIntercepted {
+				next_hop: NextMessageHop::NodeId(peer_node_id),
+				message,
+				..
+			} => {
 				if let Some(om_mailbox) = self.om_mailbox.as_ref() {
 					om_mailbox.onion_message_intercepted(peer_node_id, message);
 				} else {
@@ -1735,6 +1743,12 @@ where
 					);
 				}
 			},
+			LdkEvent::OnionMessageIntercepted {
+				next_hop: NextMessageHop::ShortChannelId(_),
+				..
+			} => {
+				log_trace!(self.logger, "Ignoring onion message intercepted for unknown SCID");
+			},
 			LdkEvent::OnionMessagePeerConnected { peer_node_id } => {
 				if let Some(om_mailbox) = self.om_mailbox.as_ref() {
 					let messages = om_mailbox.onion_message_peer_connected(peer_node_id);

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 as impl_writeable_tlv_based_enum;
 use lightning::io::{self, Error, ErrorKind};
 use lightning::sign::{EntropySource as LdkEntropySource, RandomBytes};
 use lightning::util::persist::{

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 as impl_writeable_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;

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 as impl_writeable_tlv_based;
 use lightning::offers::static_invoice::StaticInvoice;
 use lightning::util::persist::KVStore;
 use lightning::util::ser::{Readable, Writeable};

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 as impl_writeable_tlv_based;
 use lightning::ln::channelmanager::{
 	Bolt11InvoiceParameters, OptionalBolt11PaymentParams, PaymentId,
 };
@@ -313,7 +313,7 @@ impl Bolt11Payment {
 				let payee_pubkey = invoice.recover_payee_pub_key();
 				log_info!(
 					self.logger,
-					"Initiated sending {} msat to {}",
+					"Initiated sending {} msat to {:?}",
 					payment_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 as impl_writeable_tlv_based;
 use lightning::ln::channelmanager::PaymentId;
 
 use crate::data_store::{StorableObject, StorableObjectUpdate};

src/payment/store.rs

@@ -16,8 +16,8 @@ use lightning::ln::types::ChannelId;
 use lightning::offers::offer::OfferId;
 use lightning::util::ser::{Readable, Writeable};
 use lightning::{
-	_init_and_read_len_prefixed_tlv_fields, impl_writeable_tlv_based,
-	impl_writeable_tlv_based_enum, write_tlv_fields,
+	_init_and_read_len_prefixed_tlv_fields, impl_ser_tlv_based as impl_writeable_tlv_based,
+	impl_ser_tlv_based_enum as impl_writeable_tlv_based_enum, write_tlv_fields,
 };
 use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning_types::string::UntrustedString;