splice: Update to Eclair style of reestablish

Update to use Eclair’s spec’d version of reestablish.

Changelog-None

Author: ddustin

channeld/channeld.c

@@ -51,6 +51,8 @@
 #include <wire/peer_wire.h>
 #include <wire/wire_sync.h>
 
+#define EXPERIMENTAL_UPGRADE_ENABLED 0
+
 /* stdin == requests, 3 == peer, 4 = HSM */
 #define MASTER_FD STDIN_FILENO
 #define HSM_FD 4
@@ -356,6 +358,7 @@ static bool handle_master_request_later(struct peer *peer, const u8 *msg)
 	return false;
 }
 
+#if EXPERIMENTAL_UPGRADE_ENABLED
 /* Compare, with false if either is NULL */
 static bool match_type(const u8 *t1, const u8 *t2)
 {
@@ -385,6 +388,7 @@ static void set_channel_type(struct channel *channel, const u8 *type)
 	wire_sync_write(MASTER_FD,
 			take(towire_channeld_upgraded(NULL, channel->type)));
 }
+#endif
 
 static void lock_signer_outpoint(const struct bitcoin_outpoint *outpoint)
 {
@@ -5165,6 +5169,7 @@ static bool capture_premature_msg(const u8 ***shit_lnd_says, const u8 *msg)
 	return true;
 }
 
+#if EXPERIMENTAL_UPGRADE_ENABLED
 /* Unwrap a channel_type into a raw byte array for the wire: can be NULL */
 static u8 *to_bytearr(const tal_t *ctx,
 		      const struct channel_type *channel_type TAKES)
@@ -5183,6 +5188,7 @@ static u8 *to_bytearr(const tal_t *ctx,
 		ret = tal_dup_talarr(ctx, u8, channel_type->features);
 	return ret;
 }
+#endif
 
 static void peer_reconnect(struct peer *peer,
 			   const struct secret *last_remote_per_commit_secret)
@@ -5219,6 +5225,7 @@ static void peer_reconnect(struct peer *peer,
 
 	send_tlvs = NULL;
 
+#if EXPERIMENTAL_UPGRADE_ENABLED
 	if (peer->experimental_upgrade) {
 		/* Subtle: we free tmpctx below as we loop, so tal off peer */
 		send_tlvs = tlv_channel_reestablish_tlvs_new(peer);
@@ -5257,6 +5264,7 @@ static void peer_reconnect(struct peer *peer,
 									  peer->channel)));
 		}
 	}
+#endif
 
 	inflight = last_inflight(peer);
 
@@ -5284,6 +5292,34 @@ static void peer_reconnect(struct peer *peer,
 		}
 	}
 
+	if (feature_negotiated(peer->our_features, peer->their_features,
+			       OPT_SPLICE)) {
+		if (!send_tlvs) {
+			/* Subtle: we free tmpctx below as we loop, so
+			 * tal off peer */
+			send_tlvs = tlv_channel_reestablish_tlvs_new(peer);
+		}
+
+		if (peer->channel_ready[REMOTE])
+			send_tlvs->your_last_funding_locked_txid = &peer->channel->funding.txid;
+
+		send_tlvs->my_current_funding_locked_txid = &peer->channel->funding.txid;
+
+		for (size_t i = 0; i < tal_count(peer->splice_state->inflights); i++) {
+			struct inflight *itr = peer->splice_state->inflights[i];
+			if (itr->locked_scid) {
+				send_tlvs->my_current_funding_locked_txid = &itr->outpoint.txid;
+				status_debug("Overriding send_tlvs->my_current_"
+					     "funding_locked_txid to %s because"
+					     " inflight is locked to scid %s",
+					     fmt_bitcoin_txid(tmpctx,
+					     		      &itr->outpoint.txid),
+					     fmt_short_channel_id(tmpctx,
+					     			  *itr->locked_scid));
+			}
+		}
+	}
+
 	/* BOLT #2:
 	 *
 	 *   - upon reconnection:
@@ -5396,26 +5432,6 @@ static void peer_reconnect(struct peer *peer,
 						  true,
 						  false,
 						  true);
-		} else if (inflight->is_locked
-			   && bitcoin_txid_eq(remote_next_funding,
-					      &inflight->outpoint.txid)) {
-			if (!bitcoin_txid_eq(&inflight->outpoint.txid,
-					     &peer->splice_state->locked_txid))
-				peer_failed_err(peer->pps,
-						&peer->channel_id,
-						"Invalid splice was resumed %s,"
-						" should be %s",
-						fmt_bitcoin_txid(tmpctx,
-								 &inflight->outpoint.txid),
-						fmt_bitcoin_txid(tmpctx,
-								 &peer->splice_state->locked_txid));
-			status_info("Splice is not confirmed but locked on"
-				    " chain -- resending splice_locked");
-			peer_write(peer->pps,
-				   take(towire_splice_locked(NULL,
-							     &peer->channel_id,
-							     &inflight->outpoint.txid)));
-			peer->splice_state->locked_ready[LOCAL] = true;
 		} else if (bitcoin_txid_eq(remote_next_funding,
 					   &inflight->outpoint.txid)) {
 			/* Don't send sigs unless we have theirs */
@@ -5470,6 +5486,19 @@ static void peer_reconnect(struct peer *peer,
 		}
 	}
 
