Wrapped signatures w/ typed messages.

Author: ksedgwic

contrib/remote_hsmd/dump.cc

@@ -11,6 +11,7 @@ extern "C" {
 #include <common/status.h>
 #include <common/utils.h>
 #include <common/utxo.h>
+#include <secp256k1_recovery.h>
 }
 
 #include "contrib/remote_hsmd/dump.h"
@@ -53,6 +54,12 @@ string dump_secp256k1_ecdsa_signature(const secp256k1_ecdsa_signature *sp)
 	return dump_hex(sp->data, sizeof(sp->data));
 }
 
+string dump_secp256k1_ecdsa_recoverable_signature(
+	const secp256k1_ecdsa_recoverable_signature *sp)
+{
+	return dump_hex(sp->data, sizeof(sp->data));
+}
+
 string dump_node_id(const struct node_id *pp)
 {
 	return dump_hex(pp->k, sizeof(pp->k));

contrib/remote_hsmd/dump.h

@@ -5,6 +5,7 @@ std::string dump_basepoints(const struct basepoints *bp);
 std::string dump_bitcoin_txid(const struct bitcoin_txid *txid);
 std::string dump_bitcoin_signature(const struct bitcoin_signature *sp);
 std::string dump_secp256k1_ecdsa_signature(const secp256k1_ecdsa_signature *sp);
+std::string dump_secp256k1_ecdsa_recoverable_signature(const secp256k1_ecdsa_recoverable_signature *sp);
 std::string dump_node_id(const struct node_id *pp);
 std::string dump_pubkey(const struct pubkey *kp);
 std::string dump_unilateral_close_info(const struct unilateral_close_info *ip);

contrib/remote_hsmd/hsmd.c

@@ -1036,11 +1036,10 @@ static struct io_plan *handle_sign_commitment_tx(struct io_conn *conn,
 	 * you'll crash if you assume it's there and you're wrong.) */
 	tx->input_amounts[0] = tal_dup(tx, struct amount_sat, &funding);
 
-	u8 *** sigs;
 	proxy_stat rv = proxy_handle_sign_commitment_tx(
 		tx, &remote_funding_pubkey, &funding,
 		&c->id, c->dbid,
-		&sigs);
+		&sig);
 	if (PROXY_PERMANENT(rv))
 		status_failed(STATUS_FAIL_INTERNAL_ERROR,
 		              "proxy_%s failed: %s", __FUNCTION__,
@@ -1052,10 +1051,6 @@ static struct io_plan *handle_sign_commitment_tx(struct io_conn *conn,
 	g_proxy_impl = PROXY_IMPL_MARSHALED;
 
 #if 0
-	assert(tal_count(sigs) == 1);
-
-	bool ok = signature_from_der(sigs[0][0], tal_count(sigs[0][0]), &sig);
-	assert(ok);
 	status_debug("%s:%d %s: signature: %s",
 		     __FILE__, __LINE__, __FUNCTION__,
 		     type_to_string(tmpctx, struct bitcoin_signature, &sig));
@@ -1139,14 +1134,13 @@ static struct io_plan *handle_sign_remote_commitment_tx(struct io_conn *conn,
 		      SIGHASH_ALL,
 		      &sig);
 */
-	u8 *** sigs;
 	proxy_stat rv = proxy_handle_sign_remote_commitment_tx(
 		tx, &remote_funding_pubkey, &funding,
 		&c->id, c->dbid,
 		(const struct witscript **) output_witscripts,
 		&remote_per_commit,
 		option_static_remotekey,
-		&sigs);
+		&sig);
 	if (PROXY_PERMANENT(rv))
 		status_failed(STATUS_FAIL_INTERNAL_ERROR,
 		              "proxy_%s failed: %s", __FUNCTION__,
@@ -1155,11 +1149,8 @@ static struct io_plan *handle_sign_remote_commitment_tx(struct io_conn *conn,
 		return bad_req_fmt(conn, c, msg_in,
 				   "proxy_%s error: %s", __FUNCTION__,
 				   proxy_last_message());
-	assert(tal_count(sigs) == 1);
 	g_proxy_impl = PROXY_IMPL_COMPLETE;
 
-	bool ok = signature_from_der(sigs[0][0], tal_count(sigs[0][0]), &sig);
-	assert(ok);
 	status_debug("%s:%d %s: signature: %s",
 		     __FILE__, __LINE__, __FUNCTION__,
 		     type_to_string(tmpctx, struct bitcoin_signature, &sig));
@@ -1694,11 +1685,10 @@ static struct io_plan *handle_sign_mutual_close_tx(struct io_conn *conn,
 	/* Need input amount for signing */
 	tx->input_amounts[0] = tal_dup(tx, struct amount_sat, &funding);
 
-	u8 *** sigs;
 	proxy_stat rv = proxy_handle_sign_mutual_close_tx(
 		tx, &remote_funding_pubkey, &funding,
 		&c->id, c->dbid,
-		&sigs);
+		&sig);
 	if (PROXY_PERMANENT(rv))
 		status_failed(STATUS_FAIL_INTERNAL_ERROR,
 		              "proxy_%s failed: %s", __FUNCTION__,
@@ -2046,8 +2036,7 @@ static struct io_plan *handle_sign_invoice(struct io_conn *conn,
 	if (!fromwire_hsm_sign_invoice(tmpctx, msg_in, &u5bytes, &hrpu8))
 		return bad_req(conn, c, msg_in);
 
-	u8 *sigbytes;
-	proxy_stat rv = proxy_handle_sign_invoice(u5bytes, hrpu8, &sigbytes);
+	proxy_stat rv = proxy_handle_sign_invoice(u5bytes, hrpu8, &rsig);
 	if (PROXY_PERMANENT(rv))
 		status_failed(STATUS_FAIL_INTERNAL_ERROR,
 		              "proxy_%s failed: %s", __FUNCTION__,
@@ -2058,9 +2047,7 @@ static struct io_plan *handle_sign_invoice(struct io_conn *conn,
 				   proxy_last_message());
 	g_proxy_impl = PROXY_IMPL_MARSHALED;
 
-	/* FIXME - convert the returned signature to an
-	 * secp256k1_ecdsa_recoverable_signature and remove the code
-	 * below. */
+	/* FIXME - USE THE PROXIED VALUE WHEN SERVER SUPPORTS */
 
 	/* BOLT #11:
 	 *