Skip to content

Support LNURL resolution via optional HTTP fallback#898

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

Draft
benthecarman wants to merge 1 commit into
base:main
Choose a base branch
from
Draft

Support LNURL resolution via optional HTTP fallback #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a", features = ["http"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }
Expand Down
18 changes: 13 additions & 5 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::Network;
use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock as BlockLocator};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand DownExpand Up@@ -80,8 +81,8 @@ use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
GossipSync, Graph, HRNResolver, HRNResolverInner, KeysManager, MessageRouter, OnionMessenger,
PaymentStore, PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1739,7 +1740,7 @@ fn build_with_store_internal(
})?;
}

let hrn_resolver;
let hrn_resolver_inner;
let mut blip32_resolver = None;

let runtime_handle = runtime.handle();
Expand All@@ -1751,7 +1752,7 @@ fn build_with_store_internal(
HRNResolverConfig::Blip32 => {
let hrn_res =
Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
hrn_resolver_inner = HRNResolverInner::Onion(Arc::clone(&hrn_res));
blip32_resolver = Some(Arc::clone(&hrn_res));

hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
Expand All@@ -1766,7 +1767,7 @@ fn build_with_store_internal(
BuildError::DNSResolverSetupFailed
})?;
let hrn_res = Arc::new(DNSHrnResolver(addr));
hrn_resolver = HRNResolver::Local(hrn_res);
hrn_resolver_inner = HRNResolverInner::Local(hrn_res);

if *enable_hrn_resolution_service {
if let Err(_) = may_announce_channel(&config) {
Expand All@@ -1790,6 +1791,13 @@ fn build_with_store_internal(
},
};

let http_hrn_resolver = if config.hrn_config.enable_lnurl_resolution {
Some(Arc::new(HTTPHrnResolver::new()))
} else {
None
};
let hrn_resolver = HRNResolver::new(hrn_resolver_inner, http_hrn_resolver);

// Initialize the PeerManager
let onion_messenger: Arc<OnionMessenger> =
if let Some(AsyncPaymentsRole::Server) = async_payments_role {
Expand Down
13 changes: 13 additions & 0 deletions src/config.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,18 @@ pub struct HumanReadableNamesConfig {
/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
/// * **Resolution Service**: Disabled (`false`)
pub resolution_config: HRNResolverConfig,
/// If set to true, enables resolving [LNURL-pay] links and the LN-Address LNURL fallback
/// via HTTP, in addition to the BIP 353 / bLIP-32 resolution method configured in
/// [`resolution_config`].
///
/// **Default:** `false`
///
/// **Note:** Enabling this may reveal our IP address to the recipient and information about
/// who we're paying to the LNURL endpoint we're querying.
///
/// [LNURL-pay]: https://github.com/lnurl/luds/blob/luds/06.md
/// [`resolution_config`]: Self::resolution_config
pub enable_lnurl_resolution: bool,

@tnulltnullMay 5, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure we want this to be a config option to begin with? If this is just due to the possible privacy leak, it should probably be part of the respective variant on the resolution config?

}

impl Default for HumanReadableNamesConfig {
Expand All@@ -276,6 +288,7 @@ impl Default for HumanReadableNamesConfig {
.expect("Socket address conversion failed."),
enable_hrn_resolution_service: false,
},
enable_lnurl_resolution: false,
}
}
}
Expand Down
83 changes: 66 additions & 17 deletions src/types.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::hrn_resolution::{
HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
};
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::chainmonitor;
use lightning::impl_writeable_tlv_based;
Expand DownExpand Up@@ -329,37 +330,85 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
>;

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

#[derive(Clone)]
pub struct HRNResolver {
inner: HRNResolverInner,
http: Option<Arc<HTTPHrnResolver>>,
}

impl HRNResolver {
pub(crate) fn new(inner: HRNResolverInner, http: Option<Arc<HTTPHrnResolver>>) -> Self {
Self { inner, http }
}
}

impl HrnResolver for HRNResolver {
fn resolve_hrn<'a>(&'a self, hrn: &'a HumanReadableName) -> HrnResolutionFuture<'a> {
match self {
HRNResolver::Onion(inner) => inner.resolve_hrn(hrn),
HRNResolver::Local(inner) => inner.resolve_hrn(hrn),
}
Box::pin(async move {
let primary = match &self.inner {
HRNResolverInner::Onion(inner) => inner.resolve_hrn(hrn).await,
HRNResolverInner::Local(inner) => inner.resolve_hrn(hrn).await,
};
match (primary, &self.http) {
(Ok(r), _) => Ok(r),
(Err(_), Some(http)) => http.resolve_hrn(hrn).await,
(Err(e), None) => Err(e),
}
})
}

fn resolve_lnurl<'a>(&'a self, url: &'a str) -> HrnResolutionFuture<'a> {
match self {
HRNResolver::Onion(inner) => inner.resolve_lnurl(url),
HRNResolver::Local(inner) => inner.resolve_lnurl(url),
}
Box::pin(async move {
let primary = match &self.inner {
HRNResolverInner::Onion(inner) => inner.resolve_lnurl(url).await,
HRNResolverInner::Local(inner) => inner.resolve_lnurl(url).await,
};
match (primary, &self.http) {
(Ok(r), _) => Ok(r),
(Err(_), Some(http)) => http.resolve_lnurl(url).await,
(Err(e), None) => Err(e),
}
})
}

fn resolve_lnurl_to_invoice<'a>(
&'a self, callback_url: String, amount: BPIAmount, expected_description_hash: [u8; 32],
) -> LNURLResolutionFuture<'a> {
match self {
HRNResolver::Onion(inner) => {
inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
},
HRNResolver::Local(inner) => {
inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
},
}
Box::pin(async move {
let primary = match &self.inner {
HRNResolverInner::Onion(inner) => {
inner
.resolve_lnurl_to_invoice(
callback_url.clone(),
amount,
expected_description_hash,
)
.await
},
HRNResolverInner::Local(inner) => {
inner
.resolve_lnurl_to_invoice(
callback_url.clone(),
amount,
expected_description_hash,
)
.await
},
};
match (primary, &self.http) {
(Ok(r), _) => Ok(r),
(Err(_), Some(http)) => {
http.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
.await
},
(Err(e), None) => Err(e),
}
})
}
}

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" + '
Support LNURL resolution via optional HTTP fallback by benthecarman · Pull Request #898 · lightningdevkit/ldk-node · GitHub
Skip to content
Support LNURL resolution via optional HTTP fallback#898

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

 Draft

