Add timeout for RGS updates

.. even though we don't expect this to block, we're better safe than
sorry and start to introduce timeouts for any calls we make to remote
servers.

Author: tnull

bindings/ldk_node.udl

@@ -163,6 +163,7 @@ enum NodeError {
 	"MessageSigningFailed",
 	"TxSyncFailed",
 	"GossipUpdateFailed",
+	"GossipUpdateTimeout",
 	"LiquidityRequestFailed",
 	"InvalidAddress",
 	"InvalidSocketAddress",

src/config.rs

@@ -51,6 +51,9 @@ pub(crate) const LDK_WALLET_SYNC_TIMEOUT_SECS: u64 = 30;
 // The timeout after which we abort a fee rate cache update operation.
 pub(crate) const FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS: u64 = 5;
 
+// The timeout after which we abort a RGS sync operation.
+pub(crate) const RGS_SYNC_TIMEOUT_SECS: u64 = 5;
+
 // The length in bytes of our wallets' keys seed.
 pub(crate) const WALLET_KEYS_SEED_LEN: usize = 64;
 

src/error.rs

@@ -47,6 +47,8 @@ pub enum Error {
 	TxSyncFailed,
 	/// A gossip updating operation failed.
 	GossipUpdateFailed,
+	/// A gossip updating operation timed out.
+	GossipUpdateTimeout,
 	/// A liquidity request operation failed.
 	LiquidityRequestFailed,
 	/// The given address is invalid.
@@ -122,6 +124,7 @@ impl fmt::Display for Error {
 			Self::MessageSigningFailed => write!(f, "Failed to sign given message."),
 			Self::TxSyncFailed => write!(f, "Failed to sync transactions."),
 			Self::GossipUpdateFailed => write!(f, "Failed to update gossip data."),
+			Self::GossipUpdateTimeout => write!(f, "Updating gossip data timed out."),
 			Self::LiquidityRequestFailed => write!(f, "Failed to request inbound liquidity."),
 			Self::InvalidAddress => write!(f, "The given address is invalid."),
 			Self::InvalidSocketAddress => write!(f, "The given network address is invalid."),

src/gossip.rs

@@ -1,3 +1,4 @@
+use crate::config::RGS_SYNC_TIMEOUT_SECS;
 use crate::logger::{log_trace, FilesystemLogger, Logger};
 use crate::types::{GossipSync, NetworkGraph, P2PGossipSync, RapidGossipSync};
 use crate::Error;
@@ -6,6 +7,7 @@ use lightning::routing::utxo::UtxoLookup;
 
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
+use std::time::Duration;
 
 pub(crate) enum GossipSource {
 	P2PNetwork {
@@ -55,7 +57,17 @@ impl GossipSource {
 			Self::RapidGossipSync { gossip_sync, server_url, latest_sync_timestamp, logger } => {
 				let query_timestamp = latest_sync_timestamp.load(Ordering::Acquire);
 				let query_url = format!("{}/{}", server_url, query_timestamp);
-				let response = reqwest::get(query_url).await.map_err(|e| {
+
+				let response = tokio::time::timeout(
+					Duration::from_secs(RGS_SYNC_TIMEOUT_SECS),
+					reqwest::get(query_url),
+				)
+				.await
+				.map_err(|e| {
+					log_trace!(logger, "Retrieving RGS gossip update timed out: {}", e);
+					Error::GossipUpdateTimeout
+				})?
+				.map_err(|e| {
 					log_trace!(logger, "Failed to retrieve RGS gossip update: {}", e);
 					Error::GossipUpdateFailed
 				})?;