Skip to content

feat: add private payment requests - #1172

Open
ben-kaufman wants to merge 13 commits into
masterfrom
codex/paykit-payment-request-ui-android
Open

feat: add private payment requests#1172
ben-kaufman wants to merge 13 commits into
masterfrom
codex/paykit-payment-request-ui-android

Conversation

@ben-kaufman

@ben-kaufman ben-kaufman commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

This PR adds private Paykit Payment Requests to Bitkit.

Description

  1. Automatically opens incoming requests in the existing Send confirmation flow with the requesting contact, exact amount, and a Payment Request title.
  2. Keeps dismissed requests actionable through a bell, preview sheet, and full request history, with manual reopen and explicit rejection.
  3. Adds outgoing request creation from Receive for linked, saved contacts, including amount, note, expiry, queued delivery state, and sent history.
  4. Drops expired or remotely unavailable requests, keeps presentation state scoped to the active Pubky identity, and protects account changes, sheet transitions, and overlapping actions.
  5. Requires strict private resolution for requests: a consumed Private Payment List is never reused, another endpoint from that list is not attempted, and public details are never used as fallback while waiting for a newer list.
  6. Updates Paykit to 0.1.0-rc44 and adds local E2E homeserver configuration plus safe cold-start restoration for externally managed Pubky sessions.

The request payload itself remains SDK-backed and durable; Bitkit persists only encrypted, identity-scoped presentation suppression, not a duplicate request queue. Payment proofs and receipts remain out of scope.

Dependencies:

Preview

N/A — proof recordings were completed locally and are intentionally not attached to the PR.

QA Notes

Manual Tests

  • 1. Clean wallet → create Pubky profile → enable Paykit and Contact Payments → add the peer as a contact: private-capable request action appears once the Noise link is established.
  • 2. Peer creates a private request → Home: Payment Request opens automatically with the correct contact and amount.
  • 3. Payment Request → dismiss without rejecting → bell → request preview → Pay: the request remains queued, reopens, and pays successfully.
  • 4. Peer creates a second request after payment → Pay: a newer Private Payment List is used; the consumed list is not reused and no public fallback occurs.
  • 5. Receive → Send Payment Request → enter amount, note, and expiry → select linked contact → Send: request is queued once and appears in sent history.
  • 6. Incoming request → Reject: only that request becomes terminal and the private payment list is not consumed.
  • 7. Incoming request → dismiss → relaunch: request remains discoverable without automatically reopening again; expired requests disappear live.
  • 8. Cross-platform E2E: iOS creates two requests that Android receives and pays, and Android creates two requests that iOS receives and pays, on clean regtest state.

Automated Checks

  • PaykitPaymentRequestRepoTest.kt: covers mapping, eligibility, proposal delivery, rejection, expiry, identity-scoped presentation state, and action serialization.
  • PaykitSdkServiceTest.kt: covers exact identity enforcement and safe deferred session restoration.
  • AppViewModelSendFlowTest.kt: covers automatic/manual presentation, sheet transitions, identity changes, newer-list retry, strict private resolution, and payment lifecycle races.
  • PaymentRequestExpirationTest.kt: covers expiry selection and retained draft state.
  • SheetHostTest.kt: covers locked sheet dismissal and scrim input isolation during durable proposal creation.
  • Local verification passed: app compile, Android-test compile, complete dev unit suite, detekt, and git diff --check.
  • Both final cross-platform proof videos decoded end to end without errors.

Comment thread app/src/main/java/to/bitkit/services/PaykitSdkService.kt Fixed
Comment thread app/src/main/java/to/bitkit/services/PaykitSdkService.kt Fixed
Comment thread app/src/main/java/to/bitkit/services/PaykitSdkService.kt Fixed
Comment thread app/src/main/java/to/bitkit/services/PaykitSdkService.kt Fixed
Comment thread app/src/main/java/to/bitkit/services/PaykitSdkService.kt Fixed
Comment thread app/src/main/java/to/bitkit/services/PaykitSdkService.kt Fixed
@greptile-apps

This comment has been minimized.

Comment thread app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt Outdated
@ben-kaufman
ben-kaufman force-pushed the codex/paykit-payment-request-ui-android branch 2 times, most recently from ba7f745 to e8183a5 Compare August 20, 2026 10:41
ovitrif
ovitrif previously approved these changes Aug 20, 2026

@ovitrif ovitrif left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Durably queued requests stay confirmed after an identity change, and a consumed private payment list is never reused or replaced by public details.

@ovitrif ovitrif added this to the 2.5.0 milestone Aug 20, 2026
@ben-kaufman
ben-kaufman requested a review from piotr-iohk August 21, 2026 01:08
@ben-kaufman
ben-kaufman force-pushed the codex/paykit-payment-request-ui-android branch from 5120677 to 7877465 Compare August 21, 2026 01:16
@ovitrif

ovitrif commented Aug 21, 2026

Copy link
Copy Markdown
Collaborator

Local Locks interoperability was verified with pubky/paykit-server#2 at 41cda2567226a690a012770017d5e7c1d49e2a2b.

Note this paykit-server needs to integrated into the bitkit-docker and e2e tests soonish 🙏🏻

cc. @jvsena42 @piotr-iohk

@piotr-iohk

Copy link
Copy Markdown
Collaborator

Local Locks interoperability was verified with pubky/paykit-server#2 at 41cda2567226a690a012770017d5e7c1d49e2a2b.

Note this paykit-server needs to integrated into the bitkit-docker and e2e tests soonish 🙏🏻

