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

channeld-df: actually check serial_id of input when setting sigs

Browse Source 
We're about to totally upset the order that sigs are set on our PSBTs
for new channel opens, making it such that our peer's sigs may arrive
before ours do.

We can no longer rely on the 'set witness means this is our input' since
there's no guarantee that our input sigs have been added yet, so we
check the serial_id and only set the stack on their (odd) inputs.
This commit is contained in:
niftynei 2020-10-08 17:03:07 -05:00 committed by Rusty Russell
parent f3bd57a088
commit d1c7c78159
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
channeld/channeld.c
View File

@ -2009,6 +2009,9 @@ static void handle_tx_sigs(struct peer *peer, const u8 *msg)
const struct witness_stack **ws;
const struct wally_tx *wtx;
size_t j = 0;
enum tx_role role = peer->channel->opener == REMOTE
? TX_INITIATOR : TX_ACCEPTER;
if (!fromwire_tx_signatures(tmpctx, msg, &cid, &txid,
cast_const3(
@ -2047,11 +2050,17 @@ static void handle_tx_sigs(struct peer *peer, const u8 *msg)
for (size_t i = 0; i < peer->psbt->num_inputs; i++) {
struct wally_psbt_input *in =
&peer->psbt->inputs[i];
u16 in_serial;
const struct witness_element **elem;
/* Really we should check serial parity, but we can
* cheat and only check that the final witness
* stack hasn't been set yet */
if (in->final_witness)
if (!psbt_get_serial_id(&in->unknowns, &in_serial)) {
status_broken("PSBT input %zu missing serial_id %s",
i, type_to_string(tmpctx,
struct wally_psbt,
peer->psbt));
return;
}
if (in_serial % 2 != role)
continue;
if (j == tal_count(ws))