Splicing support

channeld/channeld.c

@@ -2918,6 +2918,26 @@ static size_t calc_weight(enum tx_role role, const struct wally_psbt *psbt)
 	return weight;
 }
 
+/* Get the non-initiator (acceptor) amount after the splice */
+static struct amount_msat splice_acceptor_balance(struct peer *peer,
+						  enum tx_role our_role)
+{
+	struct amount_msat acceptor_value;
+
+	/* Start with the acceptor's balance before the splice */
+	acceptor_value =
+		peer->channel->view->owed[our_role == TX_INITIATOR ? REMOTE : LOCAL];
+
+	/* Adjust by the acceptor's relative splice amount (signed) */
+	if (!amount_msat_add_sat_s64(&acceptor_value, acceptor_value,
+				     peer->splicing->accepter_relative))
+		peer_failed_warn(
+			peer->pps, &peer->channel_id,
+			"Unable to add accepter's relative splice to prior balance.");
+
+	return acceptor_value;
+}
+
 /* Returns the total channel funding output amount if all checks pass.
  * Otherwise, exits via peer_failed_warn. DTODO: Change to `tx_abort`. */
 static struct amount_sat check_balances(struct peer *peer,
@@ -3450,6 +3470,39 @@ static struct inflight *inflights_new(struct peer *peer)
 	return inf;
 }
 
+static void update_hsmd_with_splice(struct peer *peer,
+				    struct inflight *inflight,
+				    const struct amount_msat push_val)
+{
+	u8 *msg;
+
+	/* local_upfront_shutdown_script, local_upfront_shutdown_wallet_index,
+	 * remote_upfront_shutdown_script aren't allowed to change, so we
+	 * don't need to gather them */
+	msg = towire_hsmd_setup_channel(
+		NULL,
+		peer->channel->opener == LOCAL,
+		inflight->amnt,
+		push_val,
+		&inflight->outpoint.txid,
+		inflight->outpoint.n,
+		peer->channel->config[LOCAL].to_self_delay,
+		/*local_upfront_shutdown_script*/ NULL,
+		/*local_upfront_shutdown_wallet_index*/ NULL,
+		&peer->channel->basepoints[REMOTE],
+		&peer->channel->funding_pubkey[REMOTE],
+		peer->channel->config[REMOTE].to_self_delay,
+		/*remote_upfront_shutdown_script*/ NULL,
+		peer->channel->type);
+
+	wire_sync_write(HSM_FD, take(msg));
+	msg = wire_sync_read(tmpctx, HSM_FD);
+	if (!fromwire_hsmd_setup_channel_reply(msg))
+		status_failed(STATUS_FAIL_HSM_IO, "Bad ready_channel_reply %s",
+			      tal_hex(tmpctx, msg));
+}
+
+
 /* ACCEPTER side of the splice. Here we handle all the accepter's steps for the
  * splice. Since the channel must be in STFU mode we block the daemon here until
  * the splice is finished or aborted. */
@@ -3586,6 +3639,10 @@ static void splice_accepter(struct peer *peer, const u8 *inmsg)
 	new_inflight->last_tx = NULL;
 	new_inflight->i_am_initiator = false;
 
+	update_hsmd_with_splice(peer,
+				new_inflight,
+				splice_acceptor_balance(peer, TX_ACCEPTER));
+
 	update_view_from_inflights(peer);
 
 	peer->splice_state->count++;
@@ -3820,6 +3877,10 @@ static void splice_initiator_user_finalized(struct peer *peer)
 	new_inflight->last_tx = NULL;
 	new_inflight->i_am_initiator = true;
 
+	update_hsmd_with_splice(peer,
+				new_inflight,
+				splice_acceptor_balance(peer, TX_INITIATOR));
+
 	update_view_from_inflights(peer);
 
 	peer->splice_state->count++;

common/psbt_open.c

@@ -379,33 +379,54 @@ u64 psbt_new_output_serial(struct wally_psbt *psbt, enum tx_role role)
 	return serial_id;
 }
 
+#include <stdio.h>
+#include <common/type_to_string.h>
+
 bool psbt_has_required_fields(struct wally_psbt *psbt)
 {
+	psbt_set_version(psbt, 0);
+	fprintf(stderr, "wally_psbt: %s\n", type_to_string(tmpctx, struct wally_psbt, psbt));
+	psbt_set_version(psbt, 2);
+
 	u64 serial_id;
 	for (size_t i = 0; i < psbt->num_inputs; i++) {
 		const struct wally_map_item *redeem_script;
 		struct wally_psbt_input *input = &psbt->inputs[i];
 
-		if (!psbt_get_serial_id(&input->unknowns, &serial_id))
+		if (!psbt_get_serial_id(&input->unknowns, &serial_id)) {
+			fprintf(stderr, "in[%ld]: missing serial id\n", i);
 			return false;
+		}
 
 		/* Required because we send the full tx over the wire now */
-		if (!input->utxo)
+		/* Only insist on PSBT_IN_NON_WITNESS_UTXO (.utxo) if
+		 * PSBT_IN_WITNESS_UTXO (.witness_utxo) is not present
+		 * because PSBT_IN_NON_WITNESS_UTXO uses a lot of
+		 * memory */
+		if (!input->witness_utxo && !input->utxo) {
+			fprintf(stderr, "in[%ld]: missing both utxo\n", i);
 			return false;
+		}
 
-		/* If is P2SH, redeemscript must be present */
-		assert(psbt->inputs[i].index < input->utxo->num_outputs);
-		const u8 *outscript =
-			wally_tx_output_get_script(tmpctx,
-				&input->utxo->outputs[psbt->inputs[i].index]);
-		redeem_script = wally_map_get_integer(&psbt->inputs[i].psbt_fields, /* PSBT_IN_REDEEM_SCRIPT */ 0x04);
-		if (is_p2sh(outscript, NULL) && (!redeem_script || redeem_script->value_len == 0))
-			return false;
+		if (input->utxo) {
+			/* If is P2SH, redeemscript must be present */
+			assert(psbt->inputs[i].index < input->utxo->num_outputs);
+			const u8 *outscript =
+				wally_tx_output_get_script(tmpctx,
+							   &input->utxo->outputs[psbt->inputs[i].index]);
+			redeem_script = wally_map_get_integer(&psbt->inputs[i].psbt_fields, /* PSBT_IN_REDEEM_SCRIPT */ 0x04);
+			if (is_p2sh(outscript, NULL) && (!redeem_script || redeem_script->value_len == 0)) {
+				fprintf(stderr, "in[%ld]: missing redeemscript\n", i);
+				return false;
+			}
+		}
 	}
 
 	for (size_t i = 0; i < psbt->num_outputs; i++) {
-		if (!psbt_get_serial_id(&psbt->outputs[i].unknowns, &serial_id))
+		if (!psbt_get_serial_id(&psbt->outputs[i].unknowns, &serial_id)) {
+			fprintf(stderr, "out[%ld]: missing serial id\n", i);
 			return false;
+		}
 	}
 
 	return true;