Skip to content

HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 5 commits into from
Apr 27, 2026
Merged

HRN resolution refinement and architectural clean-up #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7e11a61
Replace peer_manager_hook with deferred closure registration
chuksys Apr 22, 2026
9b72b11
Remove redundant Arc wrapping of HRNResolver
chuksys Apr 22, 2026
de65d2f
Use ok_or_else for lazy error logging in DNS resolution
chuksys Apr 22, 2026
5d27176
Fix HRN configuration defaults in docs and table formatting
chuksys Apr 22, 2026
e29ae44
Remove unused variable prefix in set_test_offer
chuksys Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 12 additions & 22 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
})?;
}

// This hook resolves a circular dependency:
// 1. PeerManager requires OnionMessenger (via MessageHandler).
// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
//
// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
// This allows us to initialize the resolver before the PeerManager exists,
// and prevents a reference cycle (memory leak).
let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
let hrn_resolver;
let mut blip32_resolver = None;

let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
let hrn_res =
Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
blip32_resolver = Some(Arc::clone(&hrn_res));

// We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
let pm_hook_clone = Arc::clone(&peer_manager_hook);
hrn_res.register_post_queue_action(Box::new(move || {
if let Ok(guard) = pm_hook_clone.lock() {
if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
pm.process_events();
}
}
}));
hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
},
HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
let addr = dns_server_address
.to_socket_addrs()
.map_err(|_| BuildError::DNSResolverSetupFailed)?
.next()
.ok_or({
.ok_or_else(|| {
log_error!(logger, "No valid address found for: {}", dns_server_address);
BuildError::DNSResolverSetupFailed
})?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
Arc::clone(&keys_manager),
));

if let Ok(mut guard) = peer_manager_hook.lock() {
*guard = Some(Arc::downgrade(&peer_manager));
if let Some(res) = blip32_resolver {
let pm_weak = Arc::downgrade(&peer_manager);
res.register_post_queue_action(Box::new(move || {
if let Some(upgraded_pm) = pm_weak.upgrade() {
upgraded_pm.process_events();
}
}));
}

liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
node_metrics,
om_mailbox,
async_payments_role,
hrn_resolver: Arc::new(hrn_resolver),
hrn_resolver,
#[cfg(cycle_tests)]
_leak_checker,
})
Expand Down
26 changes: 13 additions & 13 deletions src/config.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
///
/// By default, this uses the `Dns` variant with the following settings:
/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
/// * **Resolution Service**: Enabled (`false`)
/// * **Resolution Service**: Disabled (`false`)
pub resolution_config: HRNResolverConfig,
}

Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
node_metrics: Arc<RwLock<NodeMetrics>>,
om_mailbox: Option<Arc<OnionMessageMailbox>>,
async_payments_role: Option<AsyncPaymentsRole>,
hrn_resolver: Arc<HRNResolver>,
hrn_resolver: HRNResolver,
#[cfg(cycle_tests)]
_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
self.bolt12_payment().into(),
Arc::clone(&self.config),
Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
self.hrn_resolver.clone(),
)
}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
self.bolt12_payment(),
Arc::clone(&self.config),
Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
self.hrn_resolver.clone(),
))
}

Expand Down
12 changes: 6 additions & 6 deletions src/payment/unified.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
bolt12_payment: Arc<Bolt12Payment>,
config: Arc<Config>,
logger: Arc<Logger>,
hrn_resolver: Arc<HRNResolver>,
hrn_resolver: HRNResolver,
#[cfg(hrn_tests)]
test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
pub(crate) fn new(
onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
hrn_resolver: Arc<HRNResolver>,
hrn_resolver: HRNResolver,
) -> Self {
Self {
onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
}

let parse_fut =
PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

let instructions =
tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
Error::InvalidAmount
})?;

let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
let fut = instr.set_amount(amt, &self.hrn_resolver);

tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
.await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
/// offers allow us to bypass this resolution step and test the subsequent payment flow.
///
/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
pub fn set_test_offer(&self, _offer: Offer) {
let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
pub fn set_test_offer(&self, offer: Offer) {
let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
});
}
Expand Down
1 change: 1 addition & 0 deletions src/types.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
Local(Arc<DNSHrnResolver>),
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
HRN resolution refinement and architectural clean-up by chuksys · Pull Request #887 · lightningdevkit/ldk-node · GitHub
Skip to content
HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 5 commits into

from

Apr 27, 2026
 Merged


HRN resolution refinement and architectural clean-up
#887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7e11a61

Replace peer_manager_hook with deferred closure registration