+	/* Re-send `splice_locked` if an inflight is locked */
+	for (size_t i = 0; i < tal_count(peer->splice_state->inflights); i++) {
+		struct inflight *itr = peer->splice_state->inflights[i];
+		if (!itr->locked_scid)
+			continue;
+
+		peer_write(peer->pps,
+			   take(towire_splice_locked(NULL,
+						     &peer->channel_id,
+						     &itr->outpoint.txid)));
+		peer->splice_state->locked_ready[LOCAL] = true;
+	}
+
 	/* BOLT #2:
 	 *
 	 *   - if `next_commitment_number` is 1 in both the
@@ -5634,6 +5663,7 @@ static void peer_reconnect(struct peer *peer,
 	/* (If we had sent `closing_signed`, we'd be in closingd). */
 	maybe_send_shutdown(peer);
 
+#if EXPERIMENTAL_UPGRADE_ENABLED
 	if (recv_tlvs->desired_channel_type)
 		status_debug("They sent desired_channel_type [%s]",
 			     fmt_featurebits(tmpctx,
@@ -5711,6 +5741,7 @@ static void peer_reconnect(struct peer *peer,
 		if (type)
 			set_channel_type(peer->channel, type);
 	}
+#endif
 
 	tal_free(send_tlvs);
 

tests/fuzz/fuzz-wire-channel_reestablish.c

@@ -6,6 +6,8 @@
 #include <tests/fuzz/wire.h>
 #include <wire/peer_wire.h>
 
+#define EXPERIMENTAL_UPGRADE_ENABLED 0
+
 struct channel_reestablish {
 	struct channel_id channel_id;
 	u64 next_commitment_number;
@@ -46,6 +48,11 @@ static bool equal(const struct channel_reestablish *x,
 
 	if (!tal_arr_eq(x->tlvs->next_funding, y->tlvs->next_funding))
 		return false;
+	if (!tal_arr_eq(x->tlvs->your_last_funding_locked_txid, y->tlvs->your_last_funding_locked_txid))
+		return false;
+	if (!tal_arr_eq(x->tlvs->my_current_funding_locked_txid, y->tlvs->my_current_funding_locked_txid))
+		return false;
+#if EXPERIMENTAL_UPGRADE_ENABLED
 	if (!tal_arr_eq(x->tlvs->next_to_send, y->tlvs->next_to_send))
 		return false;
 	if (!tal_arr_eq(x->tlvs->desired_channel_type, y->tlvs->desired_channel_type))
@@ -54,6 +61,9 @@ static bool equal(const struct channel_reestablish *x,
 		return false;
 	return tal_arr_eq(x->tlvs->upgradable_channel_type,
 			  y->tlvs->upgradable_channel_type);
+#else
+	return true;
+#endif
 }
 
 void run(const u8 *data, size_t size)

tests/test_connection.py

@@ -3745,6 +3745,7 @@ def test_openchannel_init_alternate(node_factory, executor):
             print("nothing to do")
 
 
+@unittest.skip("experimental-upgrade-protocol TLV fields conflict with splicing TLV fields")
 def test_upgrade_statickey(node_factory, executor):
     """l1 doesn't have option_static_remotekey, l2 offers it."""
     l1, l2 = node_factory.get_nodes(2, opts=[{'may_reconnect': True,
@@ -3783,6 +3784,7 @@ def test_upgrade_statickey(node_factory, executor):
     l2.daemon.wait_for_log(r"They sent desired_channel_type \[12\]")
 
 
+@unittest.skip("experimental-upgrade-protocol TLV fields conflict with splicing TLV fields")
 def test_upgrade_statickey_onchaind(node_factory, executor, bitcoind):
     """We test penalty before/after, and unilateral before/after"""
     l1, l2 = node_factory.get_nodes(2, opts=[{'may_reconnect': True,
@@ -3940,6 +3942,7 @@ def test_upgrade_statickey_onchaind(node_factory, executor, bitcoind):
     wait_for(lambda: len(l2.rpc.listpeerchannels()['channels']) == 0)
 
 
+@unittest.skip("experimental-upgrade-protocol TLV fields conflict with splicing TLV fields")
 def test_upgrade_statickey_fail(node_factory, executor, bitcoind):
     """We reconnect at all points during retransmit, and we won't upgrade."""
     l1_disconnects = ['-WIRE_COMMITMENT_SIGNED',

wire/peer_wire.csv

@@ -320,16 +320,10 @@ msgdata,channel_reestablish,your_last_per_commitment_secret,byte,32
 msgdata,channel_reestablish,my_current_per_commitment_point,point,
 tlvtype,channel_reestablish_tlvs,next_funding,0
 tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
-tlvtype,channel_reestablish_tlvs,next_funding,0
-tlvdata,channel_reestablish_tlvs,next_funding,next_funding_txid,sha256,
-tlvtype,channel_reestablish_tlvs,next_to_send,1
-tlvdata,channel_reestablish_tlvs,next_to_send,commitment_number,tu64,
-tlvtype,channel_reestablish_tlvs,desired_channel_type,3
-tlvdata,channel_reestablish_tlvs,desired_channel_type,type,byte,...
-tlvtype,channel_reestablish_tlvs,current_channel_type,5
-tlvdata,channel_reestablish_tlvs,current_channel_type,type,byte,...
-tlvtype,channel_reestablish_tlvs,upgradable_channel_type,7
-tlvdata,channel_reestablish_tlvs,upgradable_channel_type,type,byte,...
+tlvtype,channel_reestablish_tlvs,your_last_funding_locked_txid,1
+tlvdata,channel_reestablish_tlvs,your_last_funding_locked_txid,your_last_funding_locked_txid,sha256,
+tlvtype,channel_reestablish_tlvs,my_current_funding_locked_txid,3
+tlvdata,channel_reestablish_tlvs,my_current_funding_locked_txid,my_current_funding_locked_txid,sha256,
 msgtype,announcement_signatures,259
 msgdata,announcement_signatures,channel_id,channel_id,
 msgdata,announcement_signatures,short_channel_id,short_channel_id,