Test commit for CI

Author: ddustin

channeld/channeld.c

@@ -3992,6 +3992,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
 	char *error;
 	u32 chan_output_index, splice_funding_index;
 	struct wally_psbt_output *new_chan_output;
+	struct wally_psbt *psbt;
 	struct inflight *new_inflight;
 	struct bitcoin_txid current_psbt_txid;
 	struct amount_sat both_amount;
@@ -4028,29 +4029,31 @@ static void splice_initiator_user_finalized(struct peer *peer)
 
 	check_tx_abort(peer, abort_msg);
 
+	psbt = clone_psbt(tmpctx, peer->splicing->current_psbt);
+
 	/* With pause_when_complete fase, this assert should never fail */
 	assert(peer->splicing->received_tx_complete);
 	peer->splicing->sent_tx_complete = true;
 
-	psbt_sort_by_serial_id(ictx->current_psbt);
+	psbt_sort_by_serial_id(psbt);
 
-	new_chan_output = find_channel_output(peer, ictx->current_psbt,
+	new_chan_output = find_channel_output(peer, psbt,
 					      &chan_output_index,
 					      &peer->splicing->remote_funding_pubkey);
 
-	splice_funding_index = find_channel_funding_input(ictx->current_psbt,
+	splice_funding_index = find_channel_funding_input(psbt,
 							  &peer->channel->funding);
 
-	both_amount = check_balances(peer, our_role, ictx->current_psbt,
+	both_amount = check_balances(peer, our_role, psbt,
 				     chan_output_index, splice_funding_index);
 	new_chan_output->amount = both_amount.satoshis; /* Raw: type conv */
 
-	psbt_elements_normalize_fees(ictx->current_psbt);
+	psbt_elements_normalize_fees(psbt);
 
 	status_debug("Splice adding inflight: %s",
-		     fmt_wally_psbt(tmpctx, ictx->current_psbt));
+		     fmt_wally_psbt(tmpctx, psbt));
 
-	psbt_txid(tmpctx, ictx->current_psbt, &current_psbt_txid, NULL);
+	psbt_txid(tmpctx, psbt, &current_psbt_txid, NULL);
 
 	outmsg = towire_channeld_add_inflight(tmpctx,
 					      &peer->splicing->remote_funding_pubkey,
@@ -4059,7 +4062,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
 					      peer->splicing->feerate_per_kw,
 					      amount_sat(new_chan_output->amount),
 					      peer->splicing->opener_relative,
-					      ictx->current_psbt,
+					      clone_psbt(tmpctx, psbt),
 					      true,
 					      peer->splicing->force_sign_first);
 
@@ -4068,7 +4071,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
 
 	new_inflight = inflights_new(peer);
 
-	psbt_txid(tmpctx, ictx->current_psbt, &new_inflight->outpoint.txid,
+	psbt_txid(tmpctx, psbt, &new_inflight->outpoint.txid,
 		  NULL);
 	new_inflight->remote_funding = peer->splicing->remote_funding_pubkey;
 	new_inflight->outpoint.n = chan_output_index;
@@ -4084,7 +4087,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
 	 * normal in-memory copy of the psbt: peer->splicing/ictx->current_psbt.
 	 * Since we have to support using the inflight psbt anyway, we default
 	 * to it. */
-	new_inflight->psbt = clone_psbt(new_inflight, ictx->current_psbt);
+	new_inflight->psbt = clone_psbt(new_inflight, psbt); // wally_psbt_clone_alloc fails here
 
 	current_push_val = relative_splice_balance_fundee(peer, our_role,
 							  new_inflight->psbt,

common/interactivetx.c

@@ -391,9 +391,6 @@ char *process_interactivetx_updates(const tal_t *ctx,
 	if (received_tx_complete)
 		they_complete = *received_tx_complete;
 
-	/* Build change_set and handle PSBT variables */
-	ictx->change_set = tal_free(ictx->change_set);
-
 	/* Call next_update_fn or default to 'desired_psbt' */
 	next_psbt = ictx->next_update_fn(ictx, ictx);