BOLT update, including payment metadata support #5086

rustyrussell · 2022-03-11T06:10:47Z

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.

rustyrussell · 2022-03-24T04:03:33Z

Trivial rebase

rustyrussell · 2022-03-25T04:30:08Z

Rebase, crash fix for offers (which don't have payment_metadata yet!).

rustyrussell · 2022-03-28T02:55:08Z

OK, this time I added a much bigger expiry to the canned invoice!!

rustyrussell · 2022-03-29T00:23:21Z

Trivial rebase, to fix simple conflict and get master flake fixes.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

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 <rusty@rustcorp.com.au>

… 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 <rusty@rustcorp.com.au>

…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 <rusty@rustcorp.com.au> 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 <rusty@rustcorp.com.au>

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

rustyrussell · 2022-03-31T09:18:11Z

Trivial rebase, and a real fix for subd memleak report!

Ack 5f89486

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

And document the missing arguments. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> 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 <rusty@rustcorp.com.au>

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 <rusty@rustcorp.com.au>

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 <rusty@rustcorp.com.au>

rustyrussell · 2022-04-01T04:51:49Z

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

common/test/run-bolt11.c

cdecker

ACK 91932be

cdecker · 2022-04-01T09:53:34Z

lightningd/closing_control.c

@@ -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)) {


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?

Future work! This flag will be always set when we implement it, which may Just Happen if we're slow enough:)

cdecker · 2022-04-01T09:55:56Z

gossipd/routing.c

@@ -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,


Nit: indentation of the next two lines.

cdecker · 2022-04-01T09:56:06Z

gossipd/routing.c

@@ -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,


Nit: indentation

rustyrussell added this to the v0.11 milestone Mar 11, 2022

rustyrussell requested a review from cdecker as a code owner March 11, 2022 06:10

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch 3 times, most recently from 707be20 to 396bc96 Compare March 15, 2022 03:26

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from 396bc96 to 7bbe38e Compare March 22, 2022 04:00

cdecker added the needs-rebase label Mar 23, 2022

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from 7bbe38e to ace8213 Compare March 24, 2022 04:01

rustyrussell removed the needs-rebase label Mar 24, 2022

joostjager mentioned this pull request Mar 24, 2022

routing: send payment metadata lightningnetwork/lnd#5810

Merged

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from ace8213 to 730a995 Compare March 25, 2022 04:29

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from 730a995 to 6d142ff Compare March 28, 2022 02:54

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from 6d142ff to 1402e90 Compare March 29, 2022 00:22

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch 2 times, most recently from 21707f2 to 78b5a37 Compare March 30, 2022 04:01

rustyrussell added 6 commits March 31, 2022 19:39

wire/tlvstream: const.

86f40a7

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

bolt11: support payment_metadata.

42f5df5

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from 75b0af1 to 5f89486 Compare March 31, 2022 09:17

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from 5f89486 to 9f4dfc8 Compare March 31, 2022 23:57

rustyrussell added 2 commits April 1, 2022 15:20

lightningd: metadata received support (log and decline).

5f9d492

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

sendpay: add payment_metadata argument.

0550f6f

And document the missing arguments. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

rustyrussell added 4 commits April 1, 2022 15:20

plugins/pay: send payment_metadata if provided in invoice.

1b0be29

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Changelog-Added: Protocol: `pay` (and decode, etc) supports bolt11 payment_metadata a-la lightning/bolts#912

doc: update BOLTs to latest master.

8d9bd17

Just typo fixes and the like. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

pytest: fix flake in test_multichan.

91932be

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 <rusty@rustcorp.com.au>

rustyrussell force-pushed the guilt/bolt11-add-payment_metadata branch from 9f4dfc8 to 91932be Compare April 1, 2022 04:51

cdecker reviewed Apr 1, 2022

View reviewed changes

common/test/run-bolt11.c Show resolved Hide resolved

cdecker approved these changes Apr 1, 2022

View reviewed changes

rustyrussell merged commit 01e5f18 into ElementsProject:master Apr 1, 2022

harding mentioned this pull request Apr 16, 2022

Newsletters: add 195 (2022-04-13) bitcoinops/bitcoinops.github.io#745

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BOLT update, including payment metadata support #5086

BOLT update, including payment metadata support #5086

rustyrussell commented Mar 11, 2022

rustyrussell commented Mar 24, 2022

rustyrussell commented Mar 25, 2022

rustyrussell commented Mar 28, 2022

rustyrussell commented Mar 29, 2022

rustyrussell commented Mar 31, 2022

rustyrussell commented Apr 1, 2022 •

edited

Loading

cdecker left a comment

cdecker Apr 1, 2022

rustyrussell Apr 1, 2022

cdecker Apr 1, 2022

cdecker Apr 1, 2022

BOLT update, including payment metadata support #5086

BOLT update, including payment metadata support #5086

Conversation

rustyrussell commented Mar 11, 2022

rustyrussell commented Mar 24, 2022

rustyrussell commented Mar 25, 2022

rustyrussell commented Mar 28, 2022

rustyrussell commented Mar 29, 2022

rustyrussell commented Mar 31, 2022

rustyrussell commented Apr 1, 2022 • edited Loading

cdecker left a comment

Choose a reason for hiding this comment

cdecker Apr 1, 2022

Choose a reason for hiding this comment

rustyrussell Apr 1, 2022

Choose a reason for hiding this comment

cdecker Apr 1, 2022

Choose a reason for hiding this comment

cdecker Apr 1, 2022

Choose a reason for hiding this comment

rustyrussell commented Apr 1, 2022 •

edited

Loading