diff --git a/package.json b/package.json index 195da6c908f..98426374ccd 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,6 @@ "pre-push": "yarn lint" }, "resolutions": { - "@metamask/snaps-sdk": "github:MetaMask/snaps#workspace=@metamask/snaps-sdk&commit=3c95d8b54a7778d0473499826688cefa5d0b7012", - "@metamask/snaps-utils": "github:MetaMask/snaps#workspace=@metamask/snaps-utils&commit=3c95d8b54a7778d0473499826688cefa5d0b7012", "tsup@^8.0.2": "patch:tsup@npm%3A8.0.2#./.yarn/patches/tsup-npm-8.0.2-86e40f68a7.patch" }, "devDependencies": { diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 363deb2f7d3..f6601d99cb2 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -46,8 +46,8 @@ "@metamask/eth-snap-keyring": "^4.3.1", "@metamask/keyring-api": "^8.0.1", "@metamask/keyring-controller": "^17.1.1", - "@metamask/snaps-sdk": "^6.0.0", - "@metamask/snaps-utils": "^7.7.0", + "@metamask/snaps-sdk": "^6.1.0", + "@metamask/snaps-utils": "^7.8.0", "@metamask/utils": "^9.1.0", "deepmerge": "^4.2.2", "ethereum-cryptography": "^2.1.2", diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index 560623095d1..1f556000284 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -423,8 +423,8 @@ export class AccountsController extends BaseController< ...account, metadata: { ...account.metadata, name: accountName }, }; - // Error is flaky. Leaving commented `ts-expect-error` directive so it can be re-enabled if needed. - // // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types + // // Error is flaky. Leave both this comment and the `ts-expect-error` directive so they can be re-enabled as needed. + // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types currentState.internalAccounts.accounts[accountId] = internalAccount; }); } diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json index 6b74b97afd6..8bc169d4a98 100644 --- a/packages/chain-controller/package.json +++ b/packages/chain-controller/package.json @@ -45,8 +45,8 @@ "@metamask/chain-api": "^0.1.0", "@metamask/keyring-api": "^8.0.1", "@metamask/snaps-controllers": "^8.1.1", - "@metamask/snaps-sdk": "^6.0.0", - "@metamask/snaps-utils": "^7.7.0", + "@metamask/snaps-sdk": "^6.1.0", + "@metamask/snaps-utils": "^7.8.0", "@metamask/utils": "^9.1.0", "uuid": "^8.3.2" }, diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json index d35f3625d91..73011f28acf 100644 --- a/packages/profile-sync-controller/package.json +++ b/packages/profile-sync-controller/package.json @@ -43,8 +43,8 @@ "dependencies": { "@metamask/base-controller": "^6.0.1", "@metamask/snaps-controllers": "^8.1.1", - "@metamask/snaps-sdk": "^6.0.0", - "@metamask/snaps-utils": "^7.7.0", + "@metamask/snaps-sdk": "^6.1.0", + "@metamask/snaps-utils": "^7.8.0", "@noble/ciphers": "^0.5.2", "@noble/hashes": "^1.4.0", "immer": "^9.0.6", diff --git a/yarn.lock b/yarn.lock index d5a82ea25cd..2721e53ca4d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2204,8 +2204,8 @@ __metadata: "@metamask/keyring-api": "npm:^8.0.1" "@metamask/keyring-controller": "npm:^17.1.1" "@metamask/snaps-controllers": "npm:^8.1.1" - "@metamask/snaps-sdk": "npm:^6.0.0" - "@metamask/snaps-utils": "npm:^7.7.0" + "@metamask/snaps-sdk": "npm:^6.1.0" + "@metamask/snaps-utils": "npm:^7.8.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" @@ -2463,8 +2463,8 @@ __metadata: "@metamask/chain-api": "npm:^0.1.0" "@metamask/keyring-api": "npm:^8.0.1" "@metamask/snaps-controllers": "npm:^8.1.1" - "@metamask/snaps-sdk": "npm:^6.0.0" - "@metamask/snaps-utils": "npm:^7.7.0" + "@metamask/snaps-sdk": "npm:^6.1.0" + "@metamask/snaps-utils": "npm:^7.8.0" "@metamask/utils": "npm:^9.1.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" @@ -3076,7 +3076,7 @@ __metadata: languageName: node linkType: hard -"@metamask/json-rpc-middleware-stream@workspace:packages/json-rpc-middleware-stream": +"@metamask/json-rpc-middleware-stream@npm:^8.0.1, @metamask/json-rpc-middleware-stream@workspace:packages/json-rpc-middleware-stream": version: 0.0.0-use.local resolution: "@metamask/json-rpc-middleware-stream@workspace:packages/json-rpc-middleware-stream" dependencies: @@ -3526,8 +3526,8 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.1" "@metamask/snaps-controllers": "npm:^8.1.1" - "@metamask/snaps-sdk": "npm:^6.0.0" - "@metamask/snaps-utils": "npm:^7.7.0" + "@metamask/snaps-sdk": "npm:^6.1.0" + "@metamask/snaps-utils": "npm:^7.8.0" "@noble/ciphers": "npm:^0.5.2" "@noble/hashes": "npm:^1.4.0" "@types/jest": "npm:^27.4.1" @@ -3569,6 +3569,27 @@ __metadata: languageName: node linkType: hard +"@metamask/providers@npm:^17.0.0": + version: 17.1.1 + resolution: "@metamask/providers@npm:17.1.1" + dependencies: + "@metamask/json-rpc-engine": "npm:^9.0.1" + "@metamask/json-rpc-middleware-stream": "npm:^8.0.1" + "@metamask/object-multiplex": "npm:^2.0.0" + "@metamask/rpc-errors": "npm:^6.3.1" + "@metamask/safe-event-emitter": "npm:^3.1.1" + "@metamask/utils": "npm:^9.0.0" + detect-browser: "npm:^5.2.0" + extension-port-stream: "npm:^4.1.0" + fast-deep-equal: "npm:^3.1.3" + is-stream: "npm:^2.0.0" + readable-stream: "npm:^3.6.2" + peerDependencies: + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/9aed27c02ce97838705b3dacc4f2d8a821586e5aef2e98315f98e5be1a457ac5d48602fd7d5bdc4ac608e18cca13c723b685c3d03820b952f036647eac0121ce + languageName: node + linkType: hard + "@metamask/queued-request-controller@workspace:packages/queued-request-controller": version: 0.0.0-use.local resolution: "@metamask/queued-request-controller@workspace:packages/queued-request-controller" @@ -3772,22 +3793,36 @@ __metadata: languageName: node linkType: hard -"@metamask/snaps-sdk@github:MetaMask/snaps#workspace=@metamask/snaps-sdk&commit=3c95d8b54a7778d0473499826688cefa5d0b7012": - version: 6.0.0 - resolution: "@metamask/snaps-sdk@https://github.com/MetaMask/snaps.git#workspace=%40metamask%2Fsnaps-sdk&commit=3c95d8b54a7778d0473499826688cefa5d0b7012" +"@metamask/snaps-sdk@npm:^4.2.0, @metamask/snaps-sdk@npm:^4.4.2": + version: 4.4.2 + resolution: "@metamask/snaps-sdk@npm:4.4.2" + dependencies: + "@metamask/key-tree": "npm:^9.1.1" + "@metamask/providers": "npm:^17.0.0" + "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/utils": "npm:^8.3.0" + fast-xml-parser: "npm:^4.3.4" + superstruct: "npm:^1.0.3" + checksum: 10/32be48679eb306ec97c2ee16b4146ce69875e665feb61c04f7e63a23361c445b49ad4a0c8f6176560e7973b09c56e5a26055ba7cd894d67111c8c3cedf90dc4f + languageName: node + linkType: hard + +"@metamask/snaps-sdk@npm:^6.0.0, @metamask/snaps-sdk@npm:^6.1.0": + version: 6.1.0 + resolution: "@metamask/snaps-sdk@npm:6.1.0" dependencies: "@metamask/key-tree": "npm:^9.1.2" "@metamask/providers": "npm:17.0.0" "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.1.0" - checksum: 10/8a5ef3e62935150f0e2c4e17a87baf9f90779ea3fd530b8ae81cfb5c67bbfbeae6dc9c390dd208d950f421dec4f98732d8b391f3b5fa330377db8eda69d83659 + checksum: 10/1cdad5356872dea44313914ed446cddd9bcaf397b60b47e1d93a11cacb6974066f60ca55cfa3c8fe74d7852188113994433401647fa02e13d1e9f0bd8dfde013 languageName: node linkType: hard -"@metamask/snaps-utils@github:MetaMask/snaps#workspace=@metamask/snaps-utils&commit=3c95d8b54a7778d0473499826688cefa5d0b7012": - version: 7.7.0 - resolution: "@metamask/snaps-utils@https://github.com/MetaMask/snaps.git#workspace=%40metamask%2Fsnaps-utils&commit=3c95d8b54a7778d0473499826688cefa5d0b7012" +"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.5.0, @metamask/snaps-utils@npm:^7.7.0, @metamask/snaps-utils@npm:^7.8.0": + version: 7.8.0 + resolution: "@metamask/snaps-utils@npm:7.8.0" dependencies: "@babel/core": "npm:^7.23.2" "@babel/types": "npm:^7.23.0" @@ -3797,7 +3832,7 @@ __metadata: "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/slip44": "npm:^3.1.0" "@metamask/snaps-registry": "npm:^3.2.1" - "@metamask/snaps-sdk": "npm:^6.0.0" + "@metamask/snaps-sdk": "npm:^6.1.0" "@metamask/superstruct": "npm:^3.1.0" "@metamask/utils": "npm:^9.1.0" "@noble/hashes": "npm:^1.3.1" @@ -3812,7 +3847,7 @@ __metadata: semver: "npm:^7.5.4" ses: "npm:^1.1.0" validate-npm-package-name: "npm:^5.0.0" - checksum: 10/73c2a2f41c91d4dd56a7bad48c3e95c80557f44742a4c2731c945f1ccb30dad4260f733cf2a8fbc6c643085499ac71ee3ec4af334944dc16819f844577cc9cda + checksum: 10/e4629fe57f6cbc9ba2a7ac3b41cc919c83574b8d6c9e71b593fbc5b37d6f15a7d46498dade56dbf61268a898f33b53f48cba7207c9bb5e7b6a9c79cc3cfc9aaa languageName: node linkType: hard @@ -7634,6 +7669,17 @@ __metadata: languageName: node linkType: hard +"extension-port-stream@npm:^4.1.0": + version: 4.2.0 + resolution: "extension-port-stream@npm:4.2.0" + dependencies: + readable-stream: "npm:^3.6.2 || ^4.4.2" + peerDependencies: + webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0 + checksum: 10/85559c82e3f3aa21462e234b30b7d53872708893664cd03f2f848af556cf0730cf2243b089efc9d40bbe9a4f73bd8fd19684db5a985329b0c4402b4f2fe26358 + languageName: node + linkType: hard + "fast-copy@npm:^2.1.7": version: 2.1.7 resolution: "fast-copy@npm:2.1.7"