BOLTs: import spec additions for option_simple_close.

rustyrussell · rustyrussell · commit 733efcf7dd19 · 2025-03-18T14:30:58.000+10:30
Signed-off-by: Rusty Russell &lt;rusty@rustcorp.com.au&gt;
diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ CCANDIR := ccan
 
 # Where we keep the BOLT RFCs
 BOLTDIR := ../bolts/
-DEFAULT_BOLTVERSION := acd383145dd8c3fecd69ce94e4a789767b984ac0
+DEFAULT_BOLTVERSION := ccfa38ed4f592c3711156bb4ded77f44ec01101d
 # Can be overridden on cmdline.
 BOLTVERSION := $(DEFAULT_BOLTVERSION)
 
diff --git a/channeld/channeld.c b/channeld/channeld.c
@@ -4554,6 +4554,8 @@ static void peer_in(struct peer *peer, const u8 *msg)
 	case WIRE_FUNDING_CREATED:
 	case WIRE_FUNDING_SIGNED:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_TX_ADD_INPUT:
 	case WIRE_TX_REMOVE_INPUT:
 	case WIRE_TX_ADD_OUTPUT:
diff --git a/closingd/closingd.c b/closingd/closingd.c
@@ -165,7 +165,7 @@ static void send_offer(struct per_peer_state *pps,
 
 	/* BOLT #3:
 	 *
-	 * ## Closing Transaction
+	 * ## Legacy Closing Transaction
 	 *...
 	 * Each node offering a signature... MAY eliminate its
 	 * own output.
diff --git a/common/close_tx.c b/common/close_tx.c
@@ -29,7 +29,10 @@ struct bitcoin_tx *create_close_tx(const tal_t *ctx,
 
 	/* BOLT #3:
 	 *
-	 * ## Closing Transaction
+	 * ## Legacy Closing Transaction
+	 *
+	 * This variant is used for `closing_signed` messages (i.e. where
+	 * `option_simple_close` is not negotiated).
 	 *
 	 * Note that there are two possible variants for each node.
 	 *
diff --git a/common/gossmap.c b/common/gossmap.c
@@ -1792,6 +1792,8 @@ const void *gossmap_stream_next(const tal_t *ctx,
 		case WIRE_SPLICE_LOCKED:
 		case WIRE_SHUTDOWN:
 		case WIRE_CLOSING_SIGNED:
+		case WIRE_CLOSING_COMPLETE:
+		case WIRE_CLOSING_SIG:
 		case WIRE_UPDATE_ADD_HTLC:
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
diff --git a/common/interactivetx.c b/common/interactivetx.c
@@ -157,6 +157,8 @@ static u8 *read_next_msg(const tal_t *ctx,
 		case WIRE_FUNDING_CREATED:
 		case WIRE_FUNDING_SIGNED:
 		case WIRE_CLOSING_SIGNED:
+		case WIRE_CLOSING_COMPLETE:
+		case WIRE_CLOSING_SIG:
 		case WIRE_UPDATE_ADD_HTLC:
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
@@ -747,6 +749,8 @@ char *process_interactivetx_updates(const tal_t *ctx,
 		case WIRE_CHANNEL_READY:
 		case WIRE_SHUTDOWN:
 		case WIRE_CLOSING_SIGNED:
+		case WIRE_CLOSING_COMPLETE:
+		case WIRE_CLOSING_SIG:
 		case WIRE_UPDATE_ADD_HTLC:
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
diff --git a/common/shutdown_scriptpubkey.h b/common/shutdown_scriptpubkey.h
@@ -10,6 +10,10 @@
  * 3. if (and only if) `option_shutdown_anysegwit` is negotiated:
  *    * `OP_1` through `OP_16` inclusive, followed by a single push of 2 to 40 bytes
  *    (witness program versions 1 through 16)
+ * 4. if (and only if) `option_simple_close` is negotiated:
+ *    * `OP_RETURN` followed by one of:
+ *      * `6` to `75` inclusive followed by exactly that many bytes
+ *      * `76` followed by `76` to `80` followed by exactly that many bytes
  *
  * A receiving node:
  *...
diff --git a/connectd/gossip_rcvd_filter.c b/connectd/gossip_rcvd_filter.c
@@ -67,6 +67,8 @@ static bool is_msg_gossip_broadcast(const u8 *cursor)
 	case WIRE_CHANNEL_READY:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_UPDATE_ADD_HTLC:
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
diff --git a/connectd/gossip_store.c b/connectd/gossip_store.c
@@ -76,6 +76,8 @@ static bool public_msg_type(enum peer_wire type)
 	case WIRE_TX_ABORT:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_UPDATE_ADD_HTLC:
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
diff --git a/connectd/multiplex.c b/connectd/multiplex.c
@@ -364,6 +364,8 @@ static bool is_urgent(enum peer_wire type)
 	case WIRE_TX_ACK_RBF:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_UPDATE_ADD_HTLC:
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c
@@ -238,6 +238,8 @@ static void handle_recv_gossip(struct daemon *daemon, const u8 *outermsg)
 	case WIRE_CHANNEL_READY:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_UPDATE_ADD_HTLC:
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
diff --git a/openingd/dualopend.c b/openingd/dualopend.c
@@ -1668,6 +1668,8 @@ static u8 *opening_negotiate_msg(const tal_t *ctx, struct state *state)
 		case WIRE_FUNDING_CREATED:
 		case WIRE_FUNDING_SIGNED:
 		case WIRE_CLOSING_SIGNED:
+		case WIRE_CLOSING_COMPLETE:
+		case WIRE_CLOSING_SIG:
 		case WIRE_UPDATE_ADD_HTLC:
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
@@ -2050,6 +2052,8 @@ static bool run_tx_interactive(struct state *state,
 		case WIRE_CHANNEL_READY:
 		case WIRE_SHUTDOWN:
 		case WIRE_CLOSING_SIGNED:
+		case WIRE_CLOSING_COMPLETE:
+		case WIRE_CLOSING_SIG:
 		case WIRE_UPDATE_ADD_HTLC:
 		case WIRE_UPDATE_FULFILL_HTLC:
 		case WIRE_UPDATE_FAIL_HTLC:
@@ -4231,6 +4235,8 @@ static u8 *handle_peer_in(struct state *state)
 	case WIRE_FUNDING_CREATED:
 	case WIRE_FUNDING_SIGNED:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_UPDATE_ADD_HTLC:
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
diff --git a/wire/peer_wire.c b/wire/peer_wire.c
@@ -15,6 +15,8 @@ static bool unknown_type(enum peer_wire t)
 	case WIRE_CHANNEL_READY:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_UPDATE_ADD_HTLC:
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
@@ -81,6 +83,8 @@ bool is_msg_for_gossipd(const u8 *cursor)
 	case WIRE_CHANNEL_READY:
 	case WIRE_SHUTDOWN:
 	case WIRE_CLOSING_SIGNED:
+	case WIRE_CLOSING_COMPLETE:
+	case WIRE_CLOSING_SIG:
 	case WIRE_UPDATE_ADD_HTLC:
 	case WIRE_UPDATE_FULFILL_HTLC:
 	case WIRE_UPDATE_FAIL_HTLC:
@@ -305,6 +309,18 @@ bool extract_channel_id(const u8 *in_pkt, struct channel_id *channel_id)
 		 * 2. data:
 		 *    * [`channel_id`:`channel_id`]
 		 */
+	case WIRE_CLOSING_COMPLETE:
+		/* BOLT #2:
+		 * 1. type: 40 (`closing_complete`)
+		 * 2. data:
+		 *    * [`channel_id`:`channel_id`]
+		 */
+	case WIRE_CLOSING_SIG:
+		/* BOLT #2:
+		 * 1. type: 41 (`closing_sig`)
+		 * 2. data:
+		 *    * [`channel_id`:`channel_id`]
+		 */
 	case WIRE_UPDATE_ADD_HTLC:
 		/* BOLT #2:
 		 * 1. type: 128 (`update_add_htlc`)
diff --git a/wire/peer_wire.csv b/wire/peer_wire.csv
@@ -245,6 +245,30 @@ msgdata,closing_signed,tlvs,closing_signed_tlvs,
 tlvtype,closing_signed_tlvs,fee_range,1
 tlvdata,closing_signed_tlvs,fee_range,min_fee_satoshis,u64,
 tlvdata,closing_signed_tlvs,fee_range,max_fee_satoshis,u64,
+msgtype,closing_complete,40
+msgdata,closing_complete,channel_id,channel_id,
+msgdata,closing_complete,closer_scriptpubkey_len,u16,
+msgdata,closing_complete,closer_scriptpubkey,byte,closer_scriptpubkey_len
+msgdata,closing_complete,closee_scriptpubkey_len,u16,
+msgdata,closing_complete,closee_scriptpubkey,byte,closee_scriptpubkey_len
+msgdata,closing_complete,fee_satoshis,u64,
+msgdata,closing_complete,locktime,u32,
+msgdata,closing_complete,tlvs,closing_tlvs,
+msgtype,closing_sig,41
+msgdata,closing_sig,channel_id,channel_id,
+msgdata,closing_sig,closer_scriptpubkey_len,u16,
+msgdata,closing_sig,closer_scriptpubkey,byte,closer_scriptpubkey_len
+msgdata,closing_sig,closee_scriptpubkey_len,u16,
+msgdata,closing_sig,closee_scriptpubkey,byte,closee_scriptpubkey_len
+msgdata,closing_sig,fee_satoshis,u64,
+msgdata,closing_sig,locktime,u32,
+msgdata,closing_sig,tlvs,closing_tlvs,
+tlvtype,closing_tlvs,closer_output_only,1
+tlvdata,closing_tlvs,closer_output_only,sig,signature,
+tlvtype,closing_tlvs,closee_output_only,2
+tlvdata,closing_tlvs,closee_output_only,sig,signature,
+tlvtype,closing_tlvs,closer_and_closee_outputs,3
+tlvdata,closing_tlvs,closer_and_closee_outputs,sig,signature,
 msgtype,update_add_htlc,128
 msgdata,update_add_htlc,channel_id,channel_id,
 msgdata,update_add_htlc,id,u64,

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ static void send_offer(struct per_peer_state *pps,`
`165`	`165`
`166`	`166`	`/* BOLT #3:`
`167`	`167`	`*`
`168`		`- * ## Closing Transaction`
	`168`	`+ * ## Legacy Closing Transaction`
`169`	`169`	`*...`
`170`	`170`	`* Each node offering a signature... MAY eliminate its`
`171`	`171`	`* own output.`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ struct bitcoin_tx create_close_tx(const tal_t ctx,`
`29`	`29`
`30`	`30`	`/* BOLT #3:`
`31`	`31`	`*`
`32`		`- * ## Closing Transaction`
	`32`	`+ * ## Legacy Closing Transaction`
	`33`	`+ *`
	`34`	+ * This variant is used for `closing_signed` messages (i.e. where
	`35`	+ * `option_simple_close` is not negotiated).
`33`	`36`	`*`
`34`	`37`	`* Note that there are two possible variants for each node.`
`35`	`38`	`*`