Feat/unified invoices #6421

chrisguida · 2023-07-21T22:29:44Z

Support for tracking payments to fallback addresses (fixes #542)

Currently implemented behind the invoices_onchain_fallback config option.

When this option is enabled, populate new invoices with a P2TR fallback address, and add the script to our txfilter so we can watch for payments to it, and store it in the new invoice_fallbacks child table. Adding fallbacks manually in the invoice rpc call will disable the new tracking behavior, and there is a warning to this effect.

When we detect a payment to one of our fallback addresses, check the invoice_fallbacks table to see if there's an invoice associated with that script. If so, mark the invoice as paid and send out any hooks / notifications for this.

rustyrussell · 2023-07-24T07:07:36Z

Hmm,. this is too late foir current release, but can we get that bolt11 bugfix in a PR by itself (ideally with a Changelog-Fixed: line?)

niftynei · 2023-07-24T16:14:37Z

@rustyrussell done, see #6435

lightningd/invoice.c

rustyrussell

This looks great! Complaints are in form, not function!

Commits need some cleaning up
Remove all the //

lightningd/invoice.c

rustyrussell · 2023-09-19T04:59:44Z

wallet/walletrpc.c

-					   const char *buffer,
-					   const jsmntok_t *obj UNNEEDED,
-					   const jsmntok_t *params)
+bool newaddr_inner(struct command *cmd, struct pubkey *pubkey, enum addrtype *addrtype)


This should take ld not cmd, and addrtype is a constant. In effect:

bool issue_new_address(struct lightningd *ld, enum addrtype addrtype, struct pubkey *pubkey);

rustyrussell · 2023-09-19T05:02:14Z

wallet/db.c

+    {SQL("CREATE TABLE invoice_fallbacks ("
+	 "  scriptpubkey BLOB,"
+	 "  invoice_id BIGINT REFERENCES invoices(id) ON DELETE CASCADE,"
+	 "  PRIMARY KEY (scriptpubkey)"
+	 ");"),
+     NULL},


This MUST go at the end of the dbmigrations array!!

Yes, this was moved to the bottom in a later commit.

lightningd/invoice.c

wallet/invoices.c

doc/lightning-listconfigs.7.md

chrisguida · 2023-09-19T15:18:15Z

Thanks so much for the detailed review, @rustyrussell ! I'll get on this soon :)

rustyrussell · 2023-10-25T03:52:16Z

Rebased and cleaned up:

Renamed option.
Documented it in lightningd-config.md
Fixed serialization order
Documented new notification field.
Added Changelog lines
Removed many // and fprintf.

chrisguida · 2023-10-25T20:51:17Z

Looks great @rustyrussell, thanks again for the assist on this!

Looks like there are just a couple of things left:

the rest of the review comments
renaming the rest of the unified_invoices references to invoices_onchain_fallback
making the new option default to true

I'll get started on this unless I hear back!

rustyrussell · 2023-10-26T02:08:42Z

I think I got them all, except for minor internal code things which can be fixed later...

Expand to handle P2TR addresses, use the common script encoding utility function instead of reimplementing it.

Changelog-Added: Config: `invoices-onchain-fallback` to automatically add an onchain p2tr address to invoices, and allow that for payment.

…ks table

i.e. `set` may be NULL, so we need to explicitly hand the amount. We also add an outpoint.

Changelog-Added: JSON-RPC: `listinvoices` new field `paid_outpoint` if an invoice is paid onchain.

rustyrussell · 2023-10-26T03:33:39Z

YA rebase!

rustyrussell · 2023-10-26T05:39:38Z

We can make it per-invoice next release, if we want, since it would be perfectly backward compatible. For now it's getting close to release...

chrisguida force-pushed the feat/unified-invoices branch from f07bc60 to f5604f5 Compare July 21, 2023 22:50

niftynei force-pushed the feat/unified-invoices branch from 64d2e9f to 8ca8dca Compare July 24, 2023 06:10

chrisguida force-pushed the feat/unified-invoices branch from e4a7424 to 283f5b3 Compare August 1, 2023 03:36

