From 78e5a6b066d3a8e235931dfc06aa325337874749 Mon Sep 17 00:00:00 2001
From: Carla Kirk-Cohen <42311294+carlaKC@users.noreply.github.com>
Date: Tue, 12 Mar 2024 04:56:54 -0400
Subject: [PATCH] 04-onion-routing: strict validation of scid for blinded
 payments (#1147)

This commit updates bolt04 to more strictly enforce that encrypted_data
that is part of a blinded payment only has short_channel_id set. On
the reader side, we disallow setting of both short_channel_id and
next_node_id (which is intended for use in the context of onion
messages), and on the writer side we specify that next_node_id should
not be included by recipients.
---
 04-onion-routing.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/04-onion-routing.md b/04-onion-routing.md
index 662c628da..b0173e380 100644
--- a/04-onion-routing.md
+++ b/04-onion-routing.md
@@ -245,6 +245,7 @@ The creator of `encrypted_recipient_data` (usually, the recipient of payment):
 
   - MUST create `encrypted_data_tlv` for each node in the blinded route (including itself).
   - MUST include `encrypted_data_tlv.short_channel_id` and `encrypted_data_tlv.payment_relay` for each non-final node.
+  - MUST NOT include `encrypted_data_tlv.next_node_id`.
   - MUST set `encrypted_data_tlv.payment_constraints` for each non-final node:
     - `max_cltv_expiry` to the largest block height at which the route is allowed to be used, starting
     from the final node and adding `encrypted_data_tlv.payment_relay.cltv_expiry_delta` at each hop.
@@ -304,6 +305,7 @@ The reader:
       - MUST process the message as if it were present and contained an empty array.
     - MUST return an error if:
       - `encrypted_recipient_data.allowed_features.features` contains an unknown feature bit (even if it is odd).
+      - `encrypted_recipient_data` contains both `short_channel_id` and `next_node_id`.
       - the payment uses a feature not included in `encrypted_recipient_data.allowed_features.features`.
     - If it is not the final node:
       - MUST return an error if the payload contains other tlv fields than `encrypted_recipient_data` and `current_blinding_point`.