splice: Add start_batch and an internal wire type

We add `start_batch` to match t-bast’s splicing spec and we add a new internal wire type `WIRE_PROTOCOL_BATCH_ELEMENT` using the type number 32899 following the spec in Bolt #1 for application-specific messages:

“Custom (types 32768-65535): experimental and application-specific messages”

Changelog-Added: support for `start_batch`

Author: ddustin

channeld/channeld.c

@@ -4813,6 +4813,8 @@ static void peer_in(struct peer *peer, const u8 *msg)
 	case WIRE_UPDATE_ADD_HTLC:
 		handle_peer_add_htlc(peer, msg);
 		return;
+	case WIRE_START_BATCH:
+		return;
 	case WIRE_COMMITMENT_SIGNED:
 		handle_peer_commit_sig_batch(peer, msg, 0,
 					     peer->channel->funding_pubkey[REMOTE],
@@ -4883,6 +4885,7 @@ static void peer_in(struct peer *peer, const u8 *msg)
 		return;
 
 	/* These are all swallowed by connectd */
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
 	case WIRE_CHANNEL_ANNOUNCEMENT:
 	case WIRE_CHANNEL_UPDATE:
 	case WIRE_NODE_ANNOUNCEMENT:

common/gossmap.c

@@ -1799,6 +1799,8 @@ const void *gossmap_stream_next(const tal_t *ctx,
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
 		case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+		case WIRE_PROTOCOL_BATCH_ELEMENT:
+		case WIRE_START_BATCH:
 		case WIRE_COMMITMENT_SIGNED:
 		case WIRE_REVOKE_AND_ACK:
 		case WIRE_UPDATE_FEE:

common/interactivetx.c

@@ -163,6 +163,8 @@ static u8 *read_next_msg(const tal_t *ctx,
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
 		case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+		case WIRE_PROTOCOL_BATCH_ELEMENT:
+		case WIRE_START_BATCH:
 		case WIRE_COMMITMENT_SIGNED:
 		case WIRE_REVOKE_AND_ACK:
 		case WIRE_UPDATE_FEE:
@@ -771,6 +773,8 @@ char *process_interactivetx_updates(const tal_t *ctx,
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
 		case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+		case WIRE_PROTOCOL_BATCH_ELEMENT:
+		case WIRE_START_BATCH:
 		case WIRE_COMMITMENT_SIGNED:
 		case WIRE_REVOKE_AND_ACK:
 		case WIRE_UPDATE_FEE:

connectd/gossip_rcvd_filter.c

@@ -73,6 +73,8 @@ static bool is_msg_gossip_broadcast(const u8 *cursor)
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
 	case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
+	case WIRE_START_BATCH:
 	case WIRE_COMMITMENT_SIGNED:
 	case WIRE_REVOKE_AND_ACK:
 	case WIRE_UPDATE_FEE:

connectd/gossip_store.c

@@ -82,6 +82,8 @@ static bool public_msg_type(enum peer_wire type)
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
 	case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
+	case WIRE_START_BATCH:
 	case WIRE_COMMITMENT_SIGNED:
 	case WIRE_REVOKE_AND_ACK:
 	case WIRE_UPDATE_FEE:

connectd/multiplex.c

@@ -382,6 +382,8 @@ static bool is_urgent(enum peer_wire type)
 	/* These are time-sensitive, and so send without delay. */
 	case WIRE_PING:
 	case WIRE_PONG:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
+	case WIRE_START_BATCH:
 	case WIRE_COMMITMENT_SIGNED:
 	case WIRE_REVOKE_AND_ACK:
 		return true;

gossipd/gossipd.c

@@ -244,6 +244,8 @@ static void handle_recv_gossip(struct daemon *daemon, const u8 *outermsg)
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
 	case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
+	case WIRE_START_BATCH:
 	case WIRE_COMMITMENT_SIGNED:
 	case WIRE_REVOKE_AND_ACK:
 	case WIRE_UPDATE_FEE:

openingd/dualopend.c

@@ -1673,6 +1673,8 @@ static u8 *opening_negotiate_msg(const tal_t *ctx, struct state *state)
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
 		case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+		case WIRE_PROTOCOL_BATCH_ELEMENT:
+		case WIRE_START_BATCH:
 		case WIRE_COMMITMENT_SIGNED:
 		case WIRE_REVOKE_AND_ACK:
 		case WIRE_UPDATE_FEE:
@@ -2057,6 +2059,8 @@ static bool run_tx_interactive(struct state *state,
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
 		case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+		case WIRE_PROTOCOL_BATCH_ELEMENT:
+		case WIRE_START_BATCH:
 		case WIRE_COMMITMENT_SIGNED:
 		case WIRE_REVOKE_AND_ACK:
 		case WIRE_UPDATE_FEE:
@@ -4209,6 +4213,9 @@ static u8 *handle_peer_in(struct state *state)
 		}
 		accepter_start(state, msg);
 		return NULL;
+	case WIRE_START_BATCH:
+		/* We ignore batch messages as we dont need them */
+		return NULL;
 	case WIRE_COMMITMENT_SIGNED:
 		handle_commit_signed(state, msg);
 		return NULL;
@@ -4270,6 +4277,7 @@ static u8 *handle_peer_in(struct state *state)
 	case WIRE_SPLICE:
 	case WIRE_SPLICE_ACK:
 	case WIRE_SPLICE_LOCKED:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
 		break;
 	}
 

wire/peer_wire.c

@@ -21,6 +21,8 @@ static bool unknown_type(enum peer_wire t)
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
 	case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
+	case WIRE_START_BATCH:
 	case WIRE_COMMITMENT_SIGNED:
 	case WIRE_REVOKE_AND_ACK:
 	case WIRE_UPDATE_FEE:
@@ -89,6 +91,8 @@ bool is_msg_for_gossipd(const u8 *cursor)
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
 	case WIRE_UPDATE_FAIL_MALFORMED_HTLC:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
+	case WIRE_START_BATCH:
 	case WIRE_COMMITMENT_SIGNED:
 	case WIRE_REVOKE_AND_ACK:
 	case WIRE_UPDATE_FEE:
@@ -166,6 +170,7 @@ bool extract_channel_id(const u8 *in_pkt, struct channel_id *channel_id)
 	case WIRE_ONION_MESSAGE:
 	case WIRE_PEER_STORAGE:
 	case WIRE_PEER_STORAGE_RETRIEVAL:
+	case WIRE_PROTOCOL_BATCH_ELEMENT:
 		return false;
 
 	/* Special cases: */
@@ -345,6 +350,11 @@ bool extract_channel_id(const u8 *in_pkt, struct channel_id *channel_id)
 		 * 2. data:
 		 *    * [`channel_id`:`channel_id`]
 		 */
+	case WIRE_START_BATCH:
+		/* 1. type: 127 (`start_batch`)
+		 * 2. data:
+		 *    * [`channel_id`:`channel_id`]
+		 */
 	case WIRE_COMMITMENT_SIGNED:
 		/* BOLT #2:
 		 * 1. type: 132 (`commitment_signed`)

wire/peer_wire.csv

@@ -1,3 +1,6 @@
+msgtype,protocol_batch_element,0
+msgdata,protocol_batch_element,channel_id,channel_id,
+msgdata,protocol_batch_element,element_size,u16,
 msgtype,init,16
 msgdata,init,gflen,u16,
 msgdata,init,globalfeatures,byte,gflen
@@ -293,6 +296,12 @@ msgdata,update_fail_malformed_htlc,channel_id,channel_id,
 msgdata,update_fail_malformed_htlc,id,u64,
 msgdata,update_fail_malformed_htlc,sha256_of_onion,sha256,
 msgdata,update_fail_malformed_htlc,failure_code,u16,
+msgtype,start_batch,127
+msgdata,start_batch,channel_id,channel_id,
+msgdata,start_batch,batch_size,u16,
+msgdata,start_batch,batch_info,start_batch_tlvs,
+tlvtype,start_batch_tlvs,batch_info,1
+tlvdata,start_batch_tlvs,batch_info,message_type,u16,
 msgtype,commitment_signed,132
 msgdata,commitment_signed,channel_id,channel_id,
 msgdata,commitment_signed,signature,signature,