Skip to content

Commit fc0ee27

Browse files
authored
Patch fix for initial connections in preinstalled Snaps (#26602)
## **Description** This adds a patch for MetaMask/snaps#2591. [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/26602?quickstart=1)
1 parent deb3ffc commit fc0ee27

File tree

3 files changed

+38
-42
lines changed

3 files changed

+38
-42
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/dist/chunk-E52MHHG4.js b/dist/chunk-E52MHHG4.js
2+
index d34a3ded85472b86d0905ab14c0a69b9bfe4851b..7a7dfcd288bf7888eb29e4533662237a53335e17 100644
3+
--- a/dist/chunk-E52MHHG4.js
4+
+++ b/dist/chunk-E52MHHG4.js
5+
@@ -1668,6 +1668,9 @@ handlePreinstalledSnaps_fn = function(preinstalledSnaps) {
6+
_chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _validateSnapPermissions, validateSnapPermissions_fn).call(this, processedPermissions);
7+
const { newPermissions, unusedPermissions } = _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _calculatePermissionsChange, calculatePermissionsChange_fn).call(this, snapId, processedPermissions);
8+
_chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _updatePermissions, updatePermissions_fn).call(this, { snapId, newPermissions, unusedPermissions });
9+
+ if (manifest.initialConnections) {
10+
+ _chunkEXN2TFDJjs.__privateMethod.call(void 0, this, _handleInitialConnections, handleInitialConnections_fn).call(this, snapId, existingSnap?.initialConnections ?? null, manifest.initialConnections);
11+
+ }
12+
this.update((state) => {
13+
state.snaps[snapId].status = _snapsutils.SnapStatus.Stopped;
14+
});

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@
256256
"@metamask/network-controller": "patch:@metamask/network-controller@npm%3A19.0.0#~/.yarn/patches/@metamask-network-controller-npm-19.0.0-a5e0d1fe14.patch",
257257
"@solana/web3.js/rpc-websockets": "^8.0.1",
258258
"@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A19.0.0#~/.yarn/patches/@metamask-network-controller-npm-19.0.0-a5e0d1fe14.patch",
259-
"@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch"
259+
"@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
260+
"@metamask/snaps-controllers@npm:^8.1.1": "patch:@metamask/snaps-controllers@npm%3A9.2.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.2.0-09a31bab4f.patch"
260261
},
261262
"dependencies": {
262263
"@babel/runtime": "patch:@babel/runtime@npm%3A7.24.0#~/.yarn/patches/@babel-runtime-npm-7.24.0-7eb1dd11a2.patch",
@@ -339,7 +340,7 @@
339340
"@metamask/selected-network-controller": "^15.0.2",
340341
"@metamask/signature-controller": "^16.0.0",
341342
"@metamask/smart-transactions-controller": "^10.1.6",
342-
"@metamask/snaps-controllers": "^9.2.0",
343+
"@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@npm%3A9.2.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.2.0-09a31bab4f.patch",
343344
"@metamask/snaps-execution-environments": "^6.5.0",
344345
"@metamask/snaps-rpc-methods": "^9.1.4",
345346
"@metamask/snaps-sdk": "^6.0.0",

yarn.lock

+21-40
Original file line numberDiff line numberDiff line change
@@ -5943,25 +5943,6 @@ __metadata:
59435943
languageName: node
59445944
linkType: hard
59455945

5946-
"@metamask/permission-controller@npm:^9.0.2":
5947-
version: 9.1.0
5948-
resolution: "@metamask/permission-controller@npm:9.1.0"
5949-
dependencies:
5950-
"@metamask/base-controller": "npm:^5.0.2"
5951-
"@metamask/controller-utils": "npm:^9.1.0"
5952-
"@metamask/json-rpc-engine": "npm:^8.0.2"
5953-
"@metamask/rpc-errors": "npm:^6.2.1"
5954-
"@metamask/utils": "npm:^8.3.0"
5955-
"@types/deep-freeze-strict": "npm:^1.1.0"
5956-
deep-freeze-strict: "npm:^1.1.1"
5957-
immer: "npm:^9.0.6"
5958-
nanoid: "npm:^3.1.31"
5959-
peerDependencies:
5960-
"@metamask/approval-controller": ^6.0.0
5961-
checksum: 10/bfae4c16cbe5b180b00ef029c3fa8d7f770247dfad4c0afc11822f4b0bd36373d6f749ac5507f23cf5dbd848096fa86ad2546be190c665c419cae58fcf0d7f00
5962-
languageName: node
5963-
linkType: hard
5964-
59655946
"@metamask/permission-log-controller@npm:^2.0.1":
59665947
version: 2.0.1
59675948
resolution: "@metamask/permission-log-controller@npm:2.0.1"
@@ -5986,7 +5967,7 @@ __metadata:
59865967
languageName: node
59875968
linkType: hard
59885969

5989-
"@metamask/phishing-controller@npm:^9.0.1, @metamask/phishing-controller@npm:^9.0.3":
5970+
"@metamask/phishing-controller@npm:^9.0.3":
59905971
version: 9.0.4
59915972
resolution: "@metamask/phishing-controller@npm:9.0.4"
59925973
dependencies:
@@ -6268,23 +6249,23 @@ __metadata:
62686249
languageName: node
62696250
linkType: hard
62706251

6271-
"@metamask/snaps-controllers@npm:^8.1.1":
6272-
version: 8.4.0
6273-
resolution: "@metamask/snaps-controllers@npm:8.4.0"
6252+
"@metamask/snaps-controllers@npm:9.2.0":
6253+
version: 9.2.0
6254+
resolution: "@metamask/snaps-controllers@npm:9.2.0"
62746255
dependencies:
6275-
"@metamask/approval-controller": "npm:^6.0.2"
6276-
"@metamask/base-controller": "npm:^5.0.2"
6277-
"@metamask/json-rpc-engine": "npm:^8.0.1"
6278-
"@metamask/json-rpc-middleware-stream": "npm:^7.0.1"
6256+
"@metamask/approval-controller": "npm:^7.0.0"
6257+
"@metamask/base-controller": "npm:^6.0.0"
6258+
"@metamask/json-rpc-engine": "npm:^9.0.0"
6259+
"@metamask/json-rpc-middleware-stream": "npm:^8.0.0"
62796260
"@metamask/object-multiplex": "npm:^2.0.0"
6280-
"@metamask/permission-controller": "npm:^9.0.2"
6281-
"@metamask/phishing-controller": "npm:^9.0.1"
6261+
"@metamask/permission-controller": "npm:^10.0.0"
6262+
"@metamask/phishing-controller": "npm:^10.0.0"
62826263
"@metamask/post-message-stream": "npm:^8.1.0"
62836264
"@metamask/rpc-errors": "npm:^6.2.1"
62846265
"@metamask/snaps-registry": "npm:^3.1.0"
6285-
"@metamask/snaps-rpc-methods": "npm:^9.1.2"
6286-
"@metamask/snaps-sdk": "npm:^4.4.2"
6287-
"@metamask/snaps-utils": "npm:^7.5.0"
6266+
"@metamask/snaps-rpc-methods": "npm:^9.1.4"
6267+
"@metamask/snaps-sdk": "npm:^6.0.0"
6268+
"@metamask/snaps-utils": "npm:^7.7.0"
62886269
"@metamask/utils": "npm:^8.3.0"
62896270
"@xstate/fsm": "npm:^2.0.0"
62906271
browserify-zlib: "npm:^0.2.0"
@@ -6297,17 +6278,17 @@ __metadata:
62976278
readable-web-to-node-stream: "npm:^3.0.2"
62986279
tar-stream: "npm:^3.1.7"
62996280
peerDependencies:
6300-
"@metamask/snaps-execution-environments": ^6.3.0
6281+
"@metamask/snaps-execution-environments": ^6.5.0
63016282
peerDependenciesMeta:
63026283
"@metamask/snaps-execution-environments":
63036284
optional: true
6304-
checksum: 10/12943073dea4c9c6c06294ade19aac6ad5b132f9eb7b39587a974ef5fe62ad58abb8c0b22e018cf49090f5f6435e5204ce01912485da77889170fa9aea3d4267
6285+
checksum: 10/3926bdfc3f064d57162825028aca2cf433e7adfe02ecdade174e2c75686c3dff407ee195f352662754846fc4edad8d2c6c5ce73471e3a09191a91070a98ba046
63056286
languageName: node
63066287
linkType: hard
63076288

6308-
"@metamask/snaps-controllers@npm:^9.2.0":
6289+
"@metamask/snaps-controllers@patch:@metamask/snaps-controllers@npm%3A9.2.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.2.0-09a31bab4f.patch":
63096290
version: 9.2.0
6310-
resolution: "@metamask/snaps-controllers@npm:9.2.0"
6291+
resolution: "@metamask/snaps-controllers@patch:@metamask/snaps-controllers@npm%3A9.2.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.2.0-09a31bab4f.patch::version=9.2.0&hash=820ce5"
63116292
dependencies:
63126293
"@metamask/approval-controller": "npm:^7.0.0"
63136294
"@metamask/base-controller": "npm:^6.0.0"
@@ -6338,7 +6319,7 @@ __metadata:
63386319
peerDependenciesMeta:
63396320
"@metamask/snaps-execution-environments":
63406321
optional: true
6341-
checksum: 10/3926bdfc3f064d57162825028aca2cf433e7adfe02ecdade174e2c75686c3dff407ee195f352662754846fc4edad8d2c6c5ce73471e3a09191a91070a98ba046
6322+
checksum: 10/e77ed26022440aec7886dbee4d8b3346433df685399926aebd8572f8007679b3f716e56587ca9f0652acda9c24c1f7c3f763e63066480450f51fa94cbb903541
63426323
languageName: node
63436324
linkType: hard
63446325

@@ -6373,7 +6354,7 @@ __metadata:
63736354
languageName: node
63746355
linkType: hard
63756356

6376-
"@metamask/snaps-rpc-methods@npm:^9.1.2, @metamask/snaps-rpc-methods@npm:^9.1.4":
6357+
"@metamask/snaps-rpc-methods@npm:^9.1.4":
63776358
version: 9.1.4
63786359
resolution: "@metamask/snaps-rpc-methods@npm:9.1.4"
63796360
dependencies:
@@ -6402,7 +6383,7 @@ __metadata:
64026383
languageName: node
64036384
linkType: hard
64046385

6405-
"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.5.0, @metamask/snaps-utils@npm:^7.7.0":
6386+
"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.7.0":
64066387
version: 7.7.0
64076388
resolution: "@metamask/snaps-utils@npm:7.7.0"
64086389
dependencies:
@@ -25250,7 +25231,7 @@ __metadata:
2525025231
"@metamask/selected-network-controller": "npm:^15.0.2"
2525125232
"@metamask/signature-controller": "npm:^16.0.0"
2525225233
"@metamask/smart-transactions-controller": "npm:^10.1.6"
25253-
"@metamask/snaps-controllers": "npm:^9.2.0"
25234+
"@metamask/snaps-controllers": "patch:@metamask/snaps-controllers@npm%3A9.2.0#~/.yarn/patches/@metamask-snaps-controllers-npm-9.2.0-09a31bab4f.patch"
2525425235
"@metamask/snaps-execution-environments": "npm:^6.5.0"
2525525236
"@metamask/snaps-rpc-methods": "npm:^9.1.4"
2525625237
"@metamask/snaps-sdk": "npm:^6.0.0"

0 commit comments

Comments
 (0)