chuksys Apr 22, 2026
9b72b11

Remove redundant Arc wrapping of HRNResolver


chuksys Apr 22, 2026
de65d2f

Use ok_or_else for lazy error logging in DNS resolution


chuksys Apr 22, 2026
5d27176

Fix HRN configuration defaults in docs and table formatting


chuksys Apr 22, 2026
e29ae44

Remove unused variable prefix in set_test_offer


chuksys Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 12 additions & 22 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
 })?;
	}

	// This hook resolves a circular dependency:
	// 1. PeerManager requires OnionMessenger (via MessageHandler).
	// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
	//
	// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
	// This allows us to initialize the resolver before the PeerManager exists,
	// and prevents a reference cycle (memory leak).
	let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
	let hrn_resolver;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
 hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 // We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
 let pm_hook_clone = Arc::clone(&peer_manager_hook);
 hrn_res.register_post_queue_action(Box::new(move || {
 if let Ok(guard) = pm_hook_clone.lock() {
 if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
 pm.process_events();
 }
 }
 }));
 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 },
 HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
 let addr = dns_server_address
 .to_socket_addrs()
 .map_err(|_| BuildError::DNSResolverSetupFailed)?
 .next()
 .ok_or({
 .ok_or_else(|| {
 log_error!(logger, "No valid address found for: {}", dns_server_address);
 BuildError::DNSResolverSetupFailed
 })?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
 Arc::clone(&keys_manager),
	));

	if let Ok(mut guard) = peer_manager_hook.lock() {
 *guard = Some(Arc::downgrade(&peer_manager));
	if let Some(res) = blip32_resolver {
 let pm_weak = Arc::downgrade(&peer_manager);
 res.register_post_queue_action(Box::new(move || {
 if let Some(upgraded_pm) = pm_weak.upgrade() {
 upgraded_pm.process_events();
 }
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
 node_metrics,
 om_mailbox,
 async_payments_role,
 hrn_resolver: Arc::new(hrn_resolver),
 hrn_resolver,
 #[cfg(cycle_tests)]
 _leak_checker,
	})
Expand Down

26 changes: 13 additions & 13 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
	///
	/// By default, this uses the `Dns` variant with the following settings:
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Enabled (`false`)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
}

Expand Down

6 changes: 3 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
	node_metrics: Arc<RwLock<NodeMetrics>>,
	om_mailbox: Option<Arc<OnionMessageMailbox>>,
	async_payments_role: Option<AsyncPaymentsRole>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(cycle_tests)]
	_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
 self.bolt12_payment().into(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 )
	}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
 self.bolt12_payment(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 ))
	}

Expand Down

12 changes: 6 additions & 6 deletions
src/payment/unified.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
	bolt12_payment: Arc<Bolt12Payment>,
	config: Arc<Config>,
	logger: Arc<Logger>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(hrn_tests)]
	test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
	pub(crate) fn new(
 onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
 hrn_resolver: Arc<HRNResolver>,
 hrn_resolver: HRNResolver,
	) -> Self {
 Self {
 onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
 }

 let parse_fut =
 PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
 PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

 let instructions =
 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
 Error::InvalidAmount
 })?;

 let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
 let fut = instr.set_amount(amt, &self.hrn_resolver);

 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 .await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
	/// offers allow us to bypass this resolution step and test the subsequent payment flow.
	///
	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
	pub fn set_test_offer(&self, _offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
	pub fn set_test_offer(&self, offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
 log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
 });
	}
Expand Down

1 change: 1 addition & 0 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
	IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
	Local(Arc<DNSHrnResolver>),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HRN resolution refinement and architectural clean-up by chuksys · Pull Request #887 · lightningdevkit/ldk-node · GitHub
Skip to content
HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 5 commits into

from

Apr 27, 2026
 Merged


HRN resolution refinement and architectural clean-up
#887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7e11a61

Replace peer_manager_hook with deferred closure registration


chuksys Apr 22, 2026
9b72b11

Remove redundant Arc wrapping of HRNResolver


chuksys Apr 22, 2026
de65d2f

Use ok_or_else for lazy error logging in DNS resolution


chuksys Apr 22, 2026
5d27176

Fix HRN configuration defaults in docs and table formatting


chuksys Apr 22, 2026
e29ae44

Remove unused variable prefix in set_test_offer