benthecarman
wants to merge
1
commit into

base:main
Choose a base branch

from

 Draft


Support LNURL resolution via optional HTTP fallback
#898
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a", features = ["http"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }
Expand Down

18 changes: 13 additions & 5 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::Network;
use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock as BlockLocator};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand DownExpand Up@@ -80,8 +81,8 @@ use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
	GossipSync, Graph, HRNResolver, HRNResolverInner, KeysManager, MessageRouter, OnionMessenger,
PaymentStore, PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1739,7 +1740,7 @@ fn build_with_store_internal(
 })?;
	}

	let hrn_resolver;
	let hrn_resolver_inner;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();
Expand All@@ -1751,7 +1752,7 @@ fn build_with_store_internal(
 HRNResolverConfig::Blip32 => {
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
hrn_resolver_inner = HRNResolverInner::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
Expand All@@ -1766,7 +1767,7 @@ fn build_with_store_internal(
 BuildError::DNSResolverSetupFailed
 })?;
 let hrn_res = Arc::new(DNSHrnResolver(addr));
hrn_resolver = HRNResolver::Local(hrn_res);
hrn_resolver_inner = HRNResolverInner::Local(hrn_res);

 if *enable_hrn_resolution_service {
 if let Err(_) = may_announce_channel(&config) {
Expand All@@ -1790,6 +1791,13 @@ fn build_with_store_internal(
 },
	};

	let http_hrn_resolver = if config.hrn_config.enable_lnurl_resolution {
 Some(Arc::new(HTTPHrnResolver::new()))
	} else {
 None
	};
	let hrn_resolver = HRNResolver::new(hrn_resolver_inner, http_hrn_resolver);

	// Initialize the PeerManager
	let onion_messenger: Arc<OnionMessenger> =
 if let Some(AsyncPaymentsRole::Server) = async_payments_role {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,18 @@ pub struct HumanReadableNamesConfig {
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
	/// If set to true, enables resolving [LNURL-pay] links and the LN-Address LNURL fallback
	/// via HTTP, in addition to the BIP 353 / bLIP-32 resolution method configured in
	/// [`resolution_config`].
	///
	/// **Default:** `false`
	///
	/// **Note:** Enabling this may reveal our IP address to the recipient and information about
	/// who we're paying to the LNURL endpoint we're querying.
	///
	/// [LNURL-pay]: https://github.com/lnurl/luds/blob/luds/06.md
	/// [`resolution_config`]: Self::resolution_config
	pub enable_lnurl_resolution: bool,
@tnulltnullMay 5, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure we want this to be a config option to begin with? If this is just due to the possible privacy leak, it should probably be part of the respective variant on the resolution config?
}

impl Default for HumanReadableNamesConfig {
Expand All@@ -276,6 +288,7 @@ impl Default for HumanReadableNamesConfig {
 .expect("Socket address conversion failed."),
 enable_hrn_resolution_service: false,
 },
 enable_lnurl_resolution: false,
 }
	}
}
Expand Down

83 changes: 66 additions & 17 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::hrn_resolution::{
	HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
};
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::chainmonitor;
use lightning::impl_writeable_tlv_based;
Expand DownExpand Up@@ -329,37 +330,85 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
>;

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

#[derive(Clone)]
pub struct HRNResolver {
	inner: HRNResolverInner,
	http: Option<Arc<HTTPHrnResolver>>,
}

impl HRNResolver {
	pub(crate) fn new(inner: HRNResolverInner, http: Option<Arc<HTTPHrnResolver>>) -> Self {
 Self { inner, http }
	}
}

impl HrnResolver for HRNResolver {
	fn resolve_hrn<'a>(&'a self, hrn: &'a HumanReadableName) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_hrn(hrn),
 HRNResolver::Local(inner) => inner.resolve_hrn(hrn),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_hrn(hrn).await,
 HRNResolverInner::Local(inner) => inner.resolve_hrn(hrn).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_hrn(hrn).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl<'a>(&'a self, url: &'a str) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_lnurl(url),
 HRNResolver::Local(inner) => inner.resolve_lnurl(url),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_lnurl(url).await,
 HRNResolverInner::Local(inner) => inner.resolve_lnurl(url).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_lnurl(url).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl_to_invoice<'a>(
 &'a self, callback_url: String, amount: BPIAmount, expected_description_hash: [u8; 32],
	) -> LNURLResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 HRNResolver::Local(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 HRNResolverInner::Local(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => {
 http.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 .await
 },
 (Err(e), None) => Err(e),
 }
 })
	}
}

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('^' + ".*" + '
Support LNURL resolution via optional HTTP fallback by benthecarman · Pull Request #898 · lightningdevkit/ldk-node · GitHub
Skip to content
Support LNURL resolution via optional HTTP fallback#898

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

 Draft

benthecarman
wants to merge
1
commit into

base:main
Choose a base branch

from

 Draft


Support LNURL resolution via optional HTTP fallback
#898
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a", features = ["http"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }
Expand Down

18 changes: 13 additions & 5 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::Network;
use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock as BlockLocator};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand DownExpand Up@@ -80,8 +81,8 @@ use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
	GossipSync, Graph, HRNResolver, HRNResolverInner, KeysManager, MessageRouter, OnionMessenger,
