Skip to content

Commit e19f1a8

Browse files
committed
splice: More agressive checks for tx_abort
In interop with Eclair t-bast believes we’re ignoring `tx_abort` during reestablish. Going through and auditing all the reestablish flows, improving some logs around it and adding checks for `tx_abort` coming in before `channel_reestablish`. ChangelogNone
1 parent 2bba6f0 commit e19f1a8

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

channeld/channeld.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3019,9 +3019,11 @@ static const u8 *peer_expect_msg_three(const tal_t *ctx,
30193019
&& type != third_allowed_type)
30203020
peer_failed_warn(peer->pps, &peer->channel_id,
30213021
"Got incorrect message from peer: %s"
3022-
" (should be %s) [%s]",
3022+
" (should be %s or %s or %s) [%s]",
30233023
peer_wire_name(type),
30243024
peer_wire_name(expect_type),
3025+
peer_wire_name(second_allowed_type),
3026+
peer_wire_name(third_allowed_type),
30253027
sanitize_error(tmpctx, msg, &peer->channel_id));
30263028

30273029
return msg;
@@ -5705,6 +5707,8 @@ static void peer_reconnect(struct peer *peer,
57055707
do {
57065708
clean_tmpctx();
57075709
msg = peer_read(tmpctx, peer->pps);
5710+
check_tx_abort(peer, msg,
5711+
inflight ? &inflight->outpoint.txid : NULL);
57085712
} while (handle_peer_error_or_warning(peer->pps, msg) ||
57095713
capture_premature_msg(&premature_msgs, msg));
57105714

0 commit comments

Comments
 (0)