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 <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-03-22 19:21:13 +10:30
parent 726b6878d1
commit 4d0a97e1bd
2 changed files with 22 additions and 3 deletions

View File

@@ -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,

View File

@@ -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,