hsmd: rename simple_htlc to hsm_htlc, don't gratuitously dynamically allocate.

The renaming makes it clear that it's HSM specific.

And it has no pointers, so we can have an array instead of an array of pointers.

I tested this hadn't accidentally changed the wire format by disabling
version checks and using an old hsmd with the altered daemons and
running the test suite.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

channeld/channeld.c

@@ -912,37 +912,22 @@ static u8 *master_wait_sync_reply(const tal_t *ctx,
 	return reply;
 }
 
-/* Collect the htlcs for call to hsmd. */
-static struct simple_htlc *new_simple_htlc(const tal_t *ctx,
-					   enum side side,
-					   struct amount_msat amount,
-					   const struct sha256 *payment_hash,
-					   u32 cltv_expiry)
+static struct hsm_htlc *collect_htlcs(const tal_t *ctx,
+				      const struct htlc **htlc_map)
 {
-	struct simple_htlc *simple = tal(ctx, struct simple_htlc);
-	simple->side = side;
-	simple->amount = amount;
-	simple->payment_hash = *payment_hash;
-	simple->cltv_expiry = cltv_expiry;
-	return simple;
-}
-
-static struct simple_htlc **collect_htlcs(const tal_t *ctx, const struct htlc **htlc_map)
-{
-	struct simple_htlc **htlcs;
+	struct hsm_htlc *htlcs;
 
-	htlcs = tal_arr(ctx, struct simple_htlc *, 0);
+	htlcs = tal_arr(ctx, struct hsm_htlc, 0);
 	size_t num_entries = tal_count(htlc_map);
 	for (size_t ndx = 0; ndx < num_entries; ++ndx) {
 		struct htlc const *hh = htlc_map[ndx];
 		if (hh) {
-			struct simple_htlc *simple =
-				new_simple_htlc(htlcs,
-						htlc_state_owner(hh->state),
-						hh->amount,
-						&hh->rhash,
-						hh->expiry.locktime);
-			tal_arr_expand(&htlcs, simple);
+			struct hsm_htlc htlc;
+			htlc.side = htlc_state_owner(hh->state);
+			htlc.amount = hh->amount;
+			htlc.payment_hash = hh->rhash;
+			htlc.cltv_expiry = hh->expiry.locktime;
+			tal_arr_expand(&htlcs, htlc);
 		}
 	}
 	return htlcs;
@@ -960,7 +945,7 @@ static struct bitcoin_signature *calc_commitsigs(const tal_t *ctx,
 						  struct bitcoin_signature *commit_sig,
 						  struct pubkey remote_funding_pubkey)
 {
-	struct simple_htlc **htlcs;
+	struct hsm_htlc *htlcs;
 	size_t i;
 	struct pubkey local_htlckey;
 	const u8 *msg;
@@ -973,7 +958,7 @@ static struct bitcoin_signature *calc_commitsigs(const tal_t *ctx,
 						    channel_has(peer->channel,
 								OPT_STATIC_REMOTEKEY),
 						    commit_index,
-						    (const struct simple_htlc **) htlcs,
+						    htlcs,
 						    channel_feerate(peer->channel, REMOTE));
 
 	msg = hsm_req(tmpctx, take(msg));
@@ -1897,7 +1882,7 @@ static struct commitsig_info *handle_peer_commit_sig(struct peer *peer,
 	const struct htlc **htlc_map;
 	const u8 *funding_wscript;
 	size_t i;
-	struct simple_htlc **htlcs;
+	const struct hsm_htlc *htlcs;
 	const u8 * msg2;
 	u8 *splice_msg;
 	int type;
@@ -2105,7 +2090,7 @@ static struct commitsig_info *handle_peer_commit_sig(struct peer *peer,
 	htlcs = collect_htlcs(NULL, htlc_map);
 	msg2 = towire_hsmd_validate_commitment_tx(NULL,
 						  txs[0],
-						  (const struct simple_htlc **) htlcs,
+						  htlcs,
 						  local_index,
 						  channel_feerate(peer->channel, LOCAL),
 						  &commit_sig,

common/hsm_version.h

@@ -27,7 +27,7 @@
  * v5 with preapprove_check: 0ed6dd4ea2c02b67c51b1420b3d07ab2227a4c06ce7e2942d946967687e9baf7
  * v6 no secret from get_per_commitment_point: 0cad1790beb3473d64355f4cb4f64daa80c28c8a241998b7ef0223385d7ffff9
  * v6 with sign_bolt12_2 (tweak using node id): 8fcb731279a10af3f95aeb8be1da6b2ced76a1984afa18c5f46a03515d70ea0e
- * v6 (internal rework only): eb34a3d575c2d2a2ed4d70df0858670b066fb8cb75ec8d39d0c996ae195a473b
+ * v6 (internal rework only): 22dc3adfb0d63dbd6a92ff1daacbb6218c5efa3080f8910933a18683ce75bf5f
 */
 #define HSM_MIN_VERSION 5
 #define HSM_MAX_VERSION 6

hsmd/hsmd_wire.csv

@@ -230,17 +230,17 @@ msgtype,hsmd_sign_commitment_tx_reply,105
 msgdata,hsmd_sign_commitment_tx_reply,sig,bitcoin_signature,
 
 #include <common/htlc_wire.h> // For enum side and towire_side
-subtype,simple_htlc
-subtypedata,simple_htlc,side,enum side,
-subtypedata,simple_htlc,amount,amount_msat,
-subtypedata,simple_htlc,payment_hash,sha256,
-subtypedata,simple_htlc,cltv_expiry,u32,
+subtype,hsm_htlc
+subtypedata,hsm_htlc,side,enum side,
+subtypedata,hsm_htlc,amount,amount_msat,
+subtypedata,hsm_htlc,payment_hash,sha256,
+subtypedata,hsm_htlc,cltv_expiry,u32,
 
 # Validate the counterparty's commitment signatures.
 msgtype,hsmd_validate_commitment_tx,35
 msgdata,hsmd_validate_commitment_tx,tx,bitcoin_tx,
 msgdata,hsmd_validate_commitment_tx,num_htlcs,u16,
-msgdata,hsmd_validate_commitment_tx,htlcs,simple_htlc,num_htlcs
+msgdata,hsmd_validate_commitment_tx,htlcs,hsm_htlc,num_htlcs
 msgdata,hsmd_validate_commitment_tx,commit_num,u64,
 msgdata,hsmd_validate_commitment_tx,feerate,u32,
 msgdata,hsmd_validate_commitment_tx,sig,bitcoin_signature,
@@ -304,7 +304,7 @@ msgdata,hsmd_sign_remote_commitment_tx,remote_per_commit,pubkey,
 msgdata,hsmd_sign_remote_commitment_tx,option_static_remotekey,bool,
 msgdata,hsmd_sign_remote_commitment_tx,commit_num,u64,
 msgdata,hsmd_sign_remote_commitment_tx,num_htlcs,u16,
-msgdata,hsmd_sign_remote_commitment_tx,htlcs,simple_htlc,num_htlcs
+msgdata,hsmd_sign_remote_commitment_tx,htlcs,hsm_htlc,num_htlcs
 msgdata,hsmd_sign_remote_commitment_tx,feerate,u32,
 
 # channeld asks HSM to sign remote HTLC tx.

hsmd/libhsmd.c

@@ -1584,7 +1584,7 @@ static u8 *handle_sign_remote_commitment_tx(struct hsmd_client *c, const u8 *msg
 	struct pubkey remote_per_commit;
 	bool option_static_remotekey;
 	u64 commit_num;
-	struct simple_htlc **htlc;
+	struct hsm_htlc *htlc;
 	u32 feerate;
 
 	if (!fromwire_hsmd_sign_remote_commitment_tx(tmpctx, msg_in,
@@ -1820,7 +1820,7 @@ static u8 *handle_sign_commitment_tx(struct hsmd_client *c, const u8 *msg_in)
 static u8 *handle_validate_commitment_tx(struct hsmd_client *c, const u8 *msg_in)
 {
 	struct bitcoin_tx *tx;
-	struct simple_htlc **htlc;
+	struct hsm_htlc *htlc;
 	u64 commit_num;
 	u32 feerate;
 	struct bitcoin_signature sig;

openingd/dualopend.c

@@ -1107,7 +1107,6 @@ static u8 *msg_for_remote_commit(const tal_t *ctx,
 	struct wally_tx_output *direct_outputs[NUM_SIDES];
 	struct bitcoin_tx *remote_commit;
 	struct bitcoin_signature local_sig;
-	struct simple_htlc **htlcs = tal_arr(tmpctx, struct simple_htlc *, 0);
 	u32 feerate = 0; // unused since there are no htlcs
 	u64 commit_num = 0;
         u8 *msg;
@@ -1132,7 +1131,7 @@ static u8 *msg_for_remote_commit(const tal_t *ctx,
 						    &state->first_per_commitment_point[REMOTE],
 						    true,
 						    commit_num,
-						    (const struct simple_htlc **) htlcs,
+						    NULL, /* no HTLCS */
 						    feerate);
 	wire_sync_write(HSM_FD, take(msg));
 	msg = wire_sync_read(tmpctx, HSM_FD);

openingd/openingd.c

@@ -703,7 +703,6 @@ static bool funder_finalize_channel_setup(struct state *state,
 	 * witness script.  It also needs the amount of the funding output,
 	 * as segwit signatures commit to that as well, even though it doesn't
 	 * explicitly appear in the transaction itself. */
-	struct simple_htlc **htlcs = tal_arr(tmpctx, struct simple_htlc *, 0);
 	u32 feerate = 0; // unused since there are no htlcs
 	u64 commit_num = 0;
 	msg = towire_hsmd_sign_remote_commitment_tx(NULL,
@@ -713,7 +712,7 @@ static bool funder_finalize_channel_setup(struct state *state,
 						    channel_has(state->channel,
 								OPT_STATIC_REMOTEKEY),
 						    commit_num,
-						    (const struct simple_htlc **) htlcs,
+						    NULL, /* No htlcs */
 						    feerate);
 
 	wire_sync_write(HSM_FD, take(msg));
@@ -1321,7 +1320,6 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
 	}
 
 	/* Make HSM sign it */
-	struct simple_htlc **htlcs = tal_arr(tmpctx, struct simple_htlc *, 0);
 	u32 feerate = 0; // unused since there are no htlcs
 	u64 commit_num = 0;
 	msg = towire_hsmd_sign_remote_commitment_tx(NULL,
@@ -1331,7 +1329,7 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
 						    channel_has(state->channel,
 								OPT_STATIC_REMOTEKEY),
 						   commit_num,
-						   (const struct simple_htlc **) htlcs,
+						    NULL, /* No htlcs */
 						   feerate);
 
 	wire_sync_write(HSM_FD, take(msg));

tools/generate-wire.py

@@ -231,7 +231,6 @@ class Type(FieldSet):
         'gossip_getchannels_entry',
         'failed_htlc',
         'existing_htlc',
-        'simple_htlc',
         'inflight',
         'hsm_utxo',
         'bitcoin_tx',