From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com> Date: Sat, 18 Apr 2020 00:05:11 +0000 (+0000) Subject: Merge pull request #559 from ariard/2020-03-move-local-commitment X-Git-Tag: v0.0.12~84 X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=02c1925c16fca0a5c37582ec70b3fe48ba076f8f;hp=95830edac76531fe20f9177eca532e9d73de5179;p=rust-lightning Merge pull request #559 from ariard/2020-03-move-local-commitment Split parsing and transaction management for local transactions between Chanmon/Onchain --- diff --git a/lightning/src/ln/features.rs b/lightning/src/ln/features.rs index 9ab53b4a..5eb1bd90 100644 --- a/lightning/src/ln/features.rs +++ b/lightning/src/ln/features.rs @@ -165,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), _ => (), } } @@ -299,7 +300,7 @@ impl Features { // 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 payment_secret(&self) -> bool { + pub(crate) fn supports_payment_secret(&self) -> bool { self.flags.len() > 1 && (self.flags[1] & (3 << (14-8))) != 0 } } @@ -307,7 +308,7 @@ impl Features { impl Features { // We currently never test for this since we don't actually *generate* multipath routes. #[allow(dead_code)] - pub(crate) fn basic_mpp(&self) -> bool { + pub(crate) fn supports_basic_mpp(&self) -> bool { self.flags.len() > 2 && (self.flags[2] & (3 << (16-8*2))) != 0 } } @@ -356,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()); @@ -382,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.