chuksys Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 12 additions & 22 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
 })?;
	}

	// This hook resolves a circular dependency:
	// 1. PeerManager requires OnionMessenger (via MessageHandler).
	// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
	//
	// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
	// This allows us to initialize the resolver before the PeerManager exists,
	// and prevents a reference cycle (memory leak).
	let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
	let hrn_resolver;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
 hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 // We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
 let pm_hook_clone = Arc::clone(&peer_manager_hook);
 hrn_res.register_post_queue_action(Box::new(move || {
 if let Ok(guard) = pm_hook_clone.lock() {
 if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
 pm.process_events();
 }
 }
 }));
 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 },
 HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
 let addr = dns_server_address
 .to_socket_addrs()
 .map_err(|_| BuildError::DNSResolverSetupFailed)?
 .next()
 .ok_or({
 .ok_or_else(|| {
 log_error!(logger, "No valid address found for: {}", dns_server_address);
 BuildError::DNSResolverSetupFailed
 })?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
 Arc::clone(&keys_manager),
	));

	if let Ok(mut guard) = peer_manager_hook.lock() {
 *guard = Some(Arc::downgrade(&peer_manager));
	if let Some(res) = blip32_resolver {
 let pm_weak = Arc::downgrade(&peer_manager);
 res.register_post_queue_action(Box::new(move || {
 if let Some(upgraded_pm) = pm_weak.upgrade() {
 upgraded_pm.process_events();
 }
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
 node_metrics,
 om_mailbox,
 async_payments_role,
 hrn_resolver: Arc::new(hrn_resolver),
 hrn_resolver,
 #[cfg(cycle_tests)]
 _leak_checker,
	})
Expand Down

26 changes: 13 additions & 13 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
	///
	/// By default, this uses the `Dns` variant with the following settings:
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Enabled (`false`)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
}

Expand Down

6 changes: 3 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
	node_metrics: Arc<RwLock<NodeMetrics>>,
	om_mailbox: Option<Arc<OnionMessageMailbox>>,
	async_payments_role: Option<AsyncPaymentsRole>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(cycle_tests)]
	_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
 self.bolt12_payment().into(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 )
	}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
 self.bolt12_payment(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 ))
	}

Expand Down

12 changes: 6 additions & 6 deletions
src/payment/unified.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
	bolt12_payment: Arc<Bolt12Payment>,
	config: Arc<Config>,
	logger: Arc<Logger>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(hrn_tests)]
	test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
	pub(crate) fn new(
 onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
 hrn_resolver: Arc<HRNResolver>,
 hrn_resolver: HRNResolver,
	) -> Self {
 Self {
 onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
 }

 let parse_fut =
 PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
 PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

 let instructions =
 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
 Error::InvalidAmount
 })?;

 let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
 let fut = instr.set_amount(amt, &self.hrn_resolver);

 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 .await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
	/// offers allow us to bypass this resolution step and test the subsequent payment flow.
	///
	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
	pub fn set_test_offer(&self, _offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
	pub fn set_test_offer(&self, offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
 log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
 });
	}
Expand Down

1 change: 1 addition & 0 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
	IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
	Local(Arc<DNSHrnResolver>),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HRN resolution refinement and architectural clean-up by chuksys · Pull Request #887 · lightningdevkit/ldk-node · GitHub
Skip to content
HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 5 commits into

from

Apr 27, 2026
 Merged


HRN resolution refinement and architectural clean-up
#887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7e11a61

Replace peer_manager_hook with deferred closure registration


chuksys Apr 22, 2026
9b72b11

Remove redundant Arc wrapping of HRNResolver


chuksys Apr 22, 2026
de65d2f

Use ok_or_else for lazy error logging in DNS resolution


chuksys Apr 22, 2026
5d27176

Fix HRN configuration defaults in docs and table formatting


chuksys Apr 22, 2026
e29ae44

Remove unused variable prefix in set_test_offer


