X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffeatures.rs;h=e8a3e6d26facd524c3ae3036ed87ec54a08b8937;hb=a257906743d528c32c862b053b652d4b728aa990;hp=32ba9de758632036942318c756f64708793e1b1a;hpb=d2f401a79e03a0816301fe25a089ad61cc70e52e;p=rust-lightning

diff --git a/lightning/src/ln/features.rs b/lightning/src/ln/features.rs
index 32ba9de7..e8a3e6d2 100644
--- a/lightning/src/ln/features.rs
+++ b/lightning/src/ln/features.rs
@@ -19,33 +19,63 @@
 //! supports a feature if it advertises the feature (as either required or optional) to its peers.
 //! And the implementation can interpret a feature if the feature is known to it.
 //!
-//! [BOLT #9]: https://github.com/lightningnetwork/lightning-rfc/blob/master/09-features.md
+//! The following features are currently required in the LDK:
+//! - `VariableLengthOnion` - requires/supports variable-length routing onion payloads
+//!     (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
+//! - `StaticRemoteKey` - requires/supports static key for remote output
+//!     (see [BOLT-3](https://github.com/lightning/bolts/blob/master/03-transactions.md) for more information).
+//!
+//! The following features are currently supported in the LDK:
+//! - `DataLossProtect` - requires/supports that a node which has somehow fallen behind, e.g., has been restored from an old backup,
+//!     can detect that it has fallen behind
+//!     (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
+//! - `InitialRoutingSync` - requires/supports that the sending node needs a complete routing information dump
+//!     (see [BOLT-7](https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#initial-sync) for more information).
+//! - `UpfrontShutdownScript` - commits to a shutdown scriptpubkey when opening a channel
+//!     (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
+//! - `GossipQueries` - requires/supports more sophisticated gossip control
+//!     (see [BOLT-7](https://github.com/lightning/bolts/blob/master/07-routing-gossip.md) for more information).
+//! - `PaymentSecret` - requires/supports that a node supports payment_secret field
+//!     (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md) for more information).
+//! - `BasicMPP` - requires/supports that a node can receive basic multi-part payments
+//!     (see [BOLT-4](https://github.com/lightning/bolts/blob/master/04-onion-routing.md#basic-multi-part-payments) for more information).
+//! - `Wumbo` - requires/supports that a node create large channels. Called `option_support_large_channel` in the spec.
+//!     (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md#the-open_channel-message) for more information).
+//! - `ShutdownAnySegwit` - requires/supports that future segwit versions are allowed in `shutdown`
+//!     (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
+//! - `OnionMessages` - requires/supports forwarding onion messages
+//!     (see [BOLT-7](https://github.com/lightning/bolts/pull/759/files) for more information).
+//!     TODO: update link
+//! - `ChannelType` - node supports the channel_type field in open/accept
+//!     (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
+//! - `SCIDPrivacy` - supply channel aliases for routing
+//!     (see [BOLT-2](https://github.com/lightning/bolts/blob/master/02-peer-protocol.md) for more information).
+//! - `Keysend` - send funds to a node without an invoice
+//!     (see the [`Keysend` feature assignment proposal](https://github.com/lightning/bolts/issues/605#issuecomment-606679798) for more information).
+//!
+//! [BOLT #9]: https://github.com/lightning/bolts/blob/master/09-features.md
 //! [messages]: crate::ln::msgs
 
-use {io, io_extras};
-use prelude::*;
+use crate::{io, io_extras};
+use crate::prelude::*;
 use core::{cmp, fmt};
 use core::hash::{Hash, Hasher};
 use core::marker::PhantomData;
 
 use bitcoin::bech32;
 use bitcoin::bech32::{Base32Len, FromBase32, ToBase32, u5, WriteBase32};
