wire: Apply onion mesages spec patch even when not experimental.

Signed-off-by: Rusty Russell <[email protected]>

Author: rustyrussell

channeld/channeld.c

@@ -1931,9 +1931,7 @@ static void peer_in(struct peer *peer, const u8 *msg)
 	case WIRE_PING:
 	case WIRE_PONG:
 	case WIRE_ERROR:
-#if EXPERIMENTAL_FEATURES
 	case WIRE_ONION_MESSAGE:
-#endif
 		abort();
 	}
 

gossipd/gossipd.c

@@ -757,6 +757,9 @@ static struct io_plan *peer_msg_in(struct io_conn *conn,
 	case WIRE_CHANNEL_REESTABLISH:
 	case WIRE_ANNOUNCEMENT_SIGNATURES:
 	case WIRE_GOSSIP_TIMESTAMP_FILTER:
+#if !EXPERIMENTAL_FEATURES
+	case WIRE_ONION_MESSAGE:
+#endif
 #if EXPERIMENTAL_FEATURES
 	case WIRE_TX_ADD_INPUT:
 	case WIRE_TX_REMOVE_INPUT:

wire/Makefile

@@ -16,7 +16,6 @@ WIRE_HEADERS :=	wire/onion_defs.h		\
 # We don't include peer_printgen/onion_printgen here since most don't need it.
 WIRE_SRC := wire/wire_sync.c			\
 		wire/wire_io.c			\
-		wire/wire_dummy.c		\
 		wire/fromwire.c			\
 		wire/peer_wire.c		\
 		wire/tlvstream.c		\

wire/common_wiregen.c

@@ -1,6 +1,6 @@
 --- wire/extracted_onion_wire_csv	2020-03-25 10:24:12.861645774 +1030
 +++ -	2020-03-26 13:47:13.498294435 +1030
-@@ -8,6 +8,25 @@
+@@ -8,6 +8,31 @@
  tlvtype,tlv_payload,payment_data,8
  tlvdata,tlv_payload,payment_data,payment_secret,byte,32
  tlvdata,tlv_payload,payment_data,total_msat,tu64,
@@ -15,6 +15,12 @@
 +tlvdata,onionmsg_payload,enctlv,enctlv,byte,...
 +tlvtype,onionmsg_payload,blinding,12
 +tlvdata,onionmsg_payload,blinding,blinding,point,
++tlvtype,onionmsg_payload,invoice_request,64
++tlvdata,onionmsg_payload,invoice_request,invoice_request,byte,...
++tlvtype,onionmsg_payload,invoice,66
++tlvdata,onionmsg_payload,invoice,invoice,byte,...
++tlvtype,onionmsg_payload,invoice_error,68
++tlvdata,onionmsg_payload,invoice_error,invoice_error,byte,...
 +tlvtype,encmsg_tlvs,next_node_id,4
 +tlvdata,encmsg_tlvs,next_node_id,node_id,point,
 +tlvtype,encmsg_tlvs,next_short_channel_id,6

wire/common_wiregen.h

@@ -1,11 +1,12 @@
 --- wire/extracted_peer_wire_csv	2020-03-11 10:30:35.744376417 +1030
 +++ -	2020-03-26 13:47:13.409755567 +1030
-@@ -211,3 +211,8 @@
+@@ -211,3 +211,9 @@
  msgdata,gossip_timestamp_filter,chain_hash,chain_hash,
  msgdata,gossip_timestamp_filter,first_timestamp,u32,
  msgdata,gossip_timestamp_filter,timestamp_range,u32,
 +msgtype,onion_message,385,option_onion_messages
-+msgdata,onion_message,onionmsg,byte,1366
++msgdata,onion_message,len,u16,
++msgdata,onion_message,onionmsg,byte,len
 +msgdata,onion_message,onion_message_tlvs,onion_message_tlvs,
 +tlvtype,onion_message_tlvs,blinding,2
 +tlvdata,onion_message_tlvs,blinding,blinding,point,