chuksys Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 12 additions & 22 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
 })?;
	}

	// This hook resolves a circular dependency:
	// 1. PeerManager requires OnionMessenger (via MessageHandler).
	// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
	//
	// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
	// This allows us to initialize the resolver before the PeerManager exists,
	// and prevents a reference cycle (memory leak).
	let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
	let hrn_resolver;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
 hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 // We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
 let pm_hook_clone = Arc::clone(&peer_manager_hook);
 hrn_res.register_post_queue_action(Box::new(move || {
 if let Ok(guard) = pm_hook_clone.lock() {
 if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
 pm.process_events();
 }
 }
 }));
 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 },
 HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
 let addr = dns_server_address
 .to_socket_addrs()
 .map_err(|_| BuildError::DNSResolverSetupFailed)?
 .next()
 .ok_or({
 .ok_or_else(|| {
 log_error!(logger, "No valid address found for: {}", dns_server_address);
 BuildError::DNSResolverSetupFailed
 })?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
 Arc::clone(&keys_manager),
	));

	if let Ok(mut guard) = peer_manager_hook.lock() {
 *guard = Some(Arc::downgrade(&peer_manager));
	if let Some(res) = blip32_resolver {
 let pm_weak = Arc::downgrade(&peer_manager);
 res.register_post_queue_action(Box::new(move || {
 if let Some(upgraded_pm) = pm_weak.upgrade() {
 upgraded_pm.process_events();
 }
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
 node_metrics,
 om_mailbox,
 async_payments_role,
 hrn_resolver: Arc::new(hrn_resolver),
 hrn_resolver,
 #[cfg(cycle_tests)]
 _leak_checker,
	})
Expand Down

26 changes: 13 additions & 13 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
	///
	/// By default, this uses the `Dns` variant with the following settings:
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Enabled (`false`)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
}

Expand Down

6 changes: 3 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
	node_metrics: Arc<RwLock<NodeMetrics>>,
	om_mailbox: Option<Arc<OnionMessageMailbox>>,
	async_payments_role: Option<AsyncPaymentsRole>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(cycle_tests)]
	_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
 self.bolt12_payment().into(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 )
	}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
 self.bolt12_payment(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 ))
	}

Expand Down

12 changes: 6 additions & 6 deletions
src/payment/unified.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
	bolt12_payment: Arc<Bolt12Payment>,
	config: Arc<Config>,
	logger: Arc<Logger>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(hrn_tests)]
	test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
	pub(crate) fn new(
 onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
 hrn_resolver: Arc<HRNResolver>,
 hrn_resolver: HRNResolver,
	) -> Self {
 Self {
 onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
 }

 let parse_fut =
 PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
 PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

 let instructions =
 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
 Error::InvalidAmount
 })?;

 let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
 let fut = instr.set_amount(amt, &self.hrn_resolver);

 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 .await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
	/// offers allow us to bypass this resolution step and test the subsequent payment flow.
	///
	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
	pub fn set_test_offer(&self, _offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
	pub fn set_test_offer(&self, offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
 log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
 });
	}
Expand Down

1 change: 1 addition & 0 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
	IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
	Local(Arc<DNSHrnResolver>),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
HRN resolution refinement and architectural clean-up by chuksys · Pull Request #887 · lightningdevkit/ldk-node · GitHub
Skip to content
HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 5 commits into

from

Apr 27, 2026
 Merged


HRN resolution refinement and architectural clean-up
#887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7e11a61

Replace peer_manager_hook with deferred closure registration


chuksys Apr 22, 2026
9b72b11

Remove redundant Arc wrapping of HRNResolver


chuksys Apr 22, 2026
de65d2f

Use ok_or_else for lazy error logging in DNS resolution


chuksys Apr 22, 2026
5d27176

Fix HRN configuration defaults in docs and table formatting


chuksys Apr 22, 2026
e29ae44

Remove unused variable prefix in set_test_offer


chuksys Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 12 additions & 22 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
 })?;
	}

	// This hook resolves a circular dependency:
	// 1. PeerManager requires OnionMessenger (via MessageHandler).
	// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
	//
	// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
	// This allows us to initialize the resolver before the PeerManager exists,
	// and prevents a reference cycle (memory leak).
	let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
	let hrn_resolver;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
 hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 // We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
 let pm_hook_clone = Arc::clone(&peer_manager_hook);
 hrn_res.register_post_queue_action(Box::new(move || {
 if let Ok(guard) = pm_hook_clone.lock() {
 if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
 pm.process_events();
 }
 }
 }));
 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 },
 HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
 let addr = dns_server_address
 .to_socket_addrs()
 .map_err(|_| BuildError::DNSResolverSetupFailed)?
 .next()
 .ok_or({
 .ok_or_else(|| {
 log_error!(logger, "No valid address found for: {}", dns_server_address);
 BuildError::DNSResolverSetupFailed
 })?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
 Arc::clone(&keys_manager),
	));

	if let Ok(mut guard) = peer_manager_hook.lock() {
 *guard = Some(Arc::downgrade(&peer_manager));
	if let Some(res) = blip32_resolver {
 let pm_weak = Arc::downgrade(&peer_manager);
 res.register_post_queue_action(Box::new(move || {
 if let Some(upgraded_pm) = pm_weak.upgrade() {
 upgraded_pm.process_events();
 }
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
 node_metrics,
 om_mailbox,
 async_payments_role,
 hrn_resolver: Arc::new(hrn_resolver),
 hrn_resolver,
 #[cfg(cycle_tests)]
 _leak_checker,
	})
Expand Down

26 changes: 13 additions & 13 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
	///
	/// By default, this uses the `Dns` variant with the following settings:
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Enabled (`false`)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
}

Expand Down

6 changes: 3 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
	node_metrics: Arc<RwLock<NodeMetrics>>,
	om_mailbox: Option<Arc<OnionMessageMailbox>>,
	async_payments_role: Option<AsyncPaymentsRole>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(cycle_tests)]
	_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
 self.bolt12_payment().into(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 )
	}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
 self.bolt12_payment(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 ))
	}

