Remove uneeded hsmd_sign_commitment_tx modifications

Author: ksedgwic

contrib/remote_hsmd/hsmd.c

@@ -767,16 +767,14 @@ static struct io_plan *handle_sign_commitment_tx(struct io_conn *conn,
 	struct node_id peer_id;
 	u64 dbid;
 	struct bitcoin_tx *tx;
-	struct simple_htlc **htlc;
 	u64 commit_num;
-	u32 feerate;
 	struct bitcoin_signature sig;
 
 	if (!fromwire_hsmd_sign_commitment_tx(tmpctx, msg_in,
 					     &peer_id, &dbid,
 					     &tx,
 					     &remote_funding_pubkey,
-					     &commit_num, &htlc, &feerate))
+					     &commit_num))
 		return bad_req(conn, c, msg_in);
 
 	tx->chainparams = c->chainparams;
@@ -809,8 +807,7 @@ static struct io_plan *handle_sign_commitment_tx(struct io_conn *conn,
 	} else {
 		// This is a unilateral close from our side.
 		proxy_stat rv = proxy_handle_sign_commitment_tx(
-			tx, &remote_funding_pubkey, &peer_id, dbid,
-			htlc, commit_num, feerate,  &sig);
+			&peer_id, dbid, commit_num, &sig);
 		if (PROXY_PERMANENT(rv))
 			status_failed(STATUS_FAIL_INTERNAL_ERROR,
 				      "proxy_%s failed: %s", __FUNCTION__,

contrib/remote_hsmd/proxy.cc

@@ -1105,29 +1105,20 @@ proxy_stat proxy_handle_sign_mutual_close_tx(
 }
 
 proxy_stat proxy_handle_sign_commitment_tx(
-	struct bitcoin_tx *tx,
-	const struct pubkey *counterparty_funding_pubkey,
 	struct node_id *peer_id,
 	u64 dbid,
-	struct simple_htlc **htlcs,
-	u64 commit_num, u32 feerate,
+	u64 commit_num,
 	struct bitcoin_signature *o_sig)
 {
 	STATUS_DEBUG(
 		"%s:%d %s { "
 		"\"self_id\":%s, \"peer_id\":%s, \"dbid\":%" PRIu64 ", "
-		"\"counterparty_funding_pubkey\":%s, \"tx\":%s, "
-		"\"htlcs\":%s, "
-		"\"commit_num\":%" PRIu64 ", "
-		"\"feerate\":%d }",
+		"\"commit_num\":%" PRIu64 " }",
 		__FILE__, __LINE__, __FUNCTION__,
 		dump_node_id(&self_id).c_str(),
 		dump_node_id(peer_id).c_str(),
 		dbid,
-		dump_pubkey(counterparty_funding_pubkey).c_str(),
-		dump_tx(tx).c_str(),
-		dump_htlcs((const struct simple_htlc **) htlcs, tal_count(htlcs)).c_str(),
-		commit_num, feerate
+		commit_num
 		);
 
 	last_message = "";

contrib/remote_hsmd/proxy.hpp

@@ -135,13 +135,9 @@ proxy_stat proxy_handle_sign_mutual_close_tx(
 	struct bitcoin_signature *o_sig);
 
 proxy_stat proxy_handle_sign_commitment_tx(
-	struct bitcoin_tx *tx,
-	const struct pubkey *remote_funding_pubkey,
 	struct node_id *peer_id,
 	u64 dbid,
-	struct simple_htlc **htlc,
 	u64 commit_num,
-	u32 feerate,
 	struct bitcoin_signature *o_sig);
 
 proxy_stat proxy_handle_validate_commitment_tx(

hsmd/hsmd_wire.csv

@@ -134,9 +134,6 @@ msgdata,hsmd_sign_commitment_tx,channel_dbid,u64,
 msgdata,hsmd_sign_commitment_tx,tx,bitcoin_tx,
 msgdata,hsmd_sign_commitment_tx,remote_funding_key,pubkey,
 msgdata,hsmd_sign_commitment_tx,commit_num,u64,
-msgdata,hsmd_sign_commitment_tx,num_htlcs,u16,
-msgdata,hsmd_sign_commitment_tx,htlcs,simple_htlc,num_htlcs
-msgdata,hsmd_sign_commitment_tx,feerate,u32,
 
 msgtype,hsmd_sign_commitment_tx_reply,105
 msgdata,hsmd_sign_commitment_tx_reply,sig,bitcoin_signature,

hsmd/libhsmd.c

@@ -1300,17 +1300,15 @@ static u8 *handle_sign_commitment_tx(struct hsmd_client *c, const u8 *msg_in)
 	struct secret channel_seed;
 	struct bitcoin_tx *tx;
 	struct bitcoin_signature sig;
-	struct simple_htlc **htlc;
 	u64 commit_num;
-	u32 feerate;
 	struct secrets secrets;
 	const u8 *funding_wscript;
 
 	if (!fromwire_hsmd_sign_commitment_tx(tmpctx, msg_in,
 					     &peer_id, &dbid,
 					     &tx,
 					     &remote_funding_pubkey,
-					     &commit_num, &htlc, &feerate))
+					     &commit_num))
 		return hsmd_status_malformed_request(c, msg_in);
 
 	tx->chainparams = c->chainparams;

lightningd/peer_control.c

@@ -176,61 +176,6 @@ u8 *p2wpkh_for_keyidx(const tal_t *ctx, struct lightningd *ld, u64 keyidx)
 	return scriptpubkey_p2wpkh(ctx, &shutdownkey);
 }
 
