Update ldk-node to 0.7.0-rc0

Co-Authored-By: Jeffrey Czyz <jkczyz@gmail.com>

Author: benthecarman

Cargo.lock

@@ -101,6 +101,12 @@ message Bolt11Jit {
   // See [`LdkChannelConfig::accept_underpaying_htlcs`](https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html#structfield.accept_underpaying_htlcs)
   // for more information.
   LSPFeeLimits lsp_fee_limits = 4;
+
+  // The value, in thousands of a satoshi, that was deducted from this payment as an extra
+  // fee taken by our channel counterparty.
+  //
+  // Will only be `Some` once we received the payment.
+  optional uint64 counterparty_skimmed_fee_msat = 5;
 }
 
 // Represents a BOLT 12 ‘offer’ payment, i.e., a payment for an Offer.

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

@@ -134,6 +134,12 @@ pub struct Bolt11Jit {
 	/// for more information.
 	#[prost(message, optional, tag = "4")]
 	pub lsp_fee_limits: ::core::option::Option<LspFeeLimits>,
+	/// The value, in thousands of a satoshi, that was deducted from this payment as an extra
+	/// fee taken by our channel counterparty.
+	///
+	/// Will only be `Some` once we received the payment.
+	#[prost(uint64, optional, tag = "5")]
+	pub counterparty_skimmed_fee_msat: ::core::option::Option<u64>,
 }
 /// Represents a BOLT 12 ‘offer’ payment, i.e., a payment for an Offer.
 #[allow(clippy::derive_partial_eq_without_eq)]

ldk-server-protos/src/types.rs

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-ldk-node = { git = "https://github.com/lightningdevkit/ldk-node.git", rev = "f0338d19256615088fabab2b6927d478ae3ec1a1" }
+ldk-node = { version = "0.7.0-rc.0" }
 serde = { version = "1.0.203", default-features = false, features = ["derive"] }
 hyper = { version = "1", default-features = false, features = ["server", "http1"] }
 http-body-util = { version = "0.1", default-features = false }

ldk-server/Cargo.toml

