wires: towire/fromwire for wally_tx

We're eventually moving away from 'bitcoin_tx
AdamKorcz · Oct 20, 2020 · 82c0b48 · 82c0b48
1 parent 3c98bec
commit 82c0b48
Show file tree

Hide file tree

Showing 39 changed files with 80 additions and 48 deletions.
diff --git a/bitcoin/tx.c b/bitcoin/tx.c
@@ -547,32 +547,45 @@ struct bitcoin_tx *bitcoin_tx_with_psbt(const tal_t *ctx, struct wally_psbt *psb
 	return tx;
 }
 
-struct bitcoin_tx *pull_bitcoin_tx(const tal_t *ctx, const u8 **cursor,
-				   size_t *max)
+static struct wally_tx *pull_wtx(const tal_t *ctx,
+				 const u8 **cursor,
+				 size_t *max)
 {
 	int flags = WALLY_TX_FLAG_USE_WITNESS;
-	struct bitcoin_tx *tx = tal(ctx, struct bitcoin_tx);
+	struct wally_tx *wtx;
 
 	if (chainparams->is_elements)
 		flags |= WALLY_TX_FLAG_USE_ELEMENTS;
 
 	tal_wally_start();
-	if (wally_tx_from_bytes(*cursor, *max, flags, &tx->wtx) != WALLY_OK) {
+	if (wally_tx_from_bytes(*cursor, *max, flags, &wtx) != WALLY_OK) {
 		fromwire_fail(cursor, max);
-		tx = tal_free(tx);
+		wtx = tal_free(wtx);
 	}
-	tal_wally_end(tx);
+	tal_wally_end(tal_steal(ctx, wtx));
 
-	if (tx) {
+	if (wtx) {
 		size_t wsize;
-		tal_add_destructor(tx, bitcoin_tx_destroy);
-		tx->chainparams = chainparams;
-		tx->psbt = new_psbt(tx, tx->wtx);
-
-		wally_tx_get_length(tx->wtx, flags, &wsize);
+		wally_tx_get_length(wtx, flags, &wsize);
 		*cursor += wsize;
 		*max -= wsize;
 	}
+
+	return wtx;
+}
+
+struct bitcoin_tx *pull_bitcoin_tx(const tal_t *ctx, const u8 **cursor,
+				   size_t *max)
+{
+	struct bitcoin_tx *tx = tal(ctx, struct bitcoin_tx);
+	tx->wtx = pull_wtx(tx, cursor, max);
+	if (!tx->wtx)
+		return tal_free(tx);
+
+	tal_add_destructor(tx, bitcoin_tx_destroy);
+	tx->chainparams = chainparams;
+	tx->psbt = new_psbt(tx, tx->wtx);
+
 	return tx;
 }
 
@@ -691,6 +704,16 @@ struct bitcoin_tx *fromwire_bitcoin_tx(const tal_t *ctx,
 	return tx;
 }
 
+struct wally_tx *fromwire_wally_tx(const tal_t *ctx,
+				   const u8 **cursor, size_t *max)
+{
+	struct wally_tx *wtx;
+	wtx = pull_wtx(ctx, cursor, max);
+	if (!wtx)
+		return fromwire_fail(cursor, max);
+	return wtx;
+}
+
 void towire_bitcoin_txid(u8 **pptr, const struct bitcoin_txid *txid)
 {
 	towire_sha256_double(pptr, &txid->shad);
@@ -704,6 +727,12 @@ void towire_bitcoin_tx(u8 **pptr, const struct bitcoin_tx *tx)
 	towire_wally_psbt(pptr, tx->psbt);
 }
 
+void towire_wally_tx(u8 **pptr, const struct wally_tx *wtx)
+{
+	u8 *lin = linearize_wtx(tmpctx, wtx);
+	towire_u8_array(pptr, lin, tal_count(lin));
+}
+
 struct bitcoin_tx_output *fromwire_bitcoin_tx_output(const tal_t *ctx,
 						     const u8 **cursor, size_t *max)
 {

diff --git a/bitcoin/tx.h b/bitcoin/tx.h
@@ -242,9 +242,11 @@ struct bitcoin_tx *fromwire_bitcoin_tx(const tal_t *ctx,
 				       const u8 **cursor, size_t *max);
 struct bitcoin_tx_output *fromwire_bitcoin_tx_output(const tal_t *ctx,
 						     const u8 **cursor, size_t *max);
+struct wally_tx *fromwire_wally_tx(const tal_t *ctx, const u8 **cursor, size_t *max);
 void towire_bitcoin_txid(u8 **pptr, const struct bitcoin_txid *txid);
 void towire_bitcoin_tx(u8 **pptr, const struct bitcoin_tx *tx);
 void towire_bitcoin_tx_output(u8 **pptr, const struct bitcoin_tx_output *output);
+void towire_wally_tx(u8 **pptr, const struct wally_tx *wtx);
 
 /* Various weights of transaction parts. */
 size_t bitcoin_tx_core_weight(size_t num_inputs, size_t num_outputs);

diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c
diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h
diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c
diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h
diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c
diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h
diff --git a/common/status_wiregen.c b/common/status_wiregen.c
diff --git a/common/status_wiregen.h b/common/status_wiregen.h
diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c
diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h
diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c
diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h
diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c
diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h
diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c
diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h
diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c
diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h
diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c
diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h
diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c
diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h
diff --git a/openingd/dualopend_wiregen.c b/openingd/dualopend_wiregen.c
diff --git a/openingd/dualopend_wiregen.h b/openingd/dualopend_wiregen.h
diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c
diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h
diff --git a/tools/generate-wire.py b/tools/generate-wire.py
@@ -236,6 +236,7 @@ class Type(FieldSet):
         'route_hop',
         'tx_parts',
         'wally_psbt',
+        'wally_tx',
     ]
 
     # Some BOLT types are re-typed based on their field name

diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h
diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c
diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h
diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c
diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h
diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c
diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h