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

df-broadcasts: use an impermanent marker to make sure we've sent things

Browse Source 
This can result in us logging a warning if we've 1) dropped their sigs
response, 2) only us (the opener) added inputs, 3) and we broadcast on
their reconnect (when they retransmit their sigs)
This commit is contained in:
niftynei 2021-03-15 19:44:36 -05:00 committed by Rusty Russell
parent c317b642c3
commit 61df08c50d
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lightningd/channel.h
View File

@ -40,6 +40,7 @@ struct channel_inflight {
const struct funding_info *funding;
struct wally_psbt *funding_psbt;
bool remote_tx_sigs;
bool tx_broadcast;
/* Commitment tx and sigs */
struct bitcoin_tx *last_tx;

22
lightningd/dual_open_control.c
View File

@ -1405,8 +1405,17 @@ static void handle_peer_tx_sigs_sent(struct subd *dualopend,
}
inflight = channel_current_inflight(channel);
if (psbt_finalize(inflight->funding_psbt)
&& inflight->remote_tx_sigs) {
/* Once we've sent our sigs to the peer, we're fine
* to broadcast the transaction, even if they haven't
* sent us their tx-sigs yet. They're not allowed to
* send us funding-locked until their tx-sigs has been
* received, but that's no reason not to broadcast.
* Note this only happens if we're the only input-er */
if (psbt_finalize(inflight->funding_psbt) &&
!inflight->tx_broadcast) {
inflight->tx_broadcast = true;
wtx = psbt_final_tx(NULL, inflight->funding_psbt);
if (!wtx) {
channel_internal_error(channel,
@ -1721,7 +1730,14 @@ static void handle_peer_tx_sigs_msg(struct subd *dualopend,
tal_wally_end(inflight->funding_psbt);
wallet_inflight_save(ld->wallet, inflight);
if (psbt_finalize(cast_const(struct wally_psbt *, inflight->funding_psbt))) {
/* It's possible we haven't sent them our (empty) tx-sigs yet,
* but we should be sending it soon... */
if (psbt_finalize(cast_const(struct wally_psbt *,
inflight->funding_psbt))
&& !inflight->tx_broadcast) {
inflight->tx_broadcast = true;
/* Saves the now finalized version of the psbt */
wallet_inflight_save(ld->wallet, inflight);
wtx = psbt_final_tx(NULL, inflight->funding_psbt);
if (!wtx) {