X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffeatures.rs;h=9509f0f23bf6e1c5e7a5d0c66da2a7e3c8bdc58b;hb=c1d8cb9710c7a430ba68a32c26d8ceb88007ff14;hp=ceb78a4a0d23678ecb26f3aef1da4b42bffe3da9;hpb=7eee7974b0cf207e8d867c7ffaa9771c1e9d5822;p=rust-lightning

diff --git a/lightning/src/ln/features.rs b/lightning/src/ln/features.rs
index ceb78a4a..9509f0f2 100644
--- a/lightning/src/ln/features.rs
+++ b/lightning/src/ln/features.rs
@@ -39,8 +39,13 @@
 //!     (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
@@ -163,9 +168,6 @@ mod sealed {
 			,
 		],
 		optional_features: [
-			// Note that if new "non-channel-related" flags are added here they should be
-			// explicitly cleared in InitFeatures::known_channel_features and
-			// NodeFeatures::known_channel_features.
 			// Byte 0
 			DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries,
 			// Byte 1
@@ -175,7 +177,7 @@ mod sealed {
 			// Byte 3
 			ShutdownAnySegwit,
 			// Byte 4
-			,
+			OnionMessages,
 			// Byte 5
 			ChannelType | SCIDPrivacy,
 			// Byte 6
@@ -209,7 +211,7 @@ mod sealed {
 			// Byte 3
 			ShutdownAnySegwit,
 			// Byte 4
-			,
+			OnionMessages,
 			// Byte 5
 			ChannelType | SCIDPrivacy,
 			// Byte 6
@@ -436,8 +438,6 @@ mod sealed {
 	define_feature!(27, ShutdownAnySegwit, [InitContext, NodeContext],
 		"Feature flags for `opt_shutdown_anysegwit`.", set_shutdown_any_segwit_optional,
 		set_shutdown_any_segwit_required, supports_shutdown_anysegwit, requires_shutdown_anysegwit);
-	// We do not yet advertise the onion messages feature bit, but we need to detect when peers
-	// support it.
 	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);
@@ -549,21 +549,6 @@ impl InitFeatures {
 	pub(crate) fn to_context<C: sealed::Context>(&self) -> Features<C> {
 		self.to_context_internal()
 	}
-
-	/// Returns the set of known init features that are related to channels. At least some of
-	/// these features are likely required for peers to talk to us.
-	pub fn known_channel_features() -> InitFeatures {
-		Self::known()
-			.clear_initial_routing_sync()
-			.clear_gossip_queries()
-	}
-}
-
-impl NodeFeatures {
-	/// Returns the set of known node features that are related to channels.
-	pub fn known_channel_features() -> NodeFeatures {
-		Self::known().clear_gossip_queries()
-	}
 }
 
 impl InvoiceFeatures {
@@ -782,6 +767,7 @@ impl<T: sealed::UpfrontShutdownScript> Features<T> {
 
 
 impl<T: sealed::GossipQueries> Features<T> {
+	#[cfg(test)]
 	pub(crate) fn clear_gossip_queries(mut self) -> Self {
 		<T as sealed::GossipQueries>::clear_bits(&mut self.flags);
 		self
@@ -790,6 +776,7 @@ impl<T: sealed::GossipQueries> Features<T> {
 
 impl<T: sealed::InitialRoutingSync> Features<T> {
 	// Note that initial_routing_sync is ignored if gossip_queries is set.
+	#[cfg(test)]
 	pub(crate) fn clear_initial_routing_sync(mut self) -> Self {
 		<T as sealed::InitialRoutingSync>::clear_bits(&mut self.flags);
 		self
@@ -922,6 +909,11 @@ mod tests {
 		assert!(!InitFeatures::known().requires_wumbo());
 		assert!(!NodeFeatures::known().requires_wumbo());
 
+		assert!(InitFeatures::known().supports_onion_messages());
+		assert!(NodeFeatures::known().supports_onion_messages());
+		assert!(!InitFeatures::known().requires_onion_messages());
+		assert!(!NodeFeatures::known().requires_onion_messages());
+
 		assert!(InitFeatures::known().supports_zero_conf());
 		assert!(!InitFeatures::known().requires_zero_conf());
 		assert!(NodeFeatures::known().supports_zero_conf());
@@ -966,7 +958,7 @@ mod tests {
 			// - var_onion_optin (req) | static_remote_key (req) | payment_secret(req)
 			// - basic_mpp | wumbo
 			// - opt_shutdown_anysegwit
-			// -
+			// - onion_messages
 			// - option_channel_type | option_scid_alias
 			// - option_zeroconf
 			assert_eq!(node_features.flags.len(), 7);
@@ -974,7 +966,7 @@ mod tests {
 			assert_eq!(node_features.flags[1], 0b01010001);
 			assert_eq!(node_features.flags[2], 0b00001010);
 			assert_eq!(node_features.flags[3], 0b00001000);
-			assert_eq!(node_features.flags[4], 0b00000000);
+			assert_eq!(node_features.flags[4], 0b10000000);
 			assert_eq!(node_features.flags[5], 0b10100000);
 			assert_eq!(node_features.flags[6], 0b00001000);
 		}