feat: Blink funding source #2477

prusnak · 2024-05-04T10:02:28Z

supersedes #2270 (this PR is just a rebase and squash of that PR)

ready for review
~~still in draft, because type checks (mypy and pyright) still need to be fixed~~

bitkarrot · 2024-05-05T00:49:36Z

@prusnak ok

prusnak · 2024-05-20T09:03:09Z

Maybe our typing guru @dni can help with the typing issues? :)

bitkarrot · 2024-05-21T05:10:58Z

Hi -

I could use some feedback on the unit test which was written before @motorina0 came up with the current unit test structure, but afaik the rest of the PR should be in theory OK.

If @openoms could please confirm that this branch is working to satisfaction, including all the extensions, e.g. lnurlp, events, tipjar and any other commonly used extensions that would be most helpful

bitkarrot · 2024-06-17T20:40:41Z

@openoms i confirmed this branch is working, i used this .env.example, not the one from previous

@prusnak @motorina0 unit test is for graphql not rest api, let me know if you need it to be adjusted to fit the others

bitkarrot · 2024-07-09T19:29:22Z

Where are we with this current PR? i'm getting a little thin on free time here in the next few..., so would be good to let me know

prusnak · 2024-07-10T06:49:17Z

Where are we with this current PR? i

We still need to figure out the typing issues and fix them (mypy/pyright)

motorina0 · 2024-07-10T06:50:20Z

Where are we with this current PR? i'm getting a little thin on free time here in the next few..., so would be good to let me know

I'm reviewing it now.

docs/guide/wallets.md

openoms · 2024-07-10T08:51:58Z

motorina0 · 2024-07-10T10:41:26Z

I have reviewed the code and made some refactoring.
The fine-grained commits can be found in this PR: #2575

motorina0 · 2024-07-10T10:42:31Z

@openoms regarding

the incoming payment is not picked up

This is expected, the websocket connection is not implemented, I will handle that next.

codecov · 2024-07-10T10:43:18Z

Codecov Report

Attention: Patch coverage is 25.52083% with 143 lines in your changes missing coverage. Please review.

Project coverage is 60.67%. Comparing base (eda7e35) to head (65e2611).

Files	Patch %	Lines
lnbits/wallets/blink.py	23.52%	143 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##              dev    #2477      +/-   ##
==========================================
- Coverage   61.35%   60.67%   -0.68%     
==========================================
  Files          69       70       +1     
  Lines        9925    10117     +192     
==========================================
+ Hits         6089     6138      +49     
- Misses       3836     3979     +143

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

lnbits/wallets/blink.py

prusnak · 2024-07-10T13:36:43Z

The CI is green now, thanks @motorina0!

Can you please retest @openoms with the changes from Vlad? If you say it still works, we can merge 🎉

prusnak · 2024-07-10T13:43:24Z

Please wait with the testing until we merge PR #2577 into this PR so we can also test WebSockets

motorina0 · 2024-07-10T14:12:28Z

@openoms regarding

the incoming payment is not picked up

This is expected, the websocket connection is not implemented, I will handle that next.

Done, payment notifications can be tested now.

lnbits/wallets/blink.py

prusnak · 2024-07-10T15:00:31Z

CI not failing anymore.

Marked as ready for review (turning off the draft status).

openoms · 2024-07-10T15:05:20Z

@motorina0 ran a quick test with the updates using the websocket.
the basic wallet functions and Tpos receive and send works.

Found the LNcalendar unreliable especially when paying the invoice with a Blink funded LNbits subaccount or with another Blink wallet.
Either having no receive confirmation on the LNcalendar page or getting this:

openoms · 2024-07-11T09:13:43Z

lnbits/wallets/blink.py

