@@ -5394,14 +5394,45 @@ static void peer_reconnect(struct peer *peer,
53945394 send_tlvs -> your_last_funding_locked_txid = & peer -> channel -> funding .txid ;
53955395
53965396 send_tlvs -> my_current_funding_locked_txid = & peer -> channel -> funding .txid ;
5397+ status_debug ("Setting send_tlvs->my_current_funding_locked_txid"
5398+ " to %s" ,
5399+ fmt_bitcoin_txid (tmpctx ,
5400+ & peer -> channel -> funding .txid ));
53975401
53985402 for (size_t i = 0 ; i < tal_count (peer -> splice_state -> inflights ); i ++ ) {
53995403 struct inflight * inflight = peer -> splice_state -> inflights [i ];
5400- if (inflight -> locked_scid )
5404+ if (inflight -> locked_scid ) {
54015405 send_tlvs -> my_current_funding_locked_txid = & inflight -> outpoint .txid ;
5406+ status_debug ("Overriding send_tlvs->my_current_"
5407+ "funding_locked_txid to %s because"
5408+ " inflight is locked to scid %s" ,
5409+ fmt_bitcoin_txid (tmpctx ,
5410+ & inflight -> outpoint .txid ),
5411+ fmt_short_channel_id (tmpctx ,
5412+ * inflight -> locked_scid ));
5413+ }
54025414 }
54035415 }
54045416
5417+ status_debug ("Sending channel_reestablish with"
5418+ " next_funding_tx_id: %s,"
5419+ " your_last_funding_locked: %s,"
5420+ " my_current_funding_locked: %s,"
5421+ " next_local_commit_number: %" PRIu64 "," ,
5422+ send_tlvs && send_tlvs -> next_funding
5423+ ? fmt_bitcoin_txid (tmpctx ,
5424+ send_tlvs -> next_funding )
5425+ : "NULL" ,
5426+ send_tlvs && send_tlvs -> your_last_funding_locked_txid
5427+ ? fmt_bitcoin_txid (tmpctx ,
5428+ send_tlvs -> your_last_funding_locked_txid )
5429+ : "NULL" ,
5430+ send_tlvs && send_tlvs -> my_current_funding_locked_txid
5431+ ? fmt_bitcoin_txid (tmpctx ,
5432+ send_tlvs -> my_current_funding_locked_txid )
5433+ : "NULL" ,
5434+ send_next_commitment_number );
5435+
54055436 /* BOLT #2:
54065437 *
54075438 * - upon reconnection:
0 commit comments