From fc64ebdb5364c6b162ae4742506decf3e54ae994 Mon Sep 17 00:00:00 2001 From: niftynei Date: Mon, 15 Mar 2021 19:49:01 -0500 Subject: [PATCH] dual-funding: don't not update the state! log the issue and move on with with your life --- lightningd/dual_open_control.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c index 9be695ebb..935b9c49f 100644 --- a/lightningd/dual_open_control.c +++ b/lightningd/dual_open_control.c @@ -1505,17 +1505,17 @@ static void handle_channel_locked(struct subd *dualopend, assert(channel->scid); assert(channel->remote_funding_locked); - if (channel->state != DUALOPEND_AWAITING_LOCKIN) { + /* This can happen if we missed their sigs, for some reason */ + if (channel->state != DUALOPEND_AWAITING_LOCKIN) log_debug(channel->log, "Lockin complete, but state %s", channel_state_name(channel)); - } else { - channel_set_state(channel, - DUALOPEND_AWAITING_LOCKIN, - CHANNELD_NORMAL, - REASON_UNKNOWN, - "Lockin complete"); - channel_record_open(channel); - } + + channel_set_state(channel, + channel->state, + CHANNELD_NORMAL, + REASON_UNKNOWN, + "Lockin complete"); + channel_record_open(channel); /* FIXME: LND sigs/update_fee msgs? */ peer_start_channeld(channel, pps, NULL, false);