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

Add TLV suffix to PackageTemplate

Browse source
This commit is contained in:
Matt Corallo 2021-05-26 03:06:12 +00:00
parent 321b19c4d9
commit a7494228c9
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lightning/src/chain/package.rs
View file

@ -703,10 +703,11 @@ impl Writeable for PackageTemplate {
outpoint.write(writer)?;
rev_outp.write(writer)?;
}
self.soonest_conf_deadline.write(writer)?;
self.feerate_previous.write(writer)?;
self.height_timer.write(writer)?;
self.height_original.write(writer)?;
write_tlv_fields!(writer, {
(0, self.soonest_conf_deadline),
(2, self.feerate_previous),
(4, self.height_original),
}, { (6, self.height_timer) });
Ok(())
}
}
@ -730,10 +731,15 @@ impl Readable for PackageTemplate {
PackageSolvingData::HolderFundingOutput(..) => { (PackageMalleability::Untractable, false) },
}
} else { return Err(DecodeError::InvalidValue); };
let soonest_conf_deadline = Readable::read(reader)?;
let feerate_previous = Readable::read(reader)?;
let height_timer = Readable::read(reader)?;
let height_original = Readable::read(reader)?;
let mut soonest_conf_deadline = 0;
let mut feerate_previous = 0;
let mut height_timer = None;
let mut height_original = 0;
read_tlv_fields!(reader, {
(0, soonest_conf_deadline),
(2, feerate_previous),
(4, height_original)
}, { (6, height_timer) });
Ok(PackageTemplate {
inputs,
malleability,