cc. @jvsena42 @piotr-iohk

As far as paykit-server it would be good to have a staging deployment since paykit e2e tests are run against our staging regtest and also using staging homeserver (as far as I understand that was the plan, see: #1084 (comment))

Server staging
The intended next server-side QA step is to deploy Paykit Server on staging once its runtime/listener composition is implemented. There is no staging endpoint yet, and that work is outside these mobile PRs.

@ben-kaufman
ben-kaufman force-pushed the codex/paykit-payment-request-ui-android branch from af0aaa4 to e2516e9 Compare August 21, 2026 16:19
@ovitrif
ovitrif self-requested a review August 24, 2026 16:21

@ovitrif ovitrif left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Navigating back from Payment Request sheet should return you to Payment Requests (list) screen. It instead shows the Receive Bitcoin QR, with Payment Requests still behind the sheet.

Comment thread app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveSheet.kt Outdated
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

@jvsena42 jvsena42 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review of the payment request flows. just compile and just test pass; the ComposeUi instrumented lane was run on a Pixel 9 AVD and all 15 new tests pass (after 864f008 fixed CreatePaymentRequestScreenTest querying a merged-semantics node). The 8 other failures in that lane reproduce on master and are unrelated.

Findings inline, roughly most-severe first. The SheetHost dismissEnabled work looks sound to me: programmatic hide() bypasses confirmValueChange, the disabled scrim sits under the sheet, and the inner NavHost BackHandlers still take priority over the swallowed sheet back handler.

Comment thread app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
Comment thread app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
Comment thread app/src/main/java/to/bitkit/ui/components/Money.kt Outdated
Comment thread app/src/main/res/values/strings.xml Outdated
Comment thread app/src/main/java/to/bitkit/services/PaykitSdkService.kt Outdated
Comment thread app/src/main/java/to/bitkit/ui/screens/paymentrequests/PaymentRequestsScreen.kt Outdated
ovitrif

This comment was marked as resolved.

ovitrif
ovitrif previously approved these changes Aug 24, 2026

@ovitrif ovitrif left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

List-driven Request Payment now starts on the form, and in-sheet back closes the sheet so you return to Payment Requests.

@piotr-iohk

piotr-iohk commented Aug 26, 2026

Copy link
Copy Markdown
Collaborator

Flagging while QA’ing with the staging public-pay pubkys — not a prod issue (Paykit UI is still hidden).

Enabling payments with contacts fail-closes with Unknown error if a saved contact’s receiver marker doesn’t parse (here: missing noise_public_key). I hit it on:

  • pubky1jy146y751hkgqk9p69ds5cqf461aj5x7c8ptbca5rw6m9asotso
  • pubkynekaxdyt5ktoqyufd7cgug6qppa7999hm46wfqdzm6jqnr8tj16o

In principle the same thing could happen with any broken / outdated profile marker, not only these fixtures. Recording attached. Same surface on iOS after #676 (toast there is Private Paykit is not available).

Steps:

  1. Enable Paykit UI. Create a profile. Leave payments with contacts off.
  2. Add either (or both) staging pubkys above as contacts. They do not need to be live.
  3. Enable payments with contacts.
  4. Toast is Unknown error and the toggle stays off.
Screen.Recording.2026-08-26.at.10.12.34.mov

logs.zip

@piotr-iohk

piotr-iohk commented Aug 26, 2026

Copy link
Copy Markdown
Collaborator

Flagging from QA: paying a payment request that’s larger than the wallet balance.

Same setup, two directions, both recordings attached:

  • iOS → Android (this PR): incoming sheet, Pay → toast Insufficient Spending Balance (e.g. ₿ 78,244 more needed to pay this Lightning invoice) and a red-bordered card. Dismiss then fails with Payment request operation is already in progress. Toast / error repeats; request stays on the sheet and is hard to dismiss.
Screen.Recording.2026-08-26.at.14.06.24.mov
  • Android → iOS (ldk-node Error #676, already merged): PayPlease try again. Coin selection failed. Dismiss is fine; the copy is just the wrong error.
Screen.Recording.2026-08-26.at.14.18.16.mov

Steps:

  1. Two live wallets with payments-with-contacts on. Put ~88k on the payer (split savings + spending is fine).
  2. Other wallet requests more than that total (100k Android-as-payer, 90k iOS-as-payer).
  3. On the incoming request, tap Pay, then try Dismiss.

Expected: don’t enter confirm if the amount is above spendable. On Android, Dismiss should still work after a failed Pay (no already in progress loop).

@ben-kaufman

Copy link
Copy Markdown
Contributor Author

Addressed both QA findings in signed commit 5d39cd96a:

  • A malformed remote receiver marker is still rejected and cannot be used, but its per-contact inspection error no longer aborts global private endpoint publication for valid contacts. The regression test now covers the immediate-publication path used when enabling Contact Payments.
  • An unaffordable request now releases its manual presentation state after showing the existing insufficient-balance message. It remains pending and dismissible, is not accepted or rejected, and does not consume a Private Payment List. The regression test verifies Dismiss remains actionable and no retry starts from the old context.

The matching iOS fixes are isolated in synonymdev/bitkit-ios#684: malformed remote markers no longer block other contacts, and incoming request amounts are used during initial LN/on-chain balance validation so the standard insufficient Spending/Savings error appears before coin selection.

Local verification: 193 focused Android tests passed; detekt completed successfully with only unrelated pre-existing findings.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants