Skip to content

Commit 4d3ddf4

Browse files
authored
fix: bump @metamask/keyring-controller to ^21.0.1 (#31274)
<!-- 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? --> Bumping `@metamask/keyring-controller` to ^21.0.1 ```markdown ## [21.0.1] ### Fixed - Fixed duplication of unsupported keyrings ([#5535](MetaMask/core#5535)) - Enforce keyrings metadata alignment when unlocking existing vault ([#5535](MetaMask/core#5535)) - Fixed frozen object mutation attempt when updating metadata ([#5535](MetaMask/core#5535)) ``` [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/31293?quickstart=1) ## **Related issues** Fixes: #31200 ## **Manual testing steps** 1. Start with an installation from before we introduced keyringsMetadata, proceed past onboarding so that you have a vault setup (e.g. v12.12.0) 2. Upgrade to this branch 3. Start the extension (without logging in) 4. Leave the window open a while to give it time to initialize all controllers 5. Reload the extension before unlocking 6. Try to unlock the wallet ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** - [ ] 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). - [ ] I've completed the PR template to the best of my ability - [ ] I’ve included tests if applicable - [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [ ] 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.
1 parent f1a2ea5 commit 4d3ddf4

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

lavamoat/browserify/beta/policy.json

+1
Original file line numberDiff line numberDiff line change
@@ -1739,6 +1739,7 @@
17391739
},
17401740
"@metamask/keyring-controller": {
17411741
"globals": {
1742+
"console.error": true,
17421743
"console.log": true
17431744
},
17441745
"packages": {

lavamoat/browserify/flask/policy.json

+1
Original file line numberDiff line numberDiff line change
@@ -1739,6 +1739,7 @@
17391739
},
17401740
"@metamask/keyring-controller": {
17411741
"globals": {
1742+
"console.error": true,
17421743
"console.log": true
17431744
},
17441745
"packages": {

lavamoat/browserify/main/policy.json

+1
Original file line numberDiff line numberDiff line change
@@ -1739,6 +1739,7 @@
17391739
},
17401740
"@metamask/keyring-controller": {
17411741
"globals": {
1742+
"console.error": true,
17421743
"console.log": true
17431744
},
17441745
"packages": {

lavamoat/browserify/mmi/policy.json

+1
Original file line numberDiff line numberDiff line change
@@ -1885,6 +1885,7 @@
18851885
},
18861886
"@metamask/keyring-controller": {
18871887
"globals": {
1888+
"console.error": true,
18881889
"console.log": true
18891890
},
18901891
"packages": {

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
"@metamask/json-rpc-engine": "^10.0.0",
286286
"@metamask/json-rpc-middleware-stream": "^8.0.4",
287287
"@metamask/keyring-api": "^17.2.1",
288-
"@metamask/keyring-controller": "^21.0.0",
288+
"@metamask/keyring-controller": "^21.0.1",
289289
"@metamask/keyring-internal-api": "^6.0.0",
290290
"@metamask/keyring-snap-client": "^4.0.1",
291291
"@metamask/logging-controller": "^6.0.4",

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -5620,9 +5620,9 @@ __metadata:
56205620
languageName: node
56215621
linkType: hard
56225622

5623-
"@metamask/keyring-controller@npm:^21.0.0":
5624-
version: 21.0.0
5625-
resolution: "@metamask/keyring-controller@npm:21.0.0"
5623+
"@metamask/keyring-controller@npm:^21.0.0, @metamask/keyring-controller@npm:^21.0.1":
5624+
version: 21.0.1
5625+
resolution: "@metamask/keyring-controller@npm:21.0.1"
56265626
dependencies:
56275627
"@ethereumjs/util": "npm:^9.1.0"
56285628
"@keystonehq/metamask-airgapped-keyring": "npm:^0.14.1"
@@ -5638,7 +5638,7 @@ __metadata:
56385638
ethereumjs-wallet: "npm:^1.0.1"
56395639
immer: "npm:^9.0.6"
56405640
ulid: "npm:^2.3.0"
5641-
checksum: 10/aee572da64d757417397fee74a44be1c3f0ea3168c6880cb211d99d71b5e1b457d1684760b9d347820c0d90f0052783105e60697e9315ae257d3ae12c852190a
5641+
checksum: 10/9406eb60ab111a9896a4e2db0ef009fcdd5dbe6daac1b06b77561af60e7463fcfc139727e0891203c0c135f744ac7bc5900b2e6f0bfe8dc5a218689be43bf266
56425642
languageName: node
56435643
linkType: hard
56445644

@@ -27305,7 +27305,7 @@ __metadata:
2730527305
"@metamask/json-rpc-engine": "npm:^10.0.0"
2730627306
"@metamask/json-rpc-middleware-stream": "npm:^8.0.4"
2730727307
"@metamask/keyring-api": "npm:^17.2.1"
27308-
"@metamask/keyring-controller": "npm:^21.0.0"
27308+
"@metamask/keyring-controller": "npm:^21.0.1"
2730927309
"@metamask/keyring-internal-api": "npm:^6.0.0"
2731027310
"@metamask/keyring-snap-client": "npm:^4.0.1"
2731127311
"@metamask/logging-controller": "npm:^6.0.4"

0 commit comments

Comments
 (0)