Merge pull request #6 from TheBlueMatt/2025-06-onion-resolution

Add an onion message-based DNSSEC HRN Resolver

Author: TheBlueMatt

Cargo.toml

@@ -15,18 +15,20 @@ rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
 http = ["reqwest", "std", "serde", "serde_json"]
-std = ["dnssec-prover"]
+std = ["dnssec-prover", "getrandom"]
 default = ["std"]
 
 [dependencies]
 lightning-invoice = { version = "0.33", default-features = false }
 lightning = { version = "0.1", default-features = false, features = ["dnssec"] }
 bitcoin = { version = "0.32", default-features = false }
-getrandom = { version = "0.3", default-features = false }
+getrandom = { version = "0.3", default-features = false, optional = true }
 dnssec-prover = { version = "0.6", default-features = false, optional = true, features = ["validation", "std", "tokio"] }
 reqwest = { version = "0.11", default-features = false, optional = true, features = ["rustls-tls-webpki-roots", "json"] }
 serde = { version = "1.0", default-features = false, optional = true, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, optional = true, features = ["alloc"] }
 
 [dev-dependencies]
 tokio = { version = "1.0", default-features = false, features = ["rt", "macros"] }
+lightning = { version = "0.1", features = ["std"] }
+lightning-net-tokio = { version = "0.1", default-features = false }

ci/ci-tests.sh

@@ -13,7 +13,10 @@ cargo check --verbose --color always
 cargo check --release --verbose --color always
 cargo test --no-default-features
 [ "$RUSTC_MINOR_VERSION" -gt 81 ] && cargo test --features http
-cargo test --features std
+# One std test syncs much of the lightning network graph, so --release is a must
+# At least until https://github.com/lightningdevkit/rust-lightning/pull/3687 gets backported
+export RUSTFLAGS="-C debug-assertions=on"
+cargo test --features std --release
 [ "$RUSTC_MINOR_VERSION" -gt 81 ] && cargo doc --document-private-items --no-default-features
 [ "$RUSTC_MINOR_VERSION" -gt 81 ] && cargo doc --document-private-items --features http,std
 exit 0

fuzz/src/parse.rs

@@ -10,9 +10,9 @@
 use bitcoin::Network;
 
 use bitcoin_payment_instructions::amount::Amount;
-use bitcoin_payment_instructions::hrn::HumanReadableName;
 use bitcoin_payment_instructions::hrn_resolution::{
-	DummyHrnResolver, HrnResolution, HrnResolutionFuture, HrnResolver, LNURLResolutionFuture,
+	DummyHrnResolver, HrnResolution, HrnResolutionFuture, HrnResolver, HumanReadableName,
+	LNURLResolutionFuture,
 };
 use bitcoin_payment_instructions::PaymentInstructions;
 

src/dns_resolver.rs

@@ -9,9 +9,8 @@ use dnssec_prover::rr::Name;
 
 use crate::amount::Amount;
 use crate::dnssec_utils::resolve_proof;
-use crate::hrn::HumanReadableName;
 use crate::hrn_resolution::{
-	HrnResolution, HrnResolutionFuture, HrnResolver, LNURLResolutionFuture,
+	HrnResolution, HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
 };
 
 /// An [`HrnResolver`] which resolves BIP 353 Human Readable Names to payment instructions using a
@@ -59,7 +58,7 @@ mod tests {
 	use crate::*;
 
 	#[tokio::test]
-	async fn test_http_hrn_resolver() {
+	async fn test_dns_hrn_resolver() {
 		let resolver = DNSHrnResolver(SocketAddr::from_str("8.8.8.8:53").unwrap());
 		let instructions = PaymentInstructions::parse(
 			"[email protected]",

src/hrn.rs

@@ -7,10 +7,11 @@
 //! associated types in this module.
 
 use crate::amount::Amount;
-use crate::hrn::HumanReadableName;
 
 use lightning_invoice::Bolt11Invoice;
 
+pub use lightning::onion_message::dns_resolution::HumanReadableName;
+
 use core::future::Future;
 use core::pin::Pin;
 

src/hrn_resolution.rs

@@ -17,9 +17,8 @@ use lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescriptionRef};
 
 use crate::amount::Amount;
 use crate::dnssec_utils::resolve_proof;
-use crate::hrn::HumanReadableName;
 use crate::hrn_resolution::{
-	HrnResolution, HrnResolutionFuture, HrnResolver, LNURLResolutionFuture,
+	HrnResolution, HrnResolutionFuture, HrnResolver, HumanReadableName, LNURLResolutionFuture,
 };
 
 const DOH_ENDPOINT: &'static str = "https://dns.google/dns-query?dns=";

src/http_resolver.rs

@@ -57,17 +57,17 @@ pub mod dns_resolver;
 #[cfg(feature = "http")]
 pub mod http_resolver;
 
+#[cfg(feature = "std")] // TODO: Drop once we upgrade to LDK 0.2
+pub mod onion_message_resolver;
+
 pub mod amount;
 
 pub mod receive;
 
 pub mod hrn_resolution;
 
-pub mod hrn;
-
 use amount::Amount;
-use hrn::HumanReadableName;
-use hrn_resolution::{HrnResolution, HrnResolver};
+use hrn_resolution::{HrnResolution, HrnResolver, HumanReadableName};
 
 /// A method which can be used to make a payment
 #[derive(Clone, Debug, PartialEq, Eq)]