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

dual-fund: update state before checking for 'doneness'

Browse Source 
If we only add a single input/output for the funding transaction,
 we'll only call openchannel_update once, which results in
a crash because the dest->state will never advance to
MULTIFUNDCHANNEL_UPDATED;

Instead, we update to UPDATED before we check for doneness.
This commit is contained in:
niftynei 2021-03-31 16:48:29 -05:00 committed by Rusty Russell
parent ade10e7fc4
commit 9c8ce925ef
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/spender/openchannel.c
View File

@ -691,8 +691,7 @@ openchannel_update_ok(struct command *cmd,
json_tok_full_len(result),
json_tok_full(buf, result));
/* Should we check that the channel id is correct? */
/* FIXME: check that the channel id is correct? */
done_tok = json_get_member(buf, result, "commitments_secured");
if (!done_tok)
plugin_err(cmd->plugin,
@ -708,6 +707,13 @@ openchannel_update_ok(struct command *cmd,
json_tok_full_len(result),
json_tok_full(buf, result));
/* We loop through here several times. We may
* reach an intermediate state however,
* MULTIFUNDCHANNEL_SIGNED_NOT_SECURED, so we only update
* to UPDATED iff we're at the previous state (STARTED) */
if (dest->state == MULTIFUNDCHANNEL_STARTED)
dest->state = MULTIFUNDCHANNEL_UPDATED;
if (done) {
const jsmntok_t *outnum_tok, *close_to_tok;
@ -739,12 +745,9 @@ openchannel_update_ok(struct command *cmd,
* state position */
if (dest->state == MULTIFUNDCHANNEL_SIGNED_NOT_SECURED)
dest->state = MULTIFUNDCHANNEL_SIGNED;
else {
assert(dest->state == MULTIFUNDCHANNEL_UPDATED);
else
dest->state = MULTIFUNDCHANNEL_SECURED;
}
} else
dest->state = MULTIFUNDCHANNEL_UPDATED;
}
return openchannel_update_returned(dest);
}