feat: enhance multi-product subscription support by tuna1207 · Pull Request #9866 · MetaMask/core

tuna1207 · 2026-08-13T12:03:28Z

Explanation

Generalizes @metamask/subscription-controller beyond Shield-only flows so clients can manage multiple subscription products (Shield + Money Account Plus) with product-scoped payment methods, crypto auth methods, and trial logic.

Current state

The subscription controller was built around Shield as the sole product. Messenger actions, crypto approval handling, payment-method lookup, and trial eligibility were all hardcoded to PRODUCT_TYPES.SHIELD. The pricing API now supports multiple products with different crypto auth flows (ERC-20 approval vs. delegation), so the controller needed to be generalized.

Solution

This PR extends the subscription controller and service to support multi-product subscriptions aligned with PR-141 pricing API changes:

New types and constants

PRODUCT_TYPES.MONEY_ACCOUNT_PLUS (money_account_plus)
CRYPTO_AUTH_METHODS (erc20_approval, delegation)
CryptoAuthMethod type exported from the package

Pricing model extensions

PricingPaymentMethod gains optional products and cryptoAuthMethod for product-scoped payment rows
ChainPaymentInfo gains optional delegateAddress for delegation flows
TokenPaymentInfo gains optional isVaultShare, accountantAddress, sources, and makes conversionRate optional (vault share tokens)
StartCryptoSubscriptionRequest makes rawTransaction optional for delegation; adds cryptoAuthMethod and delegationHash
CachedLastSelectedPaymentMethod tracks per-product cryptoAuthMethod

Controller generalization

lastSelectedPaymentMethod is now Partial<Record<ProductType, ...>> (per-product)
Crypto payment-method lookup is product- and auth-method-aware via #findCryptoPaymentMethod
Trial requests use #getIsTrialRequested — derived from trialPeriodDays and trialedProducts, not a simple "has trialed" boolean
Sponsorship checks are product-scoped
getCryptoApproveTransactionParams selects the ERC-20 approval payment method for the requested product
submitSubscriptionCryptoApproval accepts productType and works for any product (not Shield-only)
lastSubscription is synced from the API but not used for active product lookup

Breaking renames

Before	After
`SubscriptionController:startShieldSubscriptionWithCard`	`SubscriptionController:startSubscriptionWithCard`
`SubscriptionController:submitShieldSubscriptionCryptoApproval`	`SubscriptionController:submitSubscriptionCryptoApproval` (+ required `productType` as first arg)

Migration for consumers

// Card checkout
- messenger.call('SubscriptionController:startShieldSubscriptionWithCard', request)
+ messenger.call('SubscriptionController:startSubscriptionWithCard', request)

// Crypto approval
- messenger.call('SubscriptionController:submitShieldSubscriptionCryptoApproval', txMeta, isSponsored?, rewardAccountId?)
+ messenger.call('SubscriptionController:submitSubscriptionCryptoApproval', PRODUCT_TYPES.SHIELD, txMeta, isSponsored?, rewardAccountId?)

References

Jira: https://consensyssoftware.atlassian.net/browse/SUB-884?atlOrigin=eyJpIjoiNzRlNDdjNTAwZmYwNGNjZmI5MjgyZTM2OTU5NThjMDQiLCJwIjoiaiJ9

Checklist

I've updated the test suite for new or updated code as appropriate
I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
I've communicated my changes to consumers by updating changelogs for packages I've changed
I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

High Risk
Breaking messenger/API renames and payment/trial logic changes affect all subscription consumers; incorrect product-scoped crypto lookup or trial overrides could block checkout or grant trials wrongly.

Overview
Generalizes @metamask/subscription-controller beyond Shield so clients can manage Shield and Money Account Plus in parallel, with product-scoped payment rows, crypto auth methods, and trial handling.

New surface area: PRODUCT_TYPES.MONEY_ACCOUNT_PLUS, CRYPTO_AUTH_METHODS (erc20_approval / delegation), and richer pricing types—card vs crypto payment methods, spot vs vault tokens (optional conversionRate, required accountantAddress for vault shares), optional delegateAddress on chains, and StartCryptoSubscriptionRequest as a union of ERC-20 (rawTransaction) vs delegation (delegationHash).

