invoices+sqldb: small fixes to address some inconsistencies between KV and native SQL invoice DB implementations #9050

bhandras · 2024-08-30T15:55:51Z

This PR fixes a few inconsistencies between KV and native SQL invoice DB implementations that caused numerous test failures on our CI:

  --- FAIL: TestLightningNetworkDaemon/tranche05/107-of-168/bitcoind/sendpayment_amp_invoice_repeat (19.61s)
        lnd_amp_test.go:300: 
            	Error Trace:	/home/runner/work/lnd/lnd/itest/lnd_amp_test.go:300
            	            				/home/runner/work/lnd/lnd/lntest/harness.go:386
            	            				/home/runner/work/lnd/lnd/itest/lnd_test.go:139
            	Error:      	Not equal: 
            	            	expected: 1
            	            	actual  : 2
            	Test:       	TestLightningNetworkDaemon/tranche05/107-of-168/bitcoind/sendpayment_amp_invoice_repeat

    --- FAIL: TestLightningNetworkDaemon/tranche02/47-of-169/bitcoind/list_payments (24.16s)
        --- FAIL: TestLightningNetworkDaemon/tranche02/47-of-169/bitcoind/list_payments/invoice_exact_end_date (0.00s)
            lnd_payment_test.go:616: 
                	Error Trace:	/home/runner/work/lnd/lnd/itest/lnd_payment_test.go:616
                	Error:      	"[]" should have 1 item(s), but has 0
                	Test:       	TestLightningNetworkDaemon/tranche02/47-of-169/bitcoind/list_payments/invoice_exact_end_date
                	Messages:   	req: creation_date_end:1725010429

Now includes changes from #9022:

The PR fixes the following test:

make itest backend=btcd dbbackend=postgres nativesql=true icase=sendpayment_amp_invoice
Note that the sendpayment_amp_invoice_repeat test is not fixed by this. Also note that this depends on #9021 to unmask the test failure.

coderabbitai · 2024-08-30T15:55:58Z

Important

Review skipped

Auto reviews are limited to specific labels.

Labels to auto review (1)

llm-review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

Roasbeef

Nice work with these fixes! Great how even all of them combined weren't too involved.

Roasbeef · 2024-08-30T18:27:55Z

go.mod

@@ -204,6 +204,9 @@ replace github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2
 // allows us to specify that as an option.
 replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display

+// Temporary replace until the next version of sqldb is taged.
+replace github.com/lightningnetwork/lnd/sqldb => ./sqldb


If we merge this PR by itself first, then we can do the tag of this portion first, then merge the rest later.

Perhaps best to merge this PR which contains @aakselrod's fixes, so the whole things goes in together.

sqldb/sqlc/queries/amp_invoices.sql

channeldb/invoices.go

sqldb/sqlc/queries/invoices.sql

invoices/sql_store.go

docs/release-notes/release-notes-0.18.3.md

When fetching an AMP invoice we sometimes filter HTLCs to selected set IDs, however we always kept the full AMP state which is irrelevant as it contains state for all AMP payments. This was a side effect of UpdateInvoice needing to serialize the whole invoice when storing after an update but it is an unwanted "feature" as users will need to filter to relevant set when listing an AMP payment or subsribing to an update.

Previously SQL invoice updater ignored the set ID hint when updating an AMP invoice resulting in update subscriptions returning all of the AMP state as well as all AMP HTLCs. This commit synchornizes behavior with the KV implementation such that we now only return relevant AMP state and HTLCs when updating an AMP invoice.

Previously, the SQL implementation of the invoice query simply converted the start and end timestamps to time and used them in SQL queries to check for inclusivity. However, this logic failed when the start and end timestamps were equal. This commit addresses and corrects this issue.

Roasbeef · 2024-09-04T00:35:35Z

Native sql tests were green in the last run! Kicking the other failed tests to see if they're flakes.

bhandras force-pushed the native-sql-invoice-fixes branch from a126bee to f094b7f Compare August 30, 2024 15:56

bhandras mentioned this pull request Aug 30, 2024

invoices/sqldb: query by ChanID when updating AMP invoice preimage #9022

Closed

8 tasks

saubyk assigned bhandras Aug 30, 2024

saubyk added this to the v0.18.3 milestone Aug 30, 2024

Roasbeef requested changes Aug 30, 2024

View reviewed changes

alexbosworth reviewed Sep 3, 2024

View reviewed changes

docs/release-notes/release-notes-0.18.3.md Outdated Show resolved Hide resolved

guggero self-requested a review September 3, 2024 16:35

aakselrod reviewed Sep 3, 2024

View reviewed changes

docs/release-notes/release-notes-0.18.3.md Outdated Show resolved Hide resolved

aakselrod and others added 6 commits September 3, 2024 19:40

invoices/sqldb: query by ChanID when updating AMP invoice preimage

f1b7953

itest: check that AMP subinvoices are correctly updated w/nativesql

e3a939a

invoices: ensure AMP subinvoices are correctly updated w/nativesql

ffbdcc1

bhandras force-pushed the native-sql-invoice-fixes branch from bf0d8ad to 2c2537e Compare September 3, 2024 17:40

docs: update docs/release-notes/release-notes-0.18.3.md

1f7ac8e

bhandras force-pushed the native-sql-invoice-fixes branch from 2c2537e to 1f7ac8e Compare September 3, 2024 17:42

bhandras requested review from aakselrod, Roasbeef and alexbosworth September 3, 2024 17:43

guggero approved these changes Sep 3, 2024

View reviewed changes

aakselrod approved these changes Sep 3, 2024

View reviewed changes

alexbosworth approved these changes Sep 3, 2024

View reviewed changes

Roasbeef mentioned this pull request Sep 4, 2024

release: create branch for v0.18.3 rc3 #9061

Merged

guggero merged commit 258cf81 into lightningnetwork:master Sep 4, 2024
27 of 33 checks passed

guggero mentioned this pull request Sep 4, 2024

mod: bump sqldb to latest version #9063

Merged

bhandras deleted the native-sql-invoice-fixes branch September 4, 2024 12:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

invoices+sqldb: small fixes to address some inconsistencies between KV and native SQL invoice DB implementations #9050

invoices+sqldb: small fixes to address some inconsistencies between KV and native SQL invoice DB implementations #9050

bhandras commented Aug 30, 2024 •

edited

Loading

coderabbitai bot commented Aug 30, 2024 •

edited

Loading

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Roasbeef left a comment

Roasbeef Aug 30, 2024

bhandras Sep 3, 2024

Roasbeef commented Sep 4, 2024

invoices+sqldb: small fixes to address some inconsistencies between KV and native SQL invoice DB implementations #9050

invoices+sqldb: small fixes to address some inconsistencies between KV and native SQL invoice DB implementations #9050

Conversation

bhandras commented Aug 30, 2024 • edited Loading

coderabbitai bot commented Aug 30, 2024 • edited Loading

Review skipped

Chat

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Roasbeef left a comment

Choose a reason for hiding this comment

Roasbeef Aug 30, 2024

Choose a reason for hiding this comment

bhandras Sep 3, 2024

Choose a reason for hiding this comment

Roasbeef commented Sep 4, 2024

bhandras commented Aug 30, 2024 •

edited

Loading

coderabbitai bot commented Aug 30, 2024 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)