wire: fix up messy patches (make extract-onion-csv)

These patches are no longer necessary now blinded payments were
merged into the spec.

However, the spec did rename "blinding_point" inside `payload` to
"current_blinding_point" so we temporarily add a patch to change it back.

You can see wire/onion_wire.csv is reordered, but unchanged.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-09-11 14:36:31 +09:30
parent 232fba878e
commit cc2c720dd9
5 changed files with 21 additions and 50 deletions

View file

@ -1,25 +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,6 +8,41 @@
tlvdata,payload,payment_data,total_msat,tu64,
tlvtype,payload,payment_metadata,16
tlvdata,payload,payment_metadata,payment_metadata,byte,...
+tlvtype,payload,encrypted_recipient_data,10
+tlvdata,payload,encrypted_recipient_data,encrypted_data,byte,...
+tlvtype,payload,blinding_point,12
+tlvdata,payload,blinding_point,blinding,point,
+tlvtype,payload,total_amount_msat,18
+tlvdata,payload,total_amount_msat,total_msat,tu64,
+tlvtype,encrypted_data_tlv,padding,1
+tlvdata,encrypted_data_tlv,padding,padding,byte,...
+tlvtype,encrypted_data_tlv,short_channel_id,2
+tlvdata,encrypted_data_tlv,short_channel_id,short_channel_id,short_channel_id,
+tlvtype,encrypted_data_tlv,next_node_id,4
+tlvdata,encrypted_data_tlv,next_node_id,node_id,point,
+tlvtype,encrypted_data_tlv,path_id,6
+tlvdata,encrypted_data_tlv,path_id,data,byte,...
+tlvtype,encrypted_data_tlv,next_blinding_override,8
+tlvdata,encrypted_data_tlv,next_blinding_override,blinding,point,
@@ -8,6 +8,25 @@
tlvdata,encrypted_data_tlv,payment_constraints,htlc_minimum_msat,tu64,
tlvtype,encrypted_data_tlv,allowed_features,14
tlvdata,encrypted_data_tlv,allowed_features,features,byte,...
+tlvtype,onionmsg_tlv,reply_path,2
+tlvdata,onionmsg_tlv,reply_path,path,blinded_path,
+tlvtype,onionmsg_tlv,encrypted_recipient_data,4

View file

@ -1,20 +0,0 @@
diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv
index 9326f9f8e..d5d074d1f 100644
--- a/wire/onion_wire.csv
+++ b/wire/onion_wire.csv
@@ -24,6 +24,15 @@ tlvtype,encrypted_data_tlv,path_id,6
tlvdata,encrypted_data_tlv,path_id,data,byte,...
tlvtype,encrypted_data_tlv,next_blinding_override,8
tlvdata,encrypted_data_tlv,next_blinding_override,blinding,point,
+tlvtype,encrypted_data_tlv,payment_relay,10
+tlvdata,encrypted_data_tlv,payment_relay,cltv_expiry_delta,u16,
+tlvdata,encrypted_data_tlv,payment_relay,fee_proportional_millionths,u32,
+tlvdata,encrypted_data_tlv,payment_relay,fee_base_msat,tu32,
+tlvtype,encrypted_data_tlv,payment_constraints,12
+tlvdata,encrypted_data_tlv,payment_constraints,max_cltv_expiry,u32,
+tlvdata,encrypted_data_tlv,payment_constraints,htlc_minimum_msat,tu64,
+tlvtype,encrypted_data_tlv,allowed_features,14
+tlvdata,encrypted_data_tlv,allowed_features,features,byte,...
tlvtype,onionmsg_tlv,reply_path,2
tlvdata,onionmsg_tlv,reply_path,first_node_id,point,
tlvdata,onionmsg_tlv,reply_path,blinding,point,

View file

@ -0,0 +1,15 @@
diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv
index 3884c63dd..f5b3e9234 100644
--- a/wire/onion_wire.csv
+++ b/wire/onion_wire.csv
@@ -10,8 +10,8 @@ tlvdata,payload,payment_data,payment_secret,byte,32
tlvdata,payload,payment_data,total_msat,tu64,
tlvtype,payload,encrypted_recipient_data,10
tlvdata,payload,encrypted_recipient_data,encrypted_data,byte,...
-tlvtype,payload,current_blinding_point,12
-tlvdata,payload,current_blinding_point,blinding,point,
+tlvtype,payload,blinding_point,12
+tlvdata,payload,blinding_point,blinding,point,
tlvtype,payload,payment_metadata,16
tlvdata,payload,payment_metadata,payment_metadata,byte,...
tlvtype,payload,total_amount_msat,18

View file

@ -1,8 +0,0 @@
--- wire/onion_wire.csv 2022-08-10 16:09:32.851789435 +0930
+++ wire/onion_wire.csv.raw 2022-08-10 16:18:47.411275132 +0930
@@ -95,3 +81,5 @@
msgdata,invalid_onion_payload,type,bigsize,
msgdata,invalid_onion_payload,offset,u16,
msgtype,mpp_timeout,23
+msgtype,invalid_onion_blinding,BADONION|PERM|24
+msgdata,invalid_onion_blinding,sha256_of_onion,sha256,

View file

@ -8,12 +8,12 @@ tlvdata,payload,short_channel_id,short_channel_id,short_channel_id,
tlvtype,payload,payment_data,8
tlvdata,payload,payment_data,payment_secret,byte,32
tlvdata,payload,payment_data,total_msat,tu64,
tlvtype,payload,payment_metadata,16
tlvdata,payload,payment_metadata,payment_metadata,byte,...
tlvtype,payload,encrypted_recipient_data,10
tlvdata,payload,encrypted_recipient_data,encrypted_data,byte,...
tlvtype,payload,blinding_point,12
tlvdata,payload,blinding_point,blinding,point,
tlvtype,payload,payment_metadata,16
tlvdata,payload,payment_metadata,payment_metadata,byte,...
tlvtype,payload,total_amount_msat,18
tlvdata,payload,total_amount_msat,total_msat,tu64,
tlvtype,encrypted_data_tlv,padding,1

1 #include <wire/onion_defs.h>
8 tlvtype,payload,payment_data,8
9 tlvdata,payload,payment_data,payment_secret,byte,32
10 tlvdata,payload,payment_data,total_msat,tu64,
tlvtype,payload,payment_metadata,16
tlvdata,payload,payment_metadata,payment_metadata,byte,...
11 tlvtype,payload,encrypted_recipient_data,10
12 tlvdata,payload,encrypted_recipient_data,encrypted_data,byte,...
13 tlvtype,payload,blinding_point,12
14 tlvdata,payload,blinding_point,blinding,point,
15 tlvtype,payload,payment_metadata,16
16 tlvdata,payload,payment_metadata,payment_metadata,byte,...
17 tlvtype,payload,total_amount_msat,18
18 tlvdata,payload,total_amount_msat,total_msat,tu64,
19 tlvtype,encrypted_data_tlv,padding,1