introduce simple_htlc for communicating HTLCs to hsmd

Author: devrandom

channeld/channeld.c

@@ -1066,27 +1066,20 @@ static struct bitcoin_signature *calc_commitsigs(const tal_t *ctx,
 	// We use the existing_htlc to_wire routines, it's unfortunate that
 	// we have to send a dummy onion_routing_packet ...
 	//
-	struct existing_htlc **htlcs = tal_arr(tmpctx, struct existing_htlc *, 0);
-	u8 dummy_onion_routing_packet[TOTAL_PACKET_SIZE(ROUTING_INFO_SIZE)];
-	memset(dummy_onion_routing_packet, 0, sizeof(dummy_onion_routing_packet));
+	struct simple_htlc **htlcs = tal_arr(tmpctx, struct simple_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) {
 			status_debug("HTLC[%lu]=%" PRIu64 ", %s",
 				     ndx, hh->id, htlc_state_name(hh->state));
-			struct existing_htlc *existing =
-				new_existing_htlc(NULL,
-						  hh->id,
-						  hh->state,
-						  hh->amount,
-						  &hh->rhash,
-						  hh->expiry.locktime,
-						  dummy_onion_routing_packet,
-						  NULL,
-						  NULL,
-						  NULL);
-			tal_arr_expand(&htlcs, tal_steal(htlcs, existing));
+			struct simple_htlc *simple =
+			    new_simple_htlc(NULL,
+					    htlc_state_owner(hh->state),
+					    hh->amount,
+					    &hh->rhash,
+					    hh->expiry.locktime);
+			tal_arr_expand(&htlcs, tal_steal(htlcs, simple));
 		}
 	}
 
@@ -1095,7 +1088,7 @@ static struct bitcoin_signature *calc_commitsigs(const tal_t *ctx,
 						   &peer->remote_per_commit,
 						    peer->channel->option_static_remotekey,
 						    commit_index,
-						    (const struct existing_htlc **) htlcs,
+						    (const struct simple_htlc **) htlcs,
 						    channel_feerate(peer->channel, REMOTE));
 	msg = hsm_req(tmpctx, take(msg));
 	if (!fromwire_hsmd_sign_tx_reply(msg, commit_sig))
@@ -1766,38 +1759,31 @@ static void handle_peer_commit_sig(struct peer *peer, const u8 *msg)
 
 	// Collect the htlcs for call to hsmd validate.
 	//
-	// We use the existing_htlc to_wire routines, it's unfortunate that
+	// We use the simple_htlc to_wire routines, it's unfortunate that
 	// we have to send a dummy onion_routing_packet ...
 	//
-	struct existing_htlc **htlcs = tal_arr(NULL, struct existing_htlc *, 0);
-	u8 dummy_onion_routing_packet[TOTAL_PACKET_SIZE(ROUTING_INFO_SIZE)];
-	memset(dummy_onion_routing_packet, 0, sizeof(dummy_onion_routing_packet));
+	struct simple_htlc **htlcs = tal_arr(NULL, struct simple_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) {
 			status_debug("HTLC[%lu]=%" PRIu64 ", %s",
 				     ndx, hh->id, htlc_state_name(hh->state));
-			struct existing_htlc *existing =
-				new_existing_htlc(NULL,
-						  hh->id,
-						  hh->state,
-						  hh->amount,
-						  &hh->rhash,
-						  hh->expiry.locktime,
-						  dummy_onion_routing_packet,
-						  NULL,
-						  NULL,
-						  NULL);
-			tal_arr_expand(&htlcs, tal_steal(htlcs, existing));
+			struct simple_htlc *simple =
+			    new_simple_htlc(NULL,
+					    htlc_state_owner(hh->state),
+					    hh->amount,
+					    &hh->rhash,
+					    hh->expiry.locktime);
+			tal_arr_expand(&htlcs, tal_steal(htlcs, simple));
 		}
 	}
 
 	// Validate the counterparty's signatures, returns old_secret.
 	const u8 * msg2 =
 		towire_hsmd_validate_commitment_tx(NULL,
 						   txs[0],
-						   (const struct existing_htlc **) htlcs,
+						   (const struct simple_htlc **) htlcs,
 						   peer->next_index[LOCAL],
 						   channel_feerate(peer->channel, LOCAL),
 						   &commit_sig,

channeld/channeld_wiregen.c

@@ -28,6 +28,20 @@ struct failed_htlc *failed_htlc_dup(const tal_t *ctx,
 	return newf;
 }
 
+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)
+{
+	struct simple_htlc *simple = tal(NULL, struct simple_htlc);
+	simple->side = side;
+	simple->amount = amount;
+	simple->payment_hash = *payment_hash;
+	simple->cltv_expiry = cltv_expiry;
+	return simple;
+}
+
 struct existing_htlc *new_existing_htlc(const tal_t *ctx,
 					u64 id,
 					enum htlc_state state,
@@ -109,6 +123,14 @@ void towire_existing_htlc(u8 **pptr, const struct existing_htlc *existing)
 		towire_bool(pptr, false);
 }
 
