common: rename current onion message structures to obs2_.

Yes, we changed the spec again.  Hopefully for the last time!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-11-30 13:36:04 +10:30
parent b74848f6f6
commit 1ec6346f3d
24 changed files with 200 additions and 200 deletions

View File

@@ -4,26 +4,26 @@
tlvtype,tlv_payload,payment_data,8
tlvdata,tlv_payload,payment_data,payment_secret,byte,32
tlvdata,tlv_payload,payment_data,total_msat,tu64,
+tlvtype,onionmsg_payload,reply_path,2
+tlvdata,onionmsg_payload,reply_path,first_node_id,point,
+tlvdata,onionmsg_payload,reply_path,blinding,point,
+tlvdata,onionmsg_payload,reply_path,path,onionmsg_path,...
+tlvtype,onionmsg_payload,enctlv,10
+tlvdata,onionmsg_payload,enctlv,enctlv,byte,...
+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,padding,1
+tlvdata,encmsg_tlvs,padding,pad,byte,...
+tlvtype,encmsg_tlvs,next_node_id,4
+tlvdata,encmsg_tlvs,next_node_id,node_id,point,
+tlvtype,encmsg_tlvs,next_blinding,12
+tlvdata,encmsg_tlvs,next_blinding,blinding,point,
+tlvtype,encmsg_tlvs,self_id,14
+tlvdata,encmsg_tlvs,self_id,data,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,

View File

@@ -8,6 +8,6 @@
+tlvdata,tlv_payload,enctlv,enctlv,byte,...
+tlvtype,tlv_payload,blinding_seed,12
+tlvdata,tlv_payload,blinding_seed,blinding_seed,pubkey,
tlvtype,onionmsg_payload,reply_path,2
tlvdata,onionmsg_payload,reply_path,first_node_id,point,
tlvdata,onionmsg_payload,reply_path,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

@@ -4,7 +4,7 @@
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,387,option_onion_messages
+msgdata,onion_message,blinding,point,
+msgdata,onion_message,len,u16,
+msgdata,onion_message,onionmsg,byte,len
+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

View File

