From db8ef922edc2df5873eaed3c3f8be0a3d3ce4be7 Mon Sep 17 00:00:00 2001
From: niftynei <niftynei@gmail.com>
Date: Thu, 21 May 2020 22:14:31 -0500
Subject: [PATCH] psbt: add to/from byte helpers

We'll need these for the database methods we're going to add shortly
---
 bitcoin/psbt.c | 41 +++++++++++++++++++++++++++++++----------
 bitcoin/psbt.h |  4 ++++
 2 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/bitcoin/psbt.c b/bitcoin/psbt.c
index 204ce52ad..30b1b616a 100644
--- a/bitcoin/psbt.c
+++ b/bitcoin/psbt.c
@@ -207,17 +207,41 @@ struct amount_sat psbt_input_get_amount(struct wally_psbt *psbt,
 	return val;
 }
 
-void towire_psbt(u8 **pptr, const struct wally_psbt *psbt)
+const u8 *psbt_get_bytes(const tal_t *ctx, const struct wally_psbt *psbt,
+			 size_t *bytes_written)
 {
-	/* Let's include the PSBT bytes */
+	/* the libwally API doesn't do anything helpful for allocating
+	 * things here -- to compensate we do a single shot large alloc
+	 */
 	size_t room = 1024 * 1000;
-	u8 *pbt_bytes = tal_arr(NULL, u8, room);
-	size_t bytes_written;
-	if (wally_psbt_to_bytes(psbt, pbt_bytes, room, &bytes_written) != WALLY_OK) {
+	u8 *pbt_bytes = tal_arr(ctx, u8, room);
+	if (wally_psbt_to_bytes(psbt, pbt_bytes, room, bytes_written) != WALLY_OK) {
 		/* something went wrong. bad libwally ?? */
 		abort();
 	}
+	tal_resize(&pbt_bytes, *bytes_written);
+	return pbt_bytes;
+}
+
+struct wally_psbt *psbt_from_bytes(const tal_t *ctx, const u8 *bytes,
+				   size_t byte_len)
+{
+	struct wally_psbt *psbt;
+
+	if (wally_psbt_from_bytes(bytes, byte_len, &psbt) != WALLY_OK)
+		return NULL;
 
+	/* We promised it would be owned by ctx: libwally uses a dummy owner */
+	tal_steal(ctx, psbt);
+	tal_add_destructor(psbt, psbt_destroy);
+	return psbt;
+}
+
+void towire_psbt(u8 **pptr, const struct wally_psbt *psbt)
+{
+	/* Let's include the PSBT bytes */
+	size_t bytes_written;
+	const u8 *pbt_bytes = psbt_get_bytes(NULL, psbt, &bytes_written);
 	towire_u32(pptr, bytes_written);
 	towire_u8_array(pptr, pbt_bytes, bytes_written);
 	tal_free(pbt_bytes);
@@ -235,13 +259,10 @@ struct wally_psbt *fromwire_psbt(const tal_t *ctx,
 	if (!psbt_buf)
 		return NULL;
 
-	if (wally_psbt_from_bytes(psbt_buf, psbt_byte_len, &psbt) != WALLY_OK)
+	psbt = psbt_from_bytes(ctx, psbt_buf, psbt_byte_len);
+	if (!psbt)
 		return fromwire_fail(cursor, max);
 
-	/* We promised it would be owned by ctx: libwally uses a dummy owner */
-	tal_steal(ctx, psbt);
-	tal_add_destructor(psbt, psbt_destroy);
-
 #if DEVELOPER
 	/* Re-marshall for sanity check! */
 	u8 *tmpbuf = tal_arr(NULL, u8, psbt_byte_len);
diff --git a/bitcoin/psbt.h b/bitcoin/psbt.h
index d78caaf60..23c0b3529 100644
--- a/bitcoin/psbt.h
+++ b/bitcoin/psbt.h
@@ -38,6 +38,10 @@ void psbt_input_set_prev_utxo_wscript(struct wally_psbt *psbt, size_t in,
 struct amount_sat psbt_input_get_amount(struct wally_psbt *psbt,
 					size_t in);
 
+const u8 *psbt_get_bytes(const tal_t *ctx, const struct wally_psbt *psbt,
+			 size_t *bytes_written);
+struct wally_psbt *psbt_from_bytes(const tal_t *ctx, const u8 *bytes,
+				   size_t byte_len);
 void towire_psbt(u8 **pptr, const struct wally_psbt *psbt);
 struct wally_psbt *fromwire_psbt(const tal_t *ctx,
 				 const u8 **curosr, size_t *max);