splice: Add locked field to inflight db

This is needed to remember if a splice was locked and reconnect occurs mid `splice_locked` attempted so it can be resumed in reestablish.

Author: ddustin

lightningd/channel.c

@@ -200,6 +200,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->splice_locked_memonly = false;
 
 	list_add_tail(&channel->inflights, &inflight->list);

lightningd/channel.h

@@ -81,6 +81,11 @@ struct channel_inflight {
 	/* On reestablish recovery; should I sign first? */
 	bool force_sign_first;
 
+	/* 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;
+
 	/* Note: This field is not stored in the database.
 	 *
 	 * After splice_locked, we need a way to stop the chain watchers from

wallet/db.c

@@ -1030,6 +1030,7 @@ static struct migration dbmigrations[] = {
     {SQL("ALTER TABLE channel_funding_inflights ADD remote_funding BLOB DEFAULT NULL;"), NULL},
     {SQL("ALTER TABLE peers ADD last_known_address BLOB DEFAULT NULL;"), NULL},
     {SQL("ALTER TABLE channels ADD close_attempt_height INTEGER DEFAULT 0;"), NULL},
+    {SQL("ALTER TABLE channel_funding_inflights ADD locked_onchain INTEGER DEFAULT 0;"), NULL},
 };
 
 /**

wallet/test/run-wallet.c

@@ -1616,6 +1616,8 @@ 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->splice_locked_memonly == i2->splice_locked_memonly);
 
 	return true;
 }
@@ -2037,6 +2039,8 @@ static bool test_channel_inflight_crud(struct lightningd *ld, const tal_t *ctx)
 				0,
 				false,
 				false);
+	inflight->splice_locked_memonly = true;
+	inflight->is_locked = true;
 
 	inflight_set_last_tx(inflight, last_tx, sig);
 
@@ -2064,6 +2068,8 @@ static bool test_channel_inflight_crud(struct lightningd *ld, const tal_t *ctx)
 				0,
 				false,
 				false);
+	inflight->splice_locked_memonly = false;
+	inflight->is_locked = false;
 	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

@@ -1244,8 +1244,9 @@ void wallet_inflight_add(struct wallet *w, struct channel_inflight *inflight)
 				 ", i_am_initiator"
 				 ", force_sign_first"
 				 ", remote_funding"
+				 ", locked_onchain"
 				 ") VALUES ("
-				 "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"));
+				 "?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"));
 
 	db_bind_u64(stmt, inflight->channel->dbid);
 	db_bind_txid(stmt, &inflight->funding->outpoint.txid);
@@ -1288,6 +1289,7 @@ 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);
 
 	db_exec_prepared_v2(stmt);
 	assert(!stmt->error);
@@ -1316,17 +1318,18 @@ 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 if this is for a splice */
+	 * and the last_tx/last_sig or locked_onchain 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
 				 " WHERE"
-				 "  channel_id=?" // 4
-				 " AND funding_tx_id=?" // 5
-				 " AND funding_tx_outnum=?")); // 6
+				 "  channel_id=?" // 5
+				 " AND funding_tx_id=?" // 6
+				 " AND funding_tx_outnum=?")); // 7
 	db_bind_psbt(stmt, inflight->funding_psbt);
 	db_bind_int(stmt, inflight->remote_tx_sigs);
 	if (inflight->last_tx) {
@@ -1336,6 +1339,7 @@ void wallet_inflight_save(struct wallet *w,
 		db_bind_null(stmt);
 		db_bind_null(stmt);
 	}
+	db_bind_int(stmt, inflight->is_locked);
 	db_bind_u64(stmt, inflight->channel->dbid);
 	db_bind_txid(stmt, &inflight->funding->outpoint.txid);
 	db_bind_int(stmt, inflight->funding->outpoint.n);
@@ -1434,6 +1438,8 @@ wallet_stmt2inflight(struct wallet *w, struct db_stmt *stmt,
 				i_am_initiator,
 				force_sign_first);
 
+	inflight->is_locked = db_col_int(stmt, "locked_onchain");
+
 	/* last_tx is null for not yet committed
 	 * channels + static channel backup recoveries */
 	if (!db_col_is_null(stmt, "last_tx")) {
@@ -1485,6 +1491,7 @@ static bool wallet_channel_load_inflights(struct wallet *w,
 					", i_am_initiator"
 					", force_sign_first"
 					", remote_funding"
+					", locked_onchain"
 					" FROM channel_funding_inflights"
 					" WHERE channel_id = ?"
 					" ORDER BY funding_feerate"));