fixup! splice: Add locked field to inflight db

Author: ddustin

channeld/channeld.c

@@ -3537,7 +3537,7 @@ static void resume_splice_negotiation(struct peer *peer,
 		msg = towire_channeld_update_inflight(NULL, current_psbt,
 						      their_commit->tx,
 						      &their_commit->commit_signature,
-						      inflight->is_locked);
+						      inflight->locked_scid);
 		wire_sync_write(MASTER_FD, take(msg));
 	}
 
@@ -3608,7 +3608,7 @@ static void resume_splice_negotiation(struct peer *peer,
 		&& send_signature) {
 		msg = towire_channeld_update_inflight(NULL, current_psbt,
 						      NULL, NULL,
-						      inflight->is_locked);
+						      inflight->locked_scid);
 		wire_sync_write(MASTER_FD, take(msg));
 
 		msg = towire_channeld_splice_sending_sigs(tmpctx, &final_txid);
@@ -3778,7 +3778,7 @@ static void resume_splice_negotiation(struct peer *peer,
 		/* We let core validate our peer's signatures are correct. */
 		msg = towire_channeld_update_inflight(NULL, current_psbt, NULL,
 						      NULL,
-						      inflight->is_locked);
+						      inflight->locked_scid);
 		wire_sync_write(MASTER_FD, take(msg));
 	}
 
@@ -4011,7 +4011,7 @@ static void splice_accepter(struct peer *peer, const u8 *inmsg)
 	new_inflight->last_tx = NULL;
 	new_inflight->i_am_initiator = false;
 	new_inflight->force_sign_first = peer->splicing->force_sign_first;
-	new_inflight->is_locked = false;
+	new_inflight->locked_scid = NULL;
 
 	current_push_val = relative_splice_balance_fundee(peer, our_role,ictx->current_psbt,
 					  outpoint.n, splice_funding_index);
@@ -4233,7 +4233,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
 	new_inflight->last_tx = NULL;
 	new_inflight->i_am_initiator = true;
 	new_inflight->force_sign_first = peer->splicing->force_sign_first;
-	new_inflight->is_locked = false;
+	new_inflight->locked_scid = NULL;
 
 	audit_psbt(ictx->current_psbt, ictx->current_psbt);
 
@@ -4265,7 +4265,7 @@ static void splice_initiator_user_finalized(struct peer *peer)
 	outmsg = towire_channeld_update_inflight(NULL, new_inflight->psbt,
 						 their_commit->tx,
 						 &their_commit->commit_signature,
-						 new_inflight->is_locked);
+						 new_inflight->locked_scid);
 	wire_sync_write(MASTER_FD, take(outmsg));
 
 	sign_first = do_i_sign_first(peer, new_inflight->psbt, our_role,
@@ -4459,7 +4459,7 @@ static void splice_initiator_user_signed(struct peer *peer, const u8 *inmsg)
 	outmsg = towire_channeld_update_inflight(NULL, inflight->psbt,
 						 inflight->last_tx,
 						 &inflight->last_sig,
-						 inflight->is_locked);
+						 inflight->locked_scid);
 
 	wire_sync_write(MASTER_FD, take(outmsg));
 
@@ -5791,13 +5791,13 @@ static void handle_funding_depth(struct peer *peer, const u8 *msg)
 								" inflights to"
 								"match, %s",
 								fmt_bitcoin_txid(tmpctx, &txid));
-					inflight->is_locked = true;
+					inflight->locked_scid = tal_steal(inflight, scid);
 					assert(inflight->psbt);
 					msg = towire_channeld_update_inflight(NULL,
 									      inflight->psbt,
 									      NULL,
 									      NULL,
-									      inflight->is_locked);
+									      inflight->locked_scid);
 					wire_sync_write(MASTER_FD, take(msg));
 					inflight_match = inflight;
 				}
