tx: debugging psbt pass through

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

Author: vincenzopalazzo

bitcoin/test/run-psbt-from-tx.c

@@ -112,6 +112,23 @@ int main(int argc, char *argv[])
 	assert(final_scriptsig->value_len > 0);
 	assert(tx2->psbt->inputs[0].final_witness != NULL);
 
+	char *hex_tx = "0200000001882d49b841cb341defb60509f5863b163d32d1a819545761d31420cbf9db94d60000000000f8858a80024a01000000000000220020b6d8d2f575683f606ece57e33f59eaa146152f5c7163fb3e917b3cd19b6a558038073ba40b00000022002076f0b18b3c072222fd000432a309620dd43dfb776ab3fd710c9bda5efb0235f49c49c120";
+	tx = bitcoin_tx_from_hex(tmpctx, hex_tx, strlen(hex_tx));
+	psbt_input_get_amount(tx->psbt, 0);
+
+	msg = tal_arr(tmpctx, u8, 0);
+	/* convert to wire format */
+	towire_bitcoin_tx(&msg, tx);
+
+	len = tal_bytelen(msg);
+	assert(len > 0);
+
+	tx2 = fromwire_bitcoin_tx(tmpctx,
+				  cast_const2(const u8 **, &msg), &len);
+	assert(tx2 != NULL);
+
+	psbt_input_get_amount(tx2->psbt, 0);
+
 	common_shutdown();
 	return 0;
 }

bitcoin/test/run-tx-encode.c

@@ -163,7 +163,7 @@ int main(int argc, const char *argv[])
 	      "0204096eb817f7efb414ef4d3d8be39dd04374256d3b054a322d4a6ee22736d0"
 	      "3b");
 
-	hex_tx = "0200000001fd9915bf664e2b4888b4770101d92d9086144124646b3df49bd6e3156c9d194a000000000086450b80024a010000000000002200207b6d27992d8294099919c1beea2397dbb6d934f8b62c25130a070a608f0e58a2f4d98dff4d000000220020aa8bd5637587bebb499a4f52b13864bc03d7664985da1ba4fc34005d591e55680effaa20";
+	hex_tx = "020000000180e1806045e74fb8fe0356e6568fe723c2755e54563b2e8df2f7e99202c3d896000000000029635b80024a01000000000000220020ac0192675893119abba0193b6b52dc188d6d1032078903890e72a676ffa237df4294d5e829000000220020ad270f8b9c3719fafeaa3be48aebaeac2a953a1ef658f3d55e0d0439b51df508648d1a20";
 	tx = bitcoin_tx_from_hex(NULL, hex_tx, strlen(hex_tx));
 	assert(strcmp(hex_tx, fmt_bitcoin_tx(NULL, tx)) == 0);
 

bitcoin/tx.c

@@ -430,6 +430,7 @@ static bool uses_witness(const struct wally_tx *wtx)
 {
 	size_t i;
 
+	assert(wtx);
 	for (i = 0; i < wtx->num_inputs; i++) {
 		if (wtx->inputs[i].witness)
 			return true;

common/json_parse.c

@@ -582,11 +582,11 @@ 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)
+		struct bitcoin_tx **tx)
 {
-	tx = bitcoin_tx_from_hex(buffer, buffer + tok->start,
+	*tx = bitcoin_tx_from_hex(buffer, buffer + tok->start,
 				 tok->end - tok->start);
-	return tx != NULL;
+	return *tx != NULL;
 }
 
 

common/json_parse.h

@@ -105,7 +105,7 @@ bool json_to_txid(const char *buffer, const jsmntok_t *tok,
 
 /* Extract a bitcoin tx from this */
 bool json_to_tx(const char *buffer, const jsmntok_t *tok,
-		struct bitcoin_tx *tx);
+		struct bitcoin_tx **tx);
 
 /* Extract a bitcoin outpoint from this */
 bool json_to_outpoint(const char *buffer, const jsmntok_t *tok,

common/test/run-json_scan.c

@@ -1,8 +1,11 @@
 #include "config.h"
 #include "../json_parse.c"
 #include "../json_parse_simple.c"
+#include <assert.h>
 #include <common/amount.h>
 #include <common/setup.h>
+#include <stdio.h>
+#include <string.h>
 #include <wire/wire.h>
 
 /* AUTOGENERATED MOCKS START */
@@ -244,5 +247,21 @@ int main(int argc, char *argv[])
 	assert(toks);
 	assert(toks->size == 4);
 
+	char *hex_tx = "020000000180e1806045e74fb8fe0356e6568fe723c2755e54563b2e8df2f7e99202c3d896000000000029635b80024a01000000000000220020ac0192675893119abba0193b6b52dc188d6d1032078903890e72a676ffa237df4294d5e829000000220020ad270f8b9c3719fafeaa3be48aebaeac2a953a1ef658f3d55e0d0439b51df508648d1a20";
+	buf = tal_fmt(tmpctx, "{\"tx\":\"%s\"}", hex_tx);
+	toks = json_parse_simple(tmpctx, buf, strlen(buf));
+	toks = json_get_member(buf, toks, "tx");
+	assert(toks->end - toks->start == strlen(hex_tx));
+
+	chainparams = chainparams_for_network("bitcoin");
+	struct bitcoin_tx *tx = bitcoin_tx_from_hex(NULL, hex_tx, strlen(hex_tx));
+	assert(tx);
+	assert(strcmp(hex_tx, fmt_bitcoin_tx(NULL, tx)) == 0);
+
+	tx = NULL;
+	assert(json_to_tx(buf, toks, &tx));
+	assert(tx);
+	assert(strcmp(hex_tx, fmt_bitcoin_tx(NULL, tx)) == 0);
+
 	common_shutdown();
 }

lightningd/opening_control.c

@@ -912,7 +912,7 @@ static bool onfunding_channel_tx_hook_deserialize(struct onfunding_channel_tx_ho
 		      toks[0].end - toks[0].start, buffer + toks[0].start);
 
 	payload->tx = NULL;
-	if (!json_to_tx(buffer, tx_tok, payload->tx))
+	if (!json_to_tx(buffer, tx_tok, &payload->tx))
 		fatal("Plugin returned an invalid (json to tx) response to the"
 		      " onfunding_channel_tx hook: %.*s",
 		      tx_tok[0].end - tx_tok[0].start, buffer + tx_tok[0].start);

openingd/openingd.c

@@ -8,6 +8,7 @@
  * commit to the database once openingd succeeds.
  */
 #include "config.h"
+#include <assert.h>
 #include <bitcoin/script.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/breakpoint/breakpoint.h>
@@ -31,6 +32,7 @@
 #include <openingd/openingd_wiregen.h>
 #include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
+#include <wally_psbt.h>
 
 /* stdin == lightningd, 3 == peer, 4 = hsmd */
 #define REQ_FD STDIN_FILENO
@@ -703,13 +705,15 @@ static bool funder_finalize_channel_setup(struct state *state,
 	else
 		*pbase = NULL;
 
+	assert((*tx)->psbt->inputs[0].witness_utxo);
 	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))
 		status_failed(STATUS_FAIL_MASTER_IO, "Bad onfunding_tx %s",
 			      tal_hex(tmpctx, msg));
 
+	assert((*tx)->psbt->inputs[0].witness_utxo);
 	/* 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
 	 * witness script.  It also needs the amount of the funding output,