PaymentStore, PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1739,7 +1740,7 @@ fn build_with_store_internal(
 })?;
	}

	let hrn_resolver;
	let hrn_resolver_inner;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();
Expand All@@ -1751,7 +1752,7 @@ fn build_with_store_internal(
 HRNResolverConfig::Blip32 => {
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
hrn_resolver_inner = HRNResolverInner::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
Expand All@@ -1766,7 +1767,7 @@ fn build_with_store_internal(
 BuildError::DNSResolverSetupFailed
 })?;
 let hrn_res = Arc::new(DNSHrnResolver(addr));
hrn_resolver = HRNResolver::Local(hrn_res);
hrn_resolver_inner = HRNResolverInner::Local(hrn_res);

 if *enable_hrn_resolution_service {
 if let Err(_) = may_announce_channel(&config) {
Expand All@@ -1790,6 +1791,13 @@ fn build_with_store_internal(
 },
	};

	let http_hrn_resolver = if config.hrn_config.enable_lnurl_resolution {
 Some(Arc::new(HTTPHrnResolver::new()))
	} else {
 None
	};
	let hrn_resolver = HRNResolver::new(hrn_resolver_inner, http_hrn_resolver);

	// Initialize the PeerManager
	let onion_messenger: Arc<OnionMessenger> =
 if let Some(AsyncPaymentsRole::Server) = async_payments_role {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,18 @@ pub struct HumanReadableNamesConfig {
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
	/// If set to true, enables resolving [LNURL-pay] links and the LN-Address LNURL fallback
	/// via HTTP, in addition to the BIP 353 / bLIP-32 resolution method configured in
	/// [`resolution_config`].
	///
	/// **Default:** `false`
	///
	/// **Note:** Enabling this may reveal our IP address to the recipient and information about
	/// who we're paying to the LNURL endpoint we're querying.
	///
	/// [LNURL-pay]: https://github.com/lnurl/luds/blob/luds/06.md
	/// [`resolution_config`]: Self::resolution_config
	pub enable_lnurl_resolution: bool,
@tnulltnullMay 5, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure we want this to be a config option to begin with? If this is just due to the possible privacy leak, it should probably be part of the respective variant on the resolution config?
}

impl Default for HumanReadableNamesConfig {
Expand All@@ -276,6 +288,7 @@ impl Default for HumanReadableNamesConfig {
 .expect("Socket address conversion failed."),
 enable_hrn_resolution_service: false,
 },
 enable_lnurl_resolution: false,
 }
	}
}
Expand Down

83 changes: 66 additions & 17 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::hrn_resolution::{
	HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
};
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::chainmonitor;
use lightning::impl_writeable_tlv_based;
Expand DownExpand Up@@ -329,37 +330,85 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
>;

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

#[derive(Clone)]
pub struct HRNResolver {
	inner: HRNResolverInner,
	http: Option<Arc<HTTPHrnResolver>>,
}

impl HRNResolver {
	pub(crate) fn new(inner: HRNResolverInner, http: Option<Arc<HTTPHrnResolver>>) -> Self {
 Self { inner, http }
	}
}

impl HrnResolver for HRNResolver {
	fn resolve_hrn<'a>(&'a self, hrn: &'a HumanReadableName) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_hrn(hrn),
 HRNResolver::Local(inner) => inner.resolve_hrn(hrn),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_hrn(hrn).await,
 HRNResolverInner::Local(inner) => inner.resolve_hrn(hrn).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_hrn(hrn).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl<'a>(&'a self, url: &'a str) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_lnurl(url),
 HRNResolver::Local(inner) => inner.resolve_lnurl(url),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_lnurl(url).await,
 HRNResolverInner::Local(inner) => inner.resolve_lnurl(url).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_lnurl(url).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl_to_invoice<'a>(
 &'a self, callback_url: String, amount: BPIAmount, expected_description_hash: [u8; 32],
	) -> LNURLResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 HRNResolver::Local(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 HRNResolverInner::Local(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => {
 http.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 .await
 },
 (Err(e), None) => Err(e),
 }
 })
	}
}

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('^' + ".*" + '
Support LNURL resolution via optional HTTP fallback by benthecarman · Pull Request #898 · lightningdevkit/ldk-node · GitHub
Skip to content
Support LNURL resolution via optional HTTP fallback#898

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

 Draft

benthecarman
wants to merge
1
commit into

base:main
Choose a base branch

from

 Draft


Support LNURL resolution via optional HTTP fallback
#898
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a", features = ["http"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }
Expand Down

18 changes: 13 additions & 5 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::Network;
use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock as BlockLocator};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand DownExpand Up@@ -80,8 +81,8 @@ use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
	GossipSync, Graph, HRNResolver, HRNResolverInner, KeysManager, MessageRouter, OnionMessenger,
