Add new splice tlvs for channel_reestablish

Author: remyers

channeld/channeld.c

@@ -5122,6 +5122,35 @@ static void peer_reconnect(struct peer *peer,
 	}
 
 	inflight = last_inflight(peer);
+	
+	if (feature_negotiated(peer->our_features, peer->their_features, OPT_SPLICE)) {
+		/* Subtle: we free tmpctx below as we loop, so tal off peer */
+		send_tlvs = tlv_channel_reestablish_tlvs_new(peer);
+
+		/* BOLT- #2: channel_reestablish
+		* your_last_funding_locked tlv:
+		*  - as a sender, you just set it to the last splice_locked you received from your peer
+		*  - as a receiver, this tells you if your peer received your last splice_locked or not
+		*/
+		if (peer->splice_state->locked_ready[REMOTE] && peer->splice_state->remote_locked_txid != NULL) {
+			send_tlvs->your_last_funding_locked = tal_dup(send_tlvs, struct bitcoin_txid, peer->splice_state->remote_locked_txid);
+		} 
+		else {
+			send_tlvs->your_last_funding_locked = tal_dup(send_tlvs, struct bitcoin_txid, &peer->channel->funding.txid);
+		}
+
+		/* 
+		* my_current_funding_locked tlv:
+		* - as a sender, you just send it to your latest locally locked (ie deeply confirmed) splice transaction
+		* - as a receiver, this tells you whether your peer will be sending a splice_locked that you haven't received yet
+		*/
+		if (peer->splice_state->locked_ready[LOCAL]) {
+			send_tlvs->my_current_funding_locked = tal_dup(send_tlvs, struct bitcoin_txid, &peer->splice_state->locked_txid);
+		}
+		else {
+			send_tlvs->my_current_funding_locked = tal_dup(send_tlvs, struct bitcoin_txid, &peer->channel->funding.txid);
+		}
+	}
 
 	if (inflight && (!inflight->last_tx || !inflight->remote_tx_sigs)) {
 		if (missing_user_signatures(peer,

wire/peer_wire.csv

@@ -292,13 +292,17 @@ tlvtype,channel_reestablish_tlvs,next_funding,0
 tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
 tlvtype,channel_reestablish_tlvs,next_funding,0
 tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
-tlvtype,channel_reestablish_tlvs,next_to_send,1
+tlvtype,channel_reestablish_tlvs,your_last_funding_locked,1
+tlvdata,channel_reestablish_tlvs,your_last_funding_locked,your_last_funding_locked,bitcoin_txid,
+tlvtype,channel_reestablish_tlvs,my_current_funding_locked,3
+tlvdata,channel_reestablish_tlvs,my_current_funding_locked,my_current_funding_locked,bitcoin_txid,
+tlvtype,channel_reestablish_tlvs,next_to_send,5
 tlvdata,channel_reestablish_tlvs,next_to_send,commitment_number,tu64,
-tlvtype,channel_reestablish_tlvs,desired_channel_type,3
+tlvtype,channel_reestablish_tlvs,desired_channel_type,7
 tlvdata,channel_reestablish_tlvs,desired_channel_type,type,byte,...
-tlvtype,channel_reestablish_tlvs,current_channel_type,5
+tlvtype,channel_reestablish_tlvs,current_channel_type,9
 tlvdata,channel_reestablish_tlvs,current_channel_type,type,byte,...
-tlvtype,channel_reestablish_tlvs,upgradable_channel_type,7
+tlvtype,channel_reestablish_tlvs,upgradable_channel_type,11
 tlvdata,channel_reestablish_tlvs,upgradable_channel_type,type,byte,...
 msgtype,peer_storage,7
 msgdata,peer_storage,len,u16,