Expand Down

12 changes: 6 additions & 6 deletions
src/payment/unified.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
	bolt12_payment: Arc<Bolt12Payment>,
	config: Arc<Config>,
	logger: Arc<Logger>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(hrn_tests)]
	test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
	pub(crate) fn new(
 onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
 hrn_resolver: Arc<HRNResolver>,
 hrn_resolver: HRNResolver,
	) -> Self {
 Self {
 onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
 }

 let parse_fut =
 PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
 PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

 let instructions =
 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
 Error::InvalidAmount
 })?;

 let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
 let fut = instr.set_amount(amt, &self.hrn_resolver);

 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 .await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
	/// offers allow us to bypass this resolution step and test the subsequent payment flow.
	///
	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
	pub fn set_test_offer(&self, _offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
	pub fn set_test_offer(&self, offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
 log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
 });
	}
Expand Down

1 change: 1 addition & 0 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
	IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
	Local(Arc<DNSHrnResolver>),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HRN resolution refinement and architectural clean-up by chuksys · Pull Request #887 · lightningdevkit/ldk-node · GitHub
Skip to content
HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 5 commits into

from

Apr 27, 2026
 Merged


HRN resolution refinement and architectural clean-up
#887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7e11a61

Replace peer_manager_hook with deferred closure registration


chuksys Apr 22, 2026
9b72b11

Remove redundant Arc wrapping of HRNResolver


chuksys Apr 22, 2026
de65d2f

Use ok_or_else for lazy error logging in DNS resolution


chuksys Apr 22, 2026
5d27176

Fix HRN configuration defaults in docs and table formatting


chuksys Apr 22, 2026
e29ae44

Remove unused variable prefix in set_test_offer


chuksys Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 12 additions & 22 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
 })?;
	}

	// This hook resolves a circular dependency:
	// 1. PeerManager requires OnionMessenger (via MessageHandler).
	// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
	//
	// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
	// This allows us to initialize the resolver before the PeerManager exists,
	// and prevents a reference cycle (memory leak).
	let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
	let hrn_resolver;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
 hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 // We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
 let pm_hook_clone = Arc::clone(&peer_manager_hook);
 hrn_res.register_post_queue_action(Box::new(move || {
 if let Ok(guard) = pm_hook_clone.lock() {
 if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
 pm.process_events();
 }
 }
 }));
 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 },
 HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
 let addr = dns_server_address
 .to_socket_addrs()
 .map_err(|_| BuildError::DNSResolverSetupFailed)?
 .next()
 .ok_or({
 .ok_or_else(|| {
 log_error!(logger, "No valid address found for: {}", dns_server_address);
 BuildError::DNSResolverSetupFailed
 })?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
 Arc::clone(&keys_manager),
	));

	if let Ok(mut guard) = peer_manager_hook.lock() {
 *guard = Some(Arc::downgrade(&peer_manager));
	if let Some(res) = blip32_resolver {
 let pm_weak = Arc::downgrade(&peer_manager);
 res.register_post_queue_action(Box::new(move || {
 if let Some(upgraded_pm) = pm_weak.upgrade() {
 upgraded_pm.process_events();
 }
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
 node_metrics,
 om_mailbox,
 async_payments_role,
 hrn_resolver: Arc::new(hrn_resolver),
 hrn_resolver,
 #[cfg(cycle_tests)]
 _leak_checker,
	})
Expand Down

26 changes: 13 additions & 13 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
	///
	/// By default, this uses the `Dns` variant with the following settings:
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Enabled (`false`)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
}

Expand Down

6 changes: 3 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
	node_metrics: Arc<RwLock<NodeMetrics>>,
	om_mailbox: Option<Arc<OnionMessageMailbox>>,
	async_payments_role: Option<AsyncPaymentsRole>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(cycle_tests)]
	_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
 self.bolt12_payment().into(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 )
	}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
 self.bolt12_payment(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 ))
	}

