Repository navigation
feat(payments): add subscription lifecycle, renewal invoices and plan-based write access - #909
Conversation
🦋 Changeset detectedLatest commit: 4667dc0 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Coverage Report for CI Build 39453853954Coverage increased (+0.4%) to 74.21%Details
Uncovered Changes
Coverage RegressionsNo coverage regressions found. Coverage Stats💛 - Coveralls |
[Medium impact] The PR changes billing and write access for relays that enable subscription plans. Fix the invoice price check and the mirrored-write bypass before merging. Findings
|
…-based write access Signed-off-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>
…anned scope Signed-off-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>
Signed-off-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>
Signed-off-by: Priyanshubhartistm <bhartipriyanshustm@gmail.com>
8d0974a to
4667dc0
Compare
| if (stored?.confirmedAt) { | ||
| // A repeated callback must not grant another period. | ||
| logger('invoice %s was already confirmed, not extending the subscription again', invoice.id) | ||
| } else if (amountPaidMsat >= BigInt(plan.amount)) { |
There was a problem hiding this comment.
Paid invoices can grant nothing
confirmInvoice checks the current plan.amount, not the price quoted by the stored invoice. If an operator raises a plan's price while an invoice is payable, paying that invoice in full confirms the payment but grants no subscription. Later callbacks skip it because confirmedAt is already set.
Compare payment against the stored amountRequested, converted using its stored unit, so an issued invoice keeps its quoted price.
| if (subscriptionsEnabled && this.userSubscriptionRepository) { | ||
| const subscription = await this.userSubscriptionRepository.findByPubkey(event.pubkey) | ||
| const now = new Date() | ||
| if (!hasSubscriptionAccess(subscription, now)) { | ||
| this.cacheSet(cacheKey, CacheAdmissionState.BLOCKED_NOT_ADMITTED, 60) | ||
| return 'blocked: subscription expired' |
There was a problem hiding this comment.
Mirrored writes skip subscription expiry
The new subscription check only covers EventMessageHandler. If a mirror is configured with skipAdmissionCheck unset, StaticMirroringWorker.isUserAdmitted still accepts an admitted user based on isAdmitted and balance, without checking the subscription. An expired subscriber can publish to the upstream relay and have that event stored locally. Plan-only setups also let never-admitted users through this path because there is no admission fee.
Apply the same subscription check to mirrored writes.
How this was verified: Mirrored events pass through a separate admission check that never reads the subscription, then reach eventRepository.create.
Description
Builds on the subscription data model (#849). Nothing changes unless
payments.enabledis true andpayments.subscriptionPlansis non-empty.POST /invoicestakes aplanId(instead of a fee schedule) when plans are configured. The invoice is created for the plan price and stores the plan.PaymentsService.confirmInvoicestarts or extends the subscription in the same transaction as the invoice confirmation, and admits the user. The plan comes from the stored invoice, so the five confirmation paths (maintenance poll and the Zebedee/LNbits/OpenNode/Nodeless callbacks) need no change. A payment below the plan price does not start or extend a period.SubscriptionService.processLifecycle, run from the maintenance worker each minute: moves subscriptions whose period ended into grace (counted from the period end) or straight to expired (plan has no grace), expires subscriptions whose grace is over, and about three days before a period ends creates a renewal invoice and marks itrenewal_pending. Each pass is bounded and a stuck row cannot loop it.isUserAdmittedchecks the subscription behind the existing admission cache (no extra read per event). Access is judged from the dates, not only the stored status, so a lagging sweep neither locks anyone out nor keeps them in, and the admitted cache entry never outlives the end of access. Admitted users with no subscription row (admitted after the migration, or by invite code / NIP-43) keep access.CONFIGURATION.mddescribes the behaviour; the.knip.jsonignore for the new repository is removed now that it is used.Related Issue
Closes #908
Motivation and Context
With the data model in place nothing created or ended a subscription: write access still depended only on the permanent
is_admittedflag. This adds the billing lifecycle (subscribe, renew, grace, expire) on the existing processors.