fixup! wip: opening control notify the tx to master

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

Author: vincenzopalazzo

bitcoin/test/run-tx-encode.c

@@ -9,6 +9,7 @@
 #include <common/setup.h>
 #include <common/utils.h>
 #include <stdio.h>
+#include <string.h>
 
 /* AUTOGENERATED MOCKS START */
 /* Generated stub for amount_asset_is_main */
@@ -125,6 +126,7 @@ int main(int argc, const char *argv[])
 	chainparams = chainparams_for_network("bitcoin");
 
 	struct bitcoin_tx *tx;
+	char *hex_tx;
 
 	tx = bitcoin_tx_from_hex(NULL, extended_tx, strlen(extended_tx));
 	assert(tx);
@@ -161,6 +163,10 @@ int main(int argc, const char *argv[])
 	      "0204096eb817f7efb414ef4d3d8be39dd04374256d3b054a322d4a6ee22736d0"
 	      "3b");
 
+	hex_tx = "0200000001fd9915bf664e2b4888b4770101d92d9086144124646b3df49bd6e3156c9d194a000000000086450b80024a010000000000002200207b6d27992d8294099919c1beea2397dbb6d934f8b62c25130a070a608f0e58a2f4d98dff4d000000220020aa8bd5637587bebb499a4f52b13864bc03d7664985da1ba4fc34005d591e55680effaa20";
+	tx = bitcoin_tx_from_hex(NULL, hex_tx, strlen(hex_tx));
+	assert(strcmp(hex_tx, fmt_bitcoin_tx(NULL, tx)) == 0);
+
 	tal_free(tx);
 	common_shutdown();
 	return 0;

common/json_parse.c

@@ -584,8 +584,8 @@ bool json_to_txid(const char *buffer, const jsmntok_t *tok,
 bool json_to_tx(const char *buffer, const jsmntok_t *tok,
 		struct bitcoin_tx *tx)
 {
-	tx = bitcoin_tx_from_hex(buffer, buffer + tok->start, tok->size);
-	return true;
+	tx = bitcoin_tx_from_hex(buffer, buffer + tok->start, tok->end - tok->start);
+	return tx != NULL;
 }
 
 

lightningd/opening_control.c

@@ -869,6 +869,7 @@ struct onfunding_channel_tx_hook_payload {
 static void onfunding_channel_tx_hook_final(struct onfunding_channel_tx_hook_payload *payload STEALS)
 {
 	struct subd *openingd = payload->openingd;
+	log_info(openingd->log, "from hook sending the tx %s", fmt_bitcoin_tx(tmpctx, payload->tx));
 	// FIXME(bitfinix): manage the errors!
 	subd_send_msg(openingd,
 		      take(towire_openingd_on_funding_tx_reply(NULL, payload->tx)));
@@ -894,25 +895,26 @@ static bool onfunding_channel_tx_hook_deserialize(struct onfunding_channel_tx_ho
 {
 	const jsmntok_t *result_tok, *error_tok, *tx_tok;
 
+	log_info(payload->openingd->log, "buffer %s", buffer);
 	if ((error_tok = json_get_member(buffer, toks, "error")) != NULL)
 		fatal("Plugin returned an error inside the response to the"
 		      " onfunding_channel_tx hook: %.*s",
 		      toks[0].end - toks[0].start, buffer + toks[0].start);
 
-	if ((result_tok  = json_get_member(buffer, toks, "result")) == NULL)
-		fatal("Plugin returned an invalid response to the"
+	if ((result_tok = json_get_member(buffer, toks, "result")) == NULL)
+		fatal("Plugin returned an invalid response (missing result) 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"
+		fatal("Plugin returned an invalid response (missing tx) 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))
-		fatal("Plugin returned an invalid response to the"
+		fatal("Plugin returned an invalid (json to tx) response to the"
 		      " onfunding_channel_tx hook: %.*s",
-		      toks[0].end - toks[0].start, buffer + toks[0].start);
+		      tx_tok[0].end - tx_tok[0].start, buffer + tx_tok[0].start);
 	return true;
 }