-static struct simple_htlc **collect_htlcs(struct channel *channel, u32 local_feerate) {
-	// Collect the htlcs for call to hsmd.
-	struct htlc_in_map *htlcs_in = &channel->peer->ld->htlcs_in;
-	struct htlc_out_map *htlcs_out = &channel->peer->ld->htlcs_out;
-	struct simple_htlc **htlcs = tal_arr(tmpctx, struct simple_htlc *, 0);
-	const int committed_flag = HTLC_FLAG(REMOTE, HTLC_F_COMMITTED);
-
-	const struct htlc_in *hin;
-	struct htlc_in_map_iter ini;
-	for (hin = htlc_in_map_first(htlcs_in, &ini);
-	     hin;
-	     hin = htlc_in_map_next(htlcs_in, &ini)) {
-		if (hin->key.channel != channel)
-			continue;
-		if (!(htlc_state_flags(hin->hstate) & committed_flag))
-			continue;
-		if (htlc_is_trimmed(REMOTE, hin->msat, local_feerate,
-				    channel->our_config.dust_limit, LOCAL,
-				    channel_has(channel, OPT_ANCHOR_OUTPUTS)))
-			continue;
-		struct simple_htlc *simple =
-		    new_simple_htlc(NULL,
-				    htlc_state_owner(hin->hstate),
-				    hin->msat,
-				    &hin->payment_hash,
-				    hin->cltv_expiry
-				    );
-		tal_arr_expand(&htlcs, tal_steal(htlcs, simple));
-	}
-
-	const struct htlc_out *hout;
-	struct htlc_out_map_iter outi;
-	for (hout = htlc_out_map_first(htlcs_out, &outi);
-	     hout;
-	     hout = htlc_out_map_next(htlcs_out, &outi)) {
-		if (hout->key.channel != channel)
-			continue;
-		if (!(htlc_state_flags(hout->hstate) & committed_flag))
-			continue;
-		if (htlc_is_trimmed(REMOTE, hout->msat, local_feerate,
-				    channel->our_config.dust_limit, LOCAL,
-				    channel_has(channel, OPT_ANCHOR_OUTPUTS)))
-			continue;
-		struct simple_htlc *simple =
-		    new_simple_htlc(NULL,
-				    htlc_state_owner(hout->hstate),
-				    hout->msat,
-				    &hout->payment_hash,
-				    hout->cltv_expiry
-				    );
-		tal_arr_expand(&htlcs, tal_steal(htlcs, simple));
-	}
-	return htlcs;
-}
-
 static void sign_last_tx(struct channel *channel,
 			 struct bitcoin_tx *last_tx,
 			 struct bitcoin_signature *last_sig)
