f add from_bolt12_invoice util

Author: valentinewallace

lightning/src/routing/router.rs

@@ -18,7 +18,7 @@ use crate::ln::PaymentHash;
 use crate::ln::channelmanager::{ChannelDetails, PaymentId};
 use crate::ln::features::{Bolt12InvoiceFeatures, ChannelFeatures, InvoiceFeatures, NodeFeatures};
 use crate::ln::msgs::{DecodeError, ErrorAction, LightningError, MAX_VALUE_MSAT};
-use crate::offers::invoice::BlindedPayInfo;
+use crate::offers::invoice::{BlindedPayInfo, Invoice as Bolt12Invoice};
 use crate::routing::gossip::{DirectedChannelInfo, EffectiveCapacity, ReadOnlyNetworkGraph, NetworkGraph, NodeId, RoutingFees};
 use crate::routing::scoring::{ChannelUsage, LockableScore, Score};
 use crate::util::ser::{Writeable, Readable, ReadableArgs, Writer};
@@ -634,8 +634,19 @@ impl PaymentParameters {
 			.expect("PaymentParameters::from_node_id should always initialize the payee as unblinded")
 	}
 
-	/// Creates parameters for paying to a blinded payee.
-	pub fn blinded(blinded_route_hints: Vec<(BlindedPayInfo, BlindedPath)>) -> Self {
+	/// Creates parameters for paying to a blinded payee from the provided invoice. Sets
+	/// [`Payee::Blinded::route_hints`], [`Payee::Blinded::features`], and
+	/// [`PaymentParameters::expiry_time`].
+	pub fn from_bolt12_invoice(invoice: &Bolt12Invoice) -> Self {
+		let route_hints = invoice.payment_paths().iter()
+			.map(|(path, info)| (info.clone(), path.clone())).collect();
+		Self::blinded(route_hints)
+			.with_bolt12_features(invoice.features().clone()).unwrap()
+			.with_expiry_time(invoice.created_at().as_secs().saturating_add(invoice.relative_expiry().as_secs()))
+	}
+
+	// TODO: fix tuple order to be consistent with [`crate::offers::invoice::Invoice::payment_paths`]
+	fn blinded(blinded_route_hints: Vec<(BlindedPayInfo, BlindedPath)>) -> Self {
 		Self {
 			payee: Payee::Blinded { route_hints: blinded_route_hints, features: None },
 			expiry_time: None,
@@ -647,7 +658,7 @@ impl PaymentParameters {
 	}
 
 	/// Includes the payee's features. Errors if the parameters were not initialized with
-	/// [`PaymentParameters::blinded`].
+	/// [`PaymentParameters::from_bolt12_invoice`].
 	///
 	/// This is not exported to bindings users since bindings don't support move semantics
 	pub fn with_bolt12_features(self, features: Bolt12InvoiceFeatures) -> Result<Self, ()> {
@@ -659,7 +670,7 @@ impl PaymentParameters {
 	}
 
 	/// Includes the payee's features. Errors if the parameters were initialized with
-	/// [`PaymentParameters::blinded`].
+	/// [`PaymentParameters::from_bolt12_invoice`].
 	///
 	/// This is not exported to bindings users since bindings don't support move semantics
 	pub fn with_bolt11_features(self, features: InvoiceFeatures) -> Result<Self, ()> {
@@ -675,7 +686,7 @@ impl PaymentParameters {
 	}
 
 	/// Includes hints for routing to the payee. Errors if the parameters were initialized with
-	/// [`PaymentParameters::blinded`].
+	/// [`PaymentParameters::from_bolt12_invoice`].
 	///
 	/// This is not exported to bindings users since bindings don't support move semantics
 	pub fn with_route_hints(self, route_hints: Vec<RouteHint>) -> Result<Self, ()> {