PaymentStore, PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1739,7 +1740,7 @@ fn build_with_store_internal(
 })?;
	}

	let hrn_resolver;
	let hrn_resolver_inner;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();
Expand All@@ -1751,7 +1752,7 @@ fn build_with_store_internal(
 HRNResolverConfig::Blip32 => {
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
hrn_resolver_inner = HRNResolverInner::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
Expand All@@ -1766,7 +1767,7 @@ fn build_with_store_internal(
 BuildError::DNSResolverSetupFailed
 })?;
 let hrn_res = Arc::new(DNSHrnResolver(addr));
hrn_resolver = HRNResolver::Local(hrn_res);
hrn_resolver_inner = HRNResolverInner::Local(hrn_res);

 if *enable_hrn_resolution_service {
 if let Err(_) = may_announce_channel(&config) {
Expand All@@ -1790,6 +1791,13 @@ fn build_with_store_internal(
 },
	};

	let http_hrn_resolver = if config.hrn_config.enable_lnurl_resolution {
 Some(Arc::new(HTTPHrnResolver::new()))
	} else {
 None
	};
	let hrn_resolver = HRNResolver::new(hrn_resolver_inner, http_hrn_resolver);

	// Initialize the PeerManager
	let onion_messenger: Arc<OnionMessenger> =
 if let Some(AsyncPaymentsRole::Server) = async_payments_role {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,18 @@ pub struct HumanReadableNamesConfig {
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
	/// If set to true, enables resolving [LNURL-pay] links and the LN-Address LNURL fallback
	/// via HTTP, in addition to the BIP 353 / bLIP-32 resolution method configured in
	/// [`resolution_config`].
	///
	/// **Default:** `false`
	///
	/// **Note:** Enabling this may reveal our IP address to the recipient and information about
	/// who we're paying to the LNURL endpoint we're querying.
	///
	/// [LNURL-pay]: https://github.com/lnurl/luds/blob/luds/06.md
	/// [`resolution_config`]: Self::resolution_config
	pub enable_lnurl_resolution: bool,
@tnulltnullMay 5, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure we want this to be a config option to begin with? If this is just due to the possible privacy leak, it should probably be part of the respective variant on the resolution config?
}

impl Default for HumanReadableNamesConfig {
Expand All@@ -276,6 +288,7 @@ impl Default for HumanReadableNamesConfig {
 .expect("Socket address conversion failed."),
 enable_hrn_resolution_service: false,
 },
 enable_lnurl_resolution: false,
 }
	}
}
Expand Down

83 changes: 66 additions & 17 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::hrn_resolution::{
	HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
};
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::chainmonitor;
use lightning::impl_writeable_tlv_based;
Expand DownExpand Up@@ -329,37 +330,85 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
>;

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

#[derive(Clone)]
pub struct HRNResolver {
	inner: HRNResolverInner,
	http: Option<Arc<HTTPHrnResolver>>,
}

impl HRNResolver {
	pub(crate) fn new(inner: HRNResolverInner, http: Option<Arc<HTTPHrnResolver>>) -> Self {
 Self { inner, http }
	}
}

impl HrnResolver for HRNResolver {
	fn resolve_hrn<'a>(&'a self, hrn: &'a HumanReadableName) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_hrn(hrn),
 HRNResolver::Local(inner) => inner.resolve_hrn(hrn),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_hrn(hrn).await,
 HRNResolverInner::Local(inner) => inner.resolve_hrn(hrn).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_hrn(hrn).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl<'a>(&'a self, url: &'a str) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_lnurl(url),
 HRNResolver::Local(inner) => inner.resolve_lnurl(url),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_lnurl(url).await,
 HRNResolverInner::Local(inner) => inner.resolve_lnurl(url).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_lnurl(url).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl_to_invoice<'a>(
 &'a self, callback_url: String, amount: BPIAmount, expected_description_hash: [u8; 32],
	) -> LNURLResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 HRNResolver::Local(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 HRNResolverInner::Local(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => {
 http.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 .await
 },
 (Err(e), None) => Err(e),
 }
 })
	}
}

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" + '
Support LNURL resolution via optional HTTP fallback by benthecarman · Pull Request #898 · lightningdevkit/ldk-node · GitHub
Skip to content
Support LNURL resolution via optional HTTP fallback#898

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

 Draft

