hsmd: increase HSM_MAX_VERSION to 3

ElementsProject · Jan 26, 2023 · 03aae88 · 03aae88
1 parent eb84201
commit 03aae88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/common/hsm_version.h b/common/hsm_version.h
@@ -11,7 +11,7 @@
 #define HSM_MIN_VERSION 1
 
 /* wire/hsmd_wire.csv contents version:
- *    dd89bf9323dff42200003fb864abb6608f3aa645b636fdae3ec81d804ac05196
+ *    edd3d288fc88a5470adc2f99abcbfe4d4af29fae0c7a80b4226f28810a815524
  */
-#define HSM_MAX_VERSION 2
+#define HSM_MAX_VERSION 3
 #endif /* LIGHTNING_COMMON_HSM_VERSION_H */
diff --git a/hsmd/hsmd.c b/hsmd/hsmd.c
@@ -444,7 +444,7 @@ static struct io_plan *init_hsm(struct io_conn *conn,
 	struct secret *hsm_encryption_key;
 	struct bip32_key_version bip32_key_version;
 	u32 minversion, maxversion;
-	const u32 our_minversion = 2, our_maxversion = 2;
+	const u32 our_minversion = 2, our_maxversion = 3;
 
 	/* This must be lightningd. */
 	assert(is_lightningd(c));

diff --git a/lightningd/hsm_control.c b/lightningd/hsm_control.c
@@ -104,6 +104,7 @@ struct ext_key *hsm_init(struct lightningd *ld)
 	}
 
 	ld->hsm_fd = fds[0];
+	u32 min_version = 3; /* payment modifiers need hsmd_preapprove_{invoice,keysend} */
 	if (!wire_sync_write(ld->hsm_fd, towire_hsmd_init(tmpctx,
 							 &chainparams->bip32_key_version,
 							 chainparams,
@@ -112,7 +113,7 @@ struct ext_key *hsm_init(struct lightningd *ld)
 							 IFDEV(ld->dev_force_bip32_seed, NULL),
 							 IFDEV(ld->dev_force_channel_secrets, NULL),
 							  IFDEV(ld->dev_force_channel_secrets_shaseed, NULL),
-							  HSM_MIN_VERSION,
+							  min_version,
 							  HSM_MAX_VERSION)))
 		err(EXITCODE_HSM_GENERIC_ERROR, "Writing init msg to hsm");