@@ -240,8 +185,6 @@ static void sign_last_tx(struct channel *channel,
 	u8 *msg, **witness;
 
 	u64 commit_index = channel->next_index[LOCAL] - 1;
-	u32 local_feerate = get_feerate(channel->fee_states, channel->opener, LOCAL);
-	struct simple_htlc **htlcs = collect_htlcs(channel, local_feerate);
 
 	assert(!last_tx->wtx->inputs[0].witness);
 	msg = towire_hsmd_sign_commitment_tx(tmpctx,
@@ -250,9 +193,7 @@ static void sign_last_tx(struct channel *channel,
 					     last_tx,
 					     &channel->channel_info
 					     .remote_fundingkey,
-					     commit_index,
-					     (const struct simple_htlc **) htlcs,
-					     local_feerate);
+					     commit_index);
 
 	if (!wire_sync_write(ld->hsm_fd, take(msg)))
 		fatal("Could not write to HSM: %s", strerror(errno));

lightningd/test/run-invoice-select-inchan.c

@@ -657,7 +657,7 @@ u8 *towire_errorfmt(const tal_t *ctx UNNEEDED,
 u8 *towire_hsmd_sign_bolt12(const tal_t *ctx UNNEEDED, const wirestring *messagename UNNEEDED, const wirestring *fieldname UNNEEDED, const struct sha256 *merkleroot UNNEEDED, const u8 *publictweak UNNEEDED)
 { fprintf(stderr, "towire_hsmd_sign_bolt12 called!\n"); abort(); }
 /* Generated stub for towire_hsmd_sign_commitment_tx */
-u8 *towire_hsmd_sign_commitment_tx(const tal_t *ctx UNNEEDED, const struct node_id *peer_id UNNEEDED, u64 channel_dbid UNNEEDED, const struct bitcoin_tx *tx UNNEEDED, const struct pubkey *remote_funding_key UNNEEDED, u64 commit_num UNNEEDED, const struct simple_htlc **htlcs UNNEEDED, u32 feerate UNNEEDED)
+u8 *towire_hsmd_sign_commitment_tx(const tal_t *ctx UNNEEDED, const struct node_id *peer_id UNNEEDED, u64 channel_dbid UNNEEDED, const struct bitcoin_tx *tx UNNEEDED, const struct pubkey *remote_funding_key UNNEEDED, u64 commit_num UNNEEDED)
 { fprintf(stderr, "towire_hsmd_sign_commitment_tx called!\n"); abort(); }
 /* Generated stub for towire_hsmd_sign_invoice */
 u8 *towire_hsmd_sign_invoice(const tal_t *ctx UNNEEDED, const u8 *u5bytes UNNEEDED, const u8 *hrp UNNEEDED)

wallet/test/run-wallet.c

@@ -752,7 +752,7 @@ u8 *towire_gossipd_get_stripped_cupdate(const tal_t *ctx UNNEEDED, const struct
 u8 *towire_hsmd_get_output_scriptpubkey(const tal_t *ctx UNNEEDED, u64 channel_id UNNEEDED, const struct node_id *peer_id UNNEEDED, const struct pubkey *commitment_point UNNEEDED)
 { fprintf(stderr, "towire_hsmd_get_output_scriptpubkey called!\n"); abort(); }
 /* Generated stub for towire_hsmd_sign_commitment_tx */
-u8 *towire_hsmd_sign_commitment_tx(const tal_t *ctx UNNEEDED, const struct node_id *peer_id UNNEEDED, u64 channel_dbid UNNEEDED, const struct bitcoin_tx *tx UNNEEDED, const struct pubkey *remote_funding_key UNNEEDED, u64 commit_num UNNEEDED, const struct simple_htlc **htlcs UNNEEDED, u32 feerate UNNEEDED)
+u8 *towire_hsmd_sign_commitment_tx(const tal_t *ctx UNNEEDED, const struct node_id *peer_id UNNEEDED, u64 channel_dbid UNNEEDED, const struct bitcoin_tx *tx UNNEEDED, const struct pubkey *remote_funding_key UNNEEDED, u64 commit_num UNNEEDED)
 { fprintf(stderr, "towire_hsmd_sign_commitment_tx called!\n"); abort(); }
 /* Generated stub for towire_incorrect_cltv_expiry */
 u8 *towire_incorrect_cltv_expiry(const tal_t *ctx UNNEEDED, u32 cltv_expiry UNNEEDED, const u8 *channel_update UNNEEDED)