benthecarman
wants to merge
1
commit into

base:main
Choose a base branch

from

 Draft


Support LNURL resolution via optional HTTP fallback
#898
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a", features = ["http"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }
Expand Down

18 changes: 13 additions & 5 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::Network;
use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock as BlockLocator};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand DownExpand Up@@ -80,8 +81,8 @@ use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
	GossipSync, Graph, HRNResolver, HRNResolverInner, KeysManager, MessageRouter, OnionMessenger,
PaymentStore, PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1739,7 +1740,7 @@ fn build_with_store_internal(
 })?;
	}

	let hrn_resolver;
	let hrn_resolver_inner;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();
Expand All@@ -1751,7 +1752,7 @@ fn build_with_store_internal(
 HRNResolverConfig::Blip32 => {
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
hrn_resolver_inner = HRNResolverInner::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
Expand All@@ -1766,7 +1767,7 @@ fn build_with_store_internal(
 BuildError::DNSResolverSetupFailed
 })?;
 let hrn_res = Arc::new(DNSHrnResolver(addr));
hrn_resolver = HRNResolver::Local(hrn_res);
hrn_resolver_inner = HRNResolverInner::Local(hrn_res);

 if *enable_hrn_resolution_service {
 if let Err(_) = may_announce_channel(&config) {
Expand All@@ -1790,6 +1791,13 @@ fn build_with_store_internal(
 },
	};

	let http_hrn_resolver = if config.hrn_config.enable_lnurl_resolution {
 Some(Arc::new(HTTPHrnResolver::new()))
	} else {
 None
	};
	let hrn_resolver = HRNResolver::new(hrn_resolver_inner, http_hrn_resolver);

	// Initialize the PeerManager
	let onion_messenger: Arc<OnionMessenger> =
 if let Some(AsyncPaymentsRole::Server) = async_payments_role {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,18 @@ pub struct HumanReadableNamesConfig {
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
	/// If set to true, enables resolving [LNURL-pay] links and the LN-Address LNURL fallback
	/// via HTTP, in addition to the BIP 353 / bLIP-32 resolution method configured in
	/// [`resolution_config`].
	///
	/// **Default:** `false`
	///
	/// **Note:** Enabling this may reveal our IP address to the recipient and information about
	/// who we're paying to the LNURL endpoint we're querying.
	///
	/// [LNURL-pay]: https://github.com/lnurl/luds/blob/luds/06.md
	/// [`resolution_config`]: Self::resolution_config
	pub enable_lnurl_resolution: bool,
@tnulltnullMay 5, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure we want this to be a config option to begin with? If this is just due to the possible privacy leak, it should probably be part of the respective variant on the resolution config?
}

impl Default for HumanReadableNamesConfig {
Expand All@@ -276,6 +288,7 @@ impl Default for HumanReadableNamesConfig {
 .expect("Socket address conversion failed."),
 enable_hrn_resolution_service: false,
 },
 enable_lnurl_resolution: false,
 }
	}
}
Expand Down

83 changes: 66 additions & 17 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::hrn_resolution::{
	HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
};
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::chainmonitor;
use lightning::impl_writeable_tlv_based;
Expand DownExpand Up@@ -329,37 +330,85 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
>;

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

#[derive(Clone)]
pub struct HRNResolver {
	inner: HRNResolverInner,
	http: Option<Arc<HTTPHrnResolver>>,
}

impl HRNResolver {
	pub(crate) fn new(inner: HRNResolverInner, http: Option<Arc<HTTPHrnResolver>>) -> Self {
 Self { inner, http }
	}
}

impl HrnResolver for HRNResolver {
	fn resolve_hrn<'a>(&'a self, hrn: &'a HumanReadableName) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_hrn(hrn),
 HRNResolver::Local(inner) => inner.resolve_hrn(hrn),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_hrn(hrn).await,
 HRNResolverInner::Local(inner) => inner.resolve_hrn(hrn).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_hrn(hrn).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl<'a>(&'a self, url: &'a str) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_lnurl(url),
 HRNResolver::Local(inner) => inner.resolve_lnurl(url),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_lnurl(url).await,
 HRNResolverInner::Local(inner) => inner.resolve_lnurl(url).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_lnurl(url).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl_to_invoice<'a>(
 &'a self, callback_url: String, amount: BPIAmount, expected_description_hash: [u8; 32],
	) -> LNURLResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 HRNResolver::Local(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 HRNResolverInner::Local(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => {
 http.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 .await
 },
 (Err(e), None) => Err(e),
 }
 })
	}
}

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('^' + ".*" + '
Support LNURL resolution via optional HTTP fallback by benthecarman · Pull Request #898 · lightningdevkit/ldk-node · GitHub
Skip to content
Support LNURL resolution via optional HTTP fallback#898

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

 Draft

benthecarman
wants to merge
1
commit into

base:main
Choose a base branch

from

 Draft


Support LNURL resolution via optional HTTP fallback
#898
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a", features = ["http"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }
Expand Down

18 changes: 13 additions & 5 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::Network;
use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock as BlockLocator};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand DownExpand Up@@ -80,8 +81,8 @@ use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
	GossipSync, Graph, HRNResolver, HRNResolverInner, KeysManager, MessageRouter, OnionMessenger,