+void towire_simple_htlc(u8 **pptr, const struct simple_htlc *simple)
+{
+	towire_side(pptr, simple->side);
+	towire_amount_msat(pptr, simple->amount);
+	towire_sha256(pptr, &simple->payment_hash);
+	towire_u32(pptr, simple->cltv_expiry);
+}
+
 void towire_fulfilled_htlc(u8 **pptr, const struct fulfilled_htlc *fulfilled)
 {
 	towire_u64(pptr, fulfilled->id);
@@ -205,6 +227,18 @@ struct existing_htlc *fromwire_existing_htlc(const tal_t *ctx,
 	return existing;
 }
 
+struct simple_htlc *fromwire_simple_htlc(const tal_t *ctx,
+					 const u8 **cursor, size_t *max)
+{
+	struct simple_htlc *simple = tal(ctx, struct simple_htlc);
+
+	simple->side = fromwire_side(cursor, max);
+	simple->amount = fromwire_amount_msat(cursor, max);
+	fromwire_sha256(cursor, max, &simple->payment_hash);
+	simple->cltv_expiry = fromwire_u32(cursor, max);
+	return simple;
+}
+
 void fromwire_fulfilled_htlc(const u8 **cursor, size_t *max,
 			     struct fulfilled_htlc *fulfilled)
 {

channeld/channeld_wiregen.h

@@ -65,6 +65,14 @@ struct changed_htlc {
 	u64 id;
 };
 
+/* For signing */
+struct simple_htlc {
+	enum side side;
+	struct amount_msat amount;
+	struct sha256 payment_hash;
+	u32 cltv_expiry;
+};
+
 struct existing_htlc *new_existing_htlc(const tal_t *ctx,
 					u64 id,
 					enum htlc_state state,
@@ -76,10 +84,17 @@ struct existing_htlc *new_existing_htlc(const tal_t *ctx,
 					const struct preimage *preimage TAKES,
 					const struct failed_htlc *failed TAKES);
 
+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);
+
 struct failed_htlc *failed_htlc_dup(const tal_t *ctx, const struct failed_htlc *f TAKES);
 
 void towire_added_htlc(u8 **pptr, const struct added_htlc *added);
 void towire_existing_htlc(u8 **pptr, const struct existing_htlc *existing);
+void towire_simple_htlc(u8 **pptr, const struct simple_htlc *simple);
 void towire_fulfilled_htlc(u8 **pptr, const struct fulfilled_htlc *fulfilled);
 void towire_failed_htlc(u8 **pptr, const struct failed_htlc *failed);
 void towire_changed_htlc(u8 **pptr, const struct changed_htlc *changed);
@@ -91,6 +106,8 @@ void fromwire_added_htlc(const u8 **cursor, size_t *max,
 			 struct added_htlc *added);
 struct existing_htlc *fromwire_existing_htlc(const tal_t *ctx,
 					     const u8 **cursor, size_t *max);
+struct simple_htlc *fromwire_simple_htlc(const tal_t *ctx,
+					 const u8 **cursor, size_t *max);
 void fromwire_fulfilled_htlc(const u8 **cursor, size_t *max,
 			     struct fulfilled_htlc *fulfilled);
 struct failed_htlc *fromwire_failed_htlc(const tal_t *ctx, const u8 **cursor,