@@ -6405,7 +6405,7 @@ static void init_channel(struct peer *peer)
 
 	found_locked_inflight = false;
 	for (size_t i = 0; i < tal_count(peer->splice_state->inflights); i++) {
-		if (peer->splice_state->inflights[i]->is_locked) {
+		if (peer->splice_state->inflights[i]->locked_scid) {
 			if (found_locked_inflight)
 				status_failed(STATUS_FAIL_INTERNAL_ERROR,
 					      "There should never be two splice"
@@ -6414,6 +6414,7 @@ static void init_channel(struct peer *peer)
 					      fmt_bitcoin_txid(tmpctx, &peer->splice_state->locked_txid),
 					      fmt_bitcoin_txid(tmpctx, &peer->splice_state->inflights[i]->outpoint.txid));
 			peer->splice_state->locked_txid = peer->splice_state->inflights[i]->outpoint.txid;
+			peer->splice_state->short_channel_id = *peer->splice_state->inflights[i]->locked_scid;
 			found_locked_inflight = true;
 		}
 	}

channeld/channeld_wire.csv

@@ -272,7 +272,7 @@ msgtype,channeld_update_inflight,7219
 msgdata,channeld_update_inflight,psbt,wally_psbt,
 msgdata,channeld_update_inflight,last_tx,?bitcoin_tx,
 msgdata,channeld_update_inflight,last_sig,?bitcoin_signature,
-msgdata,channeld_update_inflight,is_locked,bool,
+msgdata,channeld_update_inflight,locked_scid,?short_channel_id,
 
 # channeld->master: A funding error has occured
 msgtype,channeld_splice_funding_error,7220

channeld/inflight.c

@@ -1,6 +1,7 @@
 #include "config.h"
 #include <assert.h>
 #include <bitcoin/psbt.h>
+#include <bitcoin/short_channel_id.h>
 #include <channeld/inflight.h>
 #include <wire/wire.h>
 
@@ -25,7 +26,14 @@ struct inflight *fromwire_inflight(const tal_t *ctx, const u8 **cursor, size_t *
 	}
 	inflight->i_am_initiator = fromwire_bool(cursor, max);
 	inflight->force_sign_first = fromwire_bool(cursor, max);
-	inflight->is_locked = fromwire_bool(cursor, max);
+	int has_locked_scid = fromwire_u8(cursor, max);
+	if (has_locked_scid) {
+		inflight->locked_scid = tal(inflight, struct short_channel_id);
+		*inflight->locked_scid = fromwire_short_channel_id(cursor, max);
+	}
+	else {
+		inflight->locked_scid = NULL;
+	}
 
 	return inflight;
 }
@@ -45,5 +53,7 @@ void towire_inflight(u8 **pptr, const struct inflight *inflight)
 	}
 	towire_bool(pptr, inflight->i_am_initiator);
 	towire_bool(pptr, inflight->force_sign_first);
-	towire_bool(pptr, inflight->is_locked);
+	towire_u8(pptr, inflight->locked_scid ? 1 : 0);
+	if (inflight->locked_scid)
+		towire_short_channel_id(pptr, *inflight->locked_scid);
 }

channeld/inflight.h

@@ -19,7 +19,7 @@ struct inflight {
 	struct bitcoin_signature last_sig;
 	bool i_am_initiator;
 	bool force_sign_first;
-	bool is_locked;
+	struct short_channel_id *locked_scid;
 };
 
 struct inflight *fromwire_inflight(const tal_t *ctx, const u8 **cursor, size_t *max);

lightningd/channel.c