PaymentStore, PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1739,7 +1740,7 @@ fn build_with_store_internal(
 })?;
	}

	let hrn_resolver;
	let hrn_resolver_inner;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();
Expand All@@ -1751,7 +1752,7 @@ fn build_with_store_internal(
 HRNResolverConfig::Blip32 => {
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
hrn_resolver_inner = HRNResolverInner::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
Expand All@@ -1766,7 +1767,7 @@ fn build_with_store_internal(
 BuildError::DNSResolverSetupFailed
 })?;
 let hrn_res = Arc::new(DNSHrnResolver(addr));
hrn_resolver = HRNResolver::Local(hrn_res);
hrn_resolver_inner = HRNResolverInner::Local(hrn_res);

 if *enable_hrn_resolution_service {
 if let Err(_) = may_announce_channel(&config) {
Expand All@@ -1790,6 +1791,13 @@ fn build_with_store_internal(
 },
	};

	let http_hrn_resolver = if config.hrn_config.enable_lnurl_resolution {
 Some(Arc::new(HTTPHrnResolver::new()))
	} else {
 None
	};
	let hrn_resolver = HRNResolver::new(hrn_resolver_inner, http_hrn_resolver);

	// Initialize the PeerManager
	let onion_messenger: Arc<OnionMessenger> =
 if let Some(AsyncPaymentsRole::Server) = async_payments_role {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,18 @@ pub struct HumanReadableNamesConfig {
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
	/// If set to true, enables resolving [LNURL-pay] links and the LN-Address LNURL fallback
	/// via HTTP, in addition to the BIP 353 / bLIP-32 resolution method configured in
	/// [`resolution_config`].
	///
	/// **Default:** `false`
	///
	/// **Note:** Enabling this may reveal our IP address to the recipient and information about
	/// who we're paying to the LNURL endpoint we're querying.
	///
	/// [LNURL-pay]: https://github.com/lnurl/luds/blob/luds/06.md
	/// [`resolution_config`]: Self::resolution_config
	pub enable_lnurl_resolution: bool,
@tnulltnullMay 5, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure we want this to be a config option to begin with? If this is just due to the possible privacy leak, it should probably be part of the respective variant on the resolution config?
}

impl Default for HumanReadableNamesConfig {
Expand All@@ -276,6 +288,7 @@ impl Default for HumanReadableNamesConfig {
 .expect("Socket address conversion failed."),
 enable_hrn_resolution_service: false,
 },
 enable_lnurl_resolution: false,
 }
	}
}
Expand Down

83 changes: 66 additions & 17 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::hrn_resolution::{
	HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
};
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::chainmonitor;
use lightning::impl_writeable_tlv_based;
Expand DownExpand Up@@ -329,37 +330,85 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
>;

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

#[derive(Clone)]
pub struct HRNResolver {
	inner: HRNResolverInner,
	http: Option<Arc<HTTPHrnResolver>>,
}

impl HRNResolver {
	pub(crate) fn new(inner: HRNResolverInner, http: Option<Arc<HTTPHrnResolver>>) -> Self {
 Self { inner, http }
	}
}

impl HrnResolver for HRNResolver {
	fn resolve_hrn<'a>(&'a self, hrn: &'a HumanReadableName) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_hrn(hrn),
 HRNResolver::Local(inner) => inner.resolve_hrn(hrn),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_hrn(hrn).await,
 HRNResolverInner::Local(inner) => inner.resolve_hrn(hrn).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_hrn(hrn).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl<'a>(&'a self, url: &'a str) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_lnurl(url),
 HRNResolver::Local(inner) => inner.resolve_lnurl(url),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_lnurl(url).await,
 HRNResolverInner::Local(inner) => inner.resolve_lnurl(url).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_lnurl(url).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl_to_invoice<'a>(
 &'a self, callback_url: String, amount: BPIAmount, expected_description_hash: [u8; 32],
	) -> LNURLResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 HRNResolver::Local(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 HRNResolverInner::Local(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => {
 http.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 .await
 },
 (Err(e), None) => Err(e),
 }
 })
	}
}

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); }
})();
})();
Support LNURL resolution via optional HTTP fallback by benthecarman · Pull Request #898 · lightningdevkit/ldk-node · GitHub
Skip to content
Support LNURL resolution via optional HTTP fallback#898

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

 Draft

