onionmessages: remove obsolete onion message parsing.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-09-29 13:19:03 +09:30
parent 342e330b56
commit 41ef85318d
34 changed files with 64 additions and 1257 deletions

View File

@@ -1,33 +0,0 @@
--- wire/extracted_onion_wire_csv 2020-03-25 10:24:12.861645774 +1030
+++ - 2020-03-26 13:47:13.498294435 +1030
@@ -8,6 +8,30 @@
tlvdata,tlv_payload,payment_data,total_msat,tu64,
tlvtype,tlv_payload,payment_metadata,16
tlvdata,tlv_payload,payment_metadata,payment_metadata,byte,...
+tlvtype,obs2_onionmsg_payload,reply_path,2
+tlvdata,obs2_onionmsg_payload,reply_path,first_node_id,point,
+tlvdata,obs2_onionmsg_payload,reply_path,blinding,point,
+tlvdata,obs2_onionmsg_payload,reply_path,path,onionmsg_path,...
+tlvtype,obs2_onionmsg_payload,enctlv,10
+tlvdata,obs2_onionmsg_payload,enctlv,enctlv,byte,...
+tlvtype,obs2_onionmsg_payload,invoice_request,64
+tlvdata,obs2_onionmsg_payload,invoice_request,invoice_request,byte,...
+tlvtype,obs2_onionmsg_payload,invoice,66
+tlvdata,obs2_onionmsg_payload,invoice,invoice,byte,...
+tlvtype,obs2_onionmsg_payload,invoice_error,68
+tlvdata,obs2_onionmsg_payload,invoice_error,invoice_error,byte,...
+tlvtype,obs2_encmsg_tlvs,padding,1
+tlvdata,obs2_encmsg_tlvs,padding,pad,byte,...
+tlvtype,obs2_encmsg_tlvs,next_node_id,4
+tlvdata,obs2_encmsg_tlvs,next_node_id,node_id,point,
+tlvtype,obs2_encmsg_tlvs,next_blinding,12
+tlvdata,obs2_encmsg_tlvs,next_blinding,blinding,point,
+tlvtype,obs2_encmsg_tlvs,self_id,14
+tlvdata,obs2_encmsg_tlvs,self_id,data,byte,...
+subtype,onionmsg_path
+subtypedata,onionmsg_path,node_id,point,
+subtypedata,onionmsg_path,enclen,u16,
+subtypedata,onionmsg_path,enctlv,byte,enclen
msgtype,invalid_realm,PERM|1
msgtype,temporary_node_failure,NODE|2
msgtype,permanent_node_failure,PERM|NODE|2

View File

@@ -1,9 +1,9 @@
--- wire/onion_wire.csv 2021-11-16 15:17:39.446494580 +1030
+++ wire/onion_wire.csv.raw 2021-11-16 15:36:00.046441058 +1030
@@ -8,10 +8,36 @@
tlvdata,obs2_encmsg_tlvs,next_blinding,blinding,point,
tlvtype,obs2_encmsg_tlvs,self_id,14
tlvdata,obs2_encmsg_tlvs,self_id,data,byte,...
@@ -8,6 +8,36 @@
tlvdata,tlv_payload,payment_data,total_msat,tu64,
tlvtype,tlv_payload,payment_metadata,16
tlvdata,tlv_payload,payment_metadata,payment_metadata,byte,...
+tlvtype,tlv_payload,encrypted_recipient_data,10
+tlvdata,tlv_payload,encrypted_recipient_data,encrypted_data,byte,...
+tlvtype,tlv_payload,blinding_point,12
@@ -30,10 +30,9 @@
+tlvdata,onionmsg_payload,invoice,invoice,tlv_invoice,
+tlvtype,onionmsg_payload,invoice_error,68
+tlvdata,onionmsg_payload,invoice_error,invoice_error,tlv_invoice_error,
subtype,onionmsg_path
subtypedata,onionmsg_path,node_id,point,
subtypedata,onionmsg_path,enclen,u16,
-subtypedata,onionmsg_path,enctlv,byte,enclen
+subtype,onionmsg_path
+subtypedata,onionmsg_path,node_id,point,
+subtypedata,onionmsg_path,enclen,u16,
+subtypedata,onionmsg_path,encrypted_recipient_data,byte,enclen
msgtype,invalid_realm,PERM|1
msgtype,temporary_node_failure,NODE|2

View File

