Added get-per-commitment-point.

Author: ksedgwic

contrib/remote_hsmd/TODO.md

@@ -4,7 +4,7 @@ API Coverage
 
 ## Failing Tests
 
-# intermittent
+# Frequently Intermittent
 tests/test_connection.py::test_funding_cancel_race
 tests/test_misc.py::test_bad_onion_immediate_peer
 
@@ -18,11 +18,11 @@ COMPLETE		proxy_stat proxy_handle_sign_node_announcement
 COMPLETE		proxy_stat proxy_handle_sign_remote_htlc_tx
 COMPLETE		proxy_stat proxy_handle_sign_invoice
 COMPLETE		proxy_stat proxy_handle_get_channel_basepoints
+COMPLETE		proxy_stat proxy_handle_get_per_commitment_point
 
 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_message
 MARSHALED		proxy_stat proxy_handle_sign_mutual_close_tx
 MARSHALED		proxy_stat proxy_handle_sign_commitment_tx

contrib/remote_hsmd/hsmd.c

@@ -1498,8 +1498,6 @@ static struct io_plan *handle_get_per_commitment_point(struct io_conn *conn,
 						       struct client *c,
 						       const u8 *msg_in)
 {
-	struct secret channel_seed;
-	struct sha256 shaseed;
 	struct pubkey per_commitment_point;
 	u64 n;
 	struct secret *old_secret;
@@ -1518,32 +1516,7 @@ static struct io_plan *handle_get_per_commitment_point(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 - lightning-signer server only currently returns the
-	 * per_commitment_point, use the original code to compute the
-	 * old_secret for now.
-	 */
-	get_channel_seed(&c->id, c->dbid, &channel_seed);
-	if (!derive_shaseed(&channel_seed, &shaseed))
-		return bad_req_fmt(conn, c, msg_in, "bad derive_shaseed");
-
-	/*
-	if (!per_commit_point(&shaseed, &per_commitment_point, n))
-		return bad_req_fmt(conn, c, msg_in,
-				   "bad per_commit_point %"PRIu64, n);
-	*/
-
-	/* FIXME - replace this with old_secret from the server */
-	if (n >= 2) {
-		old_secret = tal(tmpctx, struct secret);
-		if (!per_commit_secret(&shaseed, old_secret, n - 2)) {
-			return bad_req_fmt(conn, c, msg_in,
-					   "Cannot derive secret %"PRIu64,
-					   n - 2);
-		}
-	} else
-		old_secret = NULL;
+	g_proxy_impl = PROXY_IMPL_COMPLETE;
 
 	/*~ hsm_client_wire.csv marks the secret field here optional, so it only
 	 * gets included if the parameter is non-NULL.  We violate 80 columns

contrib/remote_hsmd/proxy.cc

@@ -563,10 +563,12 @@ proxy_stat proxy_handle_get_per_commitment_point(
 	if (status.ok()) {
 		unmarshal_pubkey(rsp.per_commitment_point(),
 			      o_per_commitment_point);
-		if (rsp.old_secret().data().empty())
+		if (rsp.old_secret().data().empty()) {
 			*o_old_secret = NULL;
-		else
+		} else {
+			*o_old_secret = tal_arr(tmpctx, struct secret, 1);
 			unmarshal_secret(rsp.old_secret(), *o_old_secret);
+		}
 		status_debug("%s:%d %s self_id=%s "
 			     "per_commitment_point=%s old_secret=%s",
 			     __FILE__, __LINE__, __FUNCTION__,