@@ -207,7 +207,7 @@ new_inflight(struct channel *channel,
 
 	inflight->i_am_initiator = i_am_initiator;
 	inflight->force_sign_first = force_sign_first;
-	inflight->is_locked = false;
+	inflight->locked_scid = NULL;
 	inflight->splice_locked_memonly = false;
 
 	list_add_tail(&channel->inflights, &inflight->list);

lightningd/channel.h

@@ -84,7 +84,7 @@ struct channel_inflight {
 	/* Has this inflight reached sufficent depth on chain? This is needed
 	 * for splices that need to coordinate `splice_locked` with their
 	 * peer through reconnect flows. */
-	bool is_locked;
+	struct short_channel_id *locked_scid;
 
 	/* Note: This field is not stored in the database.
 	 *

lightningd/channel_control.c

@@ -891,10 +891,10 @@ static void handle_update_inflight(struct lightningd *ld,
 	struct bitcoin_txid txid;
 	struct bitcoin_tx *last_tx;
 	struct bitcoin_signature *last_sig;
-	bool is_locked;
+	struct short_channel_id *locked_scid;
 
 	if (!fromwire_channeld_update_inflight(tmpctx, msg, &psbt, &last_tx,
-					       &last_sig, &is_locked)) {
+					       &last_sig, &locked_scid)) {
 		channel_internal_error(channel,
 				       "bad channel_add_inflight %s",
 				       tal_hex(channel, msg));
@@ -922,7 +922,7 @@ static void handle_update_inflight(struct lightningd *ld,
 	if (last_sig)
 		inflight->last_sig = *last_sig;
 
-	inflight->is_locked = is_locked;
+	inflight->locked_scid = tal_steal(inflight, locked_scid);
 
 	tal_wally_start();
 	if (wally_psbt_combine(inflight->funding_psbt, psbt) != WALLY_OK) {
@@ -1812,14 +1812,11 @@ bool peer_start_channeld(struct channel *channel,
 		infcopy->amnt = inflight->funding->total_funds;
 		infcopy->remote_tx_sigs = inflight->remote_tx_sigs;
 		infcopy->splice_amnt = inflight->funding->splice_amnt;
-		if (inflight->last_tx)
-			infcopy->last_tx = tal_dup(infcopy, struct bitcoin_tx, inflight->last_tx);
-		else
-			infcopy->last_tx = NULL;
+		infcopy->last_tx = tal_dup_or_null(infcopy, struct bitcoin_tx, inflight->last_tx);
 		infcopy->last_sig = inflight->last_sig;
 		infcopy->i_am_initiator = inflight->i_am_initiator;
 		infcopy->force_sign_first = inflight->force_sign_first;
-		infcopy->is_locked = inflight->is_locked;
+		infcopy->locked_scid = tal_dup_or_null(infcopy, struct short_channel_id, inflight->locked_scid);
 
 		tal_wally_start();
 		wally_psbt_clone_alloc(inflight->funding_psbt, 0, &infcopy->psbt);

wallet/db.c

@@ -1040,7 +1040,7 @@ static struct migration dbmigrations[] = {
     {SQL("ALTER TABLE channel_htlcs ADD updated_index BIGINT DEFAULT 0"), NULL},
     {SQL("CREATE INDEX channel_htlcs_updated_idx ON channel_htlcs (updated_index)"), NULL},
     {NULL, migrate_initialize_channel_htlcs_wait_indexes},
-    {SQL("ALTER TABLE channel_funding_inflights ADD locked_onchain INTEGER DEFAULT 0;"), NULL},
+    {SQL("ALTER TABLE channel_funding_inflights ADD locked_scid BIGINT DEFAULT 0;"), NULL},
 };
 
 /**

wallet/test/run-wallet.c

@@ -1648,7 +1648,10 @@ static bool channel_inflightseq(struct channel_inflight *i1,
 	CHECK(i1->lease_chan_max_msat == i2->lease_chan_max_msat);
 	CHECK(i1->lease_chan_max_ppt == i2->lease_chan_max_ppt);
 	CHECK(i1->lease_blockheight_start == i2->lease_blockheight_start);
-	CHECK(i1->is_locked == i2->is_locked);
+	CHECK(!i1->locked_scid == !i2->locked_scid);
+	if (i1->locked_scid)
+		CHECK(memeq(i1->locked_scid, sizeof(*i1->locked_scid),
+			    i2->locked_scid, sizeof(*i2->locked_scid)));
 	CHECK(i1->splice_locked_memonly == i2->splice_locked_memonly);
 
 	return true;
@@ -2072,7 +2075,8 @@ static bool test_channel_inflight_crud(struct lightningd *ld, const tal_t *ctx)
 				false,
 				false);
 	inflight->splice_locked_memonly = true;
-	inflight->is_locked = true;
+	inflight->locked_scid = tal(inflight, struct short_channel_id);
+	memset(inflight->locked_scid, 7, sizeof(struct short_channel_id));
 
 	inflight_set_last_tx(inflight, last_tx, sig);
 
@@ -2101,7 +2105,7 @@ static bool test_channel_inflight_crud(struct lightningd *ld, const tal_t *ctx)
 				false,
 				false);
 	inflight->splice_locked_memonly = false;
-	inflight->is_locked = false;
+	inflight->locked_scid = NULL;
 	inflight_set_last_tx(inflight, last_tx, sig);
 	wallet_inflight_add(w, inflight);
 	CHECK_MSG(c2 = wallet_channel_load(w, chan->dbid),

wallet/wallet.c

@@ -1374,7 +1374,7 @@ void wallet_inflight_add(struct wallet *w, struct channel_inflight *inflight)
 				 ", i_am_initiator"
 				 ", force_sign_first"
 				 ", remote_funding"
-				 ", locked_onchain"
+				 ", locked_scid"
 				 ") VALUES ("
 				 "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"));
 
@@ -1419,7 +1419,10 @@ void wallet_inflight_add(struct wallet *w, struct channel_inflight *inflight)
 		db_bind_pubkey(stmt, inflight->funding->splice_remote_funding);
 	else
 		db_bind_null(stmt);
-	db_bind_int(stmt, inflight->is_locked);
+	if (inflight->locked_scid)
+		db_bind_short_channel_id(stmt, *inflight->locked_scid);
+	else
+		db_bind_null(stmt);
 
 	db_exec_prepared_v2(stmt);
 	assert(!stmt->error);
@@ -1448,14 +1451,14 @@ void wallet_inflight_save(struct wallet *w,
 	struct db_stmt *stmt;
 	/* The *only* thing you can update on an
 	 * inflight is the funding PSBT (to add sigs)
-	 * and the last_tx/last_sig or locked_onchain if this is for a splice */
+	 * and the last_tx/last_sig or locked_scid if this is for a splice */
 	stmt = db_prepare_v2(w->db,
 			     SQL("UPDATE channel_funding_inflights SET"
 				 "  funding_psbt=?" // 0
 				 ", funding_tx_remote_sigs_received=?" // 1
 				 ", last_tx=?" // 2
 				 ", last_sig=?" // 3
-				 ", locked_onchain=?" // 4
+				 ", locked_scid=?" // 4
 				 " WHERE"
 				 "  channel_id=?" // 5
 				 " AND funding_tx_id=?" // 6
@@ -1469,14 +1472,31 @@ void wallet_inflight_save(struct wallet *w,
 		db_bind_null(stmt);
 		db_bind_null(stmt);
 	}
-	db_bind_int(stmt, inflight->is_locked);
+	if (inflight->locked_scid)
+		db_bind_short_channel_id(stmt, *inflight->locked_scid);
+	else
+		db_bind_null(stmt);
 	db_bind_u64(stmt, inflight->channel->dbid);
 	db_bind_txid(stmt, &inflight->funding->outpoint.txid);
 	db_bind_int(stmt, inflight->funding->outpoint.n);
 
 	db_exec_prepared_v2(take(stmt));
 }
 
+static struct short_channel_id *db_col_optional_scid(const tal_t *ctx,
+						     struct db_stmt *stmt,
+						     const char *colname)
+{
+	struct short_channel_id *scid;
+
+	if (db_col_is_null(stmt, colname))
+		return NULL;
+
+	scid = tal(ctx, struct short_channel_id);
+	*scid = db_col_short_channel_id(stmt, colname);
+	return scid;
+}
+
 void wallet_channel_clear_inflights(struct wallet *w,
 				    struct channel *chan)
 {
@@ -1568,7 +1588,7 @@ wallet_stmt2inflight(struct wallet *w, struct db_stmt *stmt,
 				i_am_initiator,
 				force_sign_first);
 
-	inflight->is_locked = db_col_int(stmt, "locked_onchain");
+	inflight->locked_scid = db_col_optional_scid(inflight, stmt, "locked_scid");
 
 	/* last_tx is null for not yet committed
 	 * channels + static channel backup recoveries */
@@ -1621,7 +1641,7 @@ static bool wallet_channel_load_inflights(struct wallet *w,
 					", i_am_initiator"
 					", force_sign_first"
 					", remote_funding"
-					", locked_onchain"
+					", locked_scid"
 					" FROM channel_funding_inflights"
 					" WHERE channel_id = ?"
 					" ORDER BY funding_feerate"));
@@ -1670,20 +1690,6 @@ static bool wallet_channel_config_load(struct wallet *w, const u64 id,
 	return ok;
 }
 
-static struct short_channel_id *db_col_optional_scid(const tal_t *ctx,
-						     struct db_stmt *stmt,
-						     const char *colname)
-{
-	struct short_channel_id *scid;
-
-	if (db_col_is_null(stmt, colname))
-		return NULL;
-
-	scid = tal(ctx, struct short_channel_id);
-	*scid = db_col_short_channel_id(stmt, colname);
-	return scid;
-}
-
 static struct channel_state_change **wallet_state_change_get(const tal_t *ctx,
 							     struct wallet *w,
 							     u64 channel_id)