Expand Down

12 changes: 6 additions & 6 deletions
src/payment/unified.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
	bolt12_payment: Arc<Bolt12Payment>,
	config: Arc<Config>,
	logger: Arc<Logger>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(hrn_tests)]
	test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
	pub(crate) fn new(
 onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
 hrn_resolver: Arc<HRNResolver>,
 hrn_resolver: HRNResolver,
	) -> Self {
 Self {
 onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
 }

 let parse_fut =
 PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
 PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

 let instructions =
 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
 Error::InvalidAmount
 })?;

 let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
 let fut = instr.set_amount(amt, &self.hrn_resolver);

 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 .await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
	/// offers allow us to bypass this resolution step and test the subsequent payment flow.
	///
	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
	pub fn set_test_offer(&self, _offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
	pub fn set_test_offer(&self, offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
 log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
 });
	}
Expand Down

1 change: 1 addition & 0 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
	IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
	Local(Arc<DNSHrnResolver>),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
HRN resolution refinement and architectural clean-up by chuksys · Pull Request #887 · lightningdevkit/ldk-node · GitHub
Skip to content
HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 5 commits into

from

Apr 27, 2026
 Merged


HRN resolution refinement and architectural clean-up
#887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7e11a61

Replace peer_manager_hook with deferred closure registration


chuksys Apr 22, 2026
9b72b11

Remove redundant Arc wrapping of HRNResolver


chuksys Apr 22, 2026
de65d2f

Use ok_or_else for lazy error logging in DNS resolution


chuksys Apr 22, 2026
5d27176

Fix HRN configuration defaults in docs and table formatting


chuksys Apr 22, 2026
e29ae44

Remove unused variable prefix in set_test_offer


chuksys Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 12 additions & 22 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
 })?;
	}

	// This hook resolves a circular dependency:
	// 1. PeerManager requires OnionMessenger (via MessageHandler).
	// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
	//
	// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
	// This allows us to initialize the resolver before the PeerManager exists,
	// and prevents a reference cycle (memory leak).
	let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
	let hrn_resolver;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
 hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 // We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
 let pm_hook_clone = Arc::clone(&peer_manager_hook);
 hrn_res.register_post_queue_action(Box::new(move || {
 if let Ok(guard) = pm_hook_clone.lock() {
 if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
 pm.process_events();
 }
 }
 }));
 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 },
 HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
 let addr = dns_server_address
 .to_socket_addrs()
 .map_err(|_| BuildError::DNSResolverSetupFailed)?
 .next()
 .ok_or({
 .ok_or_else(|| {
 log_error!(logger, "No valid address found for: {}", dns_server_address);
 BuildError::DNSResolverSetupFailed
 })?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
 Arc::clone(&keys_manager),
	));

	if let Ok(mut guard) = peer_manager_hook.lock() {
 *guard = Some(Arc::downgrade(&peer_manager));
	if let Some(res) = blip32_resolver {
 let pm_weak = Arc::downgrade(&peer_manager);
 res.register_post_queue_action(Box::new(move || {
 if let Some(upgraded_pm) = pm_weak.upgrade() {
 upgraded_pm.process_events();
 }
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
 node_metrics,
 om_mailbox,
 async_payments_role,
 hrn_resolver: Arc::new(hrn_resolver),
 hrn_resolver,
 #[cfg(cycle_tests)]
 _leak_checker,
	})
Expand Down

26 changes: 13 additions & 13 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
	///
	/// By default, this uses the `Dns` variant with the following settings:
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Enabled (`false`)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
}

Expand Down

6 changes: 3 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
	node_metrics: Arc<RwLock<NodeMetrics>>,
	om_mailbox: Option<Arc<OnionMessageMailbox>>,
	async_payments_role: Option<AsyncPaymentsRole>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(cycle_tests)]
	_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
 self.bolt12_payment().into(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 )
	}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
 self.bolt12_payment(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 ))
	}

Expand Down

12 changes: 6 additions & 6 deletions
src/payment/unified.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
	bolt12_payment: Arc<Bolt12Payment>,
	config: Arc<Config>,
	logger: Arc<Logger>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(hrn_tests)]
	test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
	pub(crate) fn new(
 onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
 hrn_resolver: Arc<HRNResolver>,
 hrn_resolver: HRNResolver,
	) -> Self {
 Self {
 onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
 }

 let parse_fut =
 PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
 PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

 let instructions =
 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
 Error::InvalidAmount
 })?;

 let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
 let fut = instr.set_amount(amt, &self.hrn_resolver);

 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 .await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
	/// offers allow us to bypass this resolution step and test the subsequent payment flow.
	///
	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
	pub fn set_test_offer(&self, _offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
	pub fn set_test_offer(&self, offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
 log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
 });
	}
