From 0da2729ce609dc05724519971fc70ef39367fcdc Mon Sep 17 00:00:00 2001 From: niftynei Date: Tue, 10 Jan 2023 15:06:25 -0600 Subject: [PATCH] df: for dryruns, inform on requires-confirmation value --- lightningd/dual_open_control.c | 3 +++ openingd/dualopend.c | 5 +++-- openingd/dualopend_wire.csv | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c index c1fad569b..c2a6f893c 100644 --- a/lightningd/dual_open_control.c +++ b/lightningd/dual_open_control.c @@ -1714,6 +1714,7 @@ static void handle_dry_run_finished(struct subd *dualopend, const u8 *msg) struct command *cmd; struct lease_rates *rates; struct amount_sat their_funding, our_funding; + bool requires_confirms; assert(channel->open_attempt); cmd = channel->open_attempt->cmd; @@ -1722,6 +1723,7 @@ static void handle_dry_run_finished(struct subd *dualopend, const u8 *msg) if (!fromwire_dualopend_dry_run(msg, msg, &c_id, &our_funding, &their_funding, + &requires_confirms, &rates)) { channel_internal_error(channel, "Bad WIRE_DUALOPEND_DRY_RUN_FINISHED: %s", @@ -1736,6 +1738,7 @@ static void handle_dry_run_finished(struct subd *dualopend, const u8 *msg) response = json_stream_success(cmd); json_add_amount_sat_msat(response, "our_funding_msat", our_funding); json_add_amount_sat_msat(response, "their_funding_msat", their_funding); + json_add_bool(response, "requires_confirmed_inputs", requires_confirms); if (rates) { json_add_lease_rates(response, rates); diff --git a/openingd/dualopend.c b/openingd/dualopend.c index 267a477d0..7bc6e59f6 100644 --- a/openingd/dualopend.c +++ b/openingd/dualopend.c @@ -3015,9 +3015,10 @@ static void opener_start(struct state *state, u8 *msg) msg = towire_dualopend_dry_run(NULL, &state->channel_id, tx_state->opener_funding, tx_state->accepter_funding, + state->require_confirmed_inputs, a_tlv->will_fund - ? &a_tlv->will_fund->lease_rates : NULL); - + ? &a_tlv->will_fund->lease_rates + : NULL); wire_sync_write(REQ_FD, take(msg)); diff --git a/openingd/dualopend_wire.csv b/openingd/dualopend_wire.csv index 766bfd02b..c38f096b4 100644 --- a/openingd/dualopend_wire.csv +++ b/openingd/dualopend_wire.csv @@ -242,6 +242,7 @@ msgtype,dualopend_dry_run,7026 msgdata,dualopend_dry_run,channel_id,channel_id, msgdata,dualopend_dry_run,our_funding,amount_sat, msgdata,dualopend_dry_run,their_funding,amount_sat, +msgdata,dualopend_dry_run,requires_confirmed_inputs,bool, # must go last because of embedded tu32 msgdata,dualopend_dry_run,lease_rates,?lease_rates,