Invoke process_pending_htlcs on HTLC expiry timer

Calls the new LSPS4 process_pending_htlcs() method on the
existing 5-second HTLC expiry timer. This retries forwarding
HTLCs that were deferred at peer_connected time because the
channel was not yet usable (channel_reestablish still in
progress).

Author: amackillop

Cargo.toml

@@ -41,18 +41,18 @@ default = []
 # lightning-liquidity = { version = "0.2.0", features = ["std"] }
 # 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 = "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" }
+# Branch: https://github.com/moneydevkit/rust-lightning/tree/austin_mdk-608_reprocess-pending-htlcs
+lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd", features = ["std"] }
+lightning-types = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd" }
+lightning-invoice = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd" }
+lightning-persister = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd", features = ["tokio"] }
+lightning-background-processor = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd" }
+lightning-rapid-gossip-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd" }
+lightning-block-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd", features = ["rest-client", "rpc-client", "tokio"] }
+lightning-transaction-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
+lightning-liquidity = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd", features = ["std"] }
+lightning-macros = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd" }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["std"] }
 #lightning-types = { path = "../rust-lightning/lightning-types" }
@@ -100,8 +100,8 @@ 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 = "736d3a87bf8f7220a2b2e2e0274bce94d1ae0e2a", features = ["std", "_test_utils"] }
+# Branch: https://github.com/moneydevkit/rust-lightning/commits/austin_mdk-608_reprocess-pending-htlcs
+lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "b7d6a4783aed387ef5abbc9c745a9ff9a72efdcd", features = ["std", "_test_utils"] }
 #lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
 proptest = "1.0.0"
 regex = "1.5.6"

src/lib.rs

@@ -635,7 +635,8 @@ impl Node {
 							return;
 						}
 						_ = tokio::time::sleep(Duration::from_secs(HTLC_EXPIRY_CHECK_INTERVAL_SECS)) => {
-								liquidity_handler.handle_expired_htlcs().await;
+							liquidity_handler.process_pending_htlcs();
+							liquidity_handler.handle_expired_htlcs().await;
 						}
 						_ = liquidity_handler.handle_next_event() => {}
 					}

src/liquidity.rs

@@ -487,6 +487,12 @@ where
 		}
 	}
 
+	pub(crate) fn process_pending_htlcs(&self) {
+		if let Some(lsps4_service_handler) = self.liquidity_manager.lsps4_service_handler() {
+			lsps4_service_handler.process_pending_htlcs();
+		}
+	}
+
 	pub(crate) async fn handle_next_event(&self) {
 		match self.liquidity_manager.next_event_async().await {
 			LiquidityEvent::LSPS1Client(LSPS1ClientEvent::SupportedOptionsReady {