@@ -13,12 +13,15 @@ pub(crate) fn handle_bolt12_send_request(
 		Offer::from_str(&request.offer.as_str()).map_err(|_| ldk_node::NodeError::InvalidOffer)?;
 
 	let payment_id = match request.amount_msat {
-		None => context.node.bolt12_payment().send(&offer, request.quantity, request.payer_note),
+		None => {
+			context.node.bolt12_payment().send(&offer, request.quantity, request.payer_note, None)
+		},
 		Some(amount_msat) => context.node.bolt12_payment().send_using_amount(
 			&offer,
 			amount_msat,
 			request.quantity,
 			request.payer_note,
+			None,
 		),
 	}?;
 

ldk-server/src/api/bolt12_send.rs

@@ -78,7 +78,9 @@ impl From<NodeError> for LdkServerError {
 			| NodeError::InvalidNodeAlias
 			| NodeError::InvalidDateTime
 			| NodeError::InvalidFeeRate
-			| NodeError::UriParameterParsingFailed => {
+			| NodeError::UriParameterParsingFailed
+			| NodeError::InvalidBlindedPaths
+			| NodeError::AsyncPaymentServicesDisabled => {
 				(error.to_string(), LdkServerErrorCode::InvalidRequestError)
 			},
 
@@ -92,6 +94,7 @@ impl From<NodeError> for LdkServerError {
 			| NodeError::ProbeSendingFailed
 			| NodeError::ChannelCreationFailed
 			| NodeError::ChannelClosingFailed
+			| NodeError::ChannelSplicingFailed
 			| NodeError::ChannelConfigUpdateFailed
 			| NodeError::DuplicatePayment
 			| NodeError::InsufficientFunds

ldk-server/src/api/error.rs

@@ -79,6 +79,13 @@ fn main() {
 	let mut builder = Builder::from_config(ldk_node_config);
 	builder.set_log_facade_logger();
 
+	if let Some(alias) = config_file.alias {
+		if let Err(e) = builder.set_node_alias(alias.to_string()) {
+			eprintln!("Failed to set node alias: {e}");
+			std::process::exit(-1);
+		}
+	}
+
 	match config_file.chain_source {
 		ChainSource::Rpc { rpc_address, rpc_user, rpc_password } => {
 			builder.set_chain_source_bitcoind_rpc(
@@ -107,6 +114,8 @@ fn main() {
 		},
 	};
 
+	builder.set_runtime(runtime.handle().clone());
+
 	let node = match builder.build() {
 		Ok(node) => Arc::new(node),
 		Err(e) => {
@@ -136,7 +145,7 @@ fn main() {
 	};
 
 	println!("Starting up...");
-	match node.start_with_runtime(Arc::clone(&runtime)) {
+	match node.start() {
 		Ok(()) => {},
 		Err(e) => {
 			eprintln!("Failed to start up LDK Node: {}", e);
@@ -171,14 +180,18 @@ fn main() {
 								"CHANNEL_PENDING: {} from counterparty {}",
 								channel_id, counterparty_node_id
 							);
-							event_node.event_handled();
+							if let Err(e) = event_node.event_handled() {
+								eprintln!("Failed to mark event as handled: {e}");
+							}
 						},
 						Event::ChannelReady { channel_id, counterparty_node_id, .. } => {
 							println!(
 								"CHANNEL_READY: {} from counterparty {:?}",
 								channel_id, counterparty_node_id
 							);
-							event_node.event_handled();
+							if let Err(e) = event_node.event_handled() {
+								eprintln!("Failed to mark event as handled: {e}");
+							}
 						},
 						Event::PaymentReceived { payment_id, payment_hash, amount_msat, .. } => {
 							println!(
@@ -281,15 +294,19 @@ fn main() {
 								&forwarded_payment.encode_to_vec(),
 							) {
 								Ok(_) => {
-										event_node.event_handled();
+									if let Err(e) = event_node.event_handled() {
+										eprintln!("Failed to mark event as handled: {e}");
+									}
 								}
 								Err(e) => {
 										println!("Failed to write forwarded payment to persistence: {}", e);
 								}
 							}
 						},
 						_ => {
-							event_node.event_handled();
+							if let Err(e) = event_node.event_handled() {
+								eprintln!("Failed to mark event as handled: {e}");
+							}
 						},
 					}
 				},
@@ -361,7 +378,9 @@ fn upsert_payment_details(
 		&payment.encode_to_vec(),
 	) {
 		Ok(_) => {
-			event_node.event_handled();
+			if let Err(e) = event_node.event_handled() {
+				eprintln!("Failed to mark event as handled: {e}");
+			}
 		},
 		Err(e) => {
 			eprintln!("Failed to write payment to persistence: {}", e);

ldk-server/src/main.rs

@@ -188,6 +188,7 @@ struct LSPS2ServiceTomlConfig {
 	max_client_to_self_delay: u32,
 	min_payment_size_msat: u64,
 	max_payment_size_msat: u64,
+	client_trusts_lsp: bool,
 	require_token: Option<String>,
 }
 
@@ -203,6 +204,7 @@ impl Into<LSPS2ServiceConfig> for LSPS2ServiceTomlConfig {
 				max_client_to_self_delay,
 				min_payment_size_msat,
 				max_payment_size_msat,
+				client_trusts_lsp,
 				require_token,
 			} => LSPS2ServiceConfig {
 				advertise_service,
@@ -213,6 +215,7 @@ impl Into<LSPS2ServiceConfig> for LSPS2ServiceTomlConfig {
 				min_payment_size_msat,
 				max_client_to_self_delay,
 				max_payment_size_msat,
+				client_trusts_lsp,
 				require_token,
 			},
 		}
@@ -274,6 +277,7 @@ mod tests {
 			max_client_to_self_delay = 1440           # ~10 days
 			min_payment_size_msat = 10000000          # 10,000 satoshis
 			max_payment_size_msat = 25000000000       # 0.25 BTC
+			client_trusts_lsp = true
 			"#;
 
 		fs::write(storage_path.join(config_file_name), toml_config).unwrap();
@@ -304,6 +308,7 @@ mod tests {
 				max_client_to_self_delay: 1440,
 				min_payment_size_msat: 10000000,
 				max_payment_size_msat: 25000000000,
+				client_trusts_lsp: true,
 			}),
 		};
 

ldk-server/src/util/config.rs

@@ -147,19 +147,24 @@ pub(crate) fn payment_kind_to_proto(
 				secret: secret.map(|s| Bytes::copy_from_slice(&s.0)),
 			})),
 		},
-		PaymentKind::Bolt11Jit { hash, preimage, secret, lsp_fee_limits } => {
-			ldk_server_protos::types::PaymentKind {
-				kind: Some(Bolt11Jit(ldk_server_protos::types::Bolt11Jit {
-					hash: hash.to_string(),
-					preimage: preimage.map(|p| p.to_string()),
-					secret: secret.map(|s| Bytes::copy_from_slice(&s.0)),
-					lsp_fee_limits: Some(LspFeeLimits {
-						max_total_opening_fee_msat: lsp_fee_limits.max_total_opening_fee_msat,
-						max_proportional_opening_fee_ppm_msat: lsp_fee_limits
-							.max_proportional_opening_fee_ppm_msat,
-					}),
-				})),
-			}
+		PaymentKind::Bolt11Jit {
+			hash,
+			preimage,
+			secret,
+			lsp_fee_limits,
+			counterparty_skimmed_fee_msat,
+		} => ldk_server_protos::types::PaymentKind {
+			kind: Some(Bolt11Jit(ldk_server_protos::types::Bolt11Jit {
+				hash: hash.to_string(),
+				preimage: preimage.map(|p| p.to_string()),
+				secret: secret.map(|s| Bytes::copy_from_slice(&s.0)),
+				lsp_fee_limits: Some(LspFeeLimits {
+					max_total_opening_fee_msat: lsp_fee_limits.max_total_opening_fee_msat,
+					max_proportional_opening_fee_ppm_msat: lsp_fee_limits
+						.max_proportional_opening_fee_ppm_msat,
+				}),
+				counterparty_skimmed_fee_msat,
+			})),
 		},
 		PaymentKind::Bolt12Offer { hash, preimage, secret, offer_id, payer_note, quantity } => {
 			ldk_server_protos::types::PaymentKind {