Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sendpay aggregation and ordering in listpays #4567

Merged
merged 25 commits into from
Oct 13, 2021
Merged

Fix sendpay aggregation and ordering in listpays #4567

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
db5181f
pytest: Reproduce #4482
cdecker May 28, 2021
9dc4726
db: Add groupid to the payments table
cdecker Sep 28, 2021
af371b6
jsonrpc: Add groupid to `sendpay` and `sendonion`
cdecker Sep 28, 2021
9f887f3
pyln: Add groupid to `sendpay` and `sendonion`
cdecker Sep 28, 2021
8163ae3
pay: Add `groupid` to the payment struct
cdecker Sep 29, 2021
e73564d
wallet: Add function to retrieve the latest groupid for a payment
cdecker Sep 30, 2021
779826a
db: Add `groupid` to HTLCs
cdecker Sep 29, 2021
2529daa
jsonrpc: Add missing `partid` in `listsendpays` schema
cdecker Sep 29, 2021
b83fd20
pay: Call `listsendpays` to find prior attempts and abort if needed
cdecker Sep 29, 2021
fc62b7f
doc: Add missing `amount_sent_msat` to `listpays`
cdecker Sep 29, 2021
38ec80d
jsonrpc: Add `groupid` to `waitsendpay`
cdecker Sep 29, 2021
95641e3
pay: Make `pay` idempotent
cdecker Sep 30, 2021
dd78d61
pay: Do not delete old sendpay attempts if we retry
cdecker May 31, 2021
6e1341e
paycore: Prevent multiple concurrent payment groups
cdecker Oct 4, 2021
99d5808
paycore: Default `groupid` to increment from last one
cdecker Oct 4, 2021
d555a99
pytest: Fix up `test_partial_payment` to use a single `groupid`
cdecker Oct 4, 2021
75a4f5b
pay: Fail a `sendpay` or `sendonion` that'd produce a DB collision
cdecker Oct 4, 2021
fc94852
pytest: Add `groupid` to `test_partial_payment_{timeout,restart}`
cdecker Oct 4, 2021
fea3d08
pytest: Fix `test_onchain_timeout` to use `groupid`
cdecker Oct 4, 2021
f726fc6
libplugin: Add callbacks for successful and failed payments
cdecker Oct 4, 2021
11d18c1
pytest: Adjust `test_sendpay` to the new semantics
cdecker Oct 5, 2021
b8280be
pay: Mark completed payments as such by nullifying `cmd`
cdecker Oct 5, 2021
0da9623
pay: Stash and forward results for duplicate `pay` calls
cdecker Oct 5, 2021
03847bd
pay: listpays groups by payment_hash and groupid
cdecker May 28, 2021
71752df
db: Fix a syntax error with the optional parameters
cdecker Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
db: Fix a syntax error with the optional parameters 
SQL doesn't really allow `a OR 1` as a clause since `1` is not a
boolean expression. Moving it into `a OR 1=1` however is valid again.
  • Loading branch information
@cdecker
cdecker committed Oct 8, 2021
commit 71752dfbfd72c330e0e00b32bda8a350bf02e0f6
4 changes: 3 additions & 1 deletion wallet/wallet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3411,7 +3411,9 @@ wallet_payment_list(const tal_t *ctx,
", local_offer_id"
", groupid"
" FROM payments"
" WHERE (payment_hash = ? OR ?) AND (status = ? OR ?)"
" WHERE"
" (payment_hash = ? OR 1=?) AND"
" (status = ? OR 1=?)"
" ORDER BY id;"));

if (payment_hash)
Expand Down