hsmd: remove deprecated init v2

Signed-off-by: Vincenzo Palazzo <[email protected]>
gudnuf · Feb 27, 2024 · af41cd5 · af41cd5
1 parent ef40b2f
commit af41cd5
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 18 deletions.
diff --git a/common/hsm_version.h b/common/hsm_version.h
@@ -22,6 +22,7 @@
  * v4 with forget_channel: d87c6934ea188f92785d38d7cd0b13ed7f76aa7417f3200baf0c7b5aa832fe29
  * v5 with hsmd_revoke_commitment_tx: 5742538f87ef5d5bf55b66dc19e52c8683cfeb1b887d3e64ba530ba9a4d8e638
  * v5 with sign_any_cannouncement: 5fdb9068c43a21887dc03f7dce410d2e3eeff6277f0d49b4fc56595a798fd4a4
+ * v5 drop init v2: 5024454532fe5a78bb7558000cb344190888b9915360d3d56ddca22eaba9b872
 */
 #define HSM_MIN_VERSION 5
 #define HSM_MAX_VERSION 5

diff --git a/hsmd/hsmd.c b/hsmd/hsmd.c
@@ -704,7 +704,6 @@ static struct io_plan *handle_client(struct io_conn *conn, struct client *c)
 	case WIRE_HSMD_NODE_ANNOUNCEMENT_SIG_REPLY:
 	case WIRE_HSMD_SIGN_WITHDRAWAL_REPLY:
 	case WIRE_HSMD_SIGN_INVOICE_REPLY:
-	case WIRE_HSMD_INIT_REPLY_V2:
 	case WIRE_HSMD_INIT_REPLY_V4:
 	case WIRE_HSMD_DERIVE_SECRET_REPLY:
 	case WIRE_HSMSTATUS_CLIENT_BAD_REQUEST:

diff --git a/hsmd/hsmd_wire.csv b/hsmd/hsmd_wire.csv
@@ -19,12 +19,6 @@ msgdata,hsmd_init,hsm_wire_min_version,u32,
 msgdata,hsmd_init,hsm_wire_max_version,u32,
 
 #include <common/bip32.h>
-# DEPRECATED after 23.05, remove in two versions!
-msgtype,hsmd_init_reply_v2,113
-msgdata,hsmd_init_reply_v2,node_id,node_id,
-msgdata,hsmd_init_reply_v2,bip32,ext_key,
-msgdata,hsmd_init_reply_v2,bolt12,pubkey,
-
 # Sorry: I should have put version in v2 :(
 msgtype,hsmd_init_reply_v4,114
 # This gets upgraded when the wire protocol changes in incompatible

diff --git a/hsmd/libhsmd.c b/hsmd/libhsmd.c
@@ -157,7 +157,6 @@ bool hsmd_check_client_capabilities(struct hsmd_client *client,
 	case WIRE_HSMD_NODE_ANNOUNCEMENT_SIG_REPLY:
 	case WIRE_HSMD_SIGN_WITHDRAWAL_REPLY:
 	case WIRE_HSMD_SIGN_INVOICE_REPLY:
-	case WIRE_HSMD_INIT_REPLY_V2:
 	case WIRE_HSMD_INIT_REPLY_V4:
 	case WIRE_HSMSTATUS_CLIENT_BAD_REQUEST:
 	case WIRE_HSMD_SIGN_COMMITMENT_TX_REPLY:
@@ -2124,7 +2123,6 @@ u8 *hsmd_handle_client_message(const tal_t *ctx, struct hsmd_client *client,
 	case WIRE_HSMD_NODE_ANNOUNCEMENT_SIG_REPLY:
 	case WIRE_HSMD_SIGN_WITHDRAWAL_REPLY:
 	case WIRE_HSMD_SIGN_INVOICE_REPLY:
-	case WIRE_HSMD_INIT_REPLY_V2:
 	case WIRE_HSMD_INIT_REPLY_V4:
 	case WIRE_HSMSTATUS_CLIENT_BAD_REQUEST:
 	case WIRE_HSMD_SIGN_COMMITMENT_TX_REPLY:

diff --git a/lightningd/hsm_control.c b/lightningd/hsm_control.c
@@ -130,12 +130,6 @@ struct ext_key *hsm_init(struct lightningd *ld)
 					&ld->id, bip32_base,
 					&ld->bolt12_base)) {
 		/* nothing to do. */
-	} else if (fromwire_hsmd_init_reply_v2(msg,
-					       &ld->id, bip32_base,
-					       &ld->bolt12_base)) {
-		/* implicit version */
-		hsm_version = 3;
-		ld->hsm_capabilities = NULL;
 	} else {
 		if (ld->config.keypass)
 			errx(EXITCODE_HSM_BAD_PASSWORD, "Wrong password for encrypted hsm_secret.");

diff --git a/wallet/test/run-wallet.c b/wallet/test/run-wallet.c
@@ -306,9 +306,6 @@ bool fromwire_hsmd_forget_channel_reply(const void *p UNNEEDED)
 /* Generated stub for fromwire_hsmd_get_output_scriptpubkey_reply */
 bool fromwire_hsmd_get_output_scriptpubkey_reply(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, u8 **script UNNEEDED)
 { fprintf(stderr, "fromwire_hsmd_get_output_scriptpubkey_reply called!\n"); abort(); }
-/* Generated stub for fromwire_hsmd_init_reply_v2 */
-bool fromwire_hsmd_init_reply_v2(const void *p UNNEEDED, struct node_id *node_id UNNEEDED, struct ext_key *bip32 UNNEEDED, struct pubkey *bolt12 UNNEEDED)
-{ fprintf(stderr, "fromwire_hsmd_init_reply_v2 called!\n"); abort(); }
 /* Generated stub for fromwire_hsmd_init_reply_v4 */
 bool fromwire_hsmd_init_reply_v4(const tal_t *ctx UNNEEDED, const void *p UNNEEDED, u32 *hsm_version UNNEEDED, u32 **hsm_capabilities UNNEEDED, struct node_id *node_id UNNEEDED, struct ext_key *bip32 UNNEEDED, struct pubkey *bolt12 UNNEEDED)
 { fprintf(stderr, "fromwire_hsmd_init_reply_v4 called!\n"); abort(); }