chrisguida marked this pull request as ready for review August 15, 2023 18:33

chrisguida requested a review from cdecker as a code owner August 16, 2023 19:12

rustyrussell added this to the v23.11 milestone Aug 21, 2023

rustyrussell added the needs-rebase label Sep 18, 2023

rustyrussell reviewed Sep 19, 2023

View reviewed changes

lightningd/invoice.c Show resolved Hide resolved

rustyrussell reviewed Sep 19, 2023

View reviewed changes

rustyrussell force-pushed the feat/unified-invoices branch from 0fac5fe to 6c3b2b1 Compare October 25, 2023 03:53

rustyrussell removed the needs-rebase label Oct 26, 2023

rustyrussell force-pushed the feat/unified-invoices branch from 6c3b2b1 to 009f525 Compare October 26, 2023 02:06

niftynei and others added 10 commits October 26, 2023 14:02

fallback: json add fallback cleanup

f269974

Expand to handle P2TR addresses, use the common script encoding utility function instead of reimplementing it.

wallet: add newaddr_inner() helper

df26825

bitcoin: expose fmt_bitcoin_txid

34b83e8

add invoices-onchain-fallback config option and warnings

d5fdd4c

Changelog-Added: Config: `invoices-onchain-fallback` to automatically add an onchain p2tr address to invoices, and allow that for payment.

wallet: add invoice_fallbacks table and paid_outpoint to invoices

fc8d9a4

track fallbacks for invoices, pt 1

6fe2804

add autogenerated fallbacks (not custom fallbacks) to invoice_fallbac…

f9388f5

…ks table

lightningd: adapt invoice_try_pay declaration for onchain payment.

32b678c

i.e. `set` may be NULL, so we need to explicitly hand the amount. We also add an outpoint.

mark invoice as paid when we detect an on-chain payment to a fallback

d3ea451

display paid_outpoint on invoices when present

3781993

Changelog-Added: JSON-RPC: `listinvoices` new field `paid_outpoint` if an invoice is paid onchain.

rustyrussell force-pushed the feat/unified-invoices branch from 009f525 to c760744 Compare October 26, 2023 03:34

add test, update schemas, fix warning_custom_fallbacks

bab6ca6

rustyrussell force-pushed the feat/unified-invoices branch from c760744 to bab6ca6 Compare October 26, 2023 03:35

rustyrussell merged commit 88ac2dc into ElementsProject:master Oct 26, 2023
38 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/unified invoices #6421

Feat/unified invoices #6421

chrisguida commented Jul 21, 2023 •

edited

rustyrussell commented Jul 24, 2023

niftynei commented Jul 24, 2023

rustyrussell left a comment

rustyrussell Sep 19, 2023

rustyrussell Sep 19, 2023

chrisguida Sep 19, 2023 •

edited

chrisguida commented Sep 19, 2023

rustyrussell commented Oct 25, 2023

chrisguida commented Oct 25, 2023

rustyrussell commented Oct 26, 2023

rustyrussell commented Oct 26, 2023

rustyrussell commented Oct 26, 2023

Feat/unified invoices #6421

Feat/unified invoices #6421

Conversation

chrisguida commented Jul 21, 2023 • edited

rustyrussell commented Jul 24, 2023

niftynei commented Jul 24, 2023

rustyrussell left a comment

Choose a reason for hiding this comment

rustyrussell Sep 19, 2023

Choose a reason for hiding this comment

rustyrussell Sep 19, 2023

Choose a reason for hiding this comment

chrisguida Sep 19, 2023 • edited

Choose a reason for hiding this comment

chrisguida commented Sep 19, 2023

rustyrussell commented Oct 25, 2023

chrisguida commented Oct 25, 2023

rustyrussell commented Oct 26, 2023

rustyrussell commented Oct 26, 2023

rustyrussell commented Oct 26, 2023

chrisguida commented Jul 21, 2023 •

edited

chrisguida Sep 19, 2023 •

edited