@@ -2,7 +2,7 @@ diff --git b/wire/onion_wire.csv a/wire/onion_wire.csv
index 5c52fe9a1..2ac0c4cff 100644
--- b/wire/onion_wire.csv
+++ a/wire/onion_wire.csv
@@ -49,11 +49,11 @@ tlvdata,onionmsg_payload,reply_path,path,onionmsg_path,...
@@ -51,11 +29,11 @@ tlvdata,onionmsg_payload,reply_path,path,onionmsg_path,...
tlvtype,onionmsg_payload,encrypted_data_tlv,4
tlvdata,onionmsg_payload,encrypted_data_tlv,encrypted_data_tlv,byte,...
tlvtype,onionmsg_payload,invoice_request,64

View File

@@ -1,17 +0,0 @@
--- wire/extracted_onion_wire_csv 2020-02-25 05:52:39.612291156 +1030
+++ - 2020-03-20 15:11:55.763880895 +1030
--- wire/onion_exp_wire.csv.~1~ 2021-11-17 10:56:59.947630815 +1030
+++ wire/onion_exp_wire.csv 2021-11-17 10:59:39.304581244 +1030
@@ -8,8 +8,12 @@
tlvtype,tlv_payload,payment_data,8
tlvdata,tlv_payload,payment_data,payment_secret,byte,32
tlvdata,tlv_payload,payment_data,total_msat,tu64,
tlvtype,tlv_payload,payment_metadata,16
tlvdata,tlv_payload,payment_metadata,payment_metadata,byte,...
+tlvtype,tlv_payload,encrypted_recipient_data,10
+tlvdata,tlv_payload,encrypted_recipient_data,encrypted_data,byte,...
+tlvtype,tlv_payload,blinding_point,12
+tlvdata,tlv_payload,blinding_point,blinding,point,
tlvtype,obs2_onionmsg_payload,reply_path,2
tlvdata,obs2_onionmsg_payload,reply_path,first_node_id,point,
tlvdata,obs2_onionmsg_payload,reply_path,blinding,point,

View File

@@ -1,13 +1,9 @@
--- peer_wire.csv 2021-08-25 12:41:02.876254003 +0930
+++ peer_wire.csv.raw 2021-08-25 13:42:31.991693809 +0930
@@ -320,3 +210,11 @@
@@ -320,3 +210,7 @@
msgdata,gossip_timestamp_filter,chain_hash,chain_hash,
msgdata,gossip_timestamp_filter,first_timestamp,u32,
msgdata,gossip_timestamp_filter,timestamp_range,u32,
+msgtype,obs2_onion_message,387,option_onion_messages
+msgdata,obs2_onion_message,blinding,point,
+msgdata,obs2_onion_message,len,u16,
+msgdata,obs2_onion_message,onionmsg,byte,len
+msgtype,onion_message,513,option_onion_messages
+msgdata,onion_message,blinding,point,
+msgdata,onion_message,len,u16,

View File

@@ -10,26 +10,6 @@ tlvdata,tlv_payload,payment_data,payment_secret,byte,32
tlvdata,tlv_payload,payment_data,total_msat,tu64,
tlvtype,tlv_payload,payment_metadata,16
tlvdata,tlv_payload,payment_metadata,payment_metadata,byte,...
tlvtype,obs2_onionmsg_payload,reply_path,2
tlvdata,obs2_onionmsg_payload,reply_path,first_node_id,point,
tlvdata,obs2_onionmsg_payload,reply_path,blinding,point,
tlvdata,obs2_onionmsg_payload,reply_path,path,onionmsg_path,...
tlvtype,obs2_onionmsg_payload,enctlv,10
tlvdata,obs2_onionmsg_payload,enctlv,enctlv,byte,...
tlvtype,obs2_onionmsg_payload,invoice_request,64
tlvdata,obs2_onionmsg_payload,invoice_request,invoice_request,byte,...
tlvtype,obs2_onionmsg_payload,invoice,66
tlvdata,obs2_onionmsg_payload,invoice,invoice,byte,...
tlvtype,obs2_onionmsg_payload,invoice_error,68
tlvdata,obs2_onionmsg_payload,invoice_error,invoice_error,byte,...
tlvtype,obs2_encmsg_tlvs,padding,1
tlvdata,obs2_encmsg_tlvs,padding,pad,byte,...
tlvtype,obs2_encmsg_tlvs,next_node_id,4
tlvdata,obs2_encmsg_tlvs,next_node_id,node_id,point,
tlvtype,obs2_encmsg_tlvs,next_blinding,12
tlvdata,obs2_encmsg_tlvs,next_blinding,blinding,point,
tlvtype,obs2_encmsg_tlvs,self_id,14
tlvdata,obs2_encmsg_tlvs,self_id,data,byte,...
tlvtype,tlv_payload,encrypted_recipient_data,10
tlvdata,tlv_payload,encrypted_recipient_data,encrypted_data,byte,...
tlvtype,tlv_payload,blinding_point,12
1 #include <wire/onion_defs.h>
10 tlvdata,tlv_payload,payment_data,total_msat,tu64,
11 tlvtype,tlv_payload,payment_metadata,16
12 tlvdata,tlv_payload,payment_metadata,payment_metadata,byte,...
tlvtype,obs2_onionmsg_payload,reply_path,2
tlvdata,obs2_onionmsg_payload,reply_path,first_node_id,point,
tlvdata,obs2_onionmsg_payload,reply_path,blinding,point,
tlvdata,obs2_onionmsg_payload,reply_path,path,onionmsg_path,...
tlvtype,obs2_onionmsg_payload,enctlv,10
tlvdata,obs2_onionmsg_payload,enctlv,enctlv,byte,...
tlvtype,obs2_onionmsg_payload,invoice_request,64
tlvdata,obs2_onionmsg_payload,invoice_request,invoice_request,byte,...
tlvtype,obs2_onionmsg_payload,invoice,66
tlvdata,obs2_onionmsg_payload,invoice,invoice,byte,...
tlvtype,obs2_onionmsg_payload,invoice_error,68
tlvdata,obs2_onionmsg_payload,invoice_error,invoice_error,byte,...
tlvtype,obs2_encmsg_tlvs,padding,1
tlvdata,obs2_encmsg_tlvs,padding,pad,byte,...
tlvtype,obs2_encmsg_tlvs,next_node_id,4
tlvdata,obs2_encmsg_tlvs,next_node_id,node_id,point,
tlvtype,obs2_encmsg_tlvs,next_blinding,12
tlvdata,obs2_encmsg_tlvs,next_blinding,blinding,point,
tlvtype,obs2_encmsg_tlvs,self_id,14
tlvdata,obs2_encmsg_tlvs,self_id,data,byte,...
13 tlvtype,tlv_payload,encrypted_recipient_data,10
14 tlvdata,tlv_payload,encrypted_recipient_data,encrypted_data,byte,...
15 tlvtype,tlv_payload,blinding_point,12

