From 4d0a97e1bd756c78c060d2f16c1cc171a6a83122 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 22 Mar 2022 19:21:13 +1030 Subject: [PATCH] offers: import latest variant from draft, part 2. Notably, the latest draft uses the correct tlv types inside the onion, but we don't want to (we'd prefer to demarshal those as a separate step, for better diagnostics), so we change it, then add a spec patch to change it back. Signed-off-by: Rusty Russell --- wire/extracted_onion_02_modernonion.patch | 6 +++--- ...onion_03_onionmsg-payload-as-bytearr.patch | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch diff --git a/wire/extracted_onion_02_modernonion.patch b/wire/extracted_onion_02_modernonion.patch index 653693be9..4d1bc69ca 100644 --- a/wire/extracted_onion_02_modernonion.patch +++ b/wire/extracted_onion_02_modernonion.patch @@ -25,11 +25,11 @@ +tlvtype,onionmsg_payload,encrypted_data_tlv,4 +tlvdata,onionmsg_payload,encrypted_data_tlv,encrypted_data_tlv,byte,... +tlvtype,onionmsg_payload,invoice_request,64 -+tlvdata,onionmsg_payload,invoice_request,invoice_request,byte,... ++tlvdata,onionmsg_payload,invoice_request,invoice_request,tlv_invoice_request, +tlvtype,onionmsg_payload,invoice,66 -+tlvdata,onionmsg_payload,invoice,invoice,byte,... ++tlvdata,onionmsg_payload,invoice,invoice,tlv_invoice, +tlvtype,onionmsg_payload,invoice_error,68 -+tlvdata,onionmsg_payload,invoice_error,invoice_error,byte,... ++tlvdata,onionmsg_payload,invoice_error,invoice_error,tlv_invoice_error, subtype,onionmsg_path subtypedata,onionmsg_path,node_id,point, subtypedata,onionmsg_path,enclen,u16, diff --git a/wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch b/wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch new file mode 100644 index 000000000..a71a3069b --- /dev/null +++ b/wire/extracted_onion_03_onionmsg-payload-as-bytearr.patch @@ -0,0 +1,19 @@ +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,... + tlvtype,onionmsg_payload,encrypted_data_tlv,4 + tlvdata,onionmsg_payload,encrypted_data_tlv,encrypted_data_tlv,byte,... + tlvtype,onionmsg_payload,invoice_request,64 +-tlvdata,onionmsg_payload,invoice_request,invoice_request,tlv_invoice_request, ++tlvdata,onionmsg_payload,invoice_request,invoice_request,byte,... + tlvtype,onionmsg_payload,invoice,66 +-tlvdata,onionmsg_payload,invoice,invoice,tlv_invoice, ++tlvdata,onionmsg_payload,invoice,invoice,byte,... + tlvtype,onionmsg_payload,invoice_error,68 +-tlvdata,onionmsg_payload,invoice_error,invoice_error,tlv_invoice_error, ++tlvdata,onionmsg_payload,invoice_error,invoice_error,byte,... + subtype,onionmsg_path + subtypedata,onionmsg_path,node_id,point, + subtypedata,onionmsg_path,enclen,u16,