Update LDK to current HEAD and BDK to 0.28.0

Author: tnull

Cargo.toml

@@ -25,13 +25,13 @@ description = "A ready-to-go node implementation built using LDK."
 #lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["esplora-async"] }
 
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev="7b85ebadb64058127350b83fb4b76dcb409ea518", features = ["max_level_trace", "std"] }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev="7b85ebadb64058127350b83fb4b76dcb409ea518" }
-lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev="7b85ebadb64058127350b83fb4b76dcb409ea518" }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev="7b85ebadb64058127350b83fb4b76dcb409ea518" }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev="7b85ebadb64058127350b83fb4b76dcb409ea518" }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev="7b85ebadb64058127350b83fb4b76dcb409ea518" }
-lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev="7b85ebadb64058127350b83fb4b76dcb409ea518", features = ["esplora-async"] }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506", features = ["max_level_trace", "std"] }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
+lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
+lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506", features = ["esplora-async"] }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["max_level_trace", "std"] }
 #lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
@@ -41,7 +41,7 @@ lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-li
 #lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
 #lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync", features = ["esplora-async"] }
 
-bdk = { version = "0.27.1", default-features = false, features = ["async-interface", "use-esplora-async", "sqlite-bundled"]}
+bdk = { version = "0.28.0", default-features = false, features = ["std", "async-interface", "use-esplora-async", "sqlite-bundled"]}
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
 rusqlite = { version = "0.28.0", features = ["bundled"] }
 bitcoin = "0.29.2"

src/event.rs

@@ -10,13 +10,13 @@ use crate::io::{
 use crate::logger::{log_error, log_info, Logger};
 
 use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
+use lightning::events::Event as LdkEvent;
+use lightning::events::EventHandler as LdkEventHandler;
+use lightning::events::PaymentPurpose;
 use lightning::impl_writeable_tlv_based_enum;
 use lightning::ln::PaymentHash;
 use lightning::routing::gossip::NodeId;
 use lightning::util::errors::APIError;
-use lightning::util::events::Event as LdkEvent;
-use lightning::util::events::EventHandler as LdkEventHandler;
-use lightning::util::events::PaymentPurpose;
 use lightning::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 
 use bitcoin::secp256k1::Secp256k1;
@@ -329,6 +329,7 @@ where
 				receiver_node_id: _,
 				via_channel_id: _,
 				via_user_channel_id: _,
+				claim_deadline: _,
 			} => {
 				if let Some(info) = self.payment_store.get(&payment_hash) {
 					if info.status == PaymentStatus::Succeeded {
@@ -548,6 +549,7 @@ where
 				next_channel_id,
 				fee_earned_msat,
 				claim_from_onchain_tx,
+				outbound_amount_forwarded_msat,
 			} => {
 				let read_only_network_graph = self.network_graph.read_only();
 				let nodes = read_only_network_graph.nodes();
@@ -583,24 +585,36 @@ where
 					format!(" to {}{}", node_str(&next_channel_id), channel_str(&next_channel_id));
 
 				let fee_earned = fee_earned_msat.unwrap_or(0);
+				let outbound_amount_forwarded_msat = outbound_amount_forwarded_msat.unwrap_or(0);
 				if claim_from_onchain_tx {
 					log_info!(
 						self.logger,
-						"Forwarded payment{}{}, earning {}msat in fees from claiming onchain.",
+						"Forwarded payment{}{} of {}msat, earning {}msat in fees from claiming onchain.",
 						from_prev_str,
 						to_next_str,
+						outbound_amount_forwarded_msat,
 						fee_earned,
 					);
 				} else {
 					log_info!(
 						self.logger,
-						"Forwarded payment{}{}, earning {}msat in fees.",
+						"Forwarded payment{}{} of {}msat, earning {}msat in fees.",
 						from_prev_str,
 						to_next_str,
+						outbound_amount_forwarded_msat,
 						fee_earned,
 					);
 				}
 			}
+			LdkEvent::ChannelPending {
+				channel_id: _,
+				user_channel_id: _,
+				former_temporary_channel_id: _,
+				counterparty_node_id: _,
+				funding_txo: _,
+			} => {
+				// TODO!
+			}
 			LdkEvent::ChannelReady {
 				channel_id, user_channel_id, counterparty_node_id, ..
 			} => {

src/lib.rs

@@ -100,7 +100,7 @@ use logger::{log_error, log_info, FilesystemLogger, Logger};
 
 use lightning::chain::keysinterface::EntropySource;
 use lightning::chain::{chainmonitor, BestBlock, Confirm, Watch};
-use lightning::ln::channelmanager;
+use lightning::ln::channelmanager::{self, RecipientOnionFields};
 use lightning::ln::channelmanager::{
 	ChainParameters, ChannelDetails, ChannelManagerReadArgs, PaymentId, Retry,
 };
@@ -1098,16 +1098,11 @@ impl Node {
 		let route_params = RouteParameters { payment_params, final_value_msat: amount_msat };
 
 		let retry_strategy = Retry::Timeout(LDK_PAYMENT_RETRY_TIMEOUT);
+		let recipient_fields = RecipientOnionFields { payment_secret };
 
 		match self
 			.channel_manager
-			.send_payment_with_retry(
-				payment_hash,
-				&payment_secret,
-				payment_id,
-				route_params,
-				retry_strategy,
-			)
+			.send_payment(payment_hash, recipient_fields, payment_id, route_params, retry_strategy)
 			.map_err(payment::PaymentError::Sending)
 		{
 			Ok(_payment_id) => {
@@ -1173,9 +1168,11 @@ impl Node {
 			),
 			final_value_msat: amount_msat,
 		};
+		let recipient_fields = RecipientOnionFields { payment_secret: None };
 
 		match self.channel_manager.send_spontaneous_payment_with_retry(
 			Some(payment_preimage),
+			recipient_fields,
 			PaymentId(payment_hash.0),
 			route_params,
 			Retry::Timeout(LDK_PAYMENT_RETRY_TIMEOUT),