wip: adding channel_id and txid inside the hook

Signed-off-by: Vincenzo Palazzo <[email protected]>

Author: vincenzopalazzo

lightningd/opening_control.c

@@ -861,6 +861,7 @@ static void opening_got_offer(struct subd *openingd,
 struct onfunding_channel_tx_hook_payload {
 	struct subd *openingd;
 	struct bitcoin_tx *tx;
+	struct channel_id *cid;
 };
 
 static void onfunding_channel_tx_hook_final(struct onfunding_channel_tx_hook_payload *payload STEALS)
@@ -875,8 +876,13 @@ static void onfunding_channel_tx_hook_serialize(struct onfunding_channel_tx_hook
 						struct json_stream *stream,
 						struct plugin *plugin)
 {
+	struct bitcoin_txid txid;
+
+	bitcoin_txid(payload->tx, &txid);
 	json_object_start(stream, "onfunding_channel_tx");
 	json_add_tx(stream, "tx", payload->tx);
+	json_add_txid(stream, "txid", &txid);
+	json_add_channel_id(stream, "channel_id", payload->cid);
 	json_object_end(stream);
 }
 
@@ -918,7 +924,7 @@ static char *opening_on_funding_tx(struct subd *openingd, const u8 *msg)
 	payload = tal(openingd, struct onfunding_channel_tx_hook_payload);
 	payload->openingd = openingd;
 
-	if (!fromwire_openingd_on_funding_tx(msg, msg, &payload->tx))
+	if (!fromwire_openingd_on_funding_tx(msg, msg, &payload->tx, payload->cid))
 		return tal_fmt(tmpctx, "Unexpected encoding of openingd_on_funding_tx msg: %s",
 			       tal_hex(tmpctx, msg));
 	assert(plugin_hook_call_onfunding_channel_tx(openingd->ld, NULL, payload));

openingd/openingd.c

@@ -703,7 +703,7 @@ static bool funder_finalize_channel_setup(struct state *state,
 	else
 		*pbase = NULL;
 
-	msg = towire_openingd_on_funding_tx(tmpctx, *tx);
+	msg = towire_openingd_on_funding_tx(tmpctx, *tx, &cid);
 	wire_sync_write(REQ_FD, msg);
 	msg = wire_sync_read(tmpctx, REQ_FD);
 	if (!fromwire_openingd_on_funding_tx_reply(msg, msg, tx))

openingd/openingd_wire.csv

@@ -143,6 +143,7 @@ msgdata,openingd_fundee,channel_type,channel_type,
 # Communicate the Funding Tx to master
 msgtype,openingd_on_funding_tx,6045
 msgdata,openingd_on_funding_tx,tx,bitcoin_tx,
+msgdata,openingd_on_funding_tx,channel_id,channel_id,
 
 # Get a reply from master -> openingd
 msgtype,openingd_on_funding_tx_reply,6145