Add yarn patches for @MetaMask/snaps-{sdk,utils} removing superstruct imports

MajorLift · MajorLift · commit 7760b3d3d20e · 2024-06-27T16:02:24.000-04:00
diff --git a/.yarn/patches/@metamask-snaps-sdk-npm-6.0.0-c9e758dd8d.patch b/.yarn/patches/@metamask-snaps-sdk-npm-6.0.0-c9e758dd8d.patch
diff --git a/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch b/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch
diff --git a/package.json b/package.json
@@ -45,7 +45,12 @@
   "resolutions": {
     "@metamask/eth-snap-keyring": "github:MetaMask/eth-snap-keyring#replace-superstruct-with-fork",
     "@metamask/keyring-api": "github:MetaMask/keyring-api#replace-superstruct-with-fork",
-    "@metamask/snaps-sdk": "github:MetaMask/snaps#branch=replace-superstruct-with-fork#workspace=@metamask/snaps-sdk",
+    "@metamask/snaps-sdk@npm:^4.2.0": "patch:@metamask/snaps-sdk@npm%3A6.0.0#~/.yarn/patches/@metamask-snaps-sdk-npm-6.0.0-c9e758dd8d.patch",
+    "@metamask/snaps-sdk@npm:^4.4.2": "patch:@metamask/snaps-sdk@npm%3A6.0.0#~/.yarn/patches/@metamask-snaps-sdk-npm-6.0.0-c9e758dd8d.patch",
+    "@metamask/snaps-sdk@npm:^6.0.0": "patch:@metamask/snaps-sdk@npm%3A6.0.0#~/.yarn/patches/@metamask-snaps-sdk-npm-6.0.0-c9e758dd8d.patch",
+    "@metamask/snaps-utils@npm:^7.4.0": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
+    "@metamask/snaps-utils@npm:^7.5.0": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
+    "@metamask/snaps-utils@npm:^7.7.0": "patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch",
     "@metamask/superstruct": "3.1.0",
     "tsup@^8.0.2": "patch:tsup@npm%3A8.0.2#./.yarn/patches/tsup-npm-8.0.2-86e40f68a7.patch"
   },
diff --git 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.0",
     "@metamask/keyring-controller": "^17.1.0",
-    "@metamask/snaps-sdk": "^4.4.1",
-    "@metamask/snaps-utils": "^7.4.1",
+    "@metamask/snaps-sdk": "^6.0.0",
+    "@metamask/snaps-utils": "^7.7.0",
     "@metamask/utils": "^8.5.0",
     "deepmerge": "^4.2.2",
     "ethereum-cryptography": "^2.1.2",
diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json
@@ -45,8 +45,8 @@
     "@metamask/chain-api": "^0.0.1",
     "@metamask/keyring-api": "^8.0.0",
     "@metamask/snaps-controllers": "^8.1.1",
-    "@metamask/snaps-sdk": "^4.4.1",
-    "@metamask/snaps-utils": "^7.4.1",
+    "@metamask/snaps-sdk": "^6.0.0",
+    "@metamask/snaps-utils": "^7.7.0",
     "@metamask/utils": "^8.5.0",
     "uuid": "^8.3.2"
   },