Expand Down

1 change: 1 addition & 0 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
	IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
	Local(Arc<DNSHrnResolver>),
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
HRN resolution refinement and architectural clean-up by chuksys · Pull Request #887 · lightningdevkit/ldk-node · GitHub
Skip to content
HRN resolution refinement and architectural clean-up#887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tnull
merged 5 commits into

from

Apr 27, 2026
 Merged


HRN resolution refinement and architectural clean-up
#887
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
7e11a61

Replace peer_manager_hook with deferred closure registration


chuksys Apr 22, 2026
9b72b11

Remove redundant Arc wrapping of HRNResolver


chuksys Apr 22, 2026
de65d2f

Use ok_or_else for lazy error logging in DNS resolution


chuksys Apr 22, 2026
5d27176

Fix HRN configuration defaults in docs and table formatting


chuksys Apr 22, 2026
e29ae44

Remove unused variable prefix in set_test_offer


chuksys Apr 22, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


34 changes: 12 additions & 22 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ use std::convert::TryInto;
use std::default::Default;
use std::net::ToSocketAddrs;
use std::path::PathBuf;
use std::sync::{Arc, Mutex, Once, RwLock, Weak};
use std::sync::{Arc, Mutex, Once, RwLock};
use std::time::SystemTime;
use std::{fmt, fs};

Expand DownExpand Up@@ -1735,15 +1735,8 @@ fn build_with_store_internal(
 })?;
	}

	// This hook resolves a circular dependency:
	// 1. PeerManager requires OnionMessenger (via MessageHandler).
	// 2. OnionMessenger (via HRN resolver) needs to call PeerManager::process_events.
	//
	// We provide the resolver with a Weak pointer via this Mutex-protected "hook."
	// This allows us to initialize the resolver before the PeerManager exists,
	// and prevents a reference cycle (memory leak).
	let peer_manager_hook: Arc<Mutex<Option<Weak<PeerManager>>>> = Arc::new(Mutex::new(None));
	let hrn_resolver;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();

Expand All@@ -1755,24 +1748,16 @@ fn build_with_store_internal(
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
 hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 // We clone the hook because it's moved into a Send + Sync closure that outlives this scope.
 let pm_hook_clone = Arc::clone(&peer_manager_hook);
 hrn_res.register_post_queue_action(Box::new(move || {
 if let Ok(guard) = pm_hook_clone.lock() {
 if let Some(pm) = guard.as_ref().and_then(|weak| weak.upgrade()) {
 pm.process_events();
 }
 }
 }));
 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
 },
 HRNResolverConfig::Dns { dns_server_address, enable_hrn_resolution_service, .. } => {
 let addr = dns_server_address
 .to_socket_addrs()
 .map_err(|_| BuildError::DNSResolverSetupFailed)?
 .next()
 .ok_or({
 .ok_or_else(|| {
 log_error!(logger, "No valid address found for: {}", dns_server_address);
 BuildError::DNSResolverSetupFailed
 })?;
Expand DownExpand Up@@ -1945,8 +1930,13 @@ fn build_with_store_internal(
 Arc::clone(&keys_manager),
	));

	if let Ok(mut guard) = peer_manager_hook.lock() {
 *guard = Some(Arc::downgrade(&peer_manager));
	if let Some(res) = blip32_resolver {
 let pm_weak = Arc::downgrade(&peer_manager);
 res.register_post_queue_action(Box::new(move || {
 if let Some(upgraded_pm) = pm_weak.upgrade() {
 upgraded_pm.process_events();
 }
 }));
	}

	liquidity_source.as_ref().map(|l| l.set_peer_manager(Arc::downgrade(&peer_manager)));
Expand DownExpand Up@@ -2061,7 +2051,7 @@ fn build_with_store_internal(
 node_metrics,
 om_mailbox,
 async_payments_role,
 hrn_resolver: Arc::new(hrn_resolver),
 hrn_resolver,
 #[cfg(cycle_tests)]
 _leak_checker,
	})
Expand Down

26 changes: 13 additions & 13 deletions
src/config.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,18 +118,18 @@ pub(crate) const LNURL_AUTH_TIMEOUT_SECS: u64 = 15;
/// ### Defaults
///
/// | Parameter | Value |
/// |----------------------------------------|--------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
/// |----------------------------------------|--------------------------------------|
/// | `storage_dir_path` | /tmp/ldk_node/ |
/// | `network` | Bitcoin |
/// | `listening_addresses` | None |
/// | `announcement_addresses` | None |
/// | `node_alias` | None |
/// | `trusted_peers_0conf` | [] |
/// | `probing_liquidity_limit_multiplier` | 3 |
/// | `anchor_channels_config` | Some(..) |
/// | `route_parameters` | None |
/// | `tor_config` | None |
/// | `hrn_config` | HumanReadableNamesConfig::default() |
///
/// See [`AnchorChannelsConfig`] and [`RouteParametersConfig`] for more information regarding their
/// respective default values.
Expand DownExpand Up@@ -264,7 +264,7 @@ pub struct HumanReadableNamesConfig {
	///
	/// By default, this uses the `Dns` variant with the following settings:
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Enabled (`false`)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
}

Expand Down

6 changes: 3 additions & 3 deletions
src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -238,7 +238,7 @@ pub struct Node {
	node_metrics: Arc<RwLock<NodeMetrics>>,
	om_mailbox: Option<Arc<OnionMessageMailbox>>,
	async_payments_role: Option<AsyncPaymentsRole>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(cycle_tests)]
	_leak_checker: LeakChecker,
}
Expand DownExpand Up@@ -1006,7 +1006,7 @@ impl Node {
 self.bolt12_payment().into(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 )
	}

Expand All@@ -1027,7 +1027,7 @@ impl Node {
 self.bolt12_payment(),
 Arc::clone(&self.config),
 Arc::clone(&self.logger),
Arc::clone(&self.hrn_resolver),
 self.hrn_resolver.clone(),
 ))
	}

