aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-10 17:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

psbt: Use the newly exposed wally function to clone PSBTs

Browse Source 
Signed-off-by: Jon Griffiths <jon_p_griffiths@yahoo.com>
This commit is contained in:
Jon Griffiths
2020-07-29 12:33:08 +12:00
committed by Rusty Russell
parent a51c6550ec
commit 68ffecba63
2 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bitcoin/psbt.c
View File

@@ -23,18 +23,6 @@
memmove((arr) + (pos), (arr) + (pos) + 1, \
sizeof(*(arr)) * ((num) - ((pos) + 1)))
/* FIXME: someday this will break, because it's been exposed in libwally */
int wally_psbt_clone(const struct wally_psbt *psbt, struct wally_psbt **output)
{
int ret;
size_t byte_len;
const u8 *bytes = psbt_get_bytes(NULL, psbt, &byte_len);
ret = wally_psbt_from_bytes(bytes, byte_len, output);
tal_free(bytes);
return ret;
}
void psbt_destroy(struct wally_psbt *psbt)
{
wally_psbt_free(psbt);
@@ -424,7 +412,7 @@ struct wally_tx *psbt_finalize(struct wally_psbt *psbt, bool finalize_in_place)
* data, not the global tx. But 'finalizing' a tx destroys some fields
* so we 'clone' it first and then finalize it */
if (!finalize_in_place) {
if (wally_psbt_clone(psbt, &tmppsbt) != WALLY_OK)
if (wally_psbt_clone_alloc(psbt, 0, &tmppsbt) != WALLY_OK)
return NULL;
} else
tmppsbt = cast_const(struct wally_psbt *, psbt);

2
bitcoin/psbt.h
View File

@@ -15,8 +15,6 @@ struct amount_sat;
struct bitcoin_signature;
struct pubkey;
int wally_psbt_clone(const struct wally_psbt *psbt, struct wally_psbt **output);
void psbt_destroy(struct wally_psbt *psbt);
struct wally_psbt *new_psbt(const tal_t *ctx,