mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 13:25:43 +01:00
Code Issues Projects Releases Wiki Activity

psbt: add redeemscript info to psbt for utxos that have it

Browse Source
This commit is contained in:
niftynei 2020-06-06 15:02:22 -05:00 committed by Christian Decker
parent 85dca84327
commit 0a7550473b
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/utxo.c
View File

@ -1,5 +1,8 @@
#include <assert.h> #include <assert.h>
#include <bitcoin/privkey.h>
#include <bitcoin/psbt.h>
#include <bitcoin/script.h> #include <bitcoin/script.h>
#include <ccan/ccan/mem/mem.h>
#include <common/key_derive.h> #include <common/key_derive.h>
#include <common/utils.h> #include <common/utils.h>
#include <common/utxo.h> #include <common/utxo.h>
@ -71,7 +74,7 @@ struct bitcoin_tx *tx_spending_utxos(const tal_t *ctx,
u32 nsequence) u32 nsequence)
{ {
struct pubkey key; struct pubkey key;
u8 *script; u8 *scriptSig, *scriptPubkey, *redeemscript;
assert(num_output); assert(num_output);
size_t outcount = add_change_output ? 1 + num_output : num_output; size_t outcount = add_change_output ? 1 + num_output : num_output;
@ -81,14 +84,31 @@ struct bitcoin_tx *tx_spending_utxos(const tal_t *ctx,
for (size_t i = 0; i < tal_count(utxos); i++) { for (size_t i = 0; i < tal_count(utxos); i++) {
if (utxos[i]->is_p2sh && bip32_base) { if (utxos[i]->is_p2sh && bip32_base) {
bip32_pubkey(bip32_base, &key, utxos[i]->keyindex); bip32_pubkey(bip32_base, &key, utxos[i]->keyindex);
script = bitcoin_scriptsig_p2sh_p2wpkh(tmpctx, &key); scriptSig = bitcoin_scriptsig_p2sh_p2wpkh(tmpctx, &key);
redeemscript = bitcoin_redeem_p2sh_p2wpkh(tmpctx, &key);
scriptPubkey = scriptpubkey_p2sh(tmpctx, redeemscript);
/* Make sure we've got the right info! */
if (utxos[i]->scriptPubkey)
assert(memeq(utxos[i]->scriptPubkey,
tal_bytelen(utxos[i]->scriptPubkey),
scriptPubkey, tal_bytelen(scriptPubkey)));
} else { } else {
script = NULL; scriptSig = NULL;
redeemscript = NULL;
/* We can't definitively derive the pubkey without
* hitting the HSM, so we don't */
scriptPubkey = utxos[i]->scriptPubkey;
} }
bitcoin_tx_add_input(tx, &utxos[i]->txid, utxos[i]->outnum, bitcoin_tx_add_input(tx, &utxos[i]->txid, utxos[i]->outnum,
nsequence, script, utxos[i]->amount, nsequence, scriptSig, utxos[i]->amount,
utxos[i]->scriptPubkey, NULL); scriptPubkey, NULL);
/* Add redeemscript to the PSBT input */
if (redeemscript)
psbt_input_set_redeemscript(tx->psbt, i, redeemscript);
} }
return tx; return tx;