mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-03-15 15:39:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Reject channels serialized with version <= 2

Browse source 
e23d32dadd removed support for these
versions, so serializations with them should be explicitly rejected.
This commit is contained in:
Jeffrey Czyz 2025-02-28 11:02:13 -06:00
parent 36ba27aee4
commit 13b0598294
No known key found for this signature in database
GPG key ID: 3A4E08275D5E96D2
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lightning/src/ln/channel.rs
View file

@ -10304,6 +10304,9 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
fn read<R : io::Read>(reader: &mut R, args: (&'a ES, &'b SP, u32, &'c ChannelTypeFeatures)) -> Result<Self, DecodeError> { fn read<R : io::Read>(reader: &mut R, args: (&'a ES, &'b SP, u32, &'c ChannelTypeFeatures)) -> Result<Self, DecodeError> {
let (entropy_source, signer_provider, serialized_height, our_supported_features) = args; let (entropy_source, signer_provider, serialized_height, our_supported_features) = args;
let ver = read_ver_prefix!(reader, SERIALIZATION_VERSION); let ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);
if ver <= 2 {
return Err(DecodeError::UnknownVersion);
}
// `user_id` used to be a single u64 value. In order to remain backwards compatible with // `user_id` used to be a single u64 value. In order to remain backwards compatible with
// versions prior to 0.0.113, the u128 is serialized as two separate u64 values. We read // versions prior to 0.0.113, the u128 is serialized as two separate u64 values. We read
@ -10311,13 +10314,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
let user_id_low: u64 = Readable::read(reader)?; let user_id_low: u64 = Readable::read(reader)?;
let mut config = Some(LegacyChannelConfig::default()); let mut config = Some(LegacyChannelConfig::default());
if ver == 1 { {
// Read the old serialization of the ChannelConfig from version 0.0.98.
config.as_mut().unwrap().options.forwarding_fee_proportional_millionths = Readable::read(reader)?;
config.as_mut().unwrap().options.cltv_expiry_delta = Readable::read(reader)?;
config.as_mut().unwrap().announce_for_forwarding = Readable::read(reader)?;
config.as_mut().unwrap().commit_upfront_shutdown_pubkey = Readable::read(reader)?;
} else {
// Read the 8 bytes of backwards-compatibility ChannelConfig data. // Read the 8 bytes of backwards-compatibility ChannelConfig data.
let mut _val: u64 = Readable::read(reader)?; let mut _val: u64 = Readable::read(reader)?;
} }
@ -10481,11 +10478,8 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
let holder_dust_limit_satoshis = Readable::read(reader)?; let holder_dust_limit_satoshis = Readable::read(reader)?;
let counterparty_max_htlc_value_in_flight_msat = Readable::read(reader)?; let counterparty_max_htlc_value_in_flight_msat = Readable::read(reader)?;
let mut counterparty_selected_channel_reserve_satoshis = None; let mut counterparty_selected_channel_reserve_satoshis = None;
if ver == 1 { {
// Read the old serialization from version 0.0.98. // Read the 8 bytes of backwards-compatibility counterparty_selected_channel_reserve_satoshis data.
counterparty_selected_channel_reserve_satoshis = Some(Readable::read(reader)?);
} else {
// Read the 8 bytes of backwards-compatibility data.
let _dummy: u64 = Readable::read(reader)?; let _dummy: u64 = Readable::read(reader)?;
} }
let counterparty_htlc_minimum_msat = Readable::read(reader)?; let counterparty_htlc_minimum_msat = Readable::read(reader)?;
@ -10493,11 +10487,8 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
let counterparty_max_accepted_htlcs = Readable::read(reader)?; let counterparty_max_accepted_htlcs = Readable::read(reader)?;
let mut minimum_depth = None; let mut minimum_depth = None;
if ver == 1 { {
// Read the old serialization from version 0.0.98. // Read the 4 bytes of backwards-compatibility minimum_depth data.
minimum_depth = Some(Readable::read(reader)?);
} else {
// Read the 4 bytes of backwards-compatibility data.
let _dummy: u32 = Readable::read(reader)?; let _dummy: u32 = Readable::read(reader)?;
} }