Wrap payment instructions parsing in tokio timeout

Author: chuksys

bindings/ldk_node.udl

@@ -325,6 +325,7 @@ enum NodeError {
 	"AsyncPaymentServicesDisabled",
 	"HrnParsingFailed",
 	"HrnResolverNotConfigured",
+	"TimeoutOccurred",
 };
 
 dictionary NodeStatus {

src/builder.rs

@@ -1549,11 +1549,20 @@ fn build_with_store_internal(
 		})?;
 	}
 
-	let resolver = if config.is_hrn_resolver {
-		Resolver::DNS(Arc::new(OMDomainResolver::ignoring_incoming_proofs(
-			"8.8.8.8:53".parse().map_err(|_| BuildError::DNSResolverSetupFailed)?,
-		)))
+	let resolver = if let Some(hrn_config) = &config.hrn_config {
+		if hrn_config.is_hrn_resolver {
+			let dns_addr = hrn_config.dns_server_address.as_str();
+
+			Resolver::DNS(Arc::new(OMDomainResolver::ignoring_incoming_proofs(
+				dns_addr.parse().map_err(|_| BuildError::DNSResolverSetupFailed)?,
+			)))
+		} else {
+			Resolver::HRN(Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(
+				&network_graph,
+			))))
+		}
 	} else {
+		// hrn_config is None, default to the HRN resolver.
 		Resolver::HRN(Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph))))
 	};
 

src/error.rs

@@ -129,6 +129,8 @@ pub enum Error {
 	HrnParsingFailed,
 	/// A HRN resolver was not configured
 	HrnResolverNotConfigured,
+	/// A Timeout occurred during an operation.
+	TimeoutOccurred,
 }
 
 impl fmt::Display for Error {
@@ -212,6 +214,9 @@ impl fmt::Display for Error {
 			Self::HrnResolverNotConfigured => {
 				write!(f, "A HRN resolver was not configured.")
 			},
+			Self::TimeoutOccurred => {
+				write!(f, "A Timeout occured during an operation.")
+			},
 		}
 	}
 }

src/payment/unified.rs

@@ -21,6 +21,7 @@ use crate::payment::{Bolt11Payment, Bolt12Payment, OnchainPayment};
 use crate::types::HRNResolver;
 use crate::Config;
 use std::sync::Arc;
+use std::time::Duration;
 use std::vec::IntoIter;
 
 use lightning::ln::channelmanager::PaymentId;
@@ -35,6 +36,7 @@ use bitcoin::{Amount, Txid};
 use bitcoin_payment_instructions::{
 	amount::Amount as BPIAmount, PaymentInstructions, PaymentMethod,
 };
+use tokio::time::timeout;
 
 type Uri<'a> = bip21::Uri<'a, NetworkChecked, Extras>;