Implemented sign-node-announcement.

Author: ksedgwic

contrib/remote_hsmd/TODO.md

@@ -5,38 +5,33 @@ API Coverage
 ## Failing Tests
 
 # intermittent
-tests/test_connection.py::test_restart_many_payments
-
-
-#### proxy and server done
-
-1   hsm_ecdh_req						ECDH
-7   hsm_sign_withdrawal					SignWithdrawalTx
-9   hsm_client_hsmfd					PassClientHSMFd
-11  hsm_init							InitHSM
-19  hsm_sign_remote_commitment_tx		SignRemoteCommitmentTx
-
-#### proxy done, but server not complete
-
-3   hsm_cupdate_sig_req					ChannelUpdateSig
-8   hsm_sign_invoice					SignInvoice
-10  hsm_get_channel_basepoints			GetChannelBasepoints
-18  hsm_get_per_commitment_point		GetPerCommitmentPoint
-20  hsm_sign_remote_htlc_tx				SignRemoteHTLCTx
-    HSM_SIGN_MUTUAL_CLOSE_TX			SignMutualCloseTx
-    HSM_SIGN_COMMITMENT_TX				SignCommitmentTx
-    WIRE_HSM_CANNOUNCEMENT_SIG_REQ
-    WIRE_HSM_NODE_ANNOUNCEMENT_SIG_REQ
-    WIRE_HSM_SIGN_PENALTY_TO_US
-    WIRE_HSM_SIGN_DELAYED_PAYMENT_TO_US
-    WIRE_HSM_SIGN_LOCAL_HTLC_TX
-    WIRE_HSM_SIGN_REMOTE_HTLC_TO_US
-    handle_check_future_secret
-    handle_sign_message
-
-#### need proxy and server
-
-handle_sign_funding_tx
+tests/test_connection.py::test_funding_cancel_race
+
+## Proxy Scoreboard
+
+COMPLETE		proxy_stat proxy_handle_ecdh
+COMPLETE		proxy_stat proxy_handle_pass_client_hsmfd
+COMPLETE		proxy_stat proxy_handle_sign_remote_commitment_tx
+COMPLETE		proxy_stat proxy_handle_channel_update_sig
+COMPLETE		proxy_stat proxy_handle_sign_node_announcement
+
+PARTIAL (-P2SH)	proxy_stat proxy_handle_sign_withdrawal_tx
+
+MARSHALED		proxy_stat proxy_init_hsm
+MARSHALED		proxy_stat proxy_handle_get_per_commitment_point
+MARSHALED		proxy_stat proxy_handle_sign_invoice
+MARSHALED		proxy_stat proxy_handle_sign_message
+MARSHALED		proxy_stat proxy_handle_get_channel_basepoints
+MARSHALED		proxy_stat proxy_handle_sign_mutual_close_tx
+MARSHALED		proxy_stat proxy_handle_sign_commitment_tx
+MARSHALED		proxy_stat proxy_handle_cannouncement_sig
+MARSHALED		proxy_stat proxy_handle_sign_local_htlc_tx
+MARSHALED		proxy_stat proxy_handle_sign_remote_htlc_tx
+MARSHALED		proxy_stat proxy_handle_sign_delayed_payment_to_us
+MARSHALED		proxy_stat proxy_handle_sign_remote_htlc_to_us
+MARSHALED		proxy_stat proxy_handle_sign_penalty_to_us
+MARSHALED		proxy_stat proxy_handle_check_future_secret
+
 
 Improvements
 ----------------------------------------------------------------

contrib/remote_hsmd/hsmd.c

