1
0
mirror of https://github.com/lightning/bolts.git synced 2024-11-19 10:00:04 +01:00

fixup! BOLT 4: onion message support.

@thomash-acinq points out:

1. We absolutely can put other fields in `encrypted_data_tlv`, esp. padding, and test vectors do this.
2. Presumably it was supposed to refer to onionmsg_tlv, so fix that.
3. And of course we need to allow payload fields!
This commit is contained in:
Rusty Russell 2023-05-11 12:54:30 +09:30
parent f0f35ec73b
commit 803a532c49

View File

@ -1493,7 +1493,6 @@ The creator of `encrypted_recipient_data` (usually, the recipient of the onion):
- MUST create the `encrypted_recipient_data` from the `encrypted_data_tlv` as required in [Route Blinding](#route-blinding). - MUST create the `encrypted_recipient_data` from the `encrypted_data_tlv` as required in [Route Blinding](#route-blinding).
- MUST NOT include `short_channel_id`, `payment_relay` or `payment_constraints` in any `encrypted_data_tlv` - MUST NOT include `short_channel_id`, `payment_relay` or `payment_constraints` in any `encrypted_data_tlv`
- MUST include `encrypted_data_tlv.next_node_id` for each non-final node. - MUST include `encrypted_data_tlv.next_node_id` for each non-final node.
- MUST NOT include any other fields in `encrypted_data_tlv` for any non-final node.
- MUST create the `encrypted_recipient_data` from the `encrypted_data_tlv` as required in [Route Blinding](#route-blinding). - MUST create the `encrypted_recipient_data` from the `encrypted_data_tlv` as required in [Route Blinding](#route-blinding).
The writer: The writer:
@ -1504,7 +1503,7 @@ The writer:
- SHOULD set `onion_message_packet` `len` to 1366 or 32834. - SHOULD set `onion_message_packet` `len` to 1366 or 32834.
- SHOULD retry via a different path if it expects a response and doesn't receive one after a reasonable period. - SHOULD retry via a different path if it expects a response and doesn't receive one after a reasonable period.
- For the non-final nodes' `onionmsg_tlv`: - For the non-final nodes' `onionmsg_tlv`:
- MUST NOT set `reply_path` - MUST NOT set fields other than `encrypted_recipient_data`.
- For the final node's `onionmsg_tlv`: - For the final node's `onionmsg_tlv`:
- if the final node is permitted to reply: - if the final node is permitted to reply:
- MUST set `reply_path` `blinding` to the initial blinding factor for the `first_node_id` - MUST set `reply_path` `blinding` to the initial blinding factor for the `first_node_id`
@ -1543,7 +1542,7 @@ The reader:
- otherwise (unknown or unset `path_id`): - otherwise (unknown or unset `path_id`):
- if the onion message is a reply to an onion message which contained a `path_id`: - if the onion message is a reply to an onion message which contained a `path_id`:
- MUST respond (or not respond) exactly as if it did not send the initial onion message. - MUST respond (or not respond) exactly as if it did not send the initial onion message.
- if the `onionmsg_tlv` contains other tlv fields than `encrypted_recipient_data` and `reply_path`: - if the `onionmsg_tlv` contains more than one payload field:
- MUST ignore the message. - MUST ignore the message.
- if it wants to send a reply: - if it wants to send a reply:
- MUST create an onion message using `reply_path`. - MUST create an onion message using `reply_path`.