X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Ffeatures.rs;h=1e52268ac351dffb67290ff073ef97d7c3953980;hb=c1db30d5be88e312e10efb47e26aade95413a01b;hp=18ea7bffbb8a5840ec7441e6171572630ea9573e;hpb=eee94672bee93b7d41986272563bdc23a3c6c95a;p=rust-lightning diff --git a/lightning/src/ln/features.rs b/lightning/src/ln/features.rs index 18ea7bff..1e52268a 100644 --- a/lightning/src/ln/features.rs +++ b/lightning/src/ln/features.rs @@ -33,6 +33,14 @@ mod sealed { // You should just use the type aliases instead. pub trait VariableLengthOnion: Context {} impl VariableLengthOnion for InitContext {} impl VariableLengthOnion for NodeContext {} + + pub trait PaymentSecret: Context {} + impl PaymentSecret for InitContext {} + impl PaymentSecret for NodeContext {} + + pub trait BasicMPP: Context {} + impl BasicMPP for InitContext {} + impl BasicMPP for NodeContext {} } /// Tracks the set of features which a node implements, templated by the context in which it @@ -73,7 +81,7 @@ impl InitFeatures { /// Create a Features with the features we support pub fn supported() -> InitFeatures { InitFeatures { - flags: vec![2 | 1 << 5, 1 << (9-8)], + flags: vec![2 | 1 << 5, 1 << (9-8) | 1 << (15 - 8), 1 << (17 - 8*2)], mark: PhantomData, } } @@ -136,14 +144,14 @@ impl NodeFeatures { #[cfg(not(feature = "fuzztarget"))] pub(crate) fn supported() -> NodeFeatures { NodeFeatures { - flags: vec![2 | 1 << 5, 1 << (9-8)], + flags: vec![2 | 1 << 5, 1 << (9 - 8) | 1 << (15 - 8), 1 << (17 - 8*2)], mark: PhantomData, } } #[cfg(feature = "fuzztarget")] pub fn supported() -> NodeFeatures { NodeFeatures { - flags: vec![2 | 1 << 5, 1 << (9-8)], + flags: vec![2 | 1 << 5, 1 << (9 - 8) | 1 << (15 - 8), 1 << (17 - 8*2)], mark: PhantomData, } } @@ -157,9 +165,10 @@ impl NodeFeatures { match i { // Blank out initial_routing_sync (feature bits 2/3), gossip_queries (6/7), // gossip_queries_ex (10/11), option_static_remotekey (12/13), and - // payment_secret (14/15) + // option_support_large_channel (16/17) 0 => flags.push(feature_byte & 0b00110011), - 1 => flags.push(feature_byte & 0b00000011), + 1 => flags.push(feature_byte & 0b11000011), + 2 => flags.push(feature_byte & 0b00000011), _ => (), } } @@ -199,8 +208,10 @@ impl Features { // unknown, upfront_shutdown_script, unknown (actually initial_routing_sync, but it // is only valid as an optional feature), and data_loss_protect: 0 => (byte & 0b01000100), - // unknown, unknown, unknown, var_onion_optin: - 1 => (byte & 0b01010100), + // payment_secret, unknown, unknown, var_onion_optin: + 1 => (byte & 0b00010100), + // unknown, unknown, unknown, basic_mpp: + 2 => (byte & 0b01010100), // fallback, all even bits set: _ => (byte & 0b01010101), }) != 0 @@ -213,8 +224,10 @@ impl Features { // unknown, upfront_shutdown_script, initial_routing_sync (is only valid as an // optional feature), and data_loss_protect: 0 => (byte & 0b11000100), - // unknown, unknown, unknown, var_onion_optin: - 1 => (byte & 0b11111100), + // payment_secret, unknown, unknown, var_onion_optin: + 1 => (byte & 0b00111100), + // unknown, unknown, unknown, basic_mpp: + 2 => (byte & 0b11111100), _ => byte, }) != 0 }) @@ -228,16 +241,19 @@ impl Features { #[cfg(test)] pub(crate) fn set_require_unknown_bits(&mut self) { - let newlen = cmp::max(2, self.flags.len()); + let newlen = cmp::max(3, self.flags.len()); self.flags.resize(newlen, 0u8); - self.flags[1] |= 0x40; + self.flags[2] |= 0x40; } #[cfg(test)] pub(crate) fn clear_require_unknown_bits(&mut self) { - let newlen = cmp::max(2, self.flags.len()); + let newlen = cmp::max(3, self.flags.len()); self.flags.resize(newlen, 0u8); - self.flags[1] &= !0x40; + self.flags[2] &= !0x40; + if self.flags.len() == 3 && self.flags[2] == 0 { + self.flags.resize(2, 0u8); + } if self.flags.len() == 2 && self.flags[1] == 0 { self.flags.resize(1, 0u8); } @@ -256,7 +272,7 @@ impl Features { } #[cfg(test)] pub(crate) fn unset_upfront_shutdown_script(&mut self) { - self.flags[0] ^= 1 << 5; + self.flags[0] &= !(1 << 5); } } @@ -279,6 +295,24 @@ impl Features { } } +impl Features { + #[allow(dead_code)] + // Note that we never need to test this since what really matters is the invoice - iff the + // invoice provides a payment_secret, we assume that we can use it (ie that the recipient + // supports payment_secret). + pub(crate) fn supports_payment_secret(&self) -> bool { + self.flags.len() > 1 && (self.flags[1] & (3 << (14-8))) != 0 + } +} + +impl Features { + // We currently never test for this since we don't actually *generate* multipath routes. + #[allow(dead_code)] + pub(crate) fn supports_basic_mpp(&self) -> bool { + self.flags.len() > 2 && (self.flags[2] & (3 << (16-8*2))) != 0 + } +} + impl Writeable for Features { fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> { w.size_hint(self.flags.len() + 2); @@ -323,6 +357,12 @@ mod tests { assert!(InitFeatures::supported().supports_variable_length_onion()); assert!(NodeFeatures::supported().supports_variable_length_onion()); + assert!(InitFeatures::supported().supports_payment_secret()); + assert!(NodeFeatures::supported().supports_payment_secret()); + + assert!(InitFeatures::supported().supports_basic_mpp()); + assert!(NodeFeatures::supported().supports_basic_mpp()); + let mut init_features = InitFeatures::supported(); init_features.set_initial_routing_sync(); assert!(!init_features.requires_unknown_bits()); @@ -349,10 +389,12 @@ mod tests { { // Check that the flags are as expected: optional_data_loss_protect, - // option_upfront_shutdown_script, and var_onion_optin set. + // option_upfront_shutdown_script, var_onion_optin, payment_secret, and + // basic_mpp. + assert_eq!(res.flags.len(), 3); assert_eq!(res.flags[0], 0b00100010); - assert_eq!(res.flags[1], 0b00000010); - assert_eq!(res.flags.len(), 2); + assert_eq!(res.flags[1], 0b10000010); + assert_eq!(res.flags[2], 0b00000010); } // Check that the initial_routing_sync feature was correctly blanked out.