Fixed splice_locked messgae to include splice_txid field

Author: remyers

channeld/channeld.c

@@ -511,13 +511,14 @@ static void check_mutual_splice_locked(struct peer *peer)
 }
 
 /* Our peer told us they saw our splice confirm on chain with `splice_locked`.
- * If we see it to we jump into tansitioning to post-splice, otherwise we mark
+ * If we see it to we jump into transitioning to post-splice, otherwise we mark
  * a flag and wait until we see it on chain too. */
 static void handle_peer_splice_locked(struct peer *peer, const u8 *msg)
 {
 	struct channel_id chanid;
+	struct bitcoin_txid splice_txid;
 
-	if (!fromwire_splice_locked(msg, &chanid))
+	if (!fromwire_splice_locked(msg, &chanid, &splice_txid))
 		peer_failed_warn(peer->pps, &peer->channel_id,
 				 "Bad splice_locked %s", tal_hex(msg, msg));
 
@@ -5190,7 +5191,8 @@ static void peer_reconnect(struct peer *peer,
 				    " chain -- resending splice_locked");
 			peer_write(peer->pps,
 				   take(towire_splice_locked(NULL,
-							     &peer->channel_id)));
+							     &peer->channel_id,
+							     &inflight->outpoint.txid)));
 			peer->splice_state->locked_ready[LOCAL] = true;
 		} else if (bitcoin_txid_eq(remote_next_funding,
 					   &inflight->outpoint.txid)) {
@@ -5236,7 +5238,9 @@ static void peer_reconnect(struct peer *peer,
 			status_info("We have no pending splice but peer"
 				    " expects one; resending splice_lock");
 			peer_write(peer->pps,
-				   take(towire_splice_locked(NULL, &peer->channel_id)));
+				   take(towire_splice_locked(NULL,
+				   			     &peer->channel_id,
+				   			     &peer->channel->funding.txid)));
 		}
 		else {
 			splice_abort(peer, "next_funding_txid not recognized."
@@ -5630,10 +5634,11 @@ static void handle_funding_depth(struct peer *peer, const u8 *msg)
 				}
 			}
 
-			msg = towire_splice_locked(NULL, &peer->channel_id);
-
 			peer->splice_state->locked_txid = txid;
 
+			msg = towire_splice_locked(NULL, &peer->channel_id,
+						   &txid);
+
 			peer_write(peer->pps, take(msg));
 
 			peer->splice_state->locked_ready[LOCAL] = true;

tests/fuzz/fuzz-wire-splice_locked.c

@@ -5,18 +5,19 @@
 
 struct splice_locked {
 	struct channel_id channel_id;
+	struct bitcoin_txid txid;
 };
 
 static void *encode(const tal_t *ctx, const struct splice_locked *s)
 {
-	return towire_splice_locked(ctx, &s->channel_id);
+	return towire_splice_locked(ctx, &s->channel_id, &s->txid);
 }
 
 static struct splice_locked *decode(const tal_t *ctx, const void *p)
 {
 	struct splice_locked *s = tal(ctx, struct splice_locked);
 
-	if (fromwire_splice_locked(p, &s->channel_id))
+	if (fromwire_splice_locked(p, &s->channel_id, &s->txid))
 		return s;
 	return tal_free(s);
 }

wire/peer_wire.csv

@@ -223,6 +223,7 @@ msgdata,splice_ack,relative_satoshis,s64,
 msgdata,splice_ack,funding_pubkey,point,
 msgtype,splice_locked,77,
 msgdata,splice_locked,channel_id,channel_id,
+msgdata,splice_locked,splice_txid,sha256,
 msgtype,shutdown,38
 msgdata,shutdown,channel_id,channel_id,
 msgdata,shutdown,len,u16,