BOLT update, including payment metadata support #5086
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
3 times, most recently
from
707be20
to
396bc96
Compare
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
396bc96
to
7bbe38e
Compare
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
7bbe38e
to
ace8213
Compare
|
Trivial rebase |
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
ace8213
to
730a995
Compare
|
Rebase, crash fix for offers (which don't have payment_metadata yet!). |
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
730a995
to
6d142ff
Compare
|
OK, this time I added a much bigger expiry to the canned invoice!! |
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
6d142ff
to
1402e90
Compare
|
Trivial rebase, to fix simple conflict and get master flake fixes. |
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
2 times, most recently
from
21707f2
to
78b5a37
Compare
Signed-off-by: Rusty Russell <[email protected]>
Regenerate from current BOLTS via `make extract-bolt-csv` 1. The remote_addr field was added manually into peer_wire.csv: this needs to be a patch otherwise it vanishes on regen. 2. We never brought into the channel_disabled fields, because it was too much hassle (we never actually generate this!). Do it now. Signed-off-by: Rusty Russell <[email protected]>
… payment_secret. The signatures on the new examples are sometimes different from what we produce though? They're valid, however. And one example has an unneeded feature 5-bit; it's not *wrong*, but it's not optimal. Signed-off-by: Rusty Russell <[email protected]>
…outputs. This doesn't have an effect now (except in experimental mode), but it will when we support anchors. So we deprecate the use of those in the close command too. For experimental mode we have to avoid using p2pkh; adapt that test. Signed-off-by: Rusty Russell <[email protected]> Changelog-Deprecated: JSON-RPC: `shutdown` no longer allows p2pkh or p2sh addresses.
We do this (send warnings) in almost all cases anyway, so mainly this is a textual update, but there are some changes: 1. Send ERROR not WARNING if they send a malformed commitment secret. 2. Send WARNING not ERROR if they get the shutdown_scriptpubkey wrong (vs upfront) 3. Send WARNING not ERROR if they send a bad shutdown_scriptpubkey (e.g. p2pkh in future) 4. Rename some vars 'err' to 'warn' to make it clear we send a warning. This means test_option_upfront_shutdown_script can be made reliable, too, and it now warns and doesn't automatically close channel. Signed-off-by: Rusty Russell <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
75b0af1
to
5f89486
Compare
|
Trivial rebase, and a real fix for subd memleak report! Ack 5f89486 |
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
5f89486
to
9f4dfc8
Compare
Signed-off-by: Rusty Russell <[email protected]>
And document the missing arguments. Signed-off-by: Rusty Russell <[email protected]>
Signed-off-by: Rusty Russell <[email protected]> Changelog-Added: Protocol: `pay` (and decode, etc) supports bolt11 payment_metadata a-la lightning/bolts#912
Just typo fixes and the like. Signed-off-by: Rusty Russell <[email protected]>
After this, we can exactly reproduce the vectors (in DEVELOPER mode). 1. Move payment_metadata position to match test vector. 2. Create flag to suppress `c` field production. 3. Some vectors put secret before payment_hash, hack that in. Signed-off-by: Rusty Russell <[email protected]>
I have a separate branch which fixes this race properly, but it's not anything to do with this PR. Signed-off-by: Rusty Russell <[email protected]>
rustyrussell
force-pushed
the
guilt/bolt11-add-payment_metadata
branch
from
9f4dfc8
to
91932be
Compare
|
Rebase again: we didn't set the new field to NULL in the newly re-introduced legacy onion path. Removed subd memleak report fix, since it made more problems (another branch coming for this!) Ack 9f4dfc8 |
cdecker
reviewed
Apr 1, 2022
cdecker
approved these changes
Apr 1, 2022
| @@ -684,11 +685,11 @@ static struct command_result *json_close(struct command *cmd, | |||
| channel->peer->their_features, | |||
| OPT_SHUTDOWN_ANYSEGWIT); | |||
| if (!valid_shutdown_scriptpubkey(channel->shutdown_scriptpubkey[LOCAL], | |||
| anysegwit)) { | |||
| anysegwit, !deprecated_apis)) { | |||
There was a problem hiding this comment.
This assumes that we'll always use zerof-fee anchor outputs once we phase out deprecated apis, as if that feature were mandatory, is that the case?
There was a problem hiding this comment.
Future work! This flag will be always set when we implement it, which may Just Happen if we're slow enough:)
| @@ -911,7 +911,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate, | |||
| &pending->node_id_2, | |||
| &pending->bitcoin_key_1, | |||
| &pending->bitcoin_key_2)) { | |||
| err = towire_warningfmt(rstate, NULL, | |||
| warn = towire_warningfmt(rstate, NULL, | |||
There was a problem hiding this comment.
Nit: indentation of the next two lines.
| @@ -991,7 +991,7 @@ u8 *handle_channel_announcement(struct routing_state *rstate, | |||
| } | |||
|
|
|||
| /* Note that if node_id_1 or node_id_2 are malformed, it's caught here */ | |||
| err = check_channel_announcement(rstate, | |||
| warn = check_channel_announcement(rstate, | |||
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks to Joost, bolt11 spec now supports metadata (see lightning/bolts#912). To get there, I updated the spec (in stages, there were other changes).
We don't issue invoices with metadata, but we do pay them properly if asked.