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

df: add missing check for already set scriptpubkey

Browse source 
Noticed while adding the documentation for the hook.
This commit is contained in:
niftynei 2021-03-10 22:02:17 -06:00 • committed by Rusty Russell
parent 49691fa732
commit a60d652517
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lightningd/dual_open_control.c
View file

@ -699,6 +699,7 @@ openchannel2_hook_deserialize(struct openchannel2_payload *payload,
const char *buffer, const char *buffer,
const jsmntok_t *toks) const jsmntok_t *toks)
{ {
const u8 *shutdown_script;
struct subd *dualopend = payload->dualopend; struct subd *dualopend = payload->dualopend;
/* If our daemon died, we're done */ /* If our daemon died, we're done */
@ -725,9 +726,6 @@ openchannel2_hook_deserialize(struct openchannel2_payload *payload,
if (json_get_member(buffer, toks, "accepter_funding_msat")) if (json_get_member(buffer, toks, "accepter_funding_msat"))
fatal("Plugin rejected openchannel2 but" fatal("Plugin rejected openchannel2 but"
" also set `accepter_funding_psbt`"); " also set `accepter_funding_psbt`");
if (json_get_member(buffer, toks, "funding_feerate"))
fatal("Plugin rejected openchannel2 but"
" also set `funding_feerate`");
const jsmntok_t *t_errmsg = json_get_member(buffer, toks, const jsmntok_t *t_errmsg = json_get_member(buffer, toks,
"error_message"); "error_message");
@ -750,8 +748,14 @@ openchannel2_hook_deserialize(struct openchannel2_payload *payload,
"openchannel2", true, &payload->psbt)) "openchannel2", true, &payload->psbt))
return false; return false;
payload->our_shutdown_scriptpubkey = shutdown_script =
hook_extract_shutdown_script(dualopend, buffer, toks); hook_extract_shutdown_script(dualopend, buffer, toks);
if (shutdown_script && payload->our_shutdown_scriptpubkey)
log_broken(dualopend->ld->log,
"openchannel2 hook close_to address was"
" already set by other plugin. Ignoring!");
else
payload->our_shutdown_scriptpubkey = shutdown_script;
/* Add a serial_id to everything that doesn't have one yet */ /* Add a serial_id to everything that doesn't have one yet */
if (payload->psbt) if (payload->psbt)