benthecarman
wants to merge
1
commit into

base:main
Choose a base branch

from

 Draft


Support LNURL resolution via optional HTTP fallback
#898
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -81,7 +81,7 @@ async-trait = { version = "0.1", default-features = false }
vss-client = { package = "vss-client-ng", version = "0.5" }
prost = { version = "0.11.6", default-features = false}
#bitcoin-payment-instructions = { version = "0.6" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a" }
bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "679dac50cc0d81ec4d31da94b93d467e5308f16a", features = ["http"] }

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["winbase"] }
Expand Down

18 changes: 13 additions & 5 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ use bitcoin::key::Secp256k1;
use bitcoin::secp256k1::PublicKey;
use bitcoin::Network;
use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::{chainmonitor, BestBlock as BlockLocator};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManagerReadArgs};
Expand DownExpand Up@@ -80,8 +81,8 @@ use crate::runtime::{Runtime, RuntimeSpawner};
use crate::tx_broadcaster::TransactionBroadcaster;
use crate::types::{
	AsyncPersister, ChainMonitor, ChannelManager, DynStore, DynStoreRef, DynStoreWrapper,
	GossipSync, Graph, HRNResolver, KeysManager, MessageRouter, OnionMessenger, PaymentStore,
	PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
	GossipSync, Graph, HRNResolver, HRNResolverInner, KeysManager, MessageRouter, OnionMessenger,
PaymentStore, PeerManager, PendingPaymentStore, SyncAndAsyncKVStore,
};
use crate::wallet::persist::KVStoreWalletPersister;
use crate::wallet::Wallet;
Expand DownExpand Up@@ -1739,7 +1740,7 @@ fn build_with_store_internal(
 })?;
	}

	let hrn_resolver;
	let hrn_resolver_inner;
	let mut blip32_resolver = None;

	let runtime_handle = runtime.handle();
