aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 15:44:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

psbt: add to/from byte helpers

Browse Source 
We'll need these for the database methods we're going to add shortly
This commit is contained in:
niftynei
2020-05-21 22:14:31 -05:00
committed by Christian Decker
parent 894a46e8e3
commit db8ef922ed
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
bitcoin/psbt.c
View File

@@ -207,17 +207,41 @@ struct amount_sat psbt_input_get_amount(struct wally_psbt *psbt,
return val; 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; size_t room = 1024 * 1000;
u8 *pbt_bytes = tal_arr(NULL, u8, room); u8 *pbt_bytes = tal_arr(ctx, u8, room);
size_t bytes_written; if (wally_psbt_to_bytes(psbt, pbt_bytes, room, bytes_written) != WALLY_OK) {
if (wally_psbt_to_bytes(psbt, pbt_bytes, room, &bytes_written) != WALLY_OK) {
/* something went wrong. bad libwally ?? */ /* something went wrong. bad libwally ?? */
abort(); 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_u32(pptr, bytes_written);
towire_u8_array(pptr, pbt_bytes, bytes_written); towire_u8_array(pptr, pbt_bytes, bytes_written);
tal_free(pbt_bytes); tal_free(pbt_bytes);
@@ -235,13 +259,10 @@ struct wally_psbt *fromwire_psbt(const tal_t *ctx,
if (!psbt_buf) if (!psbt_buf)
return NULL; 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); 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 #if DEVELOPER
/* Re-marshall for sanity check! */ /* Re-marshall for sanity check! */
u8 *tmpbuf = tal_arr(NULL, u8, psbt_byte_len); u8 *tmpbuf = tal_arr(NULL, u8, psbt_byte_len);

4
bitcoin/psbt.h
View File

@@ -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, struct amount_sat psbt_input_get_amount(struct wally_psbt *psbt,
size_t in); 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); void towire_psbt(u8 **pptr, const struct wally_psbt *psbt);
struct wally_psbt *fromwire_psbt(const tal_t *ctx, struct wally_psbt *fromwire_psbt(const tal_t *ctx,
const u8 **curosr, size_t *max); const u8 **curosr, size_t *max);