BOLTs: update which renames blinding terminology.
No code changes, just catching up with the BOLT changes which rework our blinded path terminology (for the better!). Another patch will sweep the rest of our internal names, this tries only to make things compile and fix up the BOLT quotes. 1. Inside payload: current_blinding_point -> current_path_key 2. Inside update_add_htlc TLV: blinding_point -> blinded_path 3. Inside blinded_path: blinding -> first_path_key 4. Inside onion_message: blinding -> path_key. 5. Inside encrypted_data_tlv: next_blinding_override -> next_path_key_override Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
@@ -2,7 +2,7 @@ diff --git a/wire/onion_wire.csv b/wire/onion_wire.csv
|
||||
index ae05f09fd..b09811ed1 100644
|
||||
--- a/wire/onion_wire.csv
|
||||
+++ b/wire/onion_wire.csv
|
||||
@@ -92,6 +92,12 @@ tlvtype,onionmsg_tlv,reply_path,2
|
||||
@@ -92,3 +92,9 @@ tlvtype,onionmsg_tlv,reply_path,2
|
||||
tlvdata,onionmsg_tlv,reply_path,path,blinded_path,
|
||||
tlvtype,onionmsg_tlv,encrypted_recipient_data,4
|
||||
tlvdata,onionmsg_tlv,encrypted_recipient_data,encrypted_recipient_data,byte,...
|
||||
@@ -12,6 +12,3 @@ index ae05f09fd..b09811ed1 100644
|
||||
+tlvdata,onionmsg_tlv,invoice,invoice,tlv_invoice,
|
||||
+tlvtype,onionmsg_tlv,invoice_error,68
|
||||
+tlvdata,onionmsg_tlv,invoice_error,invoice_error,tlv_invoice_error,
|
||||
subtype,blinded_path
|
||||
subtypedata,blinded_path,first_node_id,point,
|
||||
subtypedata,blinded_path,blinding,point,
|
||||
|
||||
@@ -4,7 +4,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
|
||||
@@ -51,11 +29,11 @@ tlvdata,onionmsg_tlv,reply_path,path,onionmsg_path,...
|
||||
@@ -51,8 +29,8 @@ tlvdata,onionmsg_tlv,reply_path,path,onionmsg_path,...
|
||||
tlvtype,onionmsg_tlv,encrypted_data_tlv,4
|
||||
tlvdata,onionmsg_tlv,encrypted_data_tlv,encrypted_data_tlv,byte,...
|
||||
tlvtype,onionmsg_tlv,invoice_request,64
|
||||
@@ -16,6 +16,3 @@ index 5c52fe9a1..2ac0c4cff 100644
|
||||
tlvtype,onionmsg_tlv,invoice_error,68
|
||||
-tlvdata,onionmsg_tlv,invoice_error,invoice_error,tlv_invoice_error,
|
||||
+tlvdata,onionmsg_tlv,invoice_error,invoice_error,byte,...
|
||||
subtype,blinded_path
|
||||
subtypedata,blinded_path,first_node_id,point,
|
||||
subtypedata,blinded_path,blinding,point,
|
||||
|
||||
@@ -9,7 +9,7 @@ index 3884c63dd..25798c3da 100644
|
||||
msgtype,invalid_onion_blinding,BADONION|PERM|24
|
||||
msgdata,invalid_onion_blinding,sha256_of_onion,sha256,
|
||||
-msgtype,onion_message,513
|
||||
-msgdata,onion_message,blinding,point,
|
||||
-msgdata,onion_message,path_key,point,
|
||||
-msgdata,onion_message,len,u16,
|
||||
-msgdata,onion_message,onion_message_packet,byte,len
|
||||
tlvtype,onionmsg_tlv,reply_path,2
|
||||
|
||||
@@ -8,6 +8,6 @@ index 41cafe553..c1d850c60 100644
|
||||
subtype,blinded_path
|
||||
-subtypedata,blinded_path,first_node_id,point,
|
||||
+subtypedata,blinded_path,first_node_id,sciddir_or_pubkey,
|
||||
subtypedata,blinded_path,blinding,point,
|
||||
subtypedata,blinded_path,first_path_key,point,
|
||||
subtypedata,blinded_path,num_hops,byte,
|
||||
subtypedata,blinded_path,path,onionmsg_hop,num_hops
|
||||
|
||||
@@ -7,6 +7,6 @@ FIXME: This is actually from BOLT 4, but we remove it from onion_wire.csv and pu
|
||||
msgdata,gossip_timestamp_filter,first_timestamp,u32,
|
||||
msgdata,gossip_timestamp_filter,timestamp_range,u32,
|
||||
+msgtype,onion_message,513,option_onion_messages
|
||||
+msgdata,onion_message,blinding,point,
|
||||
+msgdata,onion_message,path_key,point,
|
||||
+msgdata,onion_message,len,u16,
|
||||
+msgdata,onion_message,onionmsg,byte,len
|
||||
|
||||
@@ -10,12 +10,21 @@ 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,current_path_key,12
|
||||
tlvdata,payload,current_path_key,path_key,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,
|
||||
subtype,blinded_path
|
||||
subtypedata,blinded_path,first_node_id,sciddir_or_pubkey,
|
||||
subtypedata,blinded_path,first_path_key,point,
|
||||
subtypedata,blinded_path,num_hops,byte,
|
||||
subtypedata,blinded_path,path,onionmsg_hop,num_hops
|
||||
subtype,onionmsg_hop
|
||||
subtypedata,onionmsg_hop,blinded_node_id,point,
|
||||
subtypedata,onionmsg_hop,enclen,u16,
|
||||
subtypedata,onionmsg_hop,encrypted_recipient_data,byte,enclen
|
||||
tlvtype,encrypted_data_tlv,padding,1
|
||||
tlvdata,encrypted_data_tlv,padding,padding,byte,...
|
||||
tlvtype,encrypted_data_tlv,short_channel_id,2
|
||||
@@ -24,8 +33,8 @@ 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,
|
||||
tlvtype,encrypted_data_tlv,next_path_key_override,8
|
||||
tlvdata,encrypted_data_tlv,next_path_key_override,path_key,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,
|
||||
@@ -93,12 +102,3 @@ tlvtype,onionmsg_tlv,invoice,66
|
||||
tlvdata,onionmsg_tlv,invoice,invoice,byte,...
|
||||
tlvtype,onionmsg_tlv,invoice_error,68
|
||||
tlvdata,onionmsg_tlv,invoice_error,invoice_error,byte,...
|
||||
subtype,blinded_path
|
||||
subtypedata,blinded_path,first_node_id,sciddir_or_pubkey,
|
||||
subtypedata,blinded_path,blinding,point,
|
||||
subtypedata,blinded_path,num_hops,byte,
|
||||
subtypedata,blinded_path,path,onionmsg_hop,num_hops
|
||||
subtype,onionmsg_hop
|
||||
subtypedata,onionmsg_hop,blinded_node_id,point,
|
||||
subtypedata,onionmsg_hop,enclen,u16,
|
||||
subtypedata,onionmsg_hop,encrypted_recipient_data,byte,enclen
|
||||
|
||||
|
@@ -245,8 +245,8 @@ msgdata,update_add_htlc,amount_msat,u64,
|
||||
msgdata,update_add_htlc,payment_hash,sha256,
|
||||
msgdata,update_add_htlc,cltv_expiry,u32,
|
||||
msgdata,update_add_htlc,onion_routing_packet,byte,1366
|
||||
tlvtype,update_add_htlc_tlvs,blinding_point,0
|
||||
tlvdata,update_add_htlc_tlvs,blinding_point,blinding,point,
|
||||
tlvtype,update_add_htlc_tlvs,blinded_path,0
|
||||
tlvdata,update_add_htlc_tlvs,blinded_path,path_key,point,
|
||||
msgtype,update_fulfill_htlc,130
|
||||
msgdata,update_fulfill_htlc,channel_id,channel_id,
|
||||
msgdata,update_fulfill_htlc,id,u64,
|
||||
@@ -388,6 +388,6 @@ 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,513,option_onion_messages
|
||||
msgdata,onion_message,blinding,point,
|
||||
msgdata,onion_message,path_key,point,
|
||||
msgdata,onion_message,len,u16,
|
||||
msgdata,onion_message,onionmsg,byte,len
|
||||
|
||||
|
Reference in New Issue
Block a user