channeld: fix channel_ready retransmission after splice via funding_tx_index

channeld/channeld.c

@@ -12,6 +12,7 @@
  */
 #include "config.h"
 #include <bitcoin/script.h>
+#include <ccan/array_size/array_size.h>
 #include <ccan/asort/asort.h>
 #include <ccan/cast/cast.h>
 #include <ccan/mem/mem.h>
@@ -483,6 +484,7 @@ static void check_mutual_splice_locked(struct peer *peer)
 		     fmt_channel(tmpctx, peer->channel));
 
 	error = channel_update_funding(peer->channel, &inflight->outpoint,
+				       inflight->funding_tx_index,
 				       inflight->amnt,
 				       inflight->splice_amnt);
 	if (error)
@@ -4362,6 +4364,7 @@ static void splice_accepter(struct peer *peer, const u8 *inmsg)
 					   &peer->splicing->remote_funding_pubkey,
 					   &outpoint.txid,
 					   outpoint.n,
+					   peer->channel->funding_tx_index + 1,
 					   funding_feerate_perkw,
 					   both_amount,
 					   peer->splicing->accepter_relative,
@@ -4379,6 +4382,8 @@ static void splice_accepter(struct peer *peer, const u8 *inmsg)
 		  &new_inflight->outpoint.txid, NULL);
 	new_inflight->remote_funding = peer->splicing->remote_funding_pubkey;
 	new_inflight->outpoint = outpoint;
+	/* A splice's funding tx is the parent funding's index + 1. */
+	new_inflight->funding_tx_index = peer->channel->funding_tx_index + 1;
 	new_inflight->amnt = both_amount;
 	new_inflight->psbt = clone_psbt(new_inflight, ictx->current_psbt);
 	new_inflight->splice_amnt = peer->splicing->accepter_relative;
@@ -4657,6 +4662,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
 					      &peer->splicing->remote_funding_pubkey,
 					      &current_psbt_txid,
 					      chan_output_index,
+					      peer->channel->funding_tx_index + 1,
 					      peer->splicing->feerate_per_kw,
 					      amount_sat(new_chan_output->amount),
 					      peer->splicing->opener_relative,
@@ -4674,6 +4680,8 @@ static void splice_initiator_user_finalized(struct peer *peer)
 		  NULL);
 	new_inflight->remote_funding = peer->splicing->remote_funding_pubkey;
 	new_inflight->outpoint.n = chan_output_index;
+	/* A splice's funding tx is the parent funding's index + 1. */
+	new_inflight->funding_tx_index = peer->channel->funding_tx_index + 1;
 	new_inflight->amnt = amount_sat(new_chan_output->amount);
 	new_inflight->splice_amnt = peer->splicing->opener_relative;
 	new_inflight->last_tx = NULL;
@@ -5643,6 +5651,51 @@ static bool capture_premature_msg(const u8 ***shit_lnd_says, const u8 *msg)
 	return true;
 }
 
