Skip to content

Commit cb932bc

Browse files
mcmiredawnseeker8cursoragentmetamaskbot
authored
chore: Bump subscription-controller to 15.2.0 (#47819)
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> `@metamask/subscription-controller` is severely out of date: we're using 8.0.1, but the latest version is 15.2.0. This blocks an initiative by the Core Platform team to streamline the background<->UI connection API so that it goes through the root messenger instead of a bespoke object (as not all SubscriptionController methods that should be registered through the messenger actually are). This PR bumps `subscription-controller` accordingly. The good news is that SubscriptionController, SubscriptionDelegationService, and SubscriptionService are all initialized through the `wallet` package, which is already using 15.2.0. We do import some types, constants, and enums through `subscription-controller` directly, but none of the breaking changes between 8.x and 15.x affect how those symbols are used, so there's nothing we need to adapt to. [You can view the changelog for `subscription-controller` here.]( https://github.com/MetaMask/core/blob/%40metamask/subscription-controller%4015.2.0/packages/subscription-controller/CHANGELOG.md) ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: null ## **Related issues** https://consensyssoftware.atlassian.net/browse/WPC-1582 ## **Manual testing steps** Despite bumping a controller package by 7 major versions, this should not have any functional impact. All user flows should work as-is. ## **Screenshots/Recordings** (N/A) ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Extension Coding Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Medium Risk** > Large major-version controller upgrade with broad transitive dependencies; behavior should be unchanged per PR notes but subscription flows and messenger wiring merit regression checks. > > **Overview** > Bumps **`@metamask/subscription-controller`** from **8.0.1** to **15.2.0** in `package.json` and `yarn.lock`, aligning the extension’s direct dependency with the version already used via `@metamask/wallet`. > > **LavaMoat** webpack policies (MV2/MV3, all channels) are regenerated so `@metamask/subscription-controller` is modeled as a **top-level** package instead of only `@metamask/wallet>@metamask/subscription-controller`. That includes a new `@metamask/subscription-controller>@metamask/controller-utils` entry and updated nested allowances for `money-account-utils`, `polling-controller`, `delegation-deployments`, and `bignumber.js`. **No application source files** change in this diff—only dependency lockfile and policy metadata. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit cb5bffc. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Xiaoming Wang <dawnseeker8@gmail.com> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Xiaoming Wang <7315988+dawnseeker8@users.noreply.github.com> Co-authored-by: MetaMask Bot <metamaskbot@users.noreply.github.com> Co-authored-by: Xiaoming Wang <dawnseeker8@users.noreply.github.com>
1 parent 8190582 commit cb932bc

10 files changed

Lines changed: 251 additions & 134 deletions

File tree

‎lavamoat/webpack/mv2/beta/policy.json‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,6 +1635,23 @@
16351635
"@metamask/assets-controller>lodash-es": true
16361636
}
16371637
},
1638+
"@metamask/subscription-controller>@metamask/controller-utils": {
1639+
"globals": {
1640+
"Buffer.from": true,
1641+
"console.error": true,
1642+
"fetch": true,
1643+
"setTimeout": true
1644+
},
1645+
"packages": {
1646+
"@metamask/controller-utils>@metamask/ethjs-unit": true,
1647+
"@metamask/utils": true,
1648+
"ethereumjs-util>bn.js": true,
1649+
"buffer": true,
1650+
"eth-ens-namehash": true,
1651+
"eslint>fast-deep-equal": true,
1652+
"@metamask/assets-controller>lodash-es": true
1653+
}
1654+
},
16381655
"@metamask/transaction-controller>@metamask/controller-utils": {
16391656
"globals": {
16401657
"Buffer.from": true,
@@ -2519,7 +2536,7 @@
25192536
"@metamask/utils": true
25202537
}
25212538
},
2522-
"@metamask/wallet>@metamask/subscription-controller>@metamask/money-account-utils": {
2539+
"@metamask/subscription-controller>@metamask/money-account-utils": {
25232540
"packages": {
25242541
"@metamask/transaction-controller": true,
25252542
"@metamask/utils": true
@@ -2918,7 +2935,7 @@
29182935
"uuid": true
29192936
}
29202937
},
2921-
"@metamask/wallet>@metamask/subscription-controller>@metamask/polling-controller": {
2938+
"@metamask/subscription-controller>@metamask/polling-controller": {
29222939
"globals": {
29232940
"clearTimeout": true,
29242941
"console.error": true,
@@ -3363,29 +3380,29 @@
33633380
"console.warn": true
33643381
}
33653382
},
3366-
"@metamask/wallet>@metamask/subscription-controller": {
3383+
"@metamask/subscription-controller": {
33673384
"globals": {
33683385
"URL": true,
33693386
"crypto.getRandomValues": true,
33703387
"fetch": true
33713388
},
33723389
"meta": {
33733390
"webpack-optimization": [
3374-
"Dependency '@metamask/wallet>@metamask/controller-utils' reexports from 'cockatiel' and webpack collapsed that to a direct import."
3391+
"Dependency '@metamask/subscription-controller>@metamask/controller-utils' reexports from 'cockatiel' and webpack collapsed that to a direct import."
33753392
]
33763393
},
33773394
"packages": {
33783395
"@ethersproject/abi": true,
33793396
"@metamask/base-data-service": true,
3380-
"@metamask/wallet>@metamask/controller-utils": true,
3397+
"@metamask/subscription-controller>@metamask/controller-utils": true,
33813398
"@metamask/delegation-core": true,
3382-
"@metamask/wallet>@metamask/subscription-controller>@metamask/delegation-deployments": true,
3383-
"@metamask/wallet>@metamask/subscription-controller>@metamask/money-account-utils": true,
3384-
"@metamask/wallet>@metamask/subscription-controller>@metamask/polling-controller": true,
3399+
"@metamask/subscription-controller>@metamask/delegation-deployments": true,
3400+
"@metamask/subscription-controller>@metamask/money-account-utils": true,
3401+
"@metamask/subscription-controller>@metamask/polling-controller": true,
33853402
"@metamask/superstruct": true,
33863403
"@metamask/transaction-controller": true,
33873404
"@metamask/utils": true,
3388-
"@metamask/wallet>@metamask/controller-utils>bignumber.js": true,
3405+
"@metamask/subscription-controller>bignumber.js": true,
33893406
"cockatiel": true,
33903407
"eslint>fast-deep-equal": true
33913408
}
@@ -3548,7 +3565,7 @@
35483565
"@metamask/selected-network-controller": true,
35493566
"@metamask/wallet>@metamask/shield-controller": true,
35503567
"@metamask/wallet>@metamask/storage-service": true,
3551-
"@metamask/wallet>@metamask/subscription-controller": true,
3568+
"@metamask/subscription-controller": true,
35523569
"@metamask/transaction-controller": true,
35533570
"@metamask/utils": true
35543571
}
@@ -4788,22 +4805,22 @@
47884805
"crypto": true
47894806
}
47904807
},
4791-
"@metamask/wallet>@metamask/controller-utils>bignumber.js": {
4808+
"@metamask/perps-controller>bignumber.js": {
47924809
"globals": {
47934810
"crypto": true
47944811
}
47954812
},
4796-
"@metamask/perps-controller>bignumber.js": {
4813+
"@metamask/ramps-controller>bignumber.js": {
47974814
"globals": {
47984815
"crypto": true
47994816
}
48004817
},
4801-
"@metamask/ramps-controller>bignumber.js": {
4818+
"@metamask/smart-transactions-controller>bignumber.js": {
48024819
"globals": {
48034820
"crypto": true
48044821
}
48054822
},
4806-
"@metamask/smart-transactions-controller>bignumber.js": {
4823+
"@metamask/subscription-controller>bignumber.js": {
48074824
"globals": {
48084825
"crypto": true
48094826
}

‎lavamoat/webpack/mv2/experimental/policy.json‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,6 +1635,23 @@
16351635
"@metamask/assets-controller>lodash-es": true
16361636
}
16371637
},
1638+
"@metamask/subscription-controller>@metamask/controller-utils": {
1639+
"globals": {
1640+
"Buffer.from": true,
1641+
"console.error": true,
1642+
"fetch": true,
1643+
"setTimeout": true
1644+
},
1645+
"packages": {
1646+
"@metamask/controller-utils>@metamask/ethjs-unit": true,
1647+
"@metamask/utils": true,
1648+
"ethereumjs-util>bn.js": true,
1649+
"buffer": true,
1650+
"eth-ens-namehash": true,
1651+
"eslint>fast-deep-equal": true,
1652+
"@metamask/assets-controller>lodash-es": true
1653+
}
1654+
},
16381655
"@metamask/transaction-controller>@metamask/controller-utils": {
16391656
"globals": {
16401657
"Buffer.from": true,
@@ -2519,7 +2536,7 @@
25192536
"@metamask/utils": true
25202537
}
25212538
},
2522-
"@metamask/wallet>@metamask/subscription-controller>@metamask/money-account-utils": {
2539+
"@metamask/subscription-controller>@metamask/money-account-utils": {
25232540
"packages": {
25242541
"@metamask/transaction-controller": true,
25252542
"@metamask/utils": true
@@ -2918,7 +2935,7 @@
29182935
"uuid": true
29192936
}
29202937
},
2921-
"@metamask/wallet>@metamask/subscription-controller>@metamask/polling-controller": {
2938+
"@metamask/subscription-controller>@metamask/polling-controller": {
29222939
"globals": {
29232940
"clearTimeout": true,
29242941
"console.error": true,
@@ -3363,29 +3380,29 @@
33633380
"console.warn": true
33643381
}
33653382
},
3366-
"@metamask/wallet>@metamask/subscription-controller": {
3383+
"@metamask/subscription-controller": {
33673384
"globals": {
33683385
"URL": true,
33693386
"crypto.getRandomValues": true,
33703387
"fetch": true
33713388
},
33723389
"meta": {
33733390
"webpack-optimization": [
3374-
"Dependency '@metamask/wallet>@metamask/controller-utils' reexports from 'cockatiel' and webpack collapsed that to a direct import."
3391+
"Dependency '@metamask/subscription-controller>@metamask/controller-utils' reexports from 'cockatiel' and webpack collapsed that to a direct import."
33753392
]
33763393
},
33773394
"packages": {
33783395
"@ethersproject/abi": true,
33793396
"@metamask/base-data-service": true,
3380-
"@metamask/wallet>@metamask/controller-utils": true,
3397+
"@metamask/subscription-controller>@metamask/controller-utils": true,
33813398
"@metamask/delegation-core": true,
3382-
"@metamask/wallet>@metamask/subscription-controller>@metamask/delegation-deployments": true,
3383-
"@metamask/wallet>@metamask/subscription-controller>@metamask/money-account-utils": true,
3384-
"@metamask/wallet>@metamask/subscription-controller>@metamask/polling-controller": true,
3399+
"@metamask/subscription-controller>@metamask/delegation-deployments": true,
3400+
"@metamask/subscription-controller>@metamask/money-account-utils": true,
3401+
"@metamask/subscription-controller>@metamask/polling-controller": true,
33853402
"@metamask/superstruct": true,
33863403
"@metamask/transaction-controller": true,
33873404
"@metamask/utils": true,
3388-
"@metamask/wallet>@metamask/controller-utils>bignumber.js": true,
3405+
"@metamask/subscription-controller>bignumber.js": true,
33893406
"cockatiel": true,
33903407
"eslint>fast-deep-equal": true
33913408
}
@@ -3548,7 +3565,7 @@
35483565
"@metamask/selected-network-controller": true,
35493566
"@metamask/wallet>@metamask/shield-controller": true,
35503567
"@metamask/wallet>@metamask/storage-service": true,
3551-
"@metamask/wallet>@metamask/subscription-controller": true,
3568+
"@metamask/subscription-controller": true,
35523569
"@metamask/transaction-controller": true,
35533570
"@metamask/utils": true
35543571
}
@@ -4788,22 +4805,22 @@
47884805
"crypto": true
47894806
}
47904807
},
4791-
"@metamask/wallet>@metamask/controller-utils>bignumber.js": {
4808+
"@metamask/perps-controller>bignumber.js": {
47924809
"globals": {
47934810
"crypto": true
47944811
}
47954812
},
4796-
"@metamask/perps-controller>bignumber.js": {
4813+
"@metamask/ramps-controller>bignumber.js": {
47974814
"globals": {
47984815
"crypto": true
47994816
}
48004817
},
4801-
"@metamask/ramps-controller>bignumber.js": {
4818+
"@metamask/smart-transactions-controller>bignumber.js": {
48024819
"globals": {
48034820
"crypto": true
48044821
}
48054822
},
4806-
"@metamask/smart-transactions-controller>bignumber.js": {
4823+
"@metamask/subscription-controller>bignumber.js": {
48074824
"globals": {
48084825
"crypto": true
48094826
}

‎lavamoat/webpack/mv2/flask/policy.json‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,6 +1635,23 @@
16351635
"@metamask/assets-controller>lodash-es": true
16361636
}
16371637
},
1638+
"@metamask/subscription-controller>@metamask/controller-utils": {
1639+
"globals": {
1640+
"Buffer.from": true,
1641+
"console.error": true,
1642+
"fetch": true,
1643+
"setTimeout": true
1644+
},
1645+
"packages": {
1646+
"@metamask/controller-utils>@metamask/ethjs-unit": true,
1647+
"@metamask/utils": true,
1648+
"ethereumjs-util>bn.js": true,
1649+
"buffer": true,
1650+
"eth-ens-namehash": true,
1651+
"eslint>fast-deep-equal": true,
1652+
"@metamask/assets-controller>lodash-es": true
1653+
}
1654+
},
16381655
"@metamask/transaction-controller>@metamask/controller-utils": {
16391656
"globals": {
16401657
"Buffer.from": true,
@@ -2519,7 +2536,7 @@
25192536
"@metamask/utils": true
25202537
}
25212538
},
2522-
"@metamask/wallet>@metamask/subscription-controller>@metamask/money-account-utils": {
2539+
"@metamask/subscription-controller>@metamask/money-account-utils": {
25232540
"packages": {
25242541
"@metamask/transaction-controller": true,
25252542
"@metamask/utils": true
@@ -2918,7 +2935,7 @@
29182935
"uuid": true
29192936
}
29202937
},
2921-
"@metamask/wallet>@metamask/subscription-controller>@metamask/polling-controller": {
2938+
"@metamask/subscription-controller>@metamask/polling-controller": {
29222939
"globals": {
29232940
"clearTimeout": true,
29242941
"console.error": true,
@@ -3363,29 +3380,29 @@
33633380
"console.warn": true
33643381
}
33653382
},
3366-
"@metamask/wallet>@metamask/subscription-controller": {
3383+
"@metamask/subscription-controller": {
33673384
"globals": {
33683385
"URL": true,
33693386
"crypto.getRandomValues": true,
33703387
"fetch": true
33713388
},
33723389
"meta": {
33733390
"webpack-optimization": [
3374-
"Dependency '@metamask/wallet>@metamask/controller-utils' reexports from 'cockatiel' and webpack collapsed that to a direct import."
3391+
"Dependency '@metamask/subscription-controller>@metamask/controller-utils' reexports from 'cockatiel' and webpack collapsed that to a direct import."
33753392
]
33763393
},
33773394
"packages": {
33783395
"@ethersproject/abi": true,
33793396
"@metamask/base-data-service": true,
3380-
"@metamask/wallet>@metamask/controller-utils": true,
3397+
"@metamask/subscription-controller>@metamask/controller-utils": true,
33813398
"@metamask/delegation-core": true,
3382-
"@metamask/wallet>@metamask/subscription-controller>@metamask/delegation-deployments": true,
3383-
"@metamask/wallet>@metamask/subscription-controller>@metamask/money-account-utils": true,
3384-
"@metamask/wallet>@metamask/subscription-controller>@metamask/polling-controller": true,
3399+
"@metamask/subscription-controller>@metamask/delegation-deployments": true,
3400+
"@metamask/subscription-controller>@metamask/money-account-utils": true,
3401+
"@metamask/subscription-controller>@metamask/polling-controller": true,
33853402
"@metamask/superstruct": true,
33863403
"@metamask/transaction-controller": true,
33873404
"@metamask/utils": true,
3388-
"@metamask/wallet>@metamask/controller-utils>bignumber.js": true,
3405+
"@metamask/subscription-controller>bignumber.js": true,
33893406
"cockatiel": true,
33903407
"eslint>fast-deep-equal": true
33913408
}
@@ -3548,7 +3565,7 @@
35483565
"@metamask/selected-network-controller": true,
35493566
"@metamask/wallet>@metamask/shield-controller": true,
35503567
"@metamask/wallet>@metamask/storage-service": true,
3551-
"@metamask/wallet>@metamask/subscription-controller": true,
3568+
"@metamask/subscription-controller": true,
35523569
"@metamask/transaction-controller": true,
35533570
"@metamask/utils": true
35543571
}
@@ -4788,22 +4805,22 @@
47884805
"crypto": true
47894806
}
47904807
},
4791-
"@metamask/wallet>@metamask/controller-utils>bignumber.js": {
4808+
"@metamask/perps-controller>bignumber.js": {
47924809
"globals": {
47934810
"crypto": true
47944811
}
47954812
},
4796-
"@metamask/perps-controller>bignumber.js": {
4813+
"@metamask/ramps-controller>bignumber.js": {
47974814
"globals": {
47984815
"crypto": true
47994816
}
48004817
},
4801-
"@metamask/ramps-controller>bignumber.js": {
4818+
"@metamask/smart-transactions-controller>bignumber.js": {
48024819
"globals": {
48034820
"crypto": true
48044821
}
48054822
},
4806-
"@metamask/smart-transactions-controller>bignumber.js": {
4823+
"@metamask/subscription-controller>bignumber.js": {
48074824
"globals": {
48084825
"crypto": true
48094826
}

0 commit comments

Comments
 (0)