-use ln::msgs::DecodeError;
-use util::ser::{Readable, Writeable, Writer};
+use crate::ln::msgs::DecodeError;
+use crate::util::ser::{Readable, Writeable, Writer};
 
 mod sealed {
-	use prelude::*;
-	use ln::features::Features;
+	use crate::prelude::*;
+	use crate::ln::features::Features;
 
-	/// The context in which [`Features`] are applicable. Defines which features are required and
-	/// which are optional for the context.
+	/// The context in which [`Features`] are applicable. Defines which features are known to the
+	/// implementation, though specification of them as required or optional is up to the code
+	/// constructing a features object.
 	pub trait Context {
-		/// Features that are known to the implementation, where a required feature is indicated by
-		/// its even bit and an optional feature is indicated by its odd bit.
-		const KNOWN_FEATURE_FLAGS: &'static [u8];
-
-		/// Bitmask for selecting features that are known to the implementation, regardless of
-		/// whether each feature is required or optional.
+		/// Bitmask for selecting features that are known to the implementation.
 		const KNOWN_FEATURE_MASK: &'static [u8];
 	}
 
@@ -53,41 +83,16 @@ mod sealed {
 	/// are specified as a comma-separated list of bytes where each byte is a pipe-delimited list of
 	/// feature identifiers.
 	macro_rules! define_context {
-		($context: ident {
-			required_features: [$( $( $required_feature: ident )|*, )*],
-			optional_features: [$( $( $optional_feature: ident )|*, )*],
-		}) => {
+		($context: ident, [$( $( $known_feature: ident )|*, )*]) => {
 			#[derive(Eq, PartialEq)]
 			pub struct $context {}
 
 			impl Context for $context {
-				const KNOWN_FEATURE_FLAGS: &'static [u8] = &[
-					// For each byte, use bitwise-OR to compute the applicable flags for known
-					// required features `r_i` and optional features `o_j` for all `i` and `j` such
-					// that the following slice is formed:
-					//
-					// [
-					//  `r_0` | `r_1` | ... | `o_0` | `o_1` | ...,
-					//  ...,
-					// ]
-					$(
-						0b00_00_00_00 $(|
-							<Self as $required_feature>::REQUIRED_MASK)*
-						$(|
-							<Self as $optional_feature>::OPTIONAL_MASK)*,
-					)*
-				];
-
 				const KNOWN_FEATURE_MASK: &'static [u8] = &[
-					// Similar as above, but set both flags for each feature regardless of whether
-					// the feature is required or optional.
 					$(
 						0b00_00_00_00 $(|
-							<Self as $required_feature>::REQUIRED_MASK |
-							<Self as $required_feature>::OPTIONAL_MASK)*
-						$(|
-							<Self as $optional_feature>::REQUIRED_MASK |
-							<Self as $optional_feature>::OPTIONAL_MASK)*,
+							<Self as $known_feature>::REQUIRED_MASK |
+							<Self as $known_feature>::OPTIONAL_MASK)*,
 					)*
 				];
 			}
@@ -96,17 +101,12 @@ mod sealed {
 				fn fmt(&self, fmt: &mut alloc::fmt::Formatter) -> Result<(), alloc::fmt::Error> {
 					$(
 						$(
-							fmt.write_fmt(format_args!("{}: {}, ", stringify!($required_feature),
-								if <$context as $required_feature>::requires_feature(&self.flags) { "required" }
-								else if <$context as $required_feature>::supports_feature(&self.flags) { "supported" }
-								else { "not supported" }))?;
-						)*
-						$(
-							fmt.write_fmt(format_args!("{}: {}, ", stringify!($optional_feature),
-								if <$context as $optional_feature>::requires_feature(&self.flags) { "required" }
-								else if <$context as $optional_feature>::supports_feature(&self.flags) { "supported" }
+							fmt.write_fmt(format_args!("{}: {}, ", stringify!($known_feature),
+								if <$context as $known_feature>::requires_feature(&self.flags) { "required" }
+								else if <$context as $known_feature>::supports_feature(&self.flags) { "supported" }
 								else { "not supported" }))?;
 						)*
+						{} // Rust gets mad if we only have a $()* block here, so add a dummy {}
 					)*
 					fmt.write_fmt(format_args!("unknown flags: {}",
 						if self.requires_unknown_bits() { "required" }
@@ -116,119 +116,76 @@ mod sealed {
 		};
 	}
 
-	define_context!(InitContext {
-		required_features: [
-			// Byte 0
-			,
-			// Byte 1
-			VariableLengthOnion | StaticRemoteKey | PaymentSecret,
-			// Byte 2
-			,
-			// Byte 3
-			,
-		],
-		optional_features: [
-			// Byte 0
-			DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
-			// Byte 1
-			,
-			// Byte 2
-			BasicMPP,
-			// Byte 3
-			ShutdownAnySegwit,
-		],
-	});
-	define_context!(NodeContext {
-		required_features: [
-			// Byte 0
-			,
-			// Byte 1
-			VariableLengthOnion | StaticRemoteKey | PaymentSecret,
-			// Byte 2
-			,
-			// Byte 3
-			,
-			// Byte 4
-			,
-			// Byte 5
-			,
-			// Byte 6
-			,
-		],
-		optional_features: [
-			// Byte 0
-			DataLossProtect | UpfrontShutdownScript | GossipQueries,
-			// Byte 1
-			,
-			// Byte 2
-			BasicMPP,
-			// Byte 3
-			ShutdownAnySegwit,
-			// Byte 4
-			,
-			// Byte 5
-			,
-			// Byte 6
-			Keysend,
-		],
-	});
-	define_context!(ChannelContext {
-		required_features: [],
-		optional_features: [],
-	});
-	define_context!(InvoiceContext {
-		required_features: [
-			// Byte 0
-			,
-			// Byte 1
-			VariableLengthOnion | PaymentSecret,
-			// Byte 2
-			,
-		],
-		optional_features: [
-			// Byte 0
-			,
-			// Byte 1
-			,
-			// Byte 2
-			BasicMPP,
-		],
-	});
+	define_context!(InitContext, [
+		// Byte 0
+		DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
+		// Byte 1
+		VariableLengthOnion | StaticRemoteKey | PaymentSecret,
+		// Byte 2
+		BasicMPP | Wumbo,
+		// Byte 3
+		ShutdownAnySegwit,
+		// Byte 4
+		OnionMessages,
+		// Byte 5
+		ChannelType | SCIDPrivacy,
+		// Byte 6
+		ZeroConf,
+	]);
+	define_context!(NodeContext, [
+		// Byte 0
+		DataLossProtect | UpfrontShutdownScript | GossipQueries,
+		// Byte 1
+		VariableLengthOnion | StaticRemoteKey | PaymentSecret,
+		// Byte 2
+		BasicMPP | Wumbo,
+		// Byte 3
+		ShutdownAnySegwit,
+		// Byte 4
+		OnionMessages,
+		// Byte 5
+		ChannelType | SCIDPrivacy,
+		// Byte 6
+		ZeroConf | Keysend,
+	]);
+	define_context!(ChannelContext, []);
+	define_context!(InvoiceContext, [
+		// Byte 0
+		,
+		// Byte 1
+		VariableLengthOnion | PaymentSecret,
+		// Byte 2
+		BasicMPP,
+	]);
 	// This isn't a "real" feature context, and is only used in the channel_type field in an
 	// `OpenChannel` message.
-	define_context!(ChannelTypeContext {
-		required_features: [
-			// Byte 0
-			,
-			// Byte 1
-			StaticRemoteKey,
-			// Byte 2
-			,
-			// Byte 3
-			,
-		],
-		optional_features: [
-			// Byte 0
-			,
-			// Byte 1
-			,
-			// Byte 2
-			,
-			// Byte 3
-			,
-		],
-	});
+	define_context!(ChannelTypeContext, [
+		// Byte 0
+		,
+		// Byte 1
+		StaticRemoteKey,
+		// Byte 2
+		,
+		// Byte 3
+		,
+		// Byte 4
+		,
+		// Byte 5
+		SCIDPrivacy,
+		// Byte 6
+		ZeroConf,
+	]);
 
 	/// Defines a feature with the given bits for the specified [`Context`]s. The generated trait is
 	/// useful for manipulating feature flags.
 	macro_rules! define_feature {
 		($odd_bit: expr, $feature: ident, [$($context: ty),+], $doc: expr, $optional_setter: ident,
-		 $required_setter: ident) => {
+		 $required_setter: ident, $supported_getter: ident) => {
 			#[doc = $doc]
 			///
 			/// See [BOLT #9] for details.
 			///
-			/// [BOLT #9]: https://github.com/lightningnetwork/lightning-rfc/blob/master/09-features.md
+			/// [BOLT #9]: https://github.com/lightning/bolts/blob/master/09-features.md
 			pub trait $feature: Context {
 				/// The bit used to signify that the feature is required.
 				const EVEN_BIT: usize = $odd_bit - 1;
@@ -246,6 +203,12 @@ mod sealed {
 				/// [`ODD_BIT`]: #associatedconstant.ODD_BIT
 				const ASSERT_ODD_BIT_PARITY: usize;
 
+				/// Assertion that the bits are set in the context's [`KNOWN_FEATURE_MASK`].
+				///
+				/// [`KNOWN_FEATURE_MASK`]: Context::KNOWN_FEATURE_MASK
+				#[cfg(not(test))] // We violate this constraint with `UnknownFeature`
+				const ASSERT_BITS_IN_MASK: u8;
+
 				/// The byte where the feature is set.
 				const BYTE_OFFSET: usize = Self::EVEN_BIT / 8;
 
@@ -310,15 +273,18 @@ mod sealed {
 
 			impl <T: $feature> Features<T> {
 				/// Set this feature as optional.
-				pub fn $optional_setter(mut self) -> Self {
+				pub fn $optional_setter(&mut self) {
 					<T as $feature>::set_optional_bit(&mut self.flags);
-					self
 				}
 
 				/// Set this feature as required.
-				pub fn $required_setter(mut self) -> Self {
+				pub fn $required_setter(&mut self) {
 					<T as $feature>::set_required_bit(&mut self.flags);
-					self
+				}
+
+				/// Checks if this feature is supported.
+				pub fn $supported_getter(&self) -> bool {
+					<T as $feature>::supports_feature(&self.flags)
 				}
 			}
 
@@ -329,43 +295,80 @@ mod sealed {
 
 					// ODD_BIT % 2 == 1
 					const ASSERT_ODD_BIT_PARITY: usize = (<Self as $feature>::ODD_BIT % 2) - 1;
+
+					// (byte & (REQUIRED_MASK | OPTIONAL_MASK)) >> (EVEN_BIT % 8) == 3
+					#[cfg(not(test))] // We violate this constraint with `UnknownFeature`
+					const ASSERT_BITS_IN_MASK: u8 =
+						((<$context>::KNOWN_FEATURE_MASK[<Self as $feature>::BYTE_OFFSET] & (<Self as $feature>::REQUIRED_MASK | <Self as $feature>::OPTIONAL_MASK))
+						 >> (<Self as $feature>::EVEN_BIT % 8)) - 3;
 				}
 			)*
-
+		};
+		($odd_bit: expr, $feature: ident, [$($context: ty),+], $doc: expr, $optional_setter: ident,
+		 $required_setter: ident, $supported_getter: ident, $required_getter: ident) => {
+			define_feature!($odd_bit, $feature, [$($context),+], $doc, $optional_setter, $required_setter, $supported_getter);
+			impl <T: $feature> Features<T> {
+				/// Checks if this feature is required.
+				pub fn $required_getter(&self) -> bool {
+					<T as $feature>::requires_feature(&self.flags)
+				}
+			}
 		}
 	}
 
 	define_feature!(1, DataLossProtect, [InitContext, NodeContext],
 		"Feature flags for `option_data_loss_protect`.", set_data_loss_protect_optional,
-		set_data_loss_protect_required);
+		set_data_loss_protect_required, supports_data_loss_protect, requires_data_loss_protect);
 	// NOTE: Per Bolt #9, initial_routing_sync has no even bit.
 	define_feature!(3, InitialRoutingSync, [InitContext], "Feature flags for `initial_routing_sync`.",
-		set_initial_routing_sync_optional, set_initial_routing_sync_required);
+		set_initial_routing_sync_optional, set_initial_routing_sync_required,
+		initial_routing_sync);
 	define_feature!(5, UpfrontShutdownScript, [InitContext, NodeContext],
 		"Feature flags for `option_upfront_shutdown_script`.", set_upfront_shutdown_script_optional,
-		set_upfront_shutdown_script_required);
+		set_upfront_shutdown_script_required, supports_upfront_shutdown_script,
+		requires_upfront_shutdown_script);
 	define_feature!(7, GossipQueries, [InitContext, NodeContext],
-		"Feature flags for `gossip_queries`.", set_gossip_queries_optional, set_gossip_queries_required);
+		"Feature flags for `gossip_queries`.", set_gossip_queries_optional, set_gossip_queries_required,
+		supports_gossip_queries, requires_gossip_queries);
 	define_feature!(9, VariableLengthOnion, [InitContext, NodeContext, InvoiceContext],
 		"Feature flags for `var_onion_optin`.", set_variable_length_onion_optional,
-		set_variable_length_onion_required);
+		set_variable_length_onion_required, supports_variable_length_onion,
+		requires_variable_length_onion);
 	define_feature!(13, StaticRemoteKey, [InitContext, NodeContext, ChannelTypeContext],
 		"Feature flags for `option_static_remotekey`.", set_static_remote_key_optional,
-		set_static_remote_key_required);
+		set_static_remote_key_required, supports_static_remote_key, requires_static_remote_key);
 	define_feature!(15, PaymentSecret, [InitContext, NodeContext, InvoiceContext],
-		"Feature flags for `payment_secret`.", set_payment_secret_optional, set_payment_secret_required);
+		"Feature flags for `payment_secret`.", set_payment_secret_optional, set_payment_secret_required,
+		supports_payment_secret, requires_payment_secret);
 	define_feature!(17, BasicMPP, [InitContext, NodeContext, InvoiceContext],
-		"Feature flags for `basic_mpp`.", set_basic_mpp_optional, set_basic_mpp_required);
+		"Feature flags for `basic_mpp`.", set_basic_mpp_optional, set_basic_mpp_required,
+		supports_basic_mpp, requires_basic_mpp);
+	define_feature!(19, Wumbo, [InitContext, NodeContext],
+		"Feature flags for `option_support_large_channel` (aka wumbo channels).", set_wumbo_optional, set_wumbo_required,
+		supports_wumbo, requires_wumbo);
 	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 		"Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
-		set_shutdown_any_segwit_required);
+		set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
+	define_feature!(39, OnionMessages, [InitContext, NodeContext],
+		"Feature flags for `option_onion_messages`.", set_onion_messages_optional,
+		set_onion_messages_required, supports_onion_messages, requires_onion_messages);
+	define_feature!(45, ChannelType, [InitContext, NodeContext],
+		"Feature flags for `option_channel_type`.", set_channel_type_optional,
+		set_channel_type_required, supports_channel_type, requires_channel_type);
+	define_feature!(47, SCIDPrivacy, [InitContext, NodeContext, ChannelTypeContext],
+		"Feature flags for only forwarding with SCID aliasing. Called `option_scid_alias` in the BOLTs",
+		set_scid_privacy_optional, set_scid_privacy_required, supports_scid_privacy, requires_scid_privacy);
+	define_feature!(51, ZeroConf, [InitContext, NodeContext, ChannelTypeContext],
+		"Feature flags for accepting channels with zero confirmations. Called `option_zeroconf` in the BOLTs",
+		set_zero_conf_optional, set_zero_conf_required, supports_zero_conf, requires_zero_conf);
 	define_feature!(55, Keysend, [NodeContext],
-		"Feature flags for keysend payments.", set_keysend_optional, set_keysend_required);
+		"Feature flags for keysend payments.", set_keysend_optional, set_keysend_required,
+		supports_keysend, requires_keysend);
 
 	#[cfg(test)]
 	define_feature!(123456789, UnknownFeature, [NodeContext, ChannelContext, InvoiceContext],
 		"Feature flags for an unknown feature used in testing.", set_unknown_feature_optional,
-		set_unknown_feature_required);
+		set_unknown_feature_required, supports_unknown_test_feature, requires_unknown_test_feature);
 }
 
 /// Tracks the set of features which a node implements, templated by the context in which it
