Added sign-channel-announcement.

Author: ksedgwic

contrib/remote_hsmd/NOTES.md

@@ -71,6 +71,9 @@ Some popular tests:
     # sign-message
     export THETEST=tests/test_misc.py::test_signmessage
 
+    # sign-channel-announcement
+    export THETEST=tests/test_closing.py::test_closing_different_fees
+
 rust-lightning-signer
 ----------------------------------------------------------------
 

contrib/remote_hsmd/TODO.md

@@ -27,12 +27,12 @@ COMPLETE		proxy_stat proxy_handle_sign_penalty_to_us
 COMPLETE		proxy_stat proxy_handle_sign_commitment_tx
 COMPLETE		proxy_stat proxy_handle_sign_mutual_close_tx
 COMPLETE		proxy_stat proxy_handle_check_future_secret
+COMPLETE		proxy_stat proxy_handle_cannouncement_sig
 COMPLETE		proxy_stat proxy_handle_sign_message
 
 PARTIAL (-P2SH)	proxy_stat proxy_handle_sign_withdrawal_tx
 
 MARSHALED		proxy_stat proxy_init_hsm
-MARSHALED		proxy_stat proxy_handle_cannouncement_sig
 ```
 
 Improvements

contrib/remote_hsmd/hsmd.c

@@ -833,14 +833,9 @@ static struct io_plan *handle_cannouncement_sig(struct io_conn *conn,
 	 */
 	/* First type bytes are the msg type */
 	size_t offset = 2 + 256;
-	struct privkey node_pkey;
 	secp256k1_ecdsa_signature node_sig, bitcoin_sig;
-	struct sha256_double hash;
 	u8 *reply;
 	u8 *ca;
-	struct pubkey funding_pubkey;
-	struct privkey funding_privkey;
-	struct secret channel_seed;
 
 	/*~ You'll find FIXMEs like this scattered through the code.
 	 * Sometimes they suggest simple improvements which someone like
@@ -850,10 +845,6 @@ static struct io_plan *handle_cannouncement_sig(struct io_conn *conn,
 	/*~ Christian uses TODO(cdecker) or FIXME(cdecker), but I'm sure he won't
 	 * mind if you fix this for him! */
 
-	/* FIXME: We should cache these. */
-	get_channel_seed(&c->id, c->dbid, &channel_seed);
-	derive_funding_key(&channel_seed, &funding_pubkey, &funding_privkey);
-
 	/*~ fromwire_ routines which need to do allocation take a tal context
 	 * as their first field; tmpctx is good here since we won't need it
 	 * after this function. */
@@ -881,15 +872,7 @@ static struct io_plan *handle_cannouncement_sig(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, ca + offset, tal_count(ca) - offset);
-
-	sign_hash(&node_pkey, &hash, &node_sig);
-	sign_hash(&funding_privkey, &hash, &bitcoin_sig);
+	g_proxy_impl = PROXY_IMPL_COMPLETE;
 
 	reply = towire_hsm_cannouncement_sig_reply(NULL, &node_sig,
 						   &bitcoin_sig);

contrib/remote_hsmd/proxy.cc

@@ -867,25 +867,23 @@ proxy_stat proxy_handle_cannouncement_sig(
 			 tal_count(channel_announcement)).c_str()
 		);
 
+	/* Skip the portion of the channel_update that we don't sign */
+	size_t offset = 2 + 256; /* sizeof(type) + 4*sizeof(signature) */
+	size_t annsz = tal_count(channel_announcement);
+
 	last_message = "";
 	SignChannelAnnouncementRequest req;
 	marshal_node_id(&self_id, req.mutable_node_id());
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
-	req.set_channel_announcement(channel_announcement,
-				     tal_count(channel_announcement));
+	req.set_channel_announcement(channel_announcement + offset,
+				     annsz - offset);
 
 	ClientContext context;
 	SignChannelAnnouncementReply rsp;
 	Status status = stub->SignChannelAnnouncement(&context, req, &rsp);
 	if (status.ok()) {
-		// FIXME - UNCOMMENT WHEN SERVER IMPLEMENTS:
-#if 0
 		unmarshal_ecdsa_signature(rsp.node_signature(), o_node_sig);
 		unmarshal_ecdsa_signature(rsp.bitcoin_signature(), o_bitcoin_sig);
-#else
-		memset(o_node_sig->data, '\0', sizeof(o_node_sig->data));
-		memset(o_bitcoin_sig->data, '\0', sizeof(o_bitcoin_sig->data));
-#endif
 		status_debug("%s:%d %s self_id=%s node_sig=%s bitcoin_sig=%s",
 			     __FILE__, __LINE__, __FUNCTION__,
 			     dump_node_id(&self_id).c_str(),