channeld.c: update logic for retransmitting channel_ready

Extracted logic from if clause to variable for readability, and add extra checks to make sure a splice is active

Author: nGoline

channeld/channeld.c

@@ -5936,6 +5936,17 @@ static void peer_reconnect(struct peer *peer,
 				     "next_funding_txid not recognized.");
 	}
 
+	/* "none of those channel_reestablish messages contain
+	 * my_current_funding_locked or next_funding for a splice transaction" */
+	bool is_splice_active = local_next_funding
+		|| peer->splice_state->locked_ready[LOCAL]
+		|| remote_next_funding
+		|| (recv_tlvs
+		    && recv_tlvs->my_current_funding_locked
+		    && !bitcoin_txid_eq(
+			    &recv_tlvs->my_current_funding_locked->my_current_funding_locked_txid,
+			    &peer->channel->funding.txid));
+
 	/* BOLT #2:
 	 *
 	 *   - if `next_commitment_number` is 1 in both the
@@ -5950,10 +5961,7 @@ static void peer_reconnect(struct peer *peer,
 	if (peer->channel_ready[LOCAL]
 	    && peer->next_index[LOCAL] == 1
 	    && next_commitment_number == 1
-	    && !local_next_funding
-	    && !(send_tlvs && send_tlvs->my_current_funding_locked)
-	    && !remote_next_funding
-	    && !(recv_tlvs && recv_tlvs->my_current_funding_locked)) {
+	    && !is_splice_active) {
 		struct tlv_channel_ready_tlvs *tlvs = tlv_channel_ready_tlvs_new(tmpctx);
 
 		tlvs->short_channel_id = &peer->local_alias;