Expand Down

12 changes: 6 additions & 6 deletions
src/payment/unified.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ pub struct UnifiedPayment {
	bolt12_payment: Arc<Bolt12Payment>,
	config: Arc<Config>,
	logger: Arc<Logger>,
	hrn_resolver: Arc<HRNResolver>,
	hrn_resolver: HRNResolver,
	#[cfg(hrn_tests)]
	test_offer: std::sync::Mutex<Option<Offer>>,
}
Expand All@@ -83,7 +83,7 @@ impl UnifiedPayment {
	pub(crate) fn new(
 onchain_payment: Arc<OnchainPayment>, bolt11_invoice: Arc<Bolt11Payment>,
 bolt12_payment: Arc<Bolt12Payment>, config: Arc<Config>, logger: Arc<Logger>,
 hrn_resolver: Arc<HRNResolver>,
 hrn_resolver: HRNResolver,
	) -> Self {
 Self {
 onchain_payment,
Expand DownExpand Up@@ -197,7 +197,7 @@ impl UnifiedPayment {
 }

 let parse_fut =
 PaymentInstructions::parse(uri_str, target_network, self.hrn_resolver.as_ref(), false);
 PaymentInstructions::parse(uri_str, target_network, &self.hrn_resolver, false);

 let instructions =
 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), parse_fut)
Expand All@@ -223,7 +223,7 @@ impl UnifiedPayment {
 Error::InvalidAmount
 })?;

 let fut = instr.set_amount(amt, self.hrn_resolver.as_ref());
 let fut = instr.set_amount(amt, &self.hrn_resolver);

 tokio::time::timeout(Duration::from_secs(HRN_RESOLUTION_TIMEOUT_SECS), fut)
 .await
Expand DownExpand Up@@ -350,8 +350,8 @@ impl UnifiedPayment {
	/// offers allow us to bypass this resolution step and test the subsequent payment flow.
	///
	/// [BIP 353]: https://github.com/bitcoin/bips/blob/master/bip-0353.mediawiki
	pub fn set_test_offer(&self, _offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(_offer)).map_err(|e| {
	pub fn set_test_offer(&self, offer: Offer) {
 let _ = self.test_offer.lock().map(|mut guard| *guard = Some(offer)).map_err(|e| {
 log_error!(self.logger, "Failed to set test offer due to poisoned lock: {:?}", e)
 });
	}
Expand Down

1 change: 1 addition & 0 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -330,6 +330,7 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
	IgnoringMessageHandler,
>;

#[derive(Clone)]
pub enum HRNResolver {
	Onion(Arc<LDKOnionMessageDNSSECHrnResolver<Arc<Graph>, Arc<Logger>>>),
	Local(Arc<DNSHrnResolver>),
Expand Down
Loading