@@ -90,6 +90,19 @@ enum proxy_impl {
 static int g_proxy_impl;
 static enum hsm_wire_type g_proxy_last;
 
+/* FIXME - REMOVE THIS WHEN NO LONGER NEEDED */
+#if 0
+static void print_hex(char const *tag, void const *vptr, size_t sz)
+{
+	fprintf(stderr, "%s: ", tag);
+	uint8_t const *ptr = (uint8_t const *) vptr;
+	for (size_t ii = 0; ii < sz; ++ii) {
+		fprintf(stderr, "%02x", (int) ptr[ii]);
+	}
+	fprintf(stderr, "\n");
+}
+#endif
+
 /*~ We keep track of clients, but there's not much to keep. */
 struct client {
 	/* The ccan/io async io connection for this client: it closes, we die. */
@@ -1076,12 +1089,10 @@ static struct io_plan *handle_sign_remote_commitment_tx(struct io_conn *conn,
 							struct client *c,
 							const u8 *msg_in)
 {
-	struct pubkey remote_funding_pubkey, local_funding_pubkey;
+	struct pubkey remote_funding_pubkey;
 	struct amount_sat funding;
-	struct secret channel_seed;
 	struct bitcoin_tx *tx;
 	struct bitcoin_signature sig;
-	struct secrets secrets;
 	struct witscript **output_witscripts;
 	struct pubkey remote_per_commit;
 	bool option_static_remotekey;
@@ -1104,24 +1115,9 @@ static struct io_plan *handle_sign_remote_commitment_tx(struct io_conn *conn,
 	if (tal_count(output_witscripts) != tx->wtx->num_outputs)
 		return bad_req_fmt(conn, c, msg_in, "tx must have matching witscripts");
 
-	/* FIXME - WE DON'T NEED THESE ANYMORE, RIGHT? */
-	get_channel_seed(&c->id, c->dbid, &channel_seed);
-	derive_basepoints(&channel_seed,
-			  &local_funding_pubkey, NULL, &secrets, NULL);
-
 	/* Need input amount for signing */
 	tx->input_amounts[0] = tal_dup(tx, struct amount_sat, &funding);
 
-/*
-	funding_wscript = bitcoin_redeem_2of2(tmpctx,
-					      &local_funding_pubkey,
-					      &remote_funding_pubkey);
-	sign_tx_input(tx, 0, NULL, funding_wscript,
-		      &secrets.funding_privkey,
-		      &local_funding_pubkey,
-		      SIGHASH_ALL,
-		      &sig);
-*/
 	proxy_stat rv = proxy_handle_sign_remote_commitment_tx(
 		tx, &remote_funding_pubkey, &funding,
 		&c->id, c->dbid,
@@ -1628,7 +1624,7 @@ static struct io_plan *handle_check_future_secret(struct io_conn *conn,
 		return bad_req_fmt(conn, c, msg_in,
 				   "proxy_%s error: %s", __FUNCTION__,
 				   proxy_last_message());
-	g_proxy_impl = PROXY_IMPL_COMPLETE;
+	g_proxy_impl = PROXY_IMPL_MARSHALED;
 
 	/* FIXME - REPLACE BELOW W/ REMOTE RETURN */
 
@@ -2095,8 +2091,6 @@ static struct io_plan *handle_sign_node_announcement(struct io_conn *conn,
 	 */
 	/* 2 bytes msg type + 64 bytes signature */
 	size_t offset = 66;
-	struct sha256_double hash;
-	struct privkey node_pkey;
 	secp256k1_ecdsa_signature sig;
 	u8 *reply;
 	u8 *ann;
@@ -2121,14 +2115,7 @@ static struct io_plan *handle_sign_node_announcement(struct io_conn *conn,
 		return bad_req_fmt(conn, c, msg_in,
 				   "proxy_%s error: %s", __FUNCTION__,
 				   proxy_last_message());
-	g_proxy_impl = PROXY_IMPL_MARSHALED;
-
-	/* FIXME - REPLACE BELOW W/ REMOTE RETURN */
-
-	node_key(&node_pkey, NULL);
-	sha256_double(&hash, ann + offset, tal_count(ann) - offset);
-
-	sign_hash(&node_pkey, &hash, &sig);
+	g_proxy_impl = PROXY_IMPL_COMPLETE;
 
 	reply = towire_hsm_node_announcement_sig_reply(NULL, &sig);
 	return req_reply(conn, c, take(reply));

contrib/remote_hsmd/proxy.cc

@@ -674,12 +674,12 @@ proxy_stat proxy_handle_channel_update_sig(
 
 	/* Skip the portion of the channel_update that we don't sign */
 	size_t offset = 2 + 64;	/* sizeof(type) + sizeof(signature) */
-	size_t cusz = tal_count(channel_update);
+	size_t annsz = tal_count(channel_update);
 
 	last_message = "";
 	SignChannelUpdateRequest req;
 	marshal_node_id(&self_id, req.mutable_node_id());
-	req.set_channel_update(channel_update + offset, cusz - offset);
+	req.set_channel_update(channel_update + offset, annsz - offset);
 
 	ClientContext context;
 	SignChannelUpdateReply rsp;
@@ -1274,24 +1274,19 @@ proxy_stat proxy_handle_sign_node_announcement(
 
 	/* Skip the portion of the channel_update that we don't sign */
 	size_t offset = 2 + 64;	/* sizeof(type) + sizeof(signature) */
-	size_t cusz = tal_count(node_announcement);
+	size_t annsz = tal_count(node_announcement);
 
 	last_message = "";
 	SignNodeAnnouncementRequest req;
 	marshal_node_id(&self_id, req.mutable_node_id());
-	req.set_node_announcement(node_announcement + offset, cusz - offset);
+	req.set_node_announcement(node_announcement + offset, annsz - offset);
 
 	ClientContext context;
 	SignNodeAnnouncementReply rsp;
 	Status status = stub->SignNodeAnnouncement(&context, req, &rsp);
 	if (status.ok()) {
-		// FIXME - UNCOMMENT WHEN SERVER IMPLEMENTS:
-#if 0
 		unmarshal_ecdsa_signature(rsp.signature(), o_sig);
-#else
-		memset(o_sig->data, '\0', sizeof(o_sig->data));
-#endif
-		status_debug("%s:%d %s self_id=%s node_sig=%s bitcoin_sig=%s",
+		status_debug("%s:%d %s self_id=%s sig=%s",
 			     __FILE__, __LINE__, __FUNCTION__,
 			     dump_node_id(&self_id).c_str(),
 			     dump_secp256k1_ecdsa_signature(o_sig).c_str());