Expand All@@ -1751,7 +1752,7 @@ fn build_with_store_internal(
 HRNResolverConfig::Blip32 => {
 let hrn_res =
 Arc::new(LDKOnionMessageDNSSECHrnResolver::new(Arc::clone(&network_graph)));
hrn_resolver = HRNResolver::Onion(Arc::clone(&hrn_res));
hrn_resolver_inner = HRNResolverInner::Onion(Arc::clone(&hrn_res));
 blip32_resolver = Some(Arc::clone(&hrn_res));

 hrn_res as Arc<dyn DNSResolverMessageHandler + Send + Sync>
Expand All@@ -1766,7 +1767,7 @@ fn build_with_store_internal(
 BuildError::DNSResolverSetupFailed
 })?;
 let hrn_res = Arc::new(DNSHrnResolver(addr));
hrn_resolver = HRNResolver::Local(hrn_res);
hrn_resolver_inner = HRNResolverInner::Local(hrn_res);

 if *enable_hrn_resolution_service {
 if let Err(_) = may_announce_channel(&config) {
Expand All@@ -1790,6 +1791,13 @@ fn build_with_store_internal(
 },
	};

	let http_hrn_resolver = if config.hrn_config.enable_lnurl_resolution {
 Some(Arc::new(HTTPHrnResolver::new()))
	} else {
 None
	};
	let hrn_resolver = HRNResolver::new(hrn_resolver_inner, http_hrn_resolver);

	// Initialize the PeerManager
	let onion_messenger: Arc<OnionMessenger> =
 if let Some(AsyncPaymentsRole::Server) = async_payments_role {
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -266,6 +266,18 @@ pub struct HumanReadableNamesConfig {
	/// * **DNS Server**: `8.8.8.8:53` (Google Public DNS)
	/// * **Resolution Service**: Disabled (`false`)
	pub resolution_config: HRNResolverConfig,
	/// If set to true, enables resolving [LNURL-pay] links and the LN-Address LNURL fallback
	/// via HTTP, in addition to the BIP 353 / bLIP-32 resolution method configured in
	/// [`resolution_config`].
	///
	/// **Default:** `false`
	///
	/// **Note:** Enabling this may reveal our IP address to the recipient and information about
	/// who we're paying to the LNURL endpoint we're querying.
	///
	/// [LNURL-pay]: https://github.com/lnurl/luds/blob/luds/06.md
	/// [`resolution_config`]: Self::resolution_config
	pub enable_lnurl_resolution: bool,
@tnulltnullMay 5, 2026

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm not sure we want this to be a config option to begin with? If this is just due to the possible privacy leak, it should probably be part of the respective variant on the resolution config?
}

impl Default for HumanReadableNamesConfig {
Expand All@@ -276,6 +288,7 @@ impl Default for HumanReadableNamesConfig {
 .expect("Socket address conversion failed."),
 enable_hrn_resolution_service: false,
 },
 enable_lnurl_resolution: false,
 }
	}
}
Expand Down

83 changes: 66 additions & 17 deletions
src/types.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ use bitcoin_payment_instructions::dns_resolver::DNSHrnResolver;
use bitcoin_payment_instructions::hrn_resolution::{
	HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
};
use bitcoin_payment_instructions::http_resolver::HTTPHrnResolver;
use bitcoin_payment_instructions::onion_message_resolver::LDKOnionMessageDNSSECHrnResolver;
use lightning::chain::chainmonitor;
use lightning::impl_writeable_tlv_based;
Expand DownExpand Up@@ -329,37 +330,85 @@ pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMesse
>;

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

#[derive(Clone)]
pub struct HRNResolver {
	inner: HRNResolverInner,
	http: Option<Arc<HTTPHrnResolver>>,
}

impl HRNResolver {
	pub(crate) fn new(inner: HRNResolverInner, http: Option<Arc<HTTPHrnResolver>>) -> Self {
 Self { inner, http }
	}
}

impl HrnResolver for HRNResolver {
	fn resolve_hrn<'a>(&'a self, hrn: &'a HumanReadableName) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_hrn(hrn),
 HRNResolver::Local(inner) => inner.resolve_hrn(hrn),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_hrn(hrn).await,
 HRNResolverInner::Local(inner) => inner.resolve_hrn(hrn).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_hrn(hrn).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl<'a>(&'a self, url: &'a str) -> HrnResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => inner.resolve_lnurl(url),
 HRNResolver::Local(inner) => inner.resolve_lnurl(url),
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => inner.resolve_lnurl(url).await,
 HRNResolverInner::Local(inner) => inner.resolve_lnurl(url).await,
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => http.resolve_lnurl(url).await,
 (Err(e), None) => Err(e),
 }
 })
	}

	fn resolve_lnurl_to_invoice<'a>(
 &'a self, callback_url: String, amount: BPIAmount, expected_description_hash: [u8; 32],
	) -> LNURLResolutionFuture<'a> {
 match self {
 HRNResolver::Onion(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 HRNResolver::Local(inner) => {
 inner.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 },
 }
 Box::pin(async move {
 let primary = match &self.inner {
 HRNResolverInner::Onion(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 HRNResolverInner::Local(inner) => {
 inner
 .resolve_lnurl_to_invoice(
 callback_url.clone(),
 amount,
 expected_description_hash,
 )
 .await
 },
 };
 match (primary, &self.http) {
 (Ok(r), _) => Ok(r),
 (Err(_), Some(http)) => {
 http.resolve_lnurl_to_invoice(callback_url, amount, expected_description_hash)
 .await
 },
 (Err(e), None) => Err(e),
 }
 })
	}
}

Expand Down
Loading