Added sign-remote-htlc-to-us.

Author: ksedgwic

contrib/remote_hsmd/NOTES.md

@@ -42,6 +42,9 @@ Some popular tests:
     export THETEST=tests/test_pay.py::test_sendpay
     export THETEST=tests/test_pay.py::test_pay
     export THETEST=tests/test_closing.py::test_onchain_different_fees
+    export THETEST=tests/test_closing.py::test_onchain_feechange
+    export THETEST=tests/test_closing.py::test_onchain_all_dust
+    export THETEST=tests/test_closing.py::test_permfail_new_commit
 
 Tests remote_commitment:
 

contrib/remote_hsmd/TODO.md

@@ -20,6 +20,7 @@ COMPLETE		proxy_stat proxy_handle_sign_invoice
 COMPLETE		proxy_stat proxy_handle_get_channel_basepoints
 COMPLETE		proxy_stat proxy_handle_get_per_commitment_point
 COMPLETE		proxy_stat proxy_handle_sign_local_htlc_tx
+COMPLETE		proxy_stat proxy_handle_sign_remote_htlc_to_us
 
 PARTIAL (-P2SH)	proxy_stat proxy_handle_sign_withdrawal_tx
 
@@ -29,7 +30,6 @@ 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_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
 

contrib/remote_hsmd/hsmd.c

@@ -1179,6 +1179,8 @@ static struct io_plan *handle_sign_remote_htlc_tx(struct io_conn *conn,
 	return req_reply(conn, c, take(towire_hsm_sign_tx_reply(NULL, &sig)));
 }
 
+// TODO - This goes away when we complete all callers.
+//
 /*~ This covers several cases where onchaind is creating a transaction which
  * sends funds to our internal wallet. */
 /* FIXME: Derive output address for this client, and check it here! */
@@ -1291,11 +1293,8 @@ static struct io_plan *handle_sign_remote_htlc_to_us(struct io_conn *conn,
 						     const u8 *msg_in)
 {
 	struct amount_sat input_sat;
-	struct secret channel_seed, htlc_basepoint_secret;
-	struct pubkey htlc_basepoint;
 	struct bitcoin_tx *tx;
 	struct pubkey remote_per_commitment_point;
-	struct privkey privkey;
 	u8 *wscript;
 
 	if (!fromwire_hsm_sign_remote_htlc_to_us(tmpctx, msg_in,
@@ -1327,27 +1326,9 @@ static struct io_plan *handle_sign_remote_htlc_to_us(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 - server-side not implemented yet. Use original code
-	 * below for now */
-
-	get_channel_seed(&c->id, c->dbid, &channel_seed);
-
-	if (!derive_htlc_basepoint(&channel_seed, &htlc_basepoint,
-				   &htlc_basepoint_secret))
-		return bad_req_fmt(conn, c, msg_in,
-				   "Failed derive_htlc_basepoint");
-
-	if (!derive_simple_privkey(&htlc_basepoint_secret,
-				   &htlc_basepoint,
-				   &remote_per_commitment_point,
-				   &privkey))
-		return bad_req_fmt(conn, c, msg_in,
-				   "Failed deriving htlc privkey");
+	g_proxy_impl = PROXY_IMPL_COMPLETE;
 
-	return handle_sign_to_us_tx(conn, c, msg_in,
-				    tx, &privkey, wscript, input_sat);
+	return req_reply(conn, c, take(towire_hsm_sign_tx_reply(NULL, &sig)));
 }
 
 /*~ This is used when the remote peer's commitment transaction is revoked;

contrib/remote_hsmd/proxy.cc

@@ -1106,12 +1106,7 @@ proxy_stat proxy_handle_sign_remote_htlc_to_us(
 	SignatureReply rsp;
 	Status status = stub->SignRemoteHTLCToUs(&context, req, &rsp);
 	if (status.ok()) {
-		// FIXME - UNCOMMENT WHEN SERVER IMPLEMENTS:
-#if 0
 		unmarshal_bitcoin_signature(rsp.signature(), o_sig);
-#else
-		memset(o_sig, '\0', sizeof(*o_sig));
-#endif
 		status_debug("%s:%d %s self_id=%s sig=%s",
 			     __FILE__, __LINE__, __FUNCTION__,
 			     dump_node_id(&self_id).c_str(),