splice: Enable remote funding key rotation

Allows our peer to change their funding pub key during a splice.

Changelog-Changed: Support added for peers that wish to rotate their funding pubkey during a splice.

Author: ddustin

channeld/channeld.c

@@ -3737,8 +3737,7 @@ static void splice_accepter(struct peer *peer, const u8 *inmsg)
 
 	if (!pubkey_eq(&peer->splicing->remote_funding_pubkey,
 		       &peer->channel->funding_pubkey[REMOTE]))
-		peer_failed_warn(peer->pps, &peer->channel_id,
-				 "Splice doesnt support changing pubkeys");
+		status_info("Splice peer is rotating funding pubkey");
 
 	if (funding_feerate_perkw < peer->feerate_min)
 		peer_failed_warn(peer->pps, &peer->channel_id,
@@ -3851,7 +3850,7 @@ static void splice_initiator(struct peer *peer, const u8 *inmsg)
 {
 	struct channel_id channel_id;
 	size_t input_index;
-	const u8 *wit_script;
+	const u8 *wit_script, *new_wit_script;
 	u8 *outmsg;
 	struct interactivetx_context *ictx;
 	struct bitcoin_tx *prev_tx;
@@ -3876,8 +3875,7 @@ static void splice_initiator(struct peer *peer, const u8 *inmsg)
 
 	if (!pubkey_eq(&peer->splicing->remote_funding_pubkey,
 		       &peer->channel->funding_pubkey[REMOTE]))
-		peer_failed_warn(peer->pps, &peer->channel_id,
-				 "Splice[ACK] doesnt support changing pubkeys");
+		status_info("Splice[ACK] peer is rotating funding pubkey");
 
 	peer->splicing->received_tx_complete = false;
 	peer->splicing->sent_tx_complete = false;
@@ -3898,6 +3896,9 @@ static void splice_initiator(struct peer *peer, const u8 *inmsg)
 	wit_script = bitcoin_redeem_2of2(tmpctx,
 					 &peer->channel->funding_pubkey[LOCAL],
 					 &peer->channel->funding_pubkey[REMOTE]);
+	new_wit_script = bitcoin_redeem_2of2(tmpctx,
+					     &peer->channel->funding_pubkey[LOCAL],
+					     &peer->splicing->remote_funding_pubkey);
 
 	input_index = ictx->desired_psbt->num_inputs;
 
@@ -3935,7 +3936,7 @@ static void splice_initiator(struct peer *peer, const u8 *inmsg)
 	 *       funding keys using the higher of the two `generation` fields.
 	 */
 	psbt_append_output(ictx->desired_psbt,
-			   scriptpubkey_p2wsh(ictx->desired_psbt, wit_script),
+			   scriptpubkey_p2wsh(ictx->desired_psbt, new_wit_script),
 			   calc_balance(peer));
 
 	psbt_add_serials(ictx->desired_psbt, ictx->our_role);