aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-21 08:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

channeld-df: only send our sigs if we've got them

Browse Source
This commit is contained in:
niftynei
2020-10-08 17:08:01 -05:00
committed by Rusty Russell
parent d1c7c78159
commit bdf1cc2f93
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
channeld/channeld.c
View File

@@ -2012,14 +2012,14 @@ static void handle_tx_sigs(struct peer *peer, const u8 *msg)
enum tx_role role = peer->channel->opener == REMOTE enum tx_role role = peer->channel->opener == REMOTE
? TX_INITIATOR : TX_ACCEPTER; ? TX_INITIATOR : TX_ACCEPTER;
if (!fromwire_tx_signatures(tmpctx, msg, &cid, &txid, if (!fromwire_tx_signatures(tmpctx, msg, &cid, &txid,
cast_const3( cast_const3(
struct witness_stack ***, struct witness_stack ***,
&ws))) &ws)))
peer_failed(peer->pps, peer_failed(peer->pps,
&peer->channel_id, &peer->channel_id,
"Bad tx_signatures %s", tal_hex(msg, msg)); "Bad tx_signatures %s",
tal_hex(msg, msg));
/* Maybe they didn't get our funding_locked message ? */ /* Maybe they didn't get our funding_locked message ? */
if (peer->funding_locked[LOCAL]) { if (peer->funding_locked[LOCAL]) {
@@ -2751,11 +2751,13 @@ static void peer_reconnect(struct peer *peer,
#if EXPERIMENTAL_FEATURES #if EXPERIMENTAL_FEATURES
/* Send our tx_sigs again */ /* Send our tx_sigs again */
if (peer->psbt && !peer->funding_locked[REMOTE]) { enum tx_role role = peer->channel->opener == LOCAL
? TX_INITIATOR : TX_ACCEPTER;
if (peer->psbt && psbt_side_finalized(peer->psbt, role)
&& !peer->funding_locked[REMOTE])
sync_crypto_write(peer->pps, sync_crypto_write(peer->pps,
take(psbt_to_tx_sigs_msg(NULL, peer->channel, take(psbt_to_tx_sigs_msg(NULL, peer->channel,
peer->psbt))); peer->psbt)));
}
#endif /* EXPERIMENTAL_FEATURES */ #endif /* EXPERIMENTAL_FEATURES */
/* BOLT #2: /* BOLT #2:
@@ -3539,12 +3541,14 @@ static void init_channel(struct peer *peer)
sync_crypto_write(peer->pps, take(fwd_msg)); sync_crypto_write(peer->pps, take(fwd_msg));
#if EXPERIMENTAL_FEATURES #if EXPERIMENTAL_FEATURES
enum tx_role role;
role = opener == LOCAL ? TX_INITIATOR : TX_ACCEPTER;
/* peer_reconnect does this if needed */ /* peer_reconnect does this if needed */
if (!reconnected && peer->psbt) { if (!reconnected && peer->psbt &&
psbt_side_finalized(peer->psbt, role))
sync_crypto_write(peer->pps, sync_crypto_write(peer->pps,
take(psbt_to_tx_sigs_msg(NULL, peer->channel, take(psbt_to_tx_sigs_msg(NULL, peer->channel,
peer->psbt))); peer->psbt)));
}
#endif /* EXPERIMENTAL_FEATURES */ #endif /* EXPERIMENTAL_FEATURES */
/* Reenable channel */ /* Reenable channel */