mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #362 from TheBlueMatt/2019-07-no-bogus-sec-required

Browse source 
Do not require upfront_shutdown as the security gain is marginal
This commit is contained in:
Matt Corallo 2019-07-25 19:46:58 +00:00 • committed by GitHub
commit 4e81d8d74a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ln/msgs.rs
View file

@ -63,13 +63,13 @@ impl LocalFeatures {
#[cfg(not(feature = "fuzztarget"))]
pub(crate) fn new() -> LocalFeatures {
LocalFeatures {
flags: vec![1 << 4],
flags: vec![1 << 5],
}
}
#[cfg(feature = "fuzztarget")]
pub fn new() -> LocalFeatures {
LocalFeatures {
flags: vec![1 << 4],
flags: vec![1 << 5],
}
}
@ -96,7 +96,7 @@ impl LocalFeatures {
}
#[cfg(test)]
pub(crate) fn unset_upfront_shutdown_script(&mut self) {
self.flags[0] ^= 1 << 4;
self.flags[0] ^= 1 << 5;
}
pub(crate) fn requires_unknown_bits(&self) -> bool {
@ -2018,9 +2018,9 @@ mod tests {
target_value.append(&mut hex::decode("0000").unwrap());
}
if initial_routing_sync {
target_value.append(&mut hex::decode("000118").unwrap());
target_value.append(&mut hex::decode("000128").unwrap());
} else {
target_value.append(&mut hex::decode("000110").unwrap());
target_value.append(&mut hex::decode("000120").unwrap());
}
assert_eq!(encoded_value, target_value);
}

12
src/util/config.rs
View file

@ -152,13 +152,15 @@ pub struct ChannelConfig {
///
/// This cannot be changed after the initial channel handshake.
pub announced_channel: bool,
/// Set to commit to an upfront shutdown_pubkey at channel opening. In case of mutual
/// closing, the other peer will check that our closing transction output is encumbered
/// by the provided script.
/// When set, we commit to an upfront shutdown_pubkey at channel open. If our counterparty
/// supports it, they will then enforce the mutual-close output to us matches what we provided
/// at intialization, preventing us from closing to an alternate pubkey.
///
/// We set it by default as this ensure greater security to the user funds.
/// This is set to true by default to provide a slight increase in security, though ultimately
/// any attacker who is able to take control of a channel can just as easily send the funds via
/// lightning payments, so we never require that our counterparties support this option.
///
/// This cannot be changed after channel opening.
/// This cannot be changed after a channel has been initialized.
pub commit_upfront_shutdown_pubkey: bool
}