View File

@@ -35,7 +35,6 @@ static bool unknown_type(enum peer_wire t)
case WIRE_QUERY_CHANNEL_RANGE:
case WIRE_REPLY_CHANNEL_RANGE:
case WIRE_GOSSIP_TIMESTAMP_FILTER:
case WIRE_OBS2_ONION_MESSAGE:
case WIRE_ONION_MESSAGE:
case WIRE_TX_ADD_INPUT:
case WIRE_TX_REMOVE_INPUT:
@@ -99,7 +98,6 @@ bool is_msg_for_gossipd(const u8 *cursor)
case WIRE_ACCEPT_CHANNEL2:
case WIRE_INIT_RBF:
case WIRE_ACK_RBF:
case WIRE_OBS2_ONION_MESSAGE:
case WIRE_ONION_MESSAGE:
#if EXPERIMENTAL_FEATURES
case WIRE_STFU:
@@ -139,7 +137,6 @@ bool extract_channel_id(const u8 *in_pkt, struct channel_id *channel_id)
case WIRE_QUERY_CHANNEL_RANGE:
case WIRE_REPLY_CHANNEL_RANGE:
case WIRE_GOSSIP_TIMESTAMP_FILTER:
case WIRE_OBS2_ONION_MESSAGE:
case WIRE_ONION_MESSAGE:
return false;

View File

@@ -333,10 +333,6 @@ msgtype,gossip_timestamp_filter,265,gossip_queries
msgdata,gossip_timestamp_filter,chain_hash,chain_hash,
msgdata,gossip_timestamp_filter,first_timestamp,u32,
msgdata,gossip_timestamp_filter,timestamp_range,u32,
msgtype,obs2_onion_message,387,option_onion_messages
msgdata,obs2_onion_message,blinding,point,
msgdata,obs2_onion_message,len,u16,
msgdata,obs2_onion_message,onionmsg,byte,len
msgtype,onion_message,513,option_onion_messages
msgdata,onion_message,blinding,point,
msgdata,onion_message,len,u16,
1 msgtype,init,16
333 msgdata,gossip_timestamp_filter,chain_hash,chain_hash,
334 msgdata,gossip_timestamp_filter,first_timestamp,u32,
335 msgdata,gossip_timestamp_filter,timestamp_range,u32,
msgtype,obs2_onion_message,387,option_onion_messages
msgdata,obs2_onion_message,blinding,point,
msgdata,obs2_onion_message,len,u16,
msgdata,obs2_onion_message,onionmsg,byte,len
336 msgtype,onion_message,513,option_onion_messages
337 msgdata,onion_message,blinding,point,
338 msgdata,onion_message,len,u16,