From bd83eea25323ec25441decdf1994e47bb797923a Mon Sep 17 00:00:00 2001
From: jdwldnqi837 <47104234+jdwldnqi837@users.noreply.github.com>
Date: Mon, 15 Jun 2020 16:32:57 +0800
Subject: [PATCH] Fix: height locked feature value should be 2. (#440)

// 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.
---
 libwallet/src/slate_versions/v4.rs     | 2 +-
 libwallet/src/slate_versions/v4_bin.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libwallet/src/slate_versions/v4.rs b/libwallet/src/slate_versions/v4.rs
index f8b15206..e0e020b0 100644
--- a/libwallet/src/slate_versions/v4.rs
+++ b/libwallet/src/slate_versions/v4.rs
@@ -500,7 +500,7 @@ impl From<SlateV3> for SlateV4 {
 		};
 		let (feat, feat_args) = match lock_height {
 			0 => (0, None),
-			n => (1, Some(KernelFeaturesArgsV4 { lock_hgt: n })),
+			n => (2, Some(KernelFeaturesArgsV4 { lock_hgt: n })),
 		};
 		SlateV4 {
 			ver,
diff --git a/libwallet/src/slate_versions/v4_bin.rs b/libwallet/src/slate_versions/v4_bin.rs
index 5e042848..48a7821e 100644
--- a/libwallet/src/slate_versions/v4_bin.rs
+++ b/libwallet/src/slate_versions/v4_bin.rs
@@ -431,7 +431,7 @@ impl Writeable for SlateV4Bin {
 		}
 		.write(writer)?;
 		// Write lock height for height locked kernels
-		if v4.feat == 1 {
+		if v4.feat == 2 {
 			let lock_hgt = match &v4.feat_args {
 				Some(l) => l.lock_hgt,
 				None => 0,
@@ -456,7 +456,7 @@ impl Readable for SlateV4Bin {
 		let sigs = SigsWrap::read(reader)?.0;
 		let opt_structs = SlateOptStructs::read(reader)?;
 
-		let feat_args = if opts.feat == 1 {
+		let feat_args = if opts.feat == 2 {
 			Some(KernelFeaturesArgsV4 {
 				lock_hgt: reader.read_u64()?,
 			})