Added sign-local-htlc-tx.

Author: ksedgwic

contrib/remote_hsmd/NOTES.md

@@ -41,7 +41,7 @@ Some popular tests:
     export THETEST=tests/test_connection.py::test_balance
     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
 
 Tests remote_commitment:
 

contrib/remote_hsmd/TODO.md

@@ -19,6 +19,7 @@ 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
+COMPLETE		proxy_stat proxy_handle_sign_local_htlc_tx
 
 PARTIAL (-P2SH)	proxy_stat proxy_handle_sign_withdrawal_tx
 
@@ -27,7 +28,6 @@ MARSHALED		proxy_stat proxy_handle_sign_message
 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_delayed_payment_to_us
 MARSHALED		proxy_stat proxy_handle_sign_remote_htlc_to_us
 MARSHALED		proxy_stat proxy_handle_sign_penalty_to_us

contrib/remote_hsmd/hsmd.c

@@ -1423,46 +1423,16 @@ static struct io_plan *handle_sign_local_htlc_tx(struct io_conn *conn,
 {
 	u64 commit_num;
 	struct amount_sat input_sat;
-	struct secret channel_seed, htlc_basepoint_secret;
-	struct sha256 shaseed;
-	struct pubkey per_commitment_point, htlc_basepoint;
 	struct bitcoin_tx *tx;
 	u8 *wscript;
 	struct bitcoin_signature sig;
-	struct privkey htlc_privkey;
-	struct pubkey htlc_pubkey;
 
 	if (!fromwire_hsm_sign_local_htlc_tx(tmpctx, msg_in,
 					     &commit_num, &tx, &wscript,
 					     &input_sat))
 		return bad_req(conn, c, msg_in);
 
 	tx->chainparams = c->chainparams;
-	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, commit_num))
-		return bad_req_fmt(conn, c, msg_in,
-				   "bad per_commitment_point %"PRIu64,
-				   commit_num);
-
-	if (!derive_htlc_basepoint(&channel_seed,
-				   &htlc_basepoint,
-				   &htlc_basepoint_secret))
-		return bad_req_fmt(conn, c, msg_in,
-				   "Failed deriving htlc basepoint");
-
-	if (!derive_simple_privkey(&htlc_basepoint_secret,
-				   &htlc_basepoint,
-				   &per_commitment_point,
-				   &htlc_privkey))
-		return bad_req_fmt(conn, c, msg_in,
-				   "Failed deriving htlc privkey");
-
-	if (!pubkey_from_privkey(&htlc_privkey, &htlc_pubkey))
-		return bad_req_fmt(conn, c, msg_in, "bad pubkey_from_privkey");
 
 	if (tx->wtx->num_inputs != 1)
 		return bad_req_fmt(conn, c, msg_in, "bad txinput count");
@@ -1478,13 +1448,7 @@ static struct io_plan *handle_sign_local_htlc_tx(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 */
-
-	/* FIXME: Check that output script is correct! */
-	sign_tx_input(tx, 0, NULL, wscript, &htlc_privkey, &htlc_pubkey,
-		      SIGHASH_ALL, &sig);
+	g_proxy_impl = PROXY_IMPL_COMPLETE;
 
 	return req_reply(conn, c, take(towire_hsm_sign_tx_reply(NULL, &sig)));
 }

contrib/remote_hsmd/proxy.cc

@@ -954,13 +954,7 @@ proxy_stat proxy_handle_sign_local_htlc_tx(
 	SignatureReply rsp;
 	Status status = stub->SignLocalHTLCTx(&context, req, &rsp);
 	if (status.ok()) {
-#if 1
-		/* For now just make valgrind happy */
-		memset(o_sig->s.data, '\0', sizeof(o_sig->s.data));
-#else
-		assert(rsp.sig().length() == sizeof(o_sig->s.data));
-		memcpy(o_sig->s.data, rsp.sig().data(), sizeof(o_sig->s.data));
-#endif
+		unmarshal_bitcoin_signature(rsp.signature(), o_sig);
 		status_debug("%s:%d %s self_id=%s sig=%s",
 			     __FILE__, __LINE__, __FUNCTION__,
 			     dump_node_id(&self_id).c_str(),