X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffeatures.rs;h=41b15c97c9ae63c5aaae4f4f3ef1a810da11efaa;hb=25a707314f70fc2f59488d4de34facb1428fc06d;hp=71bb66bacf7bc84380fe49316d9acec5ea293dff;hpb=883908c2926f97a33140e65cb0b4adaabd743f5e;p=rust-lightning

diff --git a/lightning/src/ln/features.rs b/lightning/src/ln/features.rs
index 71bb66ba..41b15c97 100644
--- a/lightning/src/ln/features.rs
+++ b/lightning/src/ln/features.rs
@@ -453,6 +453,16 @@ impl<T: sealed::Context> PartialEq for Features<T> {
 		self.flags.eq(&o.flags)
 	}
 }
+impl<T: sealed::Context> PartialOrd for Features<T> {
+	fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
+		self.flags.partial_cmp(&other.flags)
+	}
+}
+impl<T: sealed::Context + Eq> Ord for Features<T> {
+	fn cmp(&self, other: &Self) -> cmp::Ordering {
+		self.flags.cmp(&other.flags)
+	}
+}
 impl<T: sealed::Context> fmt::Debug for Features<T> {
 	fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
 		self.flags.fmt(fmt)
@@ -525,15 +535,29 @@ impl InvoiceFeatures {
 	/// [`PaymentParameters::for_keysend`], thus omitting the need for payers to manually construct an
 	/// `InvoiceFeatures` for [`find_route`].
 	///
+	/// MPP keysend is not widely supported yet, so we parameterize support to allow the user to
+	/// choose whether their router should find multi-part routes.
+	///
 	/// [`PaymentParameters::for_keysend`]: crate::routing::router::PaymentParameters::for_keysend
 	/// [`find_route`]: crate::routing::router::find_route
-	pub(crate) fn for_keysend() -> InvoiceFeatures {
+	pub(crate) fn for_keysend(allow_mpp: bool) -> InvoiceFeatures {
 		let mut res = InvoiceFeatures::empty();
 		res.set_variable_length_onion_optional();
+		if allow_mpp {
+			res.set_basic_mpp_optional();
+		}
 		res
 	}
 }
 
+impl Bolt12InvoiceFeatures {
+	/// Converts `Bolt12InvoiceFeatures` to `Features<C>`. Only known `Bolt12InvoiceFeatures` relevant
+	/// to context `C` are included in the result.
+	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
+		self.to_context_internal()
+	}
+}
+
 impl ChannelTypeFeatures {
 	// Maps the relevant `InitFeatures` to `ChannelTypeFeatures`. Any unknown features to
 	// `ChannelTypeFeatures` are not included in the result.
@@ -856,6 +880,7 @@ impl_feature_len_prefixed_write!(InitFeatures);
 impl_feature_len_prefixed_write!(ChannelFeatures);
 impl_feature_len_prefixed_write!(NodeFeatures);
 impl_feature_len_prefixed_write!(InvoiceFeatures);
+impl_feature_len_prefixed_write!(Bolt12InvoiceFeatures);
 impl_feature_len_prefixed_write!(BlindedHopFeatures);
 
 // Some features only appear inside of TLVs, so they don't have a length prefix when serialized.
@@ -964,12 +989,12 @@ mod tests {
 		init_features.set_payment_secret_required();
 		init_features.set_basic_mpp_optional();
 		init_features.set_wumbo_optional();
+		init_features.set_anchors_zero_fee_htlc_tx_optional();
 		init_features.set_shutdown_any_segwit_optional();
 		init_features.set_onion_messages_optional();
 		init_features.set_channel_type_optional();
 		init_features.set_scid_privacy_optional();
 		init_features.set_zero_conf_optional();
-		init_features.set_anchors_zero_fee_htlc_tx_optional();
 
 		assert!(init_features.initial_routing_sync());
 		assert!(!init_features.supports_upfront_shutdown_script());
@@ -980,7 +1005,7 @@ mod tests {
 			// Check that the flags are as expected:
 			// - option_data_loss_protect (req)
 			// - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
-			// - basic_mpp | wumbo
+			// - basic_mpp | wumbo | anchors_zero_fee_htlc_tx
 			// - opt_shutdown_anysegwit
 			// - onion_messages
 			// - option_channel_type | option_scid_alias