mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

psbt: remove script sig info from inputs before adding them to global

Browse source 
PSBT's dont' serialize / unserialize if there's any sig info set on the
global transaction
This commit is contained in:
niftynei 2020-06-06 14:35:46 -05:00 • committed by Christian Decker
parent 16656a85cf
commit 80072b389e
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bitcoin/psbt.c
View file

@ -116,10 +116,32 @@ struct wally_psbt_input *psbt_add_input(struct wally_psbt *psbt,
{ {
struct wally_tx *tx; struct wally_tx *tx;
struct wally_tx_input tmp_in; struct wally_tx_input tmp_in;
u8 *script;
size_t scriptlen = 0;
struct wally_tx_witness_stack *witness = NULL;
tx = psbt->tx; tx = psbt->tx;
assert(insert_at <= tx->num_inputs); assert(insert_at <= tx->num_inputs);
/* Remove any script sig or witness info before adding it ! */
if (input->script_len > 0) {
scriptlen = input->script_len;
input->script_len = 0;
script = (u8 *)input->script;
input->script = NULL;
}
if (input->witness) {
witness = input->witness;
input->witness = NULL;
}
wally_tx_add_input(tx, input); wally_tx_add_input(tx, input);
/* Put the script + witness info back */
if (scriptlen > 0) {
input->script_len = scriptlen;
input->script = script;
}
if (witness)
input->witness = witness;
tmp_in = tx->inputs[tx->num_inputs - 1]; tmp_in = tx->inputs[tx->num_inputs - 1];
MAKE_ROOM(tx->inputs, insert_at, tx->num_inputs); MAKE_ROOM(tx->inputs, insert_at, tx->num_inputs);