mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 01:43:36 +01:00
Code Issues Projects Releases Wiki Activity

wellet: use create_psbt and psbt_append_input instead of constructing via bitcoin_tx.

Browse Source 
Suggested-by: @niftynei
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-08-28 13:26:34 +09:30
parent e3219d3aa0
commit 73832d1488
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wallet/reservation.c
View File

@ -219,10 +219,9 @@ static struct wally_psbt *psbt_using_utxos(const tal_t *ctx,
{
struct pubkey key;
u8 *scriptSig, *scriptPubkey, *redeemscript;
struct bitcoin_tx *tx;
struct wally_psbt *psbt;
/* FIXME: Currently the easiest way to get a PSBT is via a tx */
tx = bitcoin_tx(ctx, chainparams, tal_count(utxos), 0, nlocktime);
psbt = create_psbt(ctx, tal_count(utxos), 0, nlocktime);
for (size_t i = 0; i < tal_count(utxos); i++) {
u32 this_nsequence;
@ -256,17 +255,12 @@ static struct wally_psbt *psbt_using_utxos(const tal_t *ctx,
else
this_nsequence = nsequence;
bitcoin_tx_add_input(tx, &utxos[i]->txid, utxos[i]->outnum,
this_nsequence, scriptSig, utxos[i]->amount,
scriptPubkey, NULL);
/* Add redeemscript to the PSBT input */
if (redeemscript)
psbt_input_set_redeemscript(tx->psbt, i, redeemscript);
psbt_append_input(psbt, &utxos[i]->txid, utxos[i]->outnum,
this_nsequence, scriptSig, utxos[i]->amount,
scriptPubkey, NULL, redeemscript);
}
return tx->psbt;
return psbt;
}
static struct command_result *finish_psbt(struct command *cmd,