Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

verify the ignored fee is still 0 #3007

Merged
merged 2 commits into from
Aug 29, 2019
Merged

verify the ignored fee is still 0 #3007

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4cf045
verify the ignored bytes are indeed 0
antiochp Aug 29, 2019
8ef17a7
check for !=0 (rather than >0)
antiochp Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions core/src/core/transaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down