+                    settlementVia {
+                      ... on SettlementViaLn {
+                        preImage
+                      }


The payments are not picked up when paying with Blink wallet or a Blink funded LNbits wallets which means that the intra-ledger payments are not picked up (not sure why only in LNcalendar).
The Blink backend does decide to settle depending on the invoice. It does return the preimage in this case also since it is known when creating the invoice.

.... on SettlementViaIntraLedger needs to be added to the query to cover for this case:

Suggested change

settlementVia {

... on SettlementViaLn {

preImage

}

settlementVia {

... on SettlementViaLn {

preImage

}

... on SettlementViaIntraLedger {

preImage

}

this change does not seem to be necessary as Blink intraledger payments are being picked up in most extensions

openoms · 2024-07-11T09:17:08Z

@motorina0 ran a quick test with the updates using the websocket. the basic wallet functions and Tpos receive and send works.
Found the LNcalendar unreliable especially when paying the invoice with a Blink funded LNbits subaccount or with another Blink wallet. Either having no receive confirmation on the LNcalendar page or getting this:

This is most likely an issue with the LNCalendar extension and not with the Blink funding source. You can try with an LNbits funding source (https://demo.lnbits.com), I would expect the same error.

Just curious, are you using LNCalendar in any particular way, or was it a random choice for testing.

I did test LNcalendar with a CLN backed LNbits instance where it had no problems. It is a useful extension I would plan to use myself and testing it particularly beacuse it was the only one not working. Hope to have a solution here: #2477 (comment)

motorina0 · 2024-07-11T11:57:46Z

I am not able to reproduce the issue. Payment was successful, no errors in the console (LNbits v0.12.8, LNCalendar v0.1.2).
I have the Blink funding source configured.

Is there a special scenario on how I can reproduce this?

tests/wallets/.env.example

openoms · 2024-07-15T11:12:48Z

I am not able to reproduce the issue. Payment was successful, no errors in the console (LNbits v0.12.8, LNCalendar v0.1.2). I have the Blink funding source configured.

Is there a special scenario on how I can reproduce this?

Yes, the payments in LNcalendar are still not picked up for transactions where the invoice is paid with an LNbits wallet on the same instance (which is connected to Blink). The accounting does happen - sats are spent from the wallet and arrive in the LNcalendar wallet, but the appoinment booking is not successful.

I had no problems now paying from Zeus (LND) and with a Blink wallet of another user.

arcbtc · 2024-07-16T12:57:59Z

Sounds like an issue with lncalendar and self payments, rather than blink

talvasconcelos · 2024-07-16T14:12:07Z

Possible fixed with lnbits/lncalendar#8

prusnak · 2024-07-17T13:05:25Z

@dni @talvasconcelos can you please review so we can finally merge?

arcbtc · 2024-07-19T13:06:45Z

Blink missing from the server UI

prusnak · 2024-07-19T13:18:49Z

Blink missing from the server UI

Weird - I see it in both lnbits-funding-sources.js and bundle.min.js 🤷

openoms · 2024-07-19T13:50:05Z

Blink missing from the server UI

Got it on my instance (updated to latest and restarted):

arcbtc · 2024-07-19T14:46:30Z

Weird, i must have some bundle issue. My mistake, will try again 👍

arcbtc · 2024-07-19T20:25:51Z

Its outside of the scope of this pr, but the issue was LNBITS_ALLOWED_FUNDING_SOURCES in env needing Blinkwallet, even though LNBITS_ADMIN_UI=true was set.

* refactor: mark `graphql_query` as private (`_` prefix) * feat: set default value for `blink_api_endpoint` * fix: raise if HTTP call failed * refactor: move private method to the bottom * refactor: make `wallet_id` a property * fix: key mapping for attribute * chore: fix `mypy` * chore: fix `make check` * refactor: extract query strings * refactor: extract `BlinkGrafqlQueries` class * chore: code clean-up * chore: add `try-catch` * refactor: extract `tx_query` * chore: format grapfhql queries * fix: set funding source class * chore: `make format` * fix: test by following the other patterns

Co-authored-by: openoms <[email protected]>

* feat: add websocket connection to blink * feat: close websocket on shutdown

openoms · 2024-07-24T12:12:27Z

Thank you all who have worked on improving and reviewing this PR. As you might know there is a 1M sats bounty offered for this feature which is now completed and ready to be paid.

The original initiative and the bulk of the work was taken up by @bitkarrot who would be entitled to receive the bounty, but given the additional work done (especially by @motorina0 and all the reviewers) I’d like to make sure that we offer to share the bounty if wanted.

So please comment if you have an opinion about how it would be best to deal with the payout. Planning to finalize it by the end of this week.

motorina0 · 2024-07-24T13:18:39Z

As far as I'm concerned the bounty belongs entirely to @bitkarrot

prusnak · 2024-07-24T13:31:37Z

As far as I'm concerned the bounty belongs entirely to @bitkarrot

Same 👍

prusnak mentioned this pull request May 4, 2024

feat: Blink Funding Source - GraphQL API integration #2270

Closed

prusnak force-pushed the blink-rebase branch 2 times, most recently from 96ccbf2 to 0ac3ce1 Compare May 4, 2024 10:37

prusnak force-pushed the blink-rebase branch from 0ac3ce1 to e398bb0 Compare May 5, 2024 10:44

prusnak force-pushed the blink-rebase branch from e398bb0 to 7569fe1 Compare May 20, 2024 08:44

prusnak requested a review from dni May 20, 2024 09:02

dni force-pushed the dev branch from eb41f08 to 44b458e Compare May 22, 2024 09:15

motorina0 requested review from arcbtc and motorina0 July 10, 2024 06:40

prusnak force-pushed the blink-rebase branch from 7569fe1 to 3773d1a Compare July 10, 2024 06:44

openoms reviewed Jul 10, 2024

View reviewed changes

docs/guide/wallets.md Outdated Show resolved Hide resolved

motorina0 reviewed Jul 10, 2024

View reviewed changes

lnbits/wallets/blink.py Show resolved Hide resolved

motorina0 reviewed Jul 10, 2024

View reviewed changes

lnbits/wallets/blink.py Outdated Show resolved Hide resolved

prusnak marked this pull request as ready for review July 10, 2024 14:59

openoms reviewed Jul 11, 2024

View reviewed changes

dni reviewed Jul 15, 2024

View reviewed changes

tests/wallets/.env.example Outdated Show resolved Hide resolved

talvasconcelos mentioned this pull request Jul 16, 2024

Delete unavailable dates lnbits/lncalendar#8

Merged

bitkarrot and others added 9 commits July 19, 2024 21:25

feat: Blink funding source

6f56691

chore: make bundle

96ae54a

Update docs/guide/wallets.md

abcf342

Co-authored-by: openoms <[email protected]>

feat: add websocket connection to blink (#2577)

b99a4c1

* feat: add websocket connection to blink * feat: close websocket on shutdown

feat: add blink_ws_endpoint to the UI

8a538c1

fix: use SEND tx for settlementFee

b72ccb3

refactor: remove else when if has return

117c0a5

fix: remove test env file

65e2611

arcbtc force-pushed the blink-rebase branch from dc36cb2 to 65e2611 Compare July 19, 2024 20:26

arcbtc approved these changes Jul 19, 2024

View reviewed changes

arcbtc merged commit 7298c46 into dev Jul 19, 2024

arcbtc deleted the blink-rebase branch July 19, 2024 20:32

Uh oh!

feat: Blink funding source #2477

feat: Blink funding source #2477

Conversation

prusnak commented May 4, 2024 • edited by motorina0 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bitkarrot commented May 5, 2024

Uh oh!

prusnak commented May 20, 2024

Uh oh!

bitkarrot commented May 21, 2024

Uh oh!

bitkarrot commented Jun 17, 2024

Uh oh!

bitkarrot commented Jul 9, 2024

Uh oh!

prusnak commented Jul 10, 2024

Uh oh!

motorina0 commented Jul 10, 2024

Uh oh!

Uh oh!

openoms commented Jul 10, 2024

Uh oh!

motorina0 commented Jul 10, 2024

Uh oh!

motorina0 commented Jul 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Jul 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

prusnak commented Jul 10, 2024

Uh oh!

prusnak commented Jul 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

motorina0 commented Jul 10, 2024

Uh oh!

Uh oh!

prusnak commented Jul 10, 2024

Uh oh!

openoms commented Jul 10, 2024

Uh oh!

openoms Jul 11, 2024

Choose a reason for hiding this comment

Uh oh!

openoms Jul 17, 2024

Choose a reason for hiding this comment

Uh oh!

openoms commented Jul 11, 2024

Uh oh!

motorina0 commented Jul 11, 2024

Uh oh!

Uh oh!

openoms commented Jul 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

arcbtc commented Jul 16, 2024

Uh oh!

talvasconcelos commented Jul 16, 2024

Uh oh!

prusnak commented Jul 17, 2024

Uh oh!

arcbtc commented Jul 19, 2024

Uh oh!

prusnak commented Jul 19, 2024

Uh oh!

openoms commented Jul 19, 2024

Uh oh!

arcbtc commented Jul 19, 2024

Uh oh!

arcbtc commented Jul 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openoms commented Jul 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

prusnak commented May 4, 2024 •

edited by motorina0

Loading

motorina0 commented Jul 10, 2024 •

edited

Loading

codecov bot commented Jul 10, 2024 •

edited

Loading

prusnak commented Jul 10, 2024 •

edited

Loading

openoms commented Jul 15, 2024 •

edited

Loading

arcbtc commented Jul 19, 2024 •

edited

Loading

openoms commented Jul 24, 2024 •

edited

Loading