fixup!

Rename option to option_scid_alias. Make it clear that "don't use real scid" only applied to unannouncable channels.
lightning · Oct 18, 2021 · 52f6bc4 · 52f6bc4
1 parent 4783937
commit 52f6bc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/02-peer-protocol.md b/02-peer-protocol.md
@@ -435,7 +435,7 @@ The sender:
   - MUST set `next_per_commitment_point` to the per-commitment point to be used
   for commitment transaction #1, derived as specified in
   [BOLT #3](03-transactions.md#per-commitment-secret-requirements).
-  - if `option_scid_alias_only` was negotiated:
+  - if `option_scid_alias` was negotiated:
     - MUST set `short_channel_id` `alias`.
   - otherwise:
     - SHOULD set `short_channel_id` `alias`.
@@ -447,7 +447,7 @@ The sender:
       - MUST set `alias` to a value not related to the real `short_channel_id`.
     - MUST NOT send the same `alias` for multiple peers.
     - MUST always recognize the `alias` as a `short_channel_id` for incoming HTLCs to this channel.
-    - if `option_scid_alias_only` was negotiated:
+    - if `option_scid_alias` was negotiated and `announce_channel` bit was not set in both `open_channel` and `accept_channel`:
       - MUST NOT allow incoming HTLCs to this channel using the real `short_channel_id`
     - MAY send multiple `funding_locked` messages with different `alias` values.
   - otherwise:
@@ -462,7 +462,7 @@ A non-funding node (fundee):
 
 The receiver:
   - MAY use any of the `alias` it received, in BOLT 11 `r` fields.
-  - if `option_scid_alias_only` was negotiated:
+  - if `option_scid_alias` was negotiated and the `announce_channel` bit was not set in both `open_channel` and `accept_channel`:
     - MUST NOT use the real `short_channel_id` in BOLT 11 `r` fields.
 
 From the point of waiting for `funding_locked` onward, either node MAY

diff --git a/09-features.md b/09-features.md
@@ -41,7 +41,7 @@ The Context column decodes as follows:
 | 20/21 | `option_anchor_outputs`          | Anchor outputs                                            | IN       | `option_static_remotekey` | [BOLT #3](03-transactions.md)         |
 | 22/23 | `option_anchors_zero_fee_htlc_tx` | Anchor commitment type with zero fee HTLC transactions   | IN       |                   | [BOLT #3][bolt03-htlc-tx], [lightning-dev][ml-sighash-single-harmful]|
 | 26/27 | `option_shutdown_anysegwit`         | Future segwit versions allowed in `shutdown`              | IN       |                   | [BOLT #2][bolt02-shutdown]   |
-| 46/47 | `option_scid_alias_only`| Always use negotiated channel aliases for routing                  | IN       |                   | [BOLT #2][bolt02-funding-locked]   |
+| 46/47 | `option_scid_alias`  | Supply channel aliases for routing                                      | IN       |                   | [BOLT #2][bolt02-funding-locked]   |
 
 ## Requirements