Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

verify the ignored fee is still 0 (#3007)

Browse source 
* verify the ignored bytes are indeed 0

* check for !=0 (rather than >0)
This commit is contained in:
Antioch Peverell 2019-08-29 12:56:21 +01:00 committed by GitHub
parent 357bc11746
commit 97f961fc67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/src/core/transaction.rs
View file

@ -122,17 +122,26 @@ impl Writeable for KernelFeatures {
impl Readable for KernelFeatures {
/// Still only supporting protocol version v1 serialization.
/// Always read both fee and lock_height, regardless of feature variant.
/// These will be 0 values if not applicable, but bytes must still be read.
/// These will be 0 values if not applicable, but bytes must still be read and verified.
fn read(reader: &mut dyn Reader) -> Result<KernelFeatures, ser::Error> {
let features = match reader.read_u8()? {
KernelFeatures::PLAIN_U8 => {
let fee = reader.read_u64()?;
let _lock_height = reader.read_u64()?;
let lock_height = reader.read_u64()?;
if lock_height != 0 {
return Err(ser::Error::CorruptedData);
}
KernelFeatures::Plain { fee }
}
KernelFeatures::COINBASE_U8 => {
let _fee = reader.read_u64()?;
let _lock_height = reader.read_u64()?;
let fee = reader.read_u64()?;
if fee != 0 {
return Err(ser::Error::CorruptedData);
}
let lock_height = reader.read_u64()?;
if lock_height != 0 {
return Err(ser::Error::CorruptedData);
}
KernelFeatures::Coinbase
}
KernelFeatures::HEIGHT_LOCKED_U8 => {