fixup! Allow setting default DNS resolvers for HRNs

Author: chuksys

bindings/ldk_node.udl

@@ -13,7 +13,7 @@ dictionary Config {
 	u64 probing_liquidity_limit_multiplier;
 	AnchorChannelsConfig? anchor_channels_config;
 	SendingParameters? sending_parameters;
-	HumanReadableNamesConfig hrn_config;
+	HumanReadableNamesConfig? hrn_config;
 };
 
 dictionary HumanReadableNamesConfig {
@@ -98,7 +98,6 @@ interface Builder {
 	void set_announcement_addresses(sequence<SocketAddress> announcement_addresses);
 	[Throws=BuildError]
 	void set_node_alias(string node_alias);
-	void set_hrn_config(HumanReadableNamesConfig hrn_config);
 	[Throws=BuildError]
 	Node build();
 	[Throws=BuildError]
@@ -318,7 +317,7 @@ enum NodeError {
 	"LiquiditySourceUnavailable",
 	"LiquidityFeeTooHigh",
 	"HrnParsingFailed",
-	"DnsResolversNotConfigured",
+	"DnsResolversUnavailable",
 };
 
 dictionary NodeStatus {
@@ -354,7 +353,7 @@ enum BuildError {
 	"WalletSetupFailed",
 	"LoggerSetupFailed",
 	"NetworkMismatch",
-	"DnsResolversEmpty",
+	"DnsResolversUnavailable",
 };
 
 [Trait]

src/builder.rs

@@ -8,8 +8,7 @@
 use crate::chain::{ChainSource, DEFAULT_ESPLORA_SERVER_URL};
 use crate::config::{
 	default_user_config, may_announce_channel, AnnounceError, Config, ElectrumSyncConfig,
-	EsploraSyncConfig, HumanReadableNamesConfig, DEFAULT_LOG_FILENAME, DEFAULT_LOG_LEVEL,
-	WALLET_KEYS_SEED_LEN,
+	EsploraSyncConfig, DEFAULT_LOG_FILENAME, DEFAULT_LOG_LEVEL, WALLET_KEYS_SEED_LEN,
 };
 
 use crate::connection::ConnectionManager;
@@ -175,8 +174,10 @@ 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,
+	/// The [`dns_resolvers_node_ids`] provided for HRN resolution is empty.
+	///
+	/// [`dns_resolvers_node_ids`]: crate::config::HumanReadableNamesConfig::dns_resolvers_node_ids
+	DnsResolversUnavailable,
 }
 
 impl fmt::Display for BuildError {
@@ -204,7 +205,7 @@ impl fmt::Display for BuildError {
 			Self::NetworkMismatch => {
 				write!(f, "Given network does not match the node's previously configured network.")
 			},
-			Self::DnsResolversEmpty => {
+			Self::DnsResolversUnavailable => {
 				write!(f, "The dns_resolvers list provided for HRN resolution is empty.")
 			},
 		}
@@ -465,12 +466,6 @@ impl NodeBuilder {
 		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
 	/// previously configured.
 	pub fn build(&self) -> Result<Node, BuildError> {
@@ -852,11 +847,6 @@ impl ArcedNodeBuilder {
 		self.inner.write().unwrap().set_node_alias(node_alias).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
 	/// previously configured.
 	pub fn build(&self) -> Result<Arc<Node>, BuildError> {
@@ -1509,6 +1499,12 @@ fn build_with_store_internal(
 		},
 	};
 
+	if let Some(hrn_config) = &config.hrn_config {
+		if hrn_config.dns_resolvers_node_ids.is_empty() {
+			return Err(BuildError::DnsResolversUnavailable);
+		}
+	};
+
 	let (stop_sender, _) = tokio::sync::watch::channel(());
 	let (event_handling_stopped_sender, _) = tokio::sync::watch::channel(());
 

src/config.rs

@@ -103,7 +103,7 @@ pub const WALLET_KEYS_SEED_LEN: usize = 64;
 /// | `log_level`                            | Debug              |
 /// | `anchor_channels_config`               | Some(..)           |
 /// | `sending_parameters`                   | None               |
-/// | `dns_resolvers`                        | None               |
+/// | `hrn_config`                           | None               |
 ///
 /// See [`AnchorChannelsConfig`] and [`SendingParameters`] for more information regarding their
 /// respective default values.
@@ -168,8 +168,10 @@ 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>,
-	/// Configuration Options for Human-readable Names.
-	pub hrn_config: HumanReadableNamesConfig,
+	/// Configuration options for Human-Readable Names ([BIP 353]).
+	///
+	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
+	pub hrn_config: Option<HumanReadableNamesConfig>,
 }
 
 impl Default for Config {
@@ -184,7 +186,7 @@ impl Default for Config {
 			anchor_channels_config: Some(AnchorChannelsConfig::default()),
 			sending_parameters: None,
 			node_alias: None,
-			hrn_config: HumanReadableNamesConfig::default(),
+			hrn_config: None,
 		}
 	}
 }
@@ -200,12 +202,6 @@ pub struct HumanReadableNamesConfig {
 	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.
 ///