fixup! Allow setting default DNS resolvers for HRNs

Author: chuksys

bindings/ldk_node.udl

@@ -13,6 +13,7 @@ dictionary Config {
 	u64 probing_liquidity_limit_multiplier;
 	AnchorChannelsConfig? anchor_channels_config;
 	SendingParameters? sending_parameters;
+	sequence<PublicKey>? dns_resolvers_node_ids;
 };
 
 dictionary AnchorChannelsConfig {
@@ -94,6 +95,8 @@ interface Builder {
 	[Throws=BuildError]
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
+	void set_dns_resolvers(sequence<PublicKey> dns_resolvers_node_ids);
+	[Throws=BuildError]
 	Node build();
 	[Throws=BuildError]
 	Node build_with_fs_store();
@@ -303,6 +306,7 @@ enum NodeError {
 	"LiquiditySourceUnavailable",
 	"LiquidityFeeTooHigh",
 	"HrnParsingFailed",
+	"DnsResolversNotConfigured",
 };
 
 dictionary NodeStatus {
@@ -338,6 +342,7 @@ enum BuildError {
 	"WalletSetupFailed",
 	"LoggerSetupFailed",
 	"NetworkMismatch",
+	"DnsResolversEmpty",
 };
 
 [Trait]

src/builder.rs

@@ -45,7 +45,6 @@ use lightning::routing::scoring::{
 	ProbabilisticScorer, ProbabilisticScoringDecayParameters, ProbabilisticScoringFeeParameters,
 };
 use lightning::sign::EntropySource;
-use lightning::onion_message::messenger::Destination;
 
 use lightning::util::persist::{
 	read_channel_monitors, CHANNEL_MANAGER_PERSISTENCE_KEY,
@@ -173,6 +172,8 @@ pub enum BuildError {
 	LoggerSetupFailed,
 	/// The given network does not match the node's previously configured network.
 	NetworkMismatch,
+	/// The dns_resolvers list provided for HRN resolution is empty
+	DnsResolversEmpty,
 }
 
 impl fmt::Display for BuildError {
@@ -200,6 +201,9 @@ impl fmt::Display for BuildError {
 			Self::NetworkMismatch => {
 				write!(f, "Given network does not match the node's previously configured network.")
 			},
+			Self::DnsResolversEmpty => {
+				write!(f, "The dns_resolvers list provided for HRN resolution is empty.")
+			},
 		}
 	}
 }
@@ -459,8 +463,13 @@ impl NodeBuilder {
 	}
 
 	/// Sets the default dns_resolvers to be used when sending payments to HRNs.
-	pub fn set_dns_resolvers(&mut self, dns_resolvers: Vec<Destination>) -> Result<&mut Self, BuildError> {
-		self.config.dns_resolvers = Some(dns_resolvers);
+	pub fn set_dns_resolvers(
+		&mut self, dns_resolvers_node_ids: Vec<PublicKey>,
+	) -> Result<&mut Self, BuildError> {
+		if dns_resolvers_node_ids.is_empty() {
+			return Err(BuildError::DnsResolversEmpty);
+		}
+		self.config.dns_resolvers_node_ids = Some(dns_resolvers_node_ids);
 		Ok(self)
 	}
 
@@ -846,8 +855,8 @@ impl ArcedNodeBuilder {
 	}
 
 	/// Sets the default dns_resolvers to be used when sending payments to HRNs.
-	pub fn set_dns_resolvers(&self, dns_resolvers: Vec<Destination>) -> Result<(), BuildError> {
-		self.inner.write().unwrap().set_dns_resolvers(dns_resolvers).map(|_| ());
+	pub fn set_dns_resolvers(&self, dns_resolvers_node_ids: Vec<PublicKey>) -> Result<(), BuildError> {
+		self.inner.write().unwrap().set_dns_resolvers(dns_resolvers_node_ids).map(|_| ())
 	}
 
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options

src/config.rs

@@ -11,7 +11,6 @@ use crate::logger::LogLevel;
 use crate::payment::SendingParameters;
 
 use lightning::ln::msgs::SocketAddress;
-use lightning::onion_message::messenger::Destination;
 use lightning::routing::gossip::NodeAlias;
 use lightning::util::config::ChannelConfig as LdkChannelConfig;
 use lightning::util::config::MaxDustHTLCExposure as LdkMaxDustHTLCExposure;
@@ -105,7 +104,7 @@ pub const WALLET_KEYS_SEED_LEN: usize = 64;
 /// | `anchor_channels_config`               | Some(..)           |
 /// | `sending_parameters`                   | None               |
 /// | `dns_resolvers`                        | None               |
-/// 
+///
 /// See [`AnchorChannelsConfig`] and [`SendingParameters`] for more information regarding their
 /// respective default values.
 ///
@@ -169,11 +168,11 @@ pub struct Config {
 	/// **Note:** If unset, default parameters will be used, and you will be able to override the
 	/// parameters on a per-payment basis in the corresponding method calls.
 	pub sending_parameters: Option<SendingParameters>,
-	/// The dns_resolver nodes (Destinations) to be used for resolving Human-readable Names.
-	/// 
+	/// The dns_resolver node_ids to be used for resolving Human-readable Names.
+	///
 	/// If set to `Some`, the values set will be used as dns_resolvers when sending to HRNs.
 	/// **Note:** If set to `None`, payments to HRNs will fail.
-	pub dns_resolvers: Option<Vec<Destination>>,
+	pub dns_resolvers_node_ids: Option<Vec<PublicKey>>,
 }
 
 impl Default for Config {
@@ -188,7 +187,7 @@ impl Default for Config {
 			anchor_channels_config: Some(AnchorChannelsConfig::default()),
 			sending_parameters: None,
 			node_alias: None,
-			dns_resolvers: None,
+			dns_resolvers_node_ids: None,
 		}
 	}
 }

src/lib.rs

@@ -829,6 +829,11 @@ impl Node {
 		self.config.node_alias
 	}
 
+	/// Returns the list of dns_resolvers that will be used to resolve HRNs.
+	pub fn dns_resolvers(&self) -> Option<Vec<PublicKey>> {
+		self.config.dns_resolvers_node_ids.clone()
+	}
+
 	/// Returns a payment handler allowing to create and pay [BOLT 11] invoices.
 	///
 	/// [BOLT 11]: https://github.com/lightning/bolts/blob/master/11-payment-encoding.md