+/* Is this txid a splice transaction?  funding_tx_index is 0 for the original
+ * funding (including RBF attempts) and increments by 1 for each splice, so it
+ * answers this regardless of whether the splice has already become the current
+ * channel funding.  We check the channel funding and any pending splice
+ * inflight; an unrecognized txid is treated as a splice, which is the
+ * conservative choice for a reestablish we can't account for. */
+static bool txid_is_splice(const struct peer *peer,
+			   const struct bitcoin_txid *txid)
+{
+	if (bitcoin_txid_eq(txid, &peer->channel->funding.txid))
+		return peer->channel->funding_tx_index > 0;
+	for (size_t i = 0; i < tal_count(peer->splice_state->inflights); i++) {
+		const struct inflight *inf = peer->splice_state->inflights[i];
+		if (bitcoin_txid_eq(txid, &inf->outpoint.txid))
+			return inf->funding_tx_index > 0;
+	}
+	return true;
+}
+
+/* "none of those `channel_reestablish` messages contain
+ * `my_current_funding_locked` or `next_funding` for a splice transaction":
+ * checks both the message we sent and the one we received. */
+static bool reestablish_mentions_splice(const struct peer *peer,
+					const struct tlv_channel_reestablish_tlvs *send_tlvs,
+					const struct tlv_channel_reestablish_tlvs *recv_tlvs)
+{
+	const struct tlv_channel_reestablish_tlvs *tlvs[] = {
+		send_tlvs, recv_tlvs
+	};
+
+	for (size_t i = 0; i < ARRAY_SIZE(tlvs); i++) {
+		if (!tlvs[i])
+			continue;
+		/* `next_funding` means an interactive tx construction hasn't
+		 * finished; past `channel_ready` that is always a splice. */
+		if (tlvs[i]->next_funding)
+			return true;
+		if (tlvs[i]->my_current_funding_locked
+		    && txid_is_splice(peer,
+				      &tlvs[i]->my_current_funding_locked->my_current_funding_locked_txid))
+			return true;
+	}
+	return false;
+}
+
 static void peer_reconnect(struct peer *peer,
 			   const struct secret *last_remote_per_commit_secret)
 {
@@ -5965,17 +6018,6 @@ 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:
 	 *
 	 * A node:
@@ -5994,7 +6036,7 @@ static void peer_reconnect(struct peer *peer,
 	if (peer->channel_ready[LOCAL]
 	    && peer->next_index[LOCAL] == 1
 	    && next_commitment_number == 1
-	    && !is_splice_active) {
+	    && !reestablish_mentions_splice(peer, send_tlvs, recv_tlvs)) {
 		struct tlv_channel_ready_tlvs *tlvs = tlv_channel_ready_tlvs_new(tmpctx);
 
 		tlvs->short_channel_id = &peer->local_alias;
@@ -6830,6 +6872,7 @@ static void init_channel(struct peer *peer)
 {
 	struct basepoints points[NUM_SIDES];
 	struct amount_sat funding_sats;
+	u32 funding_tx_index;
 	struct amount_msat local_msat;
 	struct pubkey funding_pubkey[NUM_SIDES];
 	struct channel_config conf[NUM_SIDES];
@@ -6859,6 +6902,7 @@ static void init_channel(struct peer *peer)
 				    &peer->channel_id,
 				    &funding,
 				    &funding_sats,
+				    &funding_tx_index,
 				    &minimum_depth,
 				    &peer->our_blockheight,
 				    &blockheight_states,
@@ -6973,6 +7017,7 @@ static void init_channel(struct peer *peer)
 
 	peer->channel = new_full_channel(peer, &peer->channel_id,
 					 &funding,
+					 funding_tx_index,
 					 minimum_depth,
 					 take(blockheight_states),
 					 lease_expiry,

channeld/channeld_wire.csv

@@ -21,6 +21,7 @@ msgdata,channeld_init,hsm_capabilities,u32,num_hsm_capabilities
 msgdata,channeld_init,channel_id,channel_id,
 msgdata,channeld_init,funding,bitcoin_outpoint,
 msgdata,channeld_init,funding_satoshi,amount_sat,
+msgdata,channeld_init,funding_tx_index,u32,
 msgdata,channeld_init,minimum_depth,u32,
 msgdata,channeld_init,our_blockheight,u32,
 msgdata,channeld_init,blockheight_states,height_states,
@@ -261,6 +262,7 @@ msgtype,channeld_add_inflight,7216
 msgdata,channeld_add_inflight,remote_funding,pubkey,
 msgdata,channeld_add_inflight,tx_id,bitcoin_txid,
 msgdata,channeld_add_inflight,tx_outnum,u32,
+msgdata,channeld_add_inflight,funding_tx_index,u32,
 msgdata,channeld_add_inflight,feerate,u32,
 msgdata,channeld_add_inflight,satoshis,amount_sat,
 msgdata,channeld_add_inflight,splice_amount,s64,

channeld/full_channel.c

@@ -74,6 +74,7 @@ static bool balance_ok(const struct balance *balance,
 struct channel *new_full_channel(const tal_t *ctx,
 				 const struct channel_id *cid,
 				 const struct bitcoin_outpoint *funding,
+				 u32 funding_tx_index,
 				 u32 minimum_depth,
 				 const struct height_states *blockheight_states,
 				 u32 lease_expiry,
@@ -93,6 +94,7 @@ struct channel *new_full_channel(const tal_t *ctx,
 	struct channel *channel = new_initial_channel(ctx,
 						      cid,
 						      funding,
+						      funding_tx_index,
 						      minimum_depth,
 						      blockheight_states,
 						      lease_expiry,

channeld/full_channel.h

@@ -36,6 +36,7 @@ struct existing_htlc;
 struct channel *new_full_channel(const tal_t *ctx,
 				 const struct channel_id *cid,
 				 const struct bitcoin_outpoint *funding,
+				 u32 funding_tx_index,
 				 u32 minimum_depth,
 				 const struct height_states *blockheight_states,
 				 u32 lease_expiry,

channeld/inflight.c

@@ -9,6 +9,7 @@ struct inflight *fromwire_inflight(const tal_t *ctx, const u8 **cursor, size_t *
 	struct inflight *inflight = tal(ctx, struct inflight);
 
 	fromwire_bitcoin_outpoint(cursor, max, &inflight->outpoint);
+	inflight->funding_tx_index = fromwire_u32(cursor, max);
 	fromwire_pubkey(cursor, max, &inflight->remote_funding);
 	inflight->amnt = fromwire_amount_sat(cursor, max);
 	inflight->remote_tx_sigs = fromwire_bool(cursor, max);
@@ -41,6 +42,7 @@ struct inflight *fromwire_inflight(const tal_t *ctx, const u8 **cursor, size_t *
 void towire_inflight(u8 **pptr, const struct inflight *inflight)
 {
 	towire_bitcoin_outpoint(pptr, &inflight->outpoint);
+	towire_u32(pptr, inflight->funding_tx_index);
 	towire_pubkey(pptr, &inflight->remote_funding);
 	towire_amount_sat(pptr, inflight->amnt);
 	towire_bool(pptr, inflight->remote_tx_sigs);

channeld/inflight.h

@@ -10,6 +10,9 @@
 struct inflight {
 	/* The new channel outpoint */
 	struct bitcoin_outpoint outpoint;
+	/* Which funding tx this is: 0 for the original funding (incl. RBF
+	 * attempts), incrementing by 1 for each splice. */
+	u32 funding_tx_index;
 	struct pubkey remote_funding;
 	struct amount_sat amnt;
 	bool remote_tx_sigs;

channeld/test/run-full_channel.c

@@ -492,7 +492,7 @@ int main(int argc, const char *argv[])
 	feerate_per_kw[LOCAL] = feerate_per_kw[REMOTE] = 15000;
 	derive_channel_id(&cid, &funding);
 	lchannel = new_full_channel(tmpctx, &cid,
-				    &funding, 0,
+				    &funding, 0, 0,
 				    take(new_height_states(NULL, LOCAL, &blockheight)),
 				    0, /* No channel lease */
 				    funding_amount, to_local,
@@ -505,7 +505,7 @@ int main(int argc, const char *argv[])
 				    &remote_funding_pubkey,
 				    take(channel_type_static_remotekey(NULL)), false, LOCAL);
 	rchannel = new_full_channel(tmpctx, &cid,
-				    &funding, 0,
+				    &funding, 0, 0,
 				    take(new_height_states(NULL, REMOTE, &blockheight)),
 				    0, /* No channel lease */
 				    funding_amount, to_remote,

common/initial_channel.c

@@ -12,6 +12,7 @@
 struct channel *new_initial_channel(const tal_t *ctx,
 				    const struct channel_id *cid,
 				    const struct bitcoin_outpoint *funding,
+				    u32 funding_tx_index,
 				    u32 minimum_depth,
 				    const struct height_states *height_states TAKES,
 				    u32 lease_expiry,
@@ -46,6 +47,7 @@ struct channel *new_initial_channel(const tal_t *ctx,
 
 	channel->cid = *cid;
 	channel->funding = *funding;
+	channel->funding_tx_index = funding_tx_index;
 	channel->funding_sats = funding_sats;
 	channel->minimum_depth = minimum_depth;
 	channel->lease_expiry = lease_expiry;
@@ -156,6 +158,7 @@ struct bitcoin_tx *initial_channel_tx(const tal_t *ctx,
 
 const char *channel_update_funding(struct channel *channel,
 				   const struct bitcoin_outpoint *funding,
+				   u32 funding_tx_index,
 				   struct amount_sat funding_sats,
 				   s64 splice_amnt)
 {
@@ -164,6 +167,7 @@ const char *channel_update_funding(struct channel *channel,
 
 	channel->funding = *funding;
 	channel->funding_sats = funding_sats;
+	channel->funding_tx_index = funding_tx_index;
 
 	if (splice_amnt * 1000 + channel->view[LOCAL].owed[LOCAL].millisatoshis < 0) /* Raw: splicing */
 		return tal_fmt(tmpctx, "Channel funding update would make local"

common/initial_channel.h

@@ -39,6 +39,10 @@ struct channel {
 	/* Funding txid and output. */
 	struct bitcoin_outpoint funding;
 
+	/* Which funding tx this is: 0 for the original funding (incl. RBF
+	 * attempts), incrementing by 1 for each splice. */
+	u32 funding_tx_index;
+
 	/* Keys used to spend funding tx. */
 	struct pubkey funding_pubkey[NUM_SIDES];
 
@@ -88,6 +92,7 @@ struct channel {
  * @ctx: tal context to allocate return value from.
  * @cid: The channel's id.
  * @funding: The commitment transaction id/outnum
+ * @funding_tx_index: 0 for the original funding, +1 for each splice.
  * @minimum_depth: The minimum confirmations needed for funding transaction.
  * @height_states: The blockheight update states.
  * @lease_expiry: Block the lease expires.
@@ -109,6 +114,7 @@ struct channel {
 struct channel *new_initial_channel(const tal_t *ctx,
 				    const struct channel_id *cid,
 				    const struct bitcoin_outpoint *funding,
+				    u32 funding_tx_index,
 				    u32 minimum_depth,
 				    const struct height_states *height_states TAKES,
 				    u32 lease_expiry,
@@ -154,6 +160,7 @@ struct bitcoin_tx *initial_channel_tx(const tal_t *ctx,
  */
 const char *channel_update_funding(struct channel *channel,
 				   const struct bitcoin_outpoint *funding,
+				   u32 funding_tx_index,
 				   struct amount_sat funding_sats,
 				   s64 splice_amnt);
 

devtools/mkcommit.c

@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
 
 	channel = new_full_channel(NULL,
 				   &cid,
-				   &funding, 1,
+				   &funding, 0, 1,
 				   take(new_height_states(NULL, fee_payer,
 							  &blockheight)),
 				   0, /* Defaults to no lease */

lightningd/channel.c

@@ -171,6 +171,7 @@ struct channel_inflight *
 new_inflight(struct channel *channel,
 	     struct pubkey *remote_funding,
 	     const struct bitcoin_outpoint *funding_outpoint,
+	     u32 funding_tx_index,
 	     u32 funding_feerate,
 	     struct amount_sat total_funds,
 	     struct amount_sat our_funds,
@@ -199,6 +200,7 @@ new_inflight(struct channel *channel,
 	funding->splice_remote_funding = tal_steal(funding, remote_funding);
 
 	inflight->funding = funding;
+	inflight->funding_tx_index = funding_tx_index;
 	inflight->channel = channel;
 	inflight->remote_tx_sigs = false;
 	inflight->funding_psbt = tal_steal(inflight, psbt);
@@ -376,6 +378,10 @@ struct channel *new_unsaved_channel(struct peer *peer,
 	channel->next_index[REMOTE] = 1;
 	channel->next_htlc_id = 0;
 	channel->funding_spend_watch = NULL;
+	/* Original funding: splices increment this.  channel->funding itself
+	 * isn't known until commit, but we save the channel then, so this
+	 * must be set now. */
+	channel->funding_tx_index = 0;
 	/* FIXME: remove push when v1 deprecated */
 	channel->push = AMOUNT_MSAT(0);
 	channel->closing_fee_negotiation_step = 50;
@@ -506,6 +512,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
 			    u64 next_index_remote,
 			    u64 next_htlc_id,
 			    const struct bitcoin_outpoint *funding,
+			    u32 funding_tx_index,
 			    struct amount_sat funding_sats,
 			    struct amount_msat push,
 			    struct amount_sat our_funds,
@@ -612,6 +619,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
 	channel->next_index[REMOTE] = next_index_remote;
 	channel->next_htlc_id = next_htlc_id;
 	channel->funding = *funding;
+	channel->funding_tx_index = funding_tx_index;
 	channel->funding_sats = funding_sats;
 	channel->funding_spend_watch = NULL;
 	channel->push = push;
@@ -1350,4 +1358,3 @@ const u8 *channel_update_for_error(const tal_t *ctx,
 
 	return channel_gossip_update_for_error(ctx, channel);
 }
-

lightningd/channel.h

@@ -58,6 +58,9 @@ struct channel_inflight {
 
 	/* Funding info */
 	const struct funding_info *funding;
+	/* Which funding tx this is: 0 for the original funding (incl. RBF
+	 * attempts), incrementing by 1 for each splice. */
+	u32 funding_tx_index;
 	struct wally_psbt *funding_psbt;
 	bool remote_tx_sigs;
 	bool tx_broadcast;
@@ -203,6 +206,9 @@ struct channel {
 
 	/* Funding outpoint and amount */
 	struct bitcoin_outpoint funding;
+	/* Which funding tx this is: 0 for the original funding (incl. RBF
+	 * attempts), incrementing by 1 for each splice. */
+	u32 funding_tx_index;
 	struct amount_sat funding_sats;
 
 	/* Watch we have on funding output. */
@@ -394,6 +400,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
 			    u64 next_index_remote,
 			    u64 next_htlc_id,
 			    const struct bitcoin_outpoint *funding,
+			    u32 funding_tx_index,
 			    struct amount_sat funding_sats,
 			    struct amount_msat push,
 			    struct amount_sat our_funds,
@@ -458,6 +465,7 @@ struct channel *new_channel(struct peer *peer, u64 dbid,
 struct channel_inflight *new_inflight(struct channel *channel,
 	     struct pubkey *remote_funding STEALS,
 	     const struct bitcoin_outpoint *funding_outpoint,
+	     u32 funding_tx_index,
 	     u32 funding_feerate,
 	     struct amount_sat funding_sat,
 	     struct amount_sat our_funds,