Runtime behavior changes: Card and crypto starts refresh subscriptions first, then override isTrialRequested from pricing trialPeriodDays and trialedProducts (client-supplied trial flags are ignored). Crypto start refetches subscriptions after success. Crypto approve params, sponsorship, and cached payment methods resolve via product + cryptoAuthMethod, with legacy unscoped pricing rows defaulting to Shield + ERC-20 approval only when both products and cryptoAuthMethod are omitted.

Breaking renames / signatures: startShieldSubscriptionWithCard → startSubscriptionWithCard; submitShieldSubscriptionCryptoApproval → submitSubscriptionCryptoApproval with a request object (still Shield / shieldSubscriptionApprove only—delegation products use startSubscriptionWithCrypto). cacheLastSelectedPaymentMethod takes { product, paymentMethod }. lastSelectedPaymentMethod is Partial<Record<ProductType, …>>. Consumers must narrow discriminated unions for pricing and token payment info.

Service layer: startSubscriptionWithCrypto validates empty products and exactly one auth combo before POST; pricing responses validated against the new structs.

^{Reviewed by Cursor Bugbot for commit 6cbac54. Bugbot is set up for automated code reviews on this repo. Configure here.}

…hield ERC-20 transactions

…ndling

…ts to 'money_account_plus'

…n previous subscriptions

…auth methods

… and add optional cryptoAuthMethod field

…port with new crypto auth methods and updated action types

…ment methods and token info, enhancing validation and structure

…intents and update documentation for clarity

…ate refresh and error handling

…tion methods and enhance tests for trial eligibility

lwin-kyaw · 2026-08-14T03:16:28Z

