wip: funding transaction in rgb

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

Author: vincenzopalazzo

lightningd/opening_control.c

@@ -674,7 +674,7 @@ static void openchannel_hook_serialize(struct openchannel_hook_payload *payload,
 
 /* openingd dies?  Remove openingd ptr from payload */
 static void openchannel_payload_remove_openingd(struct subd *openingd,
-					    struct openchannel_hook_payload *payload)
+						struct openchannel_hook_payload *payload)
 {
 	assert(payload->openingd == openingd);
 	payload->openingd = NULL;
@@ -858,6 +858,74 @@ static void opening_got_offer(struct subd *openingd,
 	plugin_hook_call_openchannel(openingd->ld, NULL, payload);
 }
 
+struct onfunding_channel_tx_hook_payload {
+	struct subd *openingd;
+	struct bitcoin_tx *tx;
+};
+
+static void onfunding_channel_tx_hook_final(struct onfunding_channel_tx_hook_payload *payload STEALS)
+{
+	struct subd *openingd = payload->openingd;
+	// FIXME(bitfinix): manage the errors!
+	subd_send_msg(openingd,
+		      take(towire_openingd_on_funding_tx_reply(NULL, payload->tx)));
+}
+
+static void onfunding_channel_tx_hook_serialize(struct onfunding_channel_tx_hook_payload *payload,
+						struct json_stream *stream,
+						struct plugin *plugin)
+{
+	json_object_start(stream, "onfunding_channel_tx");
+	json_add_tx(stream, "tx", payload->tx);
+	json_object_end(stream);
+}
+
+static bool onfunding_channel_tx_hook_deserialize(struct onfunding_channel_tx_hook_payload *payload,
+						  const char *buffer,
+						  const jsmntok_t *toks)
+{
+	const jsmntok_t *result_tok, *error_tok, *tx_tok;
+
+	if ((error_tok = json_get_member(buffer, toks, "error")) != NULL)
+		/*FIXME(bitfinix): please return an error to openingd*/
+		return false;
+
+	if ((result_tok  = json_get_member(buffer, toks, "result")) == NULL)
+		fatal("Plugin returned an invalid response to the"
+		      " onfunding_channel_tx hook: %.*s",
+		      toks[0].end - toks[0].start, buffer + toks[0].start);
+
+	if ((tx_tok = json_get_member(buffer, result_tok, "tx")) == NULL)
+		fatal("Plugin returned an invalid response to the"
+		      " onfunding_channel_tx hook: %.*s",
+		      toks[0].end - toks[0].start, buffer + toks[0].start);
+
+	if (!json_to_tx(buffer, tx_tok, payload->tx))
+		return false;
+	return true;
+}
+
+REGISTER_PLUGIN_HOOK(onfunding_channel_tx,
+		     onfunding_channel_tx_hook_deserialize,
+		     onfunding_channel_tx_hook_final,
+		     onfunding_channel_tx_hook_serialize,
+		     struct onfunding_channel_tx_hook_payload *);
+
+
+static char *opening_on_funding_tx(struct subd *openingd, const u8 *msg)
+{
+	struct onfunding_channel_tx_hook_payload *payload;
+	payload = tal(openingd, struct onfunding_channel_tx_hook_payload);
+	payload->openingd = openingd;
+
+	if (!fromwire_openingd_on_funding_tx(msg, msg, &payload->tx))
+		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));
+	// FIXME(bitfinix): return an error
+	return NULL;
+}
+
 static unsigned int openingd_msg(struct subd *openingd,
 				 const u8 *msg, const int *fds)
 {
@@ -898,13 +966,20 @@ static unsigned int openingd_msg(struct subd *openingd,
 	case WIRE_OPENINGD_GOT_OFFER:
 		opening_got_offer(openingd, msg, uc);
 		return 0;
-
+	case WIRE_OPENINGD_ON_FUNDING_TX:
+		const char *err;
+		if ((err = opening_on_funding_tx(openingd, msg)) != NULL) {
+			log_debug(openingd->log, "Unexpected error while handling on funding tx: %s", err);
+			return 1;
+		}
+		return 0;
 	/* We send these! */
 	case WIRE_OPENINGD_INIT:
 	case WIRE_OPENINGD_FUNDER_START:
 	case WIRE_OPENINGD_FUNDER_COMPLETE:
 	case WIRE_OPENINGD_FUNDER_CANCEL:
 	case WIRE_OPENINGD_GOT_OFFER_REPLY:
+	case WIRE_OPENINGD_ON_FUNDING_TX_REPLY:
 	case WIRE_OPENINGD_DEV_MEMLEAK:
 	/* Replies never get here */
 	case WIRE_OPENINGD_DEV_MEMLEAK_REPLY:

openingd/openingd.c

@@ -703,7 +703,12 @@ static bool funder_finalize_channel_setup(struct state *state,
 	else
 		*pbase = NULL;
 
-	// TODO(bitfinix): Send the commitment transaction to master and generate an hook
+	msg = towire_openingd_on_funding_tx(tmpctx, *tx);
+	wire_sync_write(REQ_FD, msg);
+	msg = wire_sync_read(tmpctx, REQ_FD);
+	if (!fromwire_openingd_on_funding_tx_reply(msg, msg, tx))
+		status_failed(STATUS_FAIL_MASTER_IO, "Bad onfunding_tx %s",
+			      tal_hex(tmpctx, msg));
 
 	/* We ask the HSM to sign their commitment transaction for us: it knows
 	 * our funding key, it just needs the remote funding key to create the
@@ -817,6 +822,7 @@ static bool funder_finalize_channel_setup(struct state *state,
 		goto fail;
 	}
 
+	// TODO(bitfixnix): RGB for initial tx channel?
 	validate_initial_commitment_signature(HSM_FD, *tx, sig);
 
 	if (!check_tx_sig(*tx, 0, NULL, wscript, &state->their_funding_pubkey, sig)) {
@@ -1503,6 +1509,8 @@ static u8 *handle_master_in(struct state *state)
 	case WIRE_OPENINGD_FAILED:
 	case WIRE_OPENINGD_GOT_OFFER:
 	case WIRE_OPENINGD_GOT_OFFER_REPLY:
+	case WIRE_OPENINGD_ON_FUNDING_TX:
+	case WIRE_OPENINGD_ON_FUNDING_TX_REPLY:
 		break;
 	}
 

openingd/openingd_wire.csv

@@ -140,6 +140,14 @@ msgdata,openingd_fundee,remote_shutdown_len,u16,
 msgdata,openingd_fundee,remote_shutdown_scriptpubkey,u8,remote_shutdown_len
 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,
+
+# Get a reply from master -> openingd
+msgtype,openingd_on_funding_tx_reply,6145
+msgdata,openingd_on_funding_tx_reply,tx,bitcoin_tx,
+
 # master -> openingd: do you have a memleak?
 msgtype,openingd_dev_memleak,6033