X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffeatures.rs;h=9509f0f23bf6e1c5e7a5d0c66da2a7e3c8bdc58b;hb=c1d8cb9710c7a430ba68a32c26d8ceb88007ff14;hp=e5e9db0352b1a45785fbec38507b31e1b3605c72;hpb=e34a2bc722a998376576eb5f2e60bbafefaed7f4;p=rust-lightning diff --git a/lightning/src/ln/features.rs b/lightning/src/ln/features.rs index e5e9db03..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,8 +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. // Byte 0 DataLossProtect | InitialRoutingSync | UpfrontShutdownScript | GossipQueries, // Byte 1 @@ -174,7 +177,7 @@ mod sealed { // Byte 3 ShutdownAnySegwit, // Byte 4 - , + OnionMessages, // Byte 5 ChannelType | SCIDPrivacy, // Byte 6 @@ -208,7 +211,7 @@ mod sealed { // Byte 3 ShutdownAnySegwit, // Byte 4 - , + OnionMessages, // Byte 5 ChannelType | SCIDPrivacy, // Byte 6 @@ -435,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); @@ -470,6 +471,17 @@ pub struct Features { mark: PhantomData, } +impl Features { + 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 Clone for Features { fn clone(&self) -> Self { Self { @@ -532,29 +544,11 @@ 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`. Only known `InitFeatures` relevant to context `C` /// are included in the result. pub(crate) fn to_context(&self) -> Features { 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 { - let mut features = Self::known().clear_gossip_queries(); - features.clear_initial_routing_sync(); - features - } } impl InvoiceFeatures { @@ -773,6 +767,7 @@ impl Features { impl Features { + #[cfg(test)] pub(crate) fn clear_gossip_queries(mut self) -> Self { ::clear_bits(&mut self.flags); self @@ -781,8 +776,10 @@ impl Features { impl Features { // Note that initial_routing_sync is ignored if gossip_queries is set. - pub(crate) fn clear_initial_routing_sync(&mut self) { - ::clear_bits(&mut self.flags) + #[cfg(test)] + pub(crate) fn clear_initial_routing_sync(mut self) -> Self { + ::clear_bits(&mut self.flags); + self } } @@ -912,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()); @@ -921,7 +923,7 @@ mod tests { let mut init_features = InitFeatures::known(); assert!(init_features.initial_routing_sync()); - init_features.clear_initial_routing_sync(); + init_features = init_features.clear_initial_routing_sync(); assert!(!init_features.initial_routing_sync()); } @@ -956,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); @@ -964,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); }