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

Fix: height locked feature value should be 2. (#440)

Browse source 
// Match on kernel feature variant:
// 0: plain
// 1: coinbase (invalid)
// 2: height locked (with associated lock_height)
// 3: NRD (with associated relative_height)
// Anything else is unknown.
This commit is contained in:
jdwldnqi837 2020-06-15 16:32:57 +08:00 committed by GitHub
parent 0079c04b2d
commit bd83eea253
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libwallet/src/slate_versions/v4.rs
View file

@ -500,7 +500,7 @@ impl From<SlateV3> for SlateV4 {
}; };
let (feat, feat_args) = match lock_height { let (feat, feat_args) = match lock_height {
0 => (0, None), 0 => (0, None),
n => (1, Some(KernelFeaturesArgsV4 { lock_hgt: n })), n => (2, Some(KernelFeaturesArgsV4 { lock_hgt: n })),
}; };
SlateV4 { SlateV4 {
ver, ver,

4
libwallet/src/slate_versions/v4_bin.rs
View file

@ -431,7 +431,7 @@ impl Writeable for SlateV4Bin {
} }
.write(writer)?; .write(writer)?;
// Write lock height for height locked kernels // Write lock height for height locked kernels
if v4.feat == 1 { if v4.feat == 2 {
let lock_hgt = match &v4.feat_args { let lock_hgt = match &v4.feat_args {
Some(l) => l.lock_hgt, Some(l) => l.lock_hgt,
None => 0, None => 0,
@ -456,7 +456,7 @@ impl Readable for SlateV4Bin {
let sigs = SigsWrap::read(reader)?.0; let sigs = SigsWrap::read(reader)?.0;
let opt_structs = SlateOptStructs::read(reader)?; let opt_structs = SlateOptStructs::read(reader)?;
let feat_args = if opts.feat == 1 { let feat_args = if opts.feat == 2 {
Some(KernelFeaturesArgsV4 { Some(KernelFeaturesArgsV4 {
lock_hgt: reader.read_u64()?, lock_hgt: reader.read_u64()?,
}) })