use new rust-lightning version

Author: Fernando Ledesma

Cargo.toml

@@ -42,17 +42,17 @@ default = []
 # lightning-macros = { version = "0.2.0" }
 
 # Branch: https://github.com/moneydevkit/rust-lightning/commits/lsp-0.2.0/
-lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891", features = ["std"] }
-lightning-types = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891" }
-lightning-invoice = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891", features = ["std"] }
-lightning-net-tokio = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891" }
-lightning-persister = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891", features = ["tokio"] }
-lightning-background-processor = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891" }
-lightning-rapid-gossip-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891" }
-lightning-block-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891", features = ["rest-client", "rpc-client", "tokio"] }
-lightning-transaction-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
-lightning-liquidity = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891", features = ["std"] }
-lightning-macros = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891" }
+lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["std"] }
+lightning-types = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a" }
+lightning-invoice = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a" }
+lightning-persister = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["tokio"] }
+lightning-background-processor = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a" }
+lightning-rapid-gossip-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a" }
+lightning-block-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["rest-client", "rpc-client", "tokio"] }
+lightning-transaction-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
+lightning-liquidity = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["std"] }
+lightning-macros = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a" }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["std"] }
 #lightning-types = { path = "../rust-lightning/lightning-types" }
@@ -99,7 +99,7 @@ winapi = { version = "0.3", features = ["winbase"] }
 [dev-dependencies]
 # lightning = { version = "0.2.0", features = ["std", "_test_utils"] }
 # Branch: https://github.com/moneydevkit/rust-lightning/commits/lsp-0.2.0/
-lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "f1ac8f14a1de542a08d02bd2132d31da216ce891", features = ["std", "_test_utils"] }
+lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["std", "_test_utils"] }
 #lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
 proptest = "1.0.0"
 regex = "1.5.6"

src/builder.rs

@@ -1534,15 +1534,33 @@ fn build_with_store_internal(
 	let is_lsp_client = liquidity_source_config
 		.map(|lsc| lsc.lsps2_client.is_some() || lsc.lsps4_client.is_some())
 		.unwrap_or(false);
+	let is_lsp_service = liquidity_source_config
+		.map(|lsc| lsc.lsps2_service.is_some() || lsc.lsps4_service.is_some())
+		.unwrap_or(false);
+
 	if is_lsp_client {
-		// If we act as an LSPS2 service, we need to to be able to intercept HTLCs and forward the
+		// If we act as an LSPS2/LSPS4 client, we need to be able to intercept HTLCs and forward the
+		// information to the service handler.
+		user_config.accept_intercept_htlcs = true;
+
+		// If we act as an LSPS2/LSPS4 client, we allow forwarding to unnannounced channels.
+		user_config.accept_forwards_to_priv_channels = true;
+
+		// If we act as an LSPS2/LSPS4 client, set the HTLC-value-in-flight to 100% of the channel value
+		// to ensure we can forward the initial payment.
+		user_config.channel_handshake_config.max_inbound_htlc_value_in_flight_percent_of_channel =
+			100;
+	}
+
+	if is_lsp_service {
+		// If we act as an LSPS2/LSPS4 service, we need to be able to intercept HTLCs and forward the
 		// information to the service handler.
 		user_config.accept_intercept_htlcs = true;
 
-		// If we act as an LSPS2 service, we allow forwarding to unnannounced channels.
+		// If we act as an LSPS2/LSPS4 service, we allow forwarding to unannounced channels.
 		user_config.accept_forwards_to_priv_channels = true;
 
-		// If we act as an LSPS2 service, set the HTLC-value-in-flight to 100% of the channel value
+		// If we act as an LSPS2/LSPS4 service, set the HTLC-value-in-flight to 100% of the channel value
 		// to ensure we can forward the initial payment.
 		user_config.channel_handshake_config.max_inbound_htlc_value_in_flight_percent_of_channel =
 			100;

src/liquidity.rs

@@ -1758,7 +1758,6 @@ where
 		if let Some(lsps4_service_handler) = self.liquidity_manager.lsps4_service_handler() {
 			if let Err(e) = lsps4_service_handler
 				.channel_ready(counterparty_node_id)
-				.await
 			{
 				log_error!(
 					self.logger,
@@ -1797,8 +1796,7 @@ where
 				intercept_id,
 				expected_outbound_amount_msat,
 				payment_hash,
-				)
-				.await 
+				) 
 			{
 				log_error!(
 					self.logger,