Call validate_initial_commitment_signature in dualopend

Author: ksedgwic

openingd/common.c

@@ -3,8 +3,13 @@
 #include <common/channel_config.h>
 #include <common/features.h>
 #include <common/initial_commit_tx.h>
+#include <common/status.h>
 #include <common/type_to_string.h>
+#include <hsmd/hsmd_wiregen.h>
 #include <openingd/common.h>
+#include <wire/wire_sync.h>
+
+#define HSM_FD 6
 
 /*~ This is the key function that checks that their configuration is reasonable:
  * it applied for both the case where they're trying to open a channel, and when
@@ -225,3 +230,32 @@ u8 *no_upfront_shutdown_script(const tal_t *ctx,
 
 	return NULL;
 }
+
+void validate_initial_commitment_signature(struct bitcoin_tx *tx,
+					   struct bitcoin_signature *sig)
+{
+	// Validate the counterparty's signature.
+	struct existing_htlc **htlcs = tal_arr(NULL, struct existing_htlc *, 0);
+	struct bitcoin_signature *htlc_sigs = tal_arr(NULL, struct bitcoin_signature, 0);
+	u32 feerate = 0; // unused since there are no htlcs
+	u64 commit_num = 0;
+	const u8 * msg =
+		towire_hsmd_validate_commitment_tx(NULL,
+						   tx,
+						   (const struct simple_htlc **) htlcs,
+						   commit_num,
+						   feerate,
+						   sig,
+						   htlc_sigs);
+	tal_free(htlc_sigs);
+	tal_free(htlcs);
+	wire_sync_write(HSM_FD, take(msg));
+	msg = wire_sync_read(tmpctx, HSM_FD);
+	struct secret *old_secret;
+	struct pubkey next_point;
+	if (!fromwire_hsmd_validate_commitment_tx_reply(tmpctx, msg, &old_secret, &next_point))
+		status_failed(STATUS_FAIL_HSM_IO,
+			      "Reading validate_commitment_tx reply: %s",
+			      tal_hex(tmpctx, msg));
+}
+

openingd/common.h

@@ -4,6 +4,8 @@
 #include "config.h"
 
 struct amount_sat;
+struct bitcoin_tx;
+struct bitcoin_signature;
 struct channel_config;
 
 
@@ -21,4 +23,7 @@ bool check_config_bounds(const tal_t *ctx,
 u8 *no_upfront_shutdown_script(const tal_t *ctx,
 			       struct feature_set *our_features,
 			       const u8 *their_features);
+
+void validate_initial_commitment_signature(struct bitcoin_tx *tx,
+					   struct bitcoin_signature *sig);
 #endif /* LIGHTNING_OPENINGD_COMMON_H */

openingd/dualopend.c

@@ -1860,6 +1860,8 @@ static u8 *accepter_commits(struct state *state,
 		return NULL;
 	}
 
+	validate_initial_commitment_signature(local_commit, &remote_sig);
+
 	/* BOLT #2:
 	 *
 	 * The recipient:
@@ -2585,6 +2587,8 @@ static u8 *opener_commits(struct state *state,
 		return NULL;
 	}
 
+	validate_initial_commitment_signature(local_commit, &remote_sig);
+
 	/* BOLT #2:
 	 *
 	 * The recipient:

openingd/openingd.c

@@ -509,34 +509,6 @@ static u8 *funder_channel_start(struct state *state, u8 channel_flags)
 						  state->channel_type);
 }
 
-static void validate_initial_commitment_signature(struct bitcoin_tx *tx,
-						  struct bitcoin_signature *sig)
-{
-	// Validate the counterparty's signature.
-	struct existing_htlc **htlcs = tal_arr(NULL, struct existing_htlc *, 0);
-	struct bitcoin_signature *htlc_sigs = tal_arr(NULL, struct bitcoin_signature, 0);
-	u32 feerate = 0; // unused since there are no htlcs
-	u64 commit_num = 0;
-	const u8 * msg =
-		towire_hsmd_validate_commitment_tx(NULL,
-						   tx,
-						   (const struct simple_htlc **) htlcs,
-						   commit_num,
-						   feerate,
-						   sig,
-						   htlc_sigs);
-	tal_free(htlc_sigs);
-	tal_free(htlcs);
-	wire_sync_write(HSM_FD, take(msg));
-	msg = wire_sync_read(tmpctx, HSM_FD);
-	struct secret *old_secret;
-	struct pubkey next_point;
-	if (!fromwire_hsmd_validate_commitment_tx_reply(tmpctx, msg, &old_secret, &next_point))
-		status_failed(STATUS_FAIL_HSM_IO,
-			      "Reading validate_commitment_tx reply: %s",
-			      tal_hex(tmpctx, msg));
-}
-
 static bool funder_finalize_channel_setup(struct state *state,
 					  struct amount_msat local_msat,
 					  struct bitcoin_signature *sig,