@@ -379,6 +382,17 @@ pub struct Features<T: sealed::Context> {
 	mark: PhantomData<T>,
 }
 
+impl <T: sealed::Context> Features<T> {
+	pub(crate) fn or(mut self, o: Self) -> Self {
+		let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
+		self.flags.resize(total_feature_len, 0u8);
+		for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
+			*byte |= *o_byte;
+		}
+		self
+	}
+}
+
 impl<T: sealed::Context> Clone for Features<T> {
 	fn clone(&self) -> Self {
 		Self {
@@ -441,16 +455,6 @@ impl InitFeatures {
 		Ok(())
 	}
 
-	/// or's another InitFeatures into this one.
-	pub(crate) fn or(mut self, o: InitFeatures) -> InitFeatures {
-		let total_feature_len = cmp::max(self.flags.len(), o.flags.len());
-		self.flags.resize(total_feature_len, 0u8);
-		for (byte, o_byte) in self.flags.iter_mut().zip(o.flags.iter()) {
-			*byte |= *o_byte;
-		}
-		self
-	}
-
 	/// Converts `InitFeatures` to `Features<C>`. Only known `InitFeatures` relevant to context `C`
 	/// are included in the result.
 	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
@@ -468,13 +472,15 @@ impl InvoiceFeatures {
 	/// Getting a route for a keysend payment to a private node requires providing the payee's
 	/// features (since they were not announced in a node announcement). However, keysend payments
 	/// don't have an invoice to pull the payee's features from, so this method is provided for use in
-	/// [`Payee::for_keysend`], thus omitting the need for payers to manually construct an
+	/// [`PaymentParameters::for_keysend`], thus omitting the need for payers to manually construct an
 	/// `InvoiceFeatures` for [`find_route`].
 	///
-	/// [`Payee::for_keysend`]: crate::routing::router::Payee::for_keysend
+	/// [`PaymentParameters::for_keysend`]: crate::routing::router::PaymentParameters::for_keysend
 	/// [`find_route`]: crate::routing::router::find_route
 	pub(crate) fn for_keysend() -> InvoiceFeatures {
-		InvoiceFeatures::empty().set_variable_length_onion_optional()
+		let mut res = InvoiceFeatures::empty();
+		res.set_variable_length_onion_optional();
+		res
 	}
 }
 
@@ -571,14 +577,6 @@ impl<T: sealed::Context> Features<T> {
 		}
 	}
 
-	/// Creates a Features with the bits set which are known by the implementation
-	pub fn known() -> Self {
-		Self {
-			flags: T::KNOWN_FEATURE_FLAGS.to_vec(),
-			mark: PhantomData,
-		}
-	}
-
 	/// Converts `Features<T>` to `Features<C>`. Only known `T` features relevant to context `C` are
 	/// included in the result.
 	fn to_context_internal<C: sealed::Context>(&self) -> Features<C> {
@@ -662,25 +660,7 @@ impl<T: sealed::Context> Features<T> {
 	}
 }
 
-impl<T: sealed::DataLossProtect> Features<T> {
-	#[cfg(test)]
-	pub(crate) fn requires_data_loss_protect(&self) -> bool {
-		<T as sealed::DataLossProtect>::requires_feature(&self.flags)
-	}
-	#[cfg(test)]
-	pub(crate) fn supports_data_loss_protect(&self) -> bool {
-		<T as sealed::DataLossProtect>::supports_feature(&self.flags)
-	}
-}
-
 impl<T: sealed::UpfrontShutdownScript> Features<T> {
-	#[cfg(test)]
-	pub(crate) fn requires_upfront_shutdown_script(&self) -> bool {
-		<T as sealed::UpfrontShutdownScript>::requires_feature(&self.flags)
-	}
-	pub(crate) fn supports_upfront_shutdown_script(&self) -> bool {
-		<T as sealed::UpfrontShutdownScript>::supports_feature(&self.flags)
-	}
 	#[cfg(test)]
 	pub(crate) fn clear_upfront_shutdown_script(mut self) -> Self {
 		<T as sealed::UpfrontShutdownScript>::clear_bits(&mut self.flags);
@@ -688,87 +668,22 @@ impl<T: sealed::UpfrontShutdownScript> Features<T> {
 	}
 }
 
-
-impl<T: sealed::GossipQueries> Features<T> {
-	#[cfg(test)]
-	pub(crate) fn requires_gossip_queries(&self) -> bool {
-		<T as sealed::GossipQueries>::requires_feature(&self.flags)
-	}
-	pub(crate) fn supports_gossip_queries(&self) -> bool {
-		<T as sealed::GossipQueries>::supports_feature(&self.flags)
-	}
+impl<T: sealed::ShutdownAnySegwit> Features<T> {
 	#[cfg(test)]
-	pub(crate) fn clear_gossip_queries(mut self) -> Self {
-		<T as sealed::GossipQueries>::clear_bits(&mut self.flags);
+	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
+		<T as sealed::ShutdownAnySegwit>::clear_bits(&mut self.flags);
 		self
 	}
 }
 
-impl<T: sealed::VariableLengthOnion> Features<T> {
+impl<T: sealed::Wumbo> Features<T> {
 	#[cfg(test)]
-	pub(crate) fn requires_variable_length_onion(&self) -> bool {
-		<T as sealed::VariableLengthOnion>::requires_feature(&self.flags)
-	}
-	pub(crate) fn supports_variable_length_onion(&self) -> bool {
-		<T as sealed::VariableLengthOnion>::supports_feature(&self.flags)
-	}
-}
-
-impl<T: sealed::StaticRemoteKey> Features<T> {
-	pub(crate) fn supports_static_remote_key(&self) -> bool {
-		<T as sealed::StaticRemoteKey>::supports_feature(&self.flags)
-	}
-	#[cfg(test)]
-	pub(crate) fn requires_static_remote_key(&self) -> bool {
-		<T as sealed::StaticRemoteKey>::requires_feature(&self.flags)
-	}
-}
-
-impl<T: sealed::InitialRoutingSync> Features<T> {
-	pub(crate) fn initial_routing_sync(&self) -> bool {
-		<T as sealed::InitialRoutingSync>::supports_feature(&self.flags)
-	}
-	// We are no longer setting initial_routing_sync now that gossip_queries
-	// is enabled. This feature is ignored by a peer when gossip_queries has 
-	// been negotiated.
-	#[cfg(test)]
-	pub(crate) fn clear_initial_routing_sync(&mut self) {
-		<T as sealed::InitialRoutingSync>::clear_bits(&mut self.flags)
-	}
-}
-
-impl<T: sealed::PaymentSecret> Features<T> {
-	#[cfg(test)]
-	pub(crate) fn requires_payment_secret(&self) -> bool {
-		<T as sealed::PaymentSecret>::requires_feature(&self.flags)
-	}
-	/// Returns whether the `payment_secret` feature is supported.
-	pub fn supports_payment_secret(&self) -> bool {
-		<T as sealed::PaymentSecret>::supports_feature(&self.flags)
-	}
-}
-
-impl<T: sealed::BasicMPP> Features<T> {
-	#[cfg(test)]
-	pub(crate) fn requires_basic_mpp(&self) -> bool {
-		<T as sealed::BasicMPP>::requires_feature(&self.flags)
-	}
-	// We currently never test for this since we don't actually *generate* multipath routes.
-	pub(crate) fn supports_basic_mpp(&self) -> bool {
-		<T as sealed::BasicMPP>::supports_feature(&self.flags)
-	}
-}
-
-impl<T: sealed::ShutdownAnySegwit> Features<T> {
-	pub(crate) fn supports_shutdown_anysegwit(&self) -> bool {
-		<T as sealed::ShutdownAnySegwit>::supports_feature(&self.flags)
-	}
-	#[cfg(test)]
-	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {
-		<T as sealed::ShutdownAnySegwit>::clear_bits(&mut self.flags);
+	pub(crate) fn clear_wumbo(mut self) -> Self {
+		<T as sealed::Wumbo>::clear_bits(&mut self.flags);
 		self
 	}
 }
+
 macro_rules! impl_feature_len_prefixed_write {
 	($features: ident) => {
 		impl Writeable for $features {
@@ -806,86 +721,44 @@ impl Readable for ChannelTypeFeatures {
 
 #[cfg(test)]
 mod tests {
-	use super::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, InvoiceFeatures, NodeFeatures};
+	use super::{ChannelFeatures, ChannelTypeFeatures, InitFeatures, InvoiceFeatures, NodeFeatures, sealed};
 	use bitcoin::bech32::{Base32Len, FromBase32, ToBase32, u5};
 
-	#[test]
-	fn sanity_test_known_features() {
-		assert!(!ChannelFeatures::known().requires_unknown_bits());
-		assert!(!ChannelFeatures::known().supports_unknown_bits());
-		assert!(!InitFeatures::known().requires_unknown_bits());
-		assert!(!InitFeatures::known().supports_unknown_bits());
-		assert!(!NodeFeatures::known().requires_unknown_bits());
-		assert!(!NodeFeatures::known().supports_unknown_bits());
-
-		assert!(InitFeatures::known().supports_upfront_shutdown_script());
-		assert!(NodeFeatures::known().supports_upfront_shutdown_script());
-		assert!(!InitFeatures::known().requires_upfront_shutdown_script());
-		assert!(!NodeFeatures::known().requires_upfront_shutdown_script());
-
-		assert!(InitFeatures::known().supports_gossip_queries());
-		assert!(NodeFeatures::known().supports_gossip_queries());
-		assert!(!InitFeatures::known().requires_gossip_queries());
-		assert!(!NodeFeatures::known().requires_gossip_queries());
-
-		assert!(InitFeatures::known().supports_data_loss_protect());
-		assert!(NodeFeatures::known().supports_data_loss_protect());
-		assert!(!InitFeatures::known().requires_data_loss_protect());
-		assert!(!NodeFeatures::known().requires_data_loss_protect());
-
-		assert!(InitFeatures::known().supports_variable_length_onion());
-		assert!(NodeFeatures::known().supports_variable_length_onion());
-		assert!(InvoiceFeatures::known().supports_variable_length_onion());
-		assert!(InitFeatures::known().requires_variable_length_onion());
-		assert!(NodeFeatures::known().requires_variable_length_onion());
-		assert!(InvoiceFeatures::known().requires_variable_length_onion());
-
-		assert!(InitFeatures::known().supports_static_remote_key());
-		assert!(NodeFeatures::known().supports_static_remote_key());
-		assert!(InitFeatures::known().requires_static_remote_key());
-		assert!(NodeFeatures::known().requires_static_remote_key());
-
-		assert!(InitFeatures::known().supports_payment_secret());
-		assert!(NodeFeatures::known().supports_payment_secret());
-		assert!(InvoiceFeatures::known().supports_payment_secret());
-		assert!(InitFeatures::known().requires_payment_secret());
-		assert!(NodeFeatures::known().requires_payment_secret());
-		assert!(InvoiceFeatures::known().requires_payment_secret());
-
-		assert!(InitFeatures::known().supports_basic_mpp());
-		assert!(NodeFeatures::known().supports_basic_mpp());
-		assert!(InvoiceFeatures::known().supports_basic_mpp());
-		assert!(!InitFeatures::known().requires_basic_mpp());
-		assert!(!NodeFeatures::known().requires_basic_mpp());
-		assert!(!InvoiceFeatures::known().requires_basic_mpp());
-
-		assert!(InitFeatures::known().supports_shutdown_anysegwit());
-		assert!(NodeFeatures::known().supports_shutdown_anysegwit());
-
-		let mut init_features = InitFeatures::known();
-		assert!(init_features.initial_routing_sync());
-		init_features.clear_initial_routing_sync();
-		assert!(!init_features.initial_routing_sync());
-	}
-
 	#[test]
 	fn sanity_test_unknown_bits() {
 		let features = ChannelFeatures::empty();
 		assert!(!features.requires_unknown_bits());
 		assert!(!features.supports_unknown_bits());
 
-		let features = ChannelFeatures::empty().set_unknown_feature_required();
+		let mut features = ChannelFeatures::empty();
+		features.set_unknown_feature_required();
 		assert!(features.requires_unknown_bits());
 		assert!(features.supports_unknown_bits());
 
-		let features = ChannelFeatures::empty().set_unknown_feature_optional();
+		let mut features = ChannelFeatures::empty();
+		features.set_unknown_feature_optional();
 		assert!(!features.requires_unknown_bits());
 		assert!(features.supports_unknown_bits());
 	}
 
 	#[test]
 	fn convert_to_context_with_relevant_flags() {
-		let init_features = InitFeatures::known().clear_upfront_shutdown_script().clear_gossip_queries();
+		let mut init_features = InitFeatures::empty();
+		// Set a bunch of features we use, plus initial_routing_sync_required (which shouldn't get
+		// converted as it's only relevant in an init context).
+		init_features.set_initial_routing_sync_required();
+		init_features.set_data_loss_protect_optional();
+		init_features.set_variable_length_onion_required();
+		init_features.set_static_remote_key_required();
+		init_features.set_payment_secret_required();
+		init_features.set_basic_mpp_optional();
+		init_features.set_wumbo_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();
+
 		assert!(init_features.initial_routing_sync());
 		assert!(!init_features.supports_upfront_shutdown_script());
 		assert!(!init_features.supports_gossip_queries());
@@ -895,13 +768,19 @@ mod tests {
 			// Check that the flags are as expected:
 			// - option_data_loss_protect
 			// - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
-			// - basic_mpp
+			// - basic_mpp | wumbo
 			// - opt_shutdown_anysegwit
-			assert_eq!(node_features.flags.len(), 4);
+			// - onion_messages
+			// - option_channel_type | option_scid_alias
+			// - option_zeroconf
+			assert_eq!(node_features.flags.len(), 7);
 			assert_eq!(node_features.flags[0], 0b00000010);
 			assert_eq!(node_features.flags[1], 0b01010001);
-			assert_eq!(node_features.flags[2], 0b00000010);
+			assert_eq!(node_features.flags[2], 0b00001010);
 			assert_eq!(node_features.flags[3], 0b00001000);
+			assert_eq!(node_features.flags[4], 0b10000000);
+			assert_eq!(node_features.flags[5], 0b10100000);
+			assert_eq!(node_features.flags[6], 0b00001000);
 		}
 
 		// Check that cleared flags are kept blank when converting back:
@@ -917,8 +796,10 @@ mod tests {
 	#[test]
 	fn convert_to_context_with_unknown_flags() {
 		// Ensure the `from` context has fewer known feature bytes than the `to` context.
-		assert!(InvoiceFeatures::known().flags.len() < NodeFeatures::known().flags.len());
-		let invoice_features = InvoiceFeatures::known().set_unknown_feature_optional();
+		assert!(<sealed::InvoiceContext as sealed::Context>::KNOWN_FEATURE_MASK.len() <
+			<sealed::NodeContext as sealed::Context>::KNOWN_FEATURE_MASK.len());
+		let mut invoice_features = InvoiceFeatures::empty();
+		invoice_features.set_unknown_feature_optional();
 		assert!(invoice_features.supports_unknown_bits());
 		let node_features: NodeFeatures = invoice_features.to_context();
 		assert!(!node_features.supports_unknown_bits());
@@ -926,9 +807,9 @@ mod tests {
 
 	#[test]
 	fn set_feature_bits() {
-		let features = InvoiceFeatures::empty()
-			.set_basic_mpp_optional()
-			.set_payment_secret_required();
+		let mut features = InvoiceFeatures::empty();
+		features.set_basic_mpp_optional();
+		features.set_payment_secret_required();
 		assert!(features.supports_basic_mpp());
 		assert!(!features.requires_basic_mpp());
 		assert!(features.requires_payment_secret());
@@ -970,7 +851,8 @@ mod tests {
 	fn test_channel_type_mapping() {
 		// If we map an InvoiceFeatures with StaticRemoteKey optional, it should map into a
 		// required-StaticRemoteKey ChannelTypeFeatures.
-		let init_features = InitFeatures::empty().set_static_remote_key_optional();
+		let mut init_features = InitFeatures::empty();
+		init_features.set_static_remote_key_optional();
 		let converted_features = ChannelTypeFeatures::from_counterparty_init(&init_features);
 		assert_eq!(converted_features, ChannelTypeFeatures::only_static_remote_key());
 		assert!(!converted_features.supports_any_optional_bits());