Added push_value to hsm_ready_channel. Added sanity checking to hsm_ready_channel stub.

Author: ksedgwic

contrib/remote_hsmd/hsmd.c

@@ -1157,6 +1157,7 @@ static struct io_plan *handle_ready_channel(struct io_conn *conn,
 {
 	bool is_outbound;
 	struct amount_sat channel_value;
+	struct amount_msat push_value;
 	struct bitcoin_txid funding_txid;
 	u16 funding_txout;
 	u16 local_to_self_delay;
@@ -1168,7 +1169,7 @@ static struct io_plan *handle_ready_channel(struct io_conn *conn,
 	bool option_static_remotekey;
 
 	if (!fromwire_hsm_ready_channel(tmpctx, msg_in, &is_outbound,
-					&channel_value, &funding_txid,
+					&channel_value, &push_value, &funding_txid,
 					&funding_txout, &local_to_self_delay,
 					&local_shutdown_script,
 					&remote_basepoints,
@@ -1182,6 +1183,7 @@ static struct io_plan *handle_ready_channel(struct io_conn *conn,
 		&c->id, c->dbid,
 		is_outbound,
 		&channel_value,
+		&push_value,
 		&funding_txid,
 		funding_txout,
 		local_to_self_delay,

contrib/remote_hsmd/proxy.cc

@@ -519,6 +519,7 @@ proxy_stat proxy_handle_ready_channel(
 	u64 dbid,
 	bool is_outbound,
 	struct amount_sat *channel_value,
+	struct amount_msat *push_value,
 	struct bitcoin_txid *funding_txid,
 	u16 funding_txout,
 	u16 local_to_self_delay,
@@ -532,6 +533,7 @@ proxy_stat proxy_handle_ready_channel(
 	status_debug(
 		"%s:%d %s self_id=%s peer_id=%s dbid=%" PRIu64 " "
 		"is_outbound=%s channel_value=%" PRIu64 " "
+		"push_value=%" PRIu64 " "
 		"funding_txid=%s funding_txout=%d "
 		"local_to_self_delay=%d local_shutdown_script=%s "
 		"remote_basepoints=%s remote_funding_pubkey=%s "
@@ -543,6 +545,7 @@ proxy_stat proxy_handle_ready_channel(
 		dbid,
 		(is_outbound ? "true" : "false"),
 		channel_value->satoshis,
+		push_value->millisatoshis,
 		dump_bitcoin_txid(funding_txid).c_str(),
 		funding_txout,
 		local_to_self_delay,
@@ -562,6 +565,7 @@ proxy_stat proxy_handle_ready_channel(
 	marshal_channel_nonce(peer_id, dbid, req.mutable_channel_nonce());
 	req.set_is_outbound(is_outbound);
 	req.set_channel_value_sat(channel_value->satoshis);
+	req.set_push_value_msat(push_value->millisatoshis);
 	marshal_outpoint(funding_txid, funding_txout, req.mutable_funding_outpoint());
 	req.set_local_to_self_delay(local_to_self_delay);
 	marshal_script(local_shutdown_script, req.mutable_local_shutdown_script());

contrib/remote_hsmd/proxy.h

@@ -53,6 +53,7 @@ proxy_stat proxy_handle_ready_channel(
 	u64 dbid,
 	bool is_outbound,
 	struct amount_sat *channel_value,
+	struct amount_msat *push_value,
 	struct bitcoin_txid *funding_txid,
 	u16 funding_txout,
 	u16 local_to_self_delay,

hsmd/hsm_wire.csv

@@ -56,6 +56,7 @@ msgdata,hsm_get_channel_basepoints_reply,funding_pubkey,pubkey,
 msgtype,hsm_ready_channel,24
 msgdata,hsm_ready_channel,is_outbound,bool,
 msgdata,hsm_ready_channel,channel_value,amount_sat,
+msgdata,hsm_ready_channel,push_value,amount_msat,
 msgdata,hsm_ready_channel,funding_txid,bitcoin_txid,
 msgdata,hsm_ready_channel,funding_txout,u16,
 msgdata,hsm_ready_channel,local_to_self_delay,u16,

hsmd/hsmd.c

@@ -1506,13 +1506,23 @@ static struct io_plan *handle_new_channel(struct io_conn *conn,
 			 take(towire_hsm_new_channel_reply(NULL)));
 }
 
+static bool mem_is_zero(const void *mem, size_t len)
+{
+    size_t i;
+    for (i = 0; i < len; ++i)
+        if (((const unsigned char *)mem)[i])
+            return false;
+    return true;
+}
+
 /*~ This is used to provide all unchanging public channel parameters. */
 static struct io_plan *handle_ready_channel(struct io_conn *conn,
 					    struct client *c,
 					    const u8 *msg_in)
 {
 	bool is_outbound;
 	struct amount_sat channel_value;
+	struct amount_msat push_value;
 	struct bitcoin_txid funding_txid;
 	u16 funding_txout;
 	u16 local_to_self_delay;
@@ -1524,7 +1534,7 @@ static struct io_plan *handle_ready_channel(struct io_conn *conn,
 	bool option_static_remotekey;
 
 	if (!fromwire_hsm_ready_channel(tmpctx, msg_in, &is_outbound,
-					&channel_value, &funding_txid,
+					&channel_value, &push_value, &funding_txid,
 					&funding_txout, &local_to_self_delay,
 					&local_shutdown_script,
 					&remote_basepoints,
@@ -1534,6 +1544,15 @@ static struct io_plan *handle_ready_channel(struct io_conn *conn,
 					&option_static_remotekey))
 		return bad_req(conn, c, msg_in);
 
+	/* Fail fast if any values are obviously uninitialized. */
+	assert(channel_value.satoshis > 0);
+	assert(push_value.millisatoshis / 1000 <= channel_value.satoshis);
+	assert(!mem_is_zero(&funding_txid, sizeof(funding_txid)));
+	assert(local_to_self_delay > 0);
+	assert(!mem_is_zero(&remote_basepoints, sizeof(remote_basepoints)));
+	assert(!mem_is_zero(&remote_funding_pubkey, sizeof(remote_funding_pubkey)));
+	assert(remote_to_self_delay > 0);
+
 	return req_reply(conn, c,
 			 take(towire_hsm_ready_channel_reply(NULL)));
 }

openingd/openingd.c

@@ -673,6 +673,7 @@ static bool funder_finalize_channel_setup(struct state *state,
 	msg = towire_hsm_ready_channel(NULL,
 				       true,	/* is_outbound */
 				       state->funding,
+				       state->push_msat,
 				       &state->funding_txid,
 				       state->funding_txout,
 				       state->localconf.to_self_delay,
@@ -1191,6 +1192,7 @@ static u8 *fundee_channel(struct state *state, const u8 *open_channel_msg)
 	msg = towire_hsm_ready_channel(NULL,
 				       false,	/* is_outbound */
 				       state->funding,
+				       state->push_msat,
 				       &state->funding_txid,
 				       state->funding_txout,
 				       state->localconf.to_self_delay,