aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-03 21:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

df: don't update local shutdown scriptpubkey from dualopend

Browse Source 
When we're the opener, we get the upfront shutdown scriptpubkey (if
there is one) from the `close_to` param of `openchannel_init`.

We were passing it through dualopend, but we need to break the update
chain so that our test_option_upfront_shutdown_script test works (same
as on the openingd flow.)
This commit is contained in:
niftynei
2020-12-15 12:26:00 -06:00
committed by Christian Decker
parent 52da9be598
commit 1393e187f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lightningd/dual_open_control.c
View File

@@ -1001,7 +1001,7 @@ static void opener_commit_received(struct subd *dualopend,
u32 feerate;
struct amount_sat total_funding, funding_ours;
u8 channel_flags, *remote_upfront_shutdown_script,
*local_upfront_shutdown_script;
*unused_script;
struct penalty_base *pbase;
struct wally_psbt *psbt;
struct channel *channel;
@@ -1030,7 +1030,7 @@ static void opener_commit_received(struct subd *dualopend,
&channel_flags,
&feerate,
&uc->our_config.channel_reserve,
&local_upfront_shutdown_script,
&unused_script,
&remote_upfront_shutdown_script)) {
log_broken(uc->log, "bad WIRE_DUALOPEND_COMMIT_RCVD %s",
tal_hex(msg, msg));
@@ -1061,7 +1061,7 @@ static void opener_commit_received(struct subd *dualopend,
&channel_info,
feerate,
LOCAL,
local_upfront_shutdown_script,
uc->fc->our_upfront_shutdown_script,
remote_upfront_shutdown_script);
if (!channel) {
@@ -1080,9 +1080,9 @@ static void opener_commit_received(struct subd *dualopend,
json_add_bool(response, "commitments_secured", true);
/* For convenience sake, we include the funding outnum */
json_add_num(response, "funding_outnum", funding_outnum);
if (local_upfront_shutdown_script)
if (uc->fc->our_upfront_shutdown_script)
json_add_hex_talarr(response, "close_to",
local_upfront_shutdown_script);
uc->fc->our_upfront_shutdown_script);
/* Now that we've got the final PSBT, save it */
channel->psbt = tal_steal(channel, psbt);
wallet_channel_save(uc->fc->cmd->ld->wallet, channel);