Added get-channel-basepoints.

Author: ksedgwic

contrib/remote_hsmd/TODO.md

@@ -17,13 +17,13 @@ COMPLETE		proxy_stat proxy_handle_channel_update_sig
 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
 
 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_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

contrib/remote_hsmd/hsmd.c

@@ -963,7 +963,6 @@ static struct io_plan *handle_get_channel_basepoints(struct io_conn *conn,
 {
 	struct node_id peer_id;
 	u64 dbid;
-	struct secret seed;
 	struct basepoints basepoints;
 	struct pubkey funding_pubkey;
 
@@ -980,12 +979,7 @@ static struct io_plan *handle_get_channel_basepoints(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 */
-
-	get_channel_seed(&peer_id, dbid, &seed);
-	derive_basepoints(&seed, &funding_pubkey, &basepoints, NULL, NULL);
+	g_proxy_impl = PROXY_IMPL_COMPLETE;
 
 	return req_reply(conn, c,
 			 take(towire_hsm_get_channel_basepoints_reply(NULL,

contrib/remote_hsmd/proxy.cc

@@ -249,13 +249,6 @@ void unmarshal_witnesses(RepeatedPtrField<WitnessStack> const &wits,
 	*o_sigs = osigs;
 }
 
-bool return_pubkey(const string &i_pubkey, struct pubkey *o_pubkey)
-{
-	/* pubkey needs to be compressed DER */
-	return pubkey_from_der(
-		(const u8*)i_pubkey.c_str(), i_pubkey.length(), o_pubkey);
-}
-
 /* Copied from ccan/mem/mem.h which the c++ compiler doesn't like */
 static inline bool memeq(const void *a, size_t al, const void *b, size_t bl)
 {
@@ -740,38 +733,13 @@ proxy_stat proxy_handle_get_channel_basepoints(
 	GetChannelBasepointsReply rsp;
 	Status status = stub->GetChannelBasepoints(&context, req, &rsp);
 	if (status.ok()) {
-		/* FIXME - Uncomment these when real value returned */
-#if 1
-		/* For now just make valgrind happy */
-		memset(o_basepoints, '\0', sizeof(*o_basepoints));
-		memset(o_funding_pubkey, '\0', sizeof(*o_funding_pubkey));
-#else
-		if (!return_pubkey(rsp.basepoints().revocation(),
-				   &o_basepoints->revocation)) {
-			last_message = "bad returned revocation basepoint";
-			return PROXY_INTERNAL_ERROR;
-		}
-		if (!return_pubkey(rsp.basepoints().payment(),
-				   &o_basepoints->payment)) {
-			last_message = "bad returned payment basepoint";
-			return PROXY_INTERNAL_ERROR;
-		}
-		if (!return_pubkey(rsp.basepoints().htlc(),
-				   &o_basepoints->htlc)) {
-			last_message = "bad returned htlc basepoint";
-			return PROXY_INTERNAL_ERROR;
-		}
-		if (!return_pubkey(rsp.basepoints().delayed_payment(),
-				   &o_basepoints->delayed_payment)) {
-			last_message = "bad returned delayed_payment basepoint";
-			return PROXY_INTERNAL_ERROR;
-		}
-		if (!return_pubkey(rsp.remote_funding_pubkey(),
-				   o_funding_pubkey)) {
-			last_message = "bad returned funding pubkey";
-			return PROXY_INTERNAL_ERROR;
-		}
-#endif
+		Basepoints const & bps = rsp.basepoints();
+		unmarshal_pubkey(bps.revocation(), &o_basepoints->revocation);
+		unmarshal_pubkey(bps.payment(), &o_basepoints->payment);
+		unmarshal_pubkey(bps.htlc(), &o_basepoints->htlc);
+		unmarshal_pubkey(bps.delayed_payment(),
+				 &o_basepoints->delayed_payment);
+		unmarshal_pubkey(bps.funding_pubkey(), o_funding_pubkey);
 		status_debug("%s:%d %s self_id=%s",
 			     __FILE__, __LINE__, __FUNCTION__,
 			     dump_node_id(&self_id).c_str(),