fix(lsps4): handle channel-not-usable splice error without fallback

When splice fails because the channel is reestablishing (not usable
yet), don't fall back to create_channel. The timer retries in ~1s
once reestablishment completes.

Author: martinsaposnic

Cargo.toml

@@ -42,17 +42,17 @@ default = []
 # lightning-macros = { version = "0.2.0" }
 
 # Branch: https://github.com/moneydevkit/rust-lightning/commits/feature/lsps4-splice-in/
-lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0", features = ["std"] }
-lightning-types = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0" }
-lightning-invoice = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0", features = ["std"] }
-lightning-net-tokio = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0" }
-lightning-persister = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0", features = ["tokio"] }
-lightning-background-processor = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0" }
-lightning-rapid-gossip-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0" }
-lightning-block-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0", features = ["rest-client", "rpc-client", "tokio"] }
-lightning-transaction-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
-lightning-liquidity = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0", features = ["std"] }
-lightning-macros = { git = "https://github.com/moneydevkit/rust-lightning", rev = "afe7b5bb0" }
+lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3", features = ["std"] }
+lightning-types = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3" }
+lightning-invoice = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3" }
+lightning-persister = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3", features = ["tokio"] }
+lightning-background-processor = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3" }
+lightning-rapid-gossip-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3" }
+lightning-block-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3", features = ["rest-client", "rpc-client", "tokio"] }
+lightning-transaction-sync = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
+lightning-liquidity = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3", features = ["std"] }
+lightning-macros = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3" }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["std"] }
 #lightning-types = { path = "../rust-lightning/lightning-types" }
@@ -101,7 +101,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 = "afe7b5bb0", features = ["std", "_test_utils"] }
+lightning = { git = "https://github.com/moneydevkit/rust-lightning", rev = "457a504b3", features = ["std", "_test_utils"] }
 #lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
 proptest = "1.0.0"
 regex = "1.5.6"

src/liquidity.rs

@@ -1146,6 +1146,16 @@ where
 							their_network_key
 						);
 					},
+					Err(ref e) if is_channel_not_yet_usable(e) => {
+						// Channel exists but is reestablishing. Don't fall back to
+						// create_channel - the 1Hz timer will retry once usable (~1s).
+						log_info!(
+							self.logger,
+							"LSPS4 splice deferred on channel {} with peer {} (channel reestablishing)",
+							channel_id,
+							their_network_key
+						);
+					},
 					Err(e) => {
 						log_error!(
 							self.logger,
@@ -2176,6 +2186,10 @@ fn is_splice_already_pending(err: &APIError) -> bool {
 	matches!(err, APIError::APIMisuseError { ref err } if err.contains("splice pending"))
 }
 
+fn is_channel_not_yet_usable(err: &APIError) -> bool {
+	matches!(err, APIError::APIMisuseError { ref err } if err.contains("pending open/close"))
+}
+
 #[derive(Debug, Clone)]
 pub(crate) struct LSPS1OpeningParamsResponse {
 	supported_options: LSPS1Options,