BOLT 2: opt_shutdown_anysegwit

In bitcoin 0.19.0, standardness rules are going to be relaxed to allow future witness versions. Once this is widely deployed, it will be safe to accept them, smoothing use of future segwit versions. See: bitcoin/bitcoin#15846 Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
lightning · Sep 18, 2019 · e8f8a79 · e8f8a79
1 parent c8e53fe
commit e8f8a79
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.aspell.en.pws b/.aspell.en.pws
@@ -370,3 +370,4 @@ tlvs
 snprintf
 GitHub
 IRC
+anysegwit
diff --git a/02-peer-protocol.md b/02-peer-protocol.md
@@ -471,7 +471,10 @@ A sending node:
    (pay to pubkey hash), OR
     2. `OP_HASH160` `20` 20-bytes `OP_EQUAL` (pay to script hash), OR
     3. `OP_0` `20` 20-bytes (version 0 pay to witness pubkey), OR
-    4. `OP_0` `32` 32-bytes (version 0 pay to witness script hash)
+    4. `OP_0` `32` 32-bytes (version 0 pay to witness script hash), OR
+    5. if (and only if) `opt_shutdown_anysegwit` is negotiated:
+      * `OP_1` through `OP_16` inclusive, followed by a single push of 2 to 40 bytes
+	    (witness program versions 1 through 16)
 
 A receiving node:
   - if it hasn't received a `funding_signed` (if it is a funder) or a `funding_created` (if it is a fundee):

diff --git a/09-features.md b/09-features.md
@@ -27,6 +27,8 @@ These flags may only be used in the `init` message:
 | 4/5   | `option_upfront_shutdown_script` | Commits to a shutdown scriptpubkey when opening channel                   | [BOLT #2][bolt02-open]       |
 | 6/7   | `gossip_queries`                 | More sophisticated gossip control                                         | [BOLT #7][bolt07-query]      |
 | 10/11 | `gossip_queries_ex`              | Gossip queries can include additional information                         | [BOLT #7][bolt07-query]      |
+| ??/?? | ``opt_shutdown_anysegwit`        | Future segwit versions allowed in `shutdown`                              | [BOLT #2][bolt02-shutdown]   |
+
 
 ## Assigned `globalfeatures` flags
 
@@ -54,6 +56,7 @@ This work is licensed under a [Creative Commons Attribution 4.0 International Li
 
 [bolt02-retransmit]: 02-peer-protocol.md#message-retransmission
 [bolt02-open]: 02-peer-protocol.md#the-open_channel-message
+[bolt02-shutdown]: 02-peer-protocol.md#closing-initiation-shutdown
 [bolt04]: 04-onion-routing.md
 [bolt07-sync]: 07-routing-gossip.md#initial-sync
 [bolt07-query]: 07-routing-gossip.md#query-messages