-    if (txMeta.type !== TransactionType.shieldSubscriptionApprove) {
-      return;
+    if (
+      productType !== PRODUCT_TYPES.SHIELD ||


Let's remove the productType from method params and this?

same as #9866 (comment)

lwin-kyaw · 2026-08-14T03:41:08Z

      this.state.lastSelectedPaymentMethod?.[request.products[0]];
    this.#assertIsPaymentMethodCrypto(selectedPaymentMethod);

+    const cryptoAuthMethod =


Looks like CRYPTO_AUTH_METHODS.ERC20_APPROVAL is being used by default, if last selected payment isn't available.

Then may I know where do we even use the CRYPTO_AUTH_METHODS.DELEGATION?
Or we don't need sponsorship for delegations?

Yes, currently only ERC20_APPROVAL handle sponsorship, for DELEGATION we only receive the delegation hash here, no sponsorship handled

lwin-kyaw · 2026-08-14T03:44:57Z

+   * when omitted. Use `CRYPTO_AUTH_METHODS.DELEGATION` for products such as
+   * Money Account Plus.
+   */
+  cryptoAuthMethod?: CryptoAuthMethod;


let's make it required?

lwin-kyaw · 2026-08-14T03:45:54Z

+  rawTransaction?: Hex;
+  /**
+   * Crypto authorization method. Defaults to `CRYPTO_AUTH_METHODS.ERC20_APPROVAL`
+   * when omitted. Use `CRYPTO_AUTH_METHODS.DELEGATION` for products such as


Can I check is CRYPTO_AUTH_METHODS.DELEGATION only for money account?

If CRYPTO_AUTH_METHODS.DELEGATION only for money account, we should add some validation/assertions in startSubscriptionWithCrypto and reject the request when shield subscription comes with DELEGATION method.

…on and validation logic, adding tests for edge cases

…y in crypto subscription methods and corresponding tests

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 48918a8. Configure here.}

…pto subscription requests, adding new request types and enhancing validation logic

…equest objects for crypto approval and payment method caching, enhancing type safety and clarity

…ed on subscription state, enhancing tests for trial requests

tuna1207 added 13 commits August 13, 2026 19:03

feat: enhance multi-product subscription support

54d39fe

fix: lint

3f5c81e

chore: update changelog for multi-product subscription enhancements

cd756dc

feat(subscription-controller): enhance crypto approval handling for S…

19736a8

…hield ERC-20 transactions

fix(subscription-controller): handle Money Account crypto approval ha…

bf9e0da

…ndling

fix(subscription-controller): update product name in subscription tes…

e35e481

…ts to 'money_account_plus'

feat(subscription-controller): add test for trial eligibility based o…

a4b5409

…n previous subscriptions

fix(subscription-controller): add validation for crypto subscription …

5522448

…auth methods

fix(subscription-controller): update crypto payment method validation…

57b48d1

… and add optional cryptoAuthMethod field

feat(subscription-controller): enhance multi-product subscription sup…

c284cc0

…port with new crypto auth methods and updated action types

feat(subscription-controller): implement discriminated unions for pay…

1e55d61

…ment methods and token info, enhancing validation and structure

fix(subscription-controller): improve error handling for sponsorship …

e586606

…intents and update documentation for clarity

fix: correct jsdoc

b3f9697

tuna1207 marked this pull request as ready for review August 14, 2026 01:54

tuna1207 requested review from a team as code owners August 14, 2026 01:54

tuna1207 deployed to default-branch August 14, 2026 01:54 — with GitHub Actions Active

tuna1207 added 2 commits August 14, 2026 09:32

fix(subscription-controller): crypto subscription starts, ensuring st…

b7db56a

…ate refresh and error handling

feat(subscription-controller): add trial request handling in subscrip…

36c01b7

…tion methods and enhance tests for trial eligibility

lwin-kyaw reviewed Aug 14, 2026

View reviewed changes

tuna1207 added 4 commits August 14, 2026 11:33

feat(subscription-controller): enhance crypto payment method resoluti…

f9d54e6

…on and validation logic, adding tests for edge cases

feat(subscription-controller): add validation for empty products arra…

89b0428

…y in crypto subscription methods and corresponding tests

chore: update changelog

87bf7c1

fix: test

48918a8

cursor Bot reviewed Aug 14, 2026

View reviewed changes

Comment thread packages/subscription-controller/src/SubscriptionController.ts

tuna1207 added 4 commits August 14, 2026 12:33

feat(subscription-controller): implement discriminated unions for cry…

f181261

…pto subscription requests, adding new request types and enhancing validation logic

feat(subscription-controller): refactor subscription methods to use r…

35450e4

…equest objects for crypto approval and payment method caching, enhancing type safety and clarity

feat(subscription-controller): add handling for trial eligibility bas…

865c4d9

…ed on subscription state, enhancing tests for trial requests

fix: lint

e25e830

fix: test

6cbac54

lwin-kyaw approved these changes Aug 14, 2026

View reviewed changes

chaitanyapotti approved these changes Aug 14, 2026

View reviewed changes

chaitanyapotti added this pull request to the merge queue Aug 14, 2026

chaitanyapotti added the team-subscriptions label Aug 14, 2026

Merged via the queue into main with commit 9cdb2b3 Aug 14, 2026
58 checks passed

chaitanyapotti deleted the feat/subscription-multi-product branch August 14, 2026 07:46

Navigation Menu

Uh oh!

Uh oh!

feat: enhance multi-product subscription support - #9866

feat: enhance multi-product subscription support#9866
chaitanyapotti merged 24 commits into
mainfrom
feat/subscription-multi-product

tuna1207 commented Aug 13, 2026 •

edited by cursor Bot

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lwin-kyaw Aug 14, 2026

Uh oh!

tuna1207 Aug 14, 2026

Uh oh!

lwin-kyaw Aug 14, 2026

Uh oh!

tuna1207 Aug 14, 2026

Uh oh!

lwin-kyaw Aug 14, 2026

Uh oh!

lwin-kyaw Aug 14, 2026

Uh oh!

lwin-kyaw Aug 14, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Uh oh!

Conversation

tuna1207 commented Aug 13, 2026 • edited by cursor Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation

Current state

Solution

Migration for consumers

References

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lwin-kyaw Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

tuna1207 Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

lwin-kyaw Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

tuna1207 Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

lwin-kyaw Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

lwin-kyaw Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

lwin-kyaw Aug 14, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

tuna1207 commented Aug 13, 2026 •

edited by cursor Bot

Loading