fixup! Add support for sending to human-readable names that resolve to Bolt12 Offers

Author: chuksys

bindings/ldk_node.udl

@@ -408,7 +408,7 @@ interface PaymentKind {
 	Onchain(Txid txid, ConfirmationStatus status);
 	Bolt11(PaymentHash hash, PaymentPreimage? preimage, PaymentSecret? secret);
 	Bolt11Jit(PaymentHash hash, PaymentPreimage? preimage, PaymentSecret? secret, u64? counterparty_skimmed_fee_msat, LSPFeeLimits lsp_fee_limits);
-	Bolt12Offer(PaymentHash? hash, PaymentPreimage? preimage, PaymentSecret? secret, OfferId offer_id, UntrustedString? payer_note, u64? quantity);
+	Bolt12Offer(PaymentHash? hash, PaymentPreimage? preimage, PaymentSecret? secret, OfferId? offer_id, UntrustedString? payer_note, u64? quantity);
 	Bolt12Refund(PaymentHash? hash, PaymentPreimage? preimage, PaymentSecret? secret, UntrustedString? payer_note, u64? quantity);
 	Spontaneous(PaymentHash hash, PaymentPreimage? preimage);
 };
@@ -803,7 +803,4 @@ typedef string NodeAlias;
 typedef string OrderId;
 
 [Custom]
-typedef string DateTime;
-
-[Custom]
-typedef string HumanReadableName;
+typedef string DateTime;

src/payment/bolt12.rs

@@ -23,6 +23,7 @@ use lightning::offers::offer::{Amount, Offer, Quantity};
 use lightning::offers::parse::Bolt12SemanticError;
 use lightning::offers::refund::Refund;
 use lightning::onion_message::dns_resolution::HumanReadableName;
+use lightning::onion_message::messenger::Destination;
 use lightning::util::string::UntrustedString;
 
 use rand::RngCore;
@@ -283,28 +284,35 @@ impl Bolt12Payment {
 		let retry_strategy = Retry::Timeout(LDK_PAYMENT_RETRY_TIMEOUT);
 		let max_total_routing_fee_msat = None;
 
-		let dns_resolvers = match &self.config.dns_resolvers {
+		let dns_resolvers = match &self.config.dns_resolvers_node_ids {
 			Some(dns_resolvers) => Ok(dns_resolvers.clone()),
 			None => Err(Error::DnsResolversNotConfigured),
 		}?;
 
+		let destinations: Vec<Destination> = dns_resolvers
+		.into_iter()
+		.map(|public_key| {
+			Destination::Node(public_key)
+		})
+		.collect();
+		
 		match self.channel_manager.pay_for_offer_from_human_readable_name(
 			hrn.clone(),
 			amount_msat,
 			payment_id,
 			retry_strategy,
 			max_total_routing_fee_msat,
-			dns_resolvers,
+			destinations,
 		) {
 			Ok(()) => {
 				log_info!(self.logger, "Initiated sending {} msats to {}", amount_msat, name);
-				let kind = PaymentKind::Bolt12Offer { 
-					hash: None, 
-					preimage: None, 
-					secret: None, 
+				let kind = PaymentKind::Bolt12Offer {
+					hash: None,
+					preimage: None,
+					secret: None,
 					offer_id: None,
-					payer_note: None, 
-					quantity: None 
+					payer_note: None,
+					quantity: None,
 				};
 				let payment = PaymentDetails::new(
 					payment_id,
@@ -319,13 +327,13 @@ impl Bolt12Payment {
 			},
 			Err(()) => {
 				log_error!(self.logger, "Failed to send payment to {}", name);
-				let kind = PaymentKind::Bolt12Offer { 
-					hash: None, 
-					preimage: None, 
-					secret: None, 
+				let kind = PaymentKind::Bolt12Offer {
+					hash: None,
+					preimage: None,
+					secret: None,
 					offer_id: None,
-					payer_note: None, 
-					quantity: None 
+					payer_note: None,
+					quantity: None,
 				};
 				let payment = PaymentDetails::new(
 					payment_id,

src/uniffi_types.rs

@@ -35,7 +35,6 @@ pub use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 
 pub use lightning_invoice::{Description, SignedRawBolt11Invoice};
 
-pub use lightning::onion_message::dns_resolution::HumanReadableName;
 pub use lightning_liquidity::lsps1::msgs::ChannelInfo as ChannelOrderInfo;
 pub use lightning_liquidity::lsps1::msgs::{OrderId, OrderParameters, PaymentState};
 
@@ -657,18 +656,6 @@ impl UniffiCustomTypeConverter for DateTime {
 	}
 }
 
-impl UniffiCustomTypeConverter for HumanReadableName {
-	type Builtin = String;
-
-	fn into_custom(val: Self::Builtin) -> uniffi::Result<Self> {
-		HumanReadableName::from_encoded(&val).map_err(|_| Error::HrnParsingFailed.into())
-	}
-
-	fn from_custom(obj: Self) -> Self::Builtin {
-		format!("{}@{}", obj.user(), obj.domain())
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;