fixup! Allow setting default DNS resolvers for HRNs

Author: chuksys

bindings/ldk_node.udl

@@ -13,7 +13,11 @@ dictionary Config {
 	u64 probing_liquidity_limit_multiplier;
 	AnchorChannelsConfig? anchor_channels_config;
 	SendingParameters? sending_parameters;
-	sequence<PublicKey>? dns_resolvers_node_ids;
+	HumanReadableNamesConfig hrn_config;
+};
+
+dictionary HumanReadableNamesConfig {
+	sequence<PublicKey> dns_resolvers_node_ids;
 };
 
 dictionary AnchorChannelsConfig {
@@ -94,8 +98,7 @@ interface Builder {
 	void set_announcement_addresses(sequence<SocketAddress> announcement_addresses);
 	[Throws=BuildError]
 	void set_node_alias(string node_alias);
-	[Throws=BuildError]
-	void set_dns_resolvers(sequence<PublicKey> dns_resolvers_node_ids);
+	void set_hrn_config(HumanReadableNamesConfig hrn_config);
 	[Throws=BuildError]
 	Node build();
 	[Throws=BuildError]

src/builder.rs

@@ -8,7 +8,8 @@
 use crate::chain::{ChainSource, DEFAULT_ESPLORA_SERVER_URL};
 use crate::config::{
 	default_user_config, may_announce_channel, AnnounceError, Config, ElectrumSyncConfig,
-	EsploraSyncConfig, DEFAULT_LOG_FILENAME, DEFAULT_LOG_LEVEL, WALLET_KEYS_SEED_LEN,
+	EsploraSyncConfig, HumanReadableNamesConfig, DEFAULT_LOG_FILENAME, DEFAULT_LOG_LEVEL,
+	WALLET_KEYS_SEED_LEN,
 };
 
 use crate::connection::ConnectionManager;
@@ -464,15 +465,10 @@ impl NodeBuilder {
 		Ok(self)
 	}
 
-	/// Sets the default dns_resolvers to be used when sending payments to HRNs.
-	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)
+	/// Sets the default [`Config::hrn_config`] to be used when sending payments to HRNs.
+	pub fn set_hrn_config(&mut self, hrn_config: HumanReadableNamesConfig) -> &mut Self {
+		self.config.hrn_config = hrn_config;
+		self
 	}
 
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
@@ -856,11 +852,9 @@ impl ArcedNodeBuilder {
 		self.inner.write().unwrap().set_node_alias(node_alias).map(|_| ())
 	}
 
-	/// Sets the default dns_resolvers to be used when sending payments to HRNs.
-	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(|_| ())
+	/// Sets the default [`Config::hrn_config`] to be used when sending payments to HRNs.
+	pub fn set_hrn_config(&self, hrn_config: HumanReadableNamesConfig) {
+		self.inner.write().unwrap().set_hrn_config(hrn_config);
 	}
 
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options

src/config.rs

@@ -168,11 +168,8 @@ 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_resolvers 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_node_ids: Option<Vec<PublicKey>>,
+	/// Configuration Options for Human-readable Names.
+	pub hrn_config: HumanReadableNamesConfig,
 }
 
 impl Default for Config {
@@ -187,11 +184,28 @@ impl Default for Config {
 			anchor_channels_config: Some(AnchorChannelsConfig::default()),
 			sending_parameters: None,
 			node_alias: None,
-			dns_resolvers_node_ids: None,
+			hrn_config: HumanReadableNamesConfig::default(),
 		}
 	}
 }
 
+/// Configuration options for Human-readable Names
+#[derive(Debug, Clone)]
+pub struct HumanReadableNamesConfig {
+	/// The DNS resolvers to be used for resolving Human-readable Names.
+	///
+	/// If not empty, the values set will be used as DNS resolvers when sending to HRNs.
+	///
+	/// **Note:** If empty, payments to HRNs will fail.
+	pub dns_resolvers_node_ids: Vec<PublicKey>,
+}
+
+impl Default for HumanReadableNamesConfig {
+	fn default() -> Self {
+		Self { dns_resolvers_node_ids: vec![] }
+	}
+}
+
 /// Configuration options pertaining to 'Anchor' channels, i.e., channels for which the
 /// `option_anchors_zero_fee_htlc_tx` channel type is negotiated.
 ///

src/lib.rs

@@ -829,11 +829,6 @@ 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

src/uniffi_types.rs

@@ -12,7 +12,7 @@
 
 pub use crate::config::{
 	default_config, AnchorChannelsConfig, BackgroundSyncConfig, ElectrumSyncConfig,
-	EsploraSyncConfig, MaxDustHTLCExposure,
+	EsploraSyncConfig, HumanReadableNamesConfig, MaxDustHTLCExposure,
 };
 pub use crate::graph::{ChannelInfo, ChannelUpdateInfo, NodeAnnouncementInfo, NodeInfo};
 pub use crate::liquidity::{LSPS1OrderStatus, LSPS2ServiceConfig, OnchainPaymentInfo, PaymentInfo};