Skip to content

Commit 73a9a24

Browse files
authored
Merge branch 'master' into resolve-bolt11-ambiguity
2 parents f78b5bf + 872c6ec commit 73a9a24

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

09-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ The Context column decodes as follows:
3838
| 8/9 | `var_onion_optin` | ASSUMED | | | |
3939
| 10/11 | `gossip_queries_ex` | Gossip queries can include additional information | IN | | [BOLT #7][bolt07-query] |
4040
| 12/13 | `option_static_remotekey` | ASSUMED | | | |
41-
| 14/15 | `payment_secret` | Node supports `payment_secret` field | IN9 | | [Routing Onion Specification][bolt04] |
41+
| 14/15 | `payment_secret` | ASSUMED | IN9 | | [Routing Onion Specification][bolt04] |
4242
| 16/17 | `basic_mpp` | Node can receive basic multi-part payments | IN9 | `payment_secret` | [BOLT #4][bolt04-mpp] |
4343
| 18/19 | `option_support_large_channel` | Can create large channels | IN | | [BOLT #2](02-peer-protocol.md#the-open_channel-message) |
4444
| 22/23 | `option_anchors` | Anchor commitment type with zero fee HTLC transactions | IN | | [BOLT #3][bolt03-htlc-tx], [lightning-dev][ml-sighash-single-harmful] |

11-payment-encoding.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,12 @@ A writer:
205205
- MUST specify the most-preferred field first, followed by less-preferred fields, in order.
206206

207207
A reader:
208-
- MUST skip over unknown fields, OR an `f` field with unknown `version`, OR `p`, `h`, `s` or
209-
`n` fields that do NOT have `data_length`s of 52, 52, 52 or 53, respectively.
208+
- MUST skip over unknown fields, OR an `f` field with unknown `version`, OR `p`, `h` or
209+
`n` fields that do NOT have `data_length`s of 52, 52 or 53, respectively.
210210
- MUST fail the payment if a mandatory field (`p` or `s`) was skipped due to an incorrect
211211
length.
212212
- MUST fail the payment if a `d` field is not present and a `h` field was skipped due to an
213-
incorrect length.
213+
incorrect length.
214214
- if the `9` field contains unknown _odd_ bits that are non-zero:
215215
- MUST ignore the bit.
216216
- if the `9` field contains unknown _even_ bits that are non-zero:
@@ -220,8 +220,10 @@ A reader:
220220
description.
221221
- if a valid `n` field is provided:
222222
- MUST use the `n` field to validate the signature instead of performing signature recovery.
223-
- if there is a valid `s` field:
224-
- MUST use that as [`payment_secret`](04-onion-routing.md#tlv_payload-payload-format)
223+
- if a valid `s` field is not provided:
224+
- MUST fail the payment.
225+
- otherwise:
226+
- MUST use the `s` field as [`payment_secret`](04-onion-routing.md#tlv_payload-payload-format)
225227
- if the `c` field (`min_final_cltv_expiry_delta`) is not provided:
226228
- MUST use an expiry delta of at least 18 when making the payment
227229
- if an `m` field is provided:
@@ -790,6 +792,9 @@ Breakdown:
790792
> ### Invalid sub-millisatoshi precision.
791793
> lnbc2500000001p1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5xysxxatsyp3k7enxv4jsxqzpusp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9qrsgq0lzc236j96a95uv0m3umg28gclm5lqxtqqwk32uuk4k6673k6n5kfvx3d2h8s295fad45fdhmusm8sjudfhlf6dcsxmfvkeywmjdkxcp99202x
792794
795+
> ### Missing required `s` field.
796+
> lnbc20m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqhp58yjmdan79s6qqdhdzgynm4zwqd5d7xmw5fk98klysy043l2ahrqs9qrsgq7ea976txfraylvgzuxs8kgcw23ezlrszfnh8r6qtfpr6cxga50aj6txm9rxrydzd06dfeawfk6swupvz4erwnyutnjq7x39ymw6j38gp49qdkj
797+
793798
# Authors
794799

795800
[ FIXME: ]

0 commit comments

Comments
 (0)