diff --git a/electrum/lnwire/onion_wire.csv b/electrum/lnwire/onion_wire.csv
index 07b10cdd8..1a995dc56 100644
--- a/electrum/lnwire/onion_wire.csv
+++ b/electrum/lnwire/onion_wire.csv
@@ -7,8 +7,14 @@ 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,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,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,payload,invoice_features,66097
 tlvdata,payload,invoice_features,invoice_features,u64,
 tlvtype,payload,outgoing_node_id,66098
@@ -20,6 +26,29 @@ tlvdata,payload,trampoline_onion_packet,version,byte,1
 tlvdata,payload,trampoline_onion_packet,public_key,byte,33
 tlvdata,payload,trampoline_onion_packet,hops_data,byte,400
 tlvdata,payload,trampoline_onion_packet,hmac,byte,32
+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,
+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,encrypted_data_tlv,unknown_tag_561,561
+tlvdata,encrypted_data_tlv,unknown_tag_561,data,byte,...
+tlvtype,encrypted_data_tlv,unknown_tag_65535,65535
+tlvdata,encrypted_data_tlv,unknown_tag_65535,data,byte,...
 msgtype,invalid_realm,PERM|1
 msgtype,temporary_node_failure,NODE|2
 msgtype,permanent_node_failure,PERM|NODE|2
@@ -67,3 +96,26 @@ msgtype,invalid_onion_payload,PERM|22
 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,
+tlvtype,onionmsg_tlv,message,1
+tlvdata,onionmsg_tlv,message,text,byte,...
+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,...
+tlvtype,onionmsg_tlv,invoice_request,64
+tlvdata,onionmsg_tlv,invoice_request,invreq,tlv_invoice_request,
+tlvtype,onionmsg_tlv,invoice,66
+tlvdata,onionmsg_tlv,invoice,inv,tlv_invoice,
+tlvtype,onionmsg_tlv,invoice_error,68
+tlvdata,onionmsg_tlv,invoice_error,inverr,tlv_invoice_error,
+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
diff --git a/electrum/lnwire/peer_wire.csv b/electrum/lnwire/peer_wire.csv
index a07bc070b..6fb630b98 100644
--- a/electrum/lnwire/peer_wire.csv
+++ b/electrum/lnwire/peer_wire.csv
@@ -116,6 +116,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,
 msgtype,update_fulfill_htlc,130
 msgdata,update_fulfill_htlc,channel_id,channel_id,
 msgdata,update_fulfill_htlc,id,u64,
@@ -229,3 +231,7 @@ msgtype,gossip_timestamp_filter,265
 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
+msgdata,onion_message,blinding,point,
+msgdata,onion_message,len,u16,
+msgdata,onion_message,onion_message_packet,byte,len