Skip to content

Commit d9fe79c

Browse files
committed
lightningd: fix DF crash from libwally update.
Broken prior to 23.05 in 908f834: ``` lightningd: FATAL SIGNAL 11 (version d1cf88c) 0x56135ea0f865 send_backtrace common/daemon.c:33 0x56135ea0fa50 crashdump common/daemon.c:75 0x7f00d263bcef ??? ./signal/../sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c:0 0x56135e9887d9 validate_input_unspent lightningd/dual_open_control.c:2632 0x56135e989a55 handle_validate_inputs lightningd/dual_open_control.c:3026 0x56135e98a9a3 dual_opend_msg lightningd/dual_open_control.c:3357 0x56135e9df230 sd_msg_read lightningd/subd.c:557 0x56135eb0b6aa next_plan ccan/ccan/io/io.c:59 0x56135eb0c2d9 do_plan ccan/ccan/io/io.c:407 0x56135eb0c31b io_ready ccan/ccan/io/io.c:417 0x56135eb0e6b5 io_loop ccan/ccan/io/poll.c:453 0x56135e99b682 io_loop_with_timers lightningd/io_loop_with_timers.c:22 0x56135e9a230c main lightningd/lightningd.c:1231 0x7f00d262350f __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 0x7f00d26235c8 __libc_start_main_impl ../csu/libc-start.c:381 0x56135e96ff24 ??? ???:0 0xffffffffffffffff ??? ???:0 ``` Signed-off-by: Rusty Russell <[email protected]> Changelog-EXPERIMENTAL: Fixed crash in dual-funding.
1 parent 1b4672b commit d9fe79c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lightningd/dual_open_control.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2602,7 +2602,7 @@ static void validate_input_unspent(struct bitcoind *bitcoind,
26022602
struct bitcoin_outpoint outpoint;
26032603

26042604
assert(pv->next_index > 0);
2605-
wally_tx_input_get_outpoint(&pv->psbt->tx->inputs[pv->next_index - 1],
2605+
wally_psbt_input_get_outpoint(&pv->psbt->inputs[pv->next_index - 1],
26062606
&outpoint);
26072607

26082608
err = tal_fmt(pv, "Requested only confirmed"
@@ -2629,8 +2629,8 @@ static void validate_input_unspent(struct bitcoind *bitcoind,
26292629
if (serial % 2 != pv->role_to_validate)
26302630
continue;
26312631

2632-
wally_tx_input_get_outpoint(&pv->psbt->tx->inputs[i],
2633-
&outpoint);
2632+
wally_psbt_input_get_outpoint(&pv->psbt->inputs[i],
2633+
&outpoint);
26342634
pv->next_index = i + 1;
26352635

26362636
/* Confirm input is in a block */

0 commit comments

Comments
 (0)