diff --git a/packages/profile-sync-controller/package.json b/packages/profile-sync-controller/package.json
@@ -43,8 +43,8 @@
   "dependencies": {
     "@metamask/base-controller": "^6.0.0",
     "@metamask/snaps-controllers": "^8.1.1",
-    "@metamask/snaps-sdk": "^4.4.1",
-    "@metamask/snaps-utils": "^7.4.1",
+    "@metamask/snaps-sdk": "^6.0.0",
+    "@metamask/snaps-utils": "^7.7.0",
     "@noble/ciphers": "^0.5.2",
     "@noble/hashes": "^1.4.0",
     "ethers": "^6.12.0",
diff --git a/yarn.lock b/yarn.lock
@@ -2204,8 +2204,8 @@ __metadata:
     "@metamask/keyring-api": "npm:^8.0.0"
     "@metamask/keyring-controller": "npm:^17.1.0"
     "@metamask/snaps-controllers": "npm:^8.1.1"
-    "@metamask/snaps-sdk": "npm:^4.4.1"
-    "@metamask/snaps-utils": "npm:^7.4.1"
+    "@metamask/snaps-sdk": "npm:^6.0.0"
+    "@metamask/snaps-utils": "npm:^7.7.0"
     "@metamask/utils": "npm:^8.5.0"
     "@types/jest": "npm:^27.4.1"
     "@types/readable-stream": "npm:^2.3.0"
@@ -2463,8 +2463,8 @@ __metadata:
     "@metamask/chain-api": "npm:^0.0.1"
     "@metamask/keyring-api": "npm:^8.0.0"
     "@metamask/snaps-controllers": "npm:^8.1.1"
-    "@metamask/snaps-sdk": "npm:^4.4.1"
-    "@metamask/snaps-utils": "npm:^7.4.1"
+    "@metamask/snaps-sdk": "npm:^6.0.0"
+    "@metamask/snaps-utils": "npm:^7.7.0"
     "@metamask/utils": "npm:^8.5.0"
     "@types/jest": "npm:^27.4.1"
     "@types/readable-stream": "npm:^2.3.0"
@@ -3475,8 +3475,8 @@ __metadata:
     "@metamask/auto-changelog": "npm:^3.4.4"
     "@metamask/base-controller": "npm:^6.0.0"
     "@metamask/snaps-controllers": "npm:^8.1.1"
-    "@metamask/snaps-sdk": "npm:^4.4.1"
-    "@metamask/snaps-utils": "npm:^7.4.1"
+    "@metamask/snaps-sdk": "npm:^6.0.0"
+    "@metamask/snaps-utils": "npm:^7.7.0"
     "@noble/ciphers": "npm:^0.5.2"
     "@noble/hashes": "npm:^1.4.0"
     "@types/jest": "npm:^27.4.1"
@@ -3497,7 +3497,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@metamask/providers@npm:^17.1.0":
+"@metamask/providers@npm:^17.0.0, @metamask/providers@npm:^17.1.0":
   version: 17.1.0
   resolution: "@metamask/providers@npm:17.1.0"
   dependencies:
@@ -3721,14 +3721,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-sdk@github:MetaMask/snaps#branch=replace-superstruct-with-fork#workspace=@metamask/snaps-sdk":
-  version: 54.0.0
-  resolution: "@metamask/snaps-sdk@https://github.com/MetaMask/snaps.git#branch=replace-superstruct-with-fork%23workspace%3D%40metamask%2Fsnaps-sdk&commit=ad0eae47f9c5d02e61abdc170cc7ee7e94e40c72"
-  checksum: 10/a3e114f3c6a524e100f89bc69a31d1854a80589442fce1ae06b488b3170a485b41e3ba035f52a9382142cdc0bd50b0ae701977506584c9d1fd2f0841b894406f
+"@metamask/snaps-sdk@npm:6.0.0":
+  version: 6.0.0
+  resolution: "@metamask/snaps-sdk@npm:6.0.0"
+  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"
+    superstruct: "npm:^1.0.3"
+  checksum: 10/91774ea791423a3cfef4ddbe30fc0351d9bfb9bad071ebce6a74be85cdd9b864b2666785cb6f0e8257a9778bc630f2de71544258d0367a93917ffe3d72ef90a5
   languageName: node
   linkType: hard
 
-"@metamask/snaps-utils@npm:^7.4.0, @metamask/snaps-utils@npm:^7.4.1, @metamask/snaps-utils@npm:^7.5.0, @metamask/snaps-utils@npm:^7.7.0":
+"@metamask/snaps-sdk@patch:@metamask/snaps-sdk@npm%3A6.0.0#~/.yarn/patches/@metamask-snaps-sdk-npm-6.0.0-c9e758dd8d.patch":
+  version: 6.0.0
+  resolution: "@metamask/snaps-sdk@patch:@metamask/snaps-sdk@npm%3A6.0.0#~/.yarn/patches/@metamask-snaps-sdk-npm-6.0.0-c9e758dd8d.patch::version=6.0.0&hash=8f563d"
+  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"
+    superstruct: "npm:^1.0.3"
+  checksum: 10/25a89c5b0966482e894768bf6e5acf7dd23aff8e6d72e940528059cd06b71e15bc2aad1e0edd1362f4083643e0eac162ded7ea6b75df10e68998f68fa641566a
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-utils@npm:7.7.0":
   version: 7.7.0
   resolution: "@metamask/snaps-utils@npm:7.7.0"
   dependencies:
@@ -3759,6 +3778,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch":
+  version: 7.7.0
+  resolution: "@metamask/snaps-utils@patch:@metamask/snaps-utils@npm%3A7.7.0#~/.yarn/patches/@metamask-snaps-utils-npm-7.7.0-2cc1f044af.patch::version=7.7.0&hash=038c48"
+  dependencies:
+    "@babel/core": "npm:^7.23.2"
+    "@babel/types": "npm:^7.23.0"
+    "@metamask/base-controller": "npm:^6.0.0"
+    "@metamask/key-tree": "npm:^9.1.1"
+    "@metamask/permission-controller": "npm:^10.0.0"
+    "@metamask/rpc-errors": "npm:^6.2.1"
+    "@metamask/slip44": "npm:^3.1.0"
+    "@metamask/snaps-registry": "npm:^3.1.0"
+    "@metamask/snaps-sdk": "npm:^6.0.0"
+    "@metamask/utils": "npm:^8.3.0"
+    "@noble/hashes": "npm:^1.3.1"
+    "@scure/base": "npm:^1.1.1"
+    chalk: "npm:^4.1.2"
+    cron-parser: "npm:^4.5.0"
+    fast-deep-equal: "npm:^3.1.3"
+    fast-json-stable-stringify: "npm:^2.1.0"
+    fast-xml-parser: "npm:^4.3.4"
+    marked: "npm:^12.0.1"
+    rfdc: "npm:^1.3.0"
+    semver: "npm:^7.5.4"
+    ses: "npm:^1.1.0"
+    superstruct: "npm:^1.0.3"
+    validate-npm-package-name: "npm:^5.0.0"
+  checksum: 10/aeb81017d820a598710a8f3eb797770ce981de766b72cbda6e1435de3665dfeca71ef391411e40300419886363b822f0ef08750f646370f8f4e3449721272447
+  languageName: node
+  linkType: hard
+
 "@metamask/superstruct@npm:3.1.0":
   version: 3.1.0
   resolution: "@metamask/superstruct@npm:3.1.0"