@@ -8,26 +8,26 @@ tlvdata,tlv_payload,short_channel_id,short_channel_id,short_channel_id,
tlvtype,tlv_payload,payment_data,8
tlvdata,tlv_payload,payment_data,payment_secret,byte,32
tlvdata,tlv_payload,payment_data,total_msat,tu64,
tlvtype,onionmsg_payload,reply_path,2
tlvdata,onionmsg_payload,reply_path,first_node_id,point,
tlvdata,onionmsg_payload,reply_path,blinding,point,
tlvdata,onionmsg_payload,reply_path,path,onionmsg_path,...
tlvtype,onionmsg_payload,enctlv,10
tlvdata,onionmsg_payload,enctlv,enctlv,byte,...
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,padding,1
tlvdata,encmsg_tlvs,padding,pad,byte,...
tlvtype,encmsg_tlvs,next_node_id,4
tlvdata,encmsg_tlvs,next_node_id,node_id,point,
tlvtype,encmsg_tlvs,next_blinding,12
tlvdata,encmsg_tlvs,next_blinding,blinding,point,
tlvtype,encmsg_tlvs,self_id,14
tlvdata,encmsg_tlvs,self_id,data,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,
1 #include <wire/onion_defs.h>
8 tlvtype,tlv_payload,payment_data,8
9 tlvdata,tlv_payload,payment_data,payment_secret,byte,32
10 tlvdata,tlv_payload,payment_data,total_msat,tu64,
11 tlvtype,onionmsg_payload,reply_path,2 tlvtype,obs2_onionmsg_payload,reply_path,2
12 tlvdata,onionmsg_payload,reply_path,first_node_id,point, tlvdata,obs2_onionmsg_payload,reply_path,first_node_id,point,
13 tlvdata,onionmsg_payload,reply_path,blinding,point, tlvdata,obs2_onionmsg_payload,reply_path,blinding,point,
14 tlvdata,onionmsg_payload,reply_path,path,onionmsg_path,... tlvdata,obs2_onionmsg_payload,reply_path,path,onionmsg_path,...
15 tlvtype,onionmsg_payload,enctlv,10 tlvtype,obs2_onionmsg_payload,enctlv,10
16 tlvdata,onionmsg_payload,enctlv,enctlv,byte,... tlvdata,obs2_onionmsg_payload,enctlv,enctlv,byte,...
17 tlvtype,onionmsg_payload,invoice_request,64 tlvtype,obs2_onionmsg_payload,invoice_request,64
18 tlvdata,onionmsg_payload,invoice_request,invoice_request,byte,... tlvdata,obs2_onionmsg_payload,invoice_request,invoice_request,byte,...
19 tlvtype,onionmsg_payload,invoice,66 tlvtype,obs2_onionmsg_payload,invoice,66
20 tlvdata,onionmsg_payload,invoice,invoice,byte,... tlvdata,obs2_onionmsg_payload,invoice,invoice,byte,...
21 tlvtype,onionmsg_payload,invoice_error,68 tlvtype,obs2_onionmsg_payload,invoice_error,68
22 tlvdata,onionmsg_payload,invoice_error,invoice_error,byte,... tlvdata,obs2_onionmsg_payload,invoice_error,invoice_error,byte,...
23 tlvtype,encmsg_tlvs,padding,1 tlvtype,obs2_encmsg_tlvs,padding,1
24 tlvdata,encmsg_tlvs,padding,pad,byte,... tlvdata,obs2_encmsg_tlvs,padding,pad,byte,...
25 tlvtype,encmsg_tlvs,next_node_id,4 tlvtype,obs2_encmsg_tlvs,next_node_id,4
26 tlvdata,encmsg_tlvs,next_node_id,node_id,point, tlvdata,obs2_encmsg_tlvs,next_node_id,node_id,point,
27 tlvtype,encmsg_tlvs,next_blinding,12 tlvtype,obs2_encmsg_tlvs,next_blinding,12
28 tlvdata,encmsg_tlvs,next_blinding,blinding,point, tlvdata,obs2_encmsg_tlvs,next_blinding,blinding,point,
29 tlvtype,encmsg_tlvs,self_id,14 tlvtype,obs2_encmsg_tlvs,self_id,14
30 tlvdata,encmsg_tlvs,self_id,data,byte,... tlvdata,obs2_encmsg_tlvs,self_id,data,byte,...
31 subtype,onionmsg_path
32 subtypedata,onionmsg_path,node_id,point,
33 subtypedata,onionmsg_path,enclen,u16,

View File

@@ -33,7 +33,7 @@ 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_ONION_MESSAGE:
case WIRE_OBS2_ONION_MESSAGE:
case WIRE_TX_ADD_INPUT:
case WIRE_TX_REMOVE_INPUT:
case WIRE_TX_ADD_OUTPUT:
@@ -62,7 +62,7 @@ bool is_msg_for_gossipd(const u8 *cursor)
case WIRE_REPLY_SHORT_CHANNEL_IDS_END:
case WIRE_QUERY_CHANNEL_RANGE:
case WIRE_REPLY_CHANNEL_RANGE:
case WIRE_ONION_MESSAGE:
case WIRE_OBS2_ONION_MESSAGE:
return true;
case WIRE_WARNING:
case WIRE_INIT:

View File

@@ -328,7 +328,7 @@ 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,onion_message,387,option_onion_messages
msgdata,onion_message,blinding,point,
msgdata,onion_message,len,u16,
msgdata,onion_message,onionmsg,byte,len
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
1 msgtype,init,16
328 msgdata,gossip_timestamp_filter,chain_hash,chain_hash,
329 msgdata,gossip_timestamp_filter,first_timestamp,u32,
330 msgdata,gossip_timestamp_filter,timestamp_range,u32,
331 msgtype,onion_message,387,option_onion_messages msgtype,obs2_onion_message,387,option_onion_messages
332 msgdata,onion_message,blinding,point, msgdata,obs2_onion_message,blinding,point,
333 msgdata,onion_message,len,u16, msgdata,obs2_onion_message,len,u16,
334 msgdata,onion_message,onionmsg,byte,len msgdata,obs2_onion_message,onionmsg,byte,len