BREAKING: Move SnapError to SDK (#1949)

This moves `SnapError` and some used utility functions to `snaps-sdk`. ## Breaking changes - `SnapError` was moved from `snaps-utils` to `snaps-sdk`.
MetaMask · Nov 10, 2023 · d360f8e · d360f8e
1 parent 394c1dd
commit d360f8e
Show file tree

Hide file tree

Showing 36 changed files with 778 additions and 604 deletions.
diff --git a/packages/examples/packages/bip32/snap.manifest.json b/packages/examples/packages/bip32/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "7z2/4sDVSx8+xUi9dVoD9v/o10rIhzxLfv7G1pfxGFw=",
+    "shasum": "a6nSBZXDUyWbimLESJxAVZRqTWFy5YXXO/+Si9nhLNY=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/bip44/snap.manifest.json b/packages/examples/packages/bip44/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "v9l9sN0gm3hxCFfQWRjV1p+5D05NIrFvjRozzVwFUpM=",
+    "shasum": "kC7naDIca71EEh+FvGppoEgpkdOCNzgSC2noYtZVgKk=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/dialogs/snap.manifest.json b/packages/examples/packages/dialogs/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "bG5IXFSsasgMlDWgtj3I5iZY2D16sO8nRBCf61lSJK0=",
+    "shasum": "p1WpZhW7JUQMqqNVoMPpK3kRu0bN2TLBFMU4IU0ayDA=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/get-entropy/snap.manifest.json b/packages/examples/packages/get-entropy/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "uDuEEIVV6EC+OXaBNvU6+4ZKxUQ3E3dDkS0G58YB9N0=",
+    "shasum": "WcUEK4cnEAv1J4efCUFaXxK4XvzzSIYf9j8qscNOOQ0=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json b/packages/examples/packages/invoke-snap/packages/core-signer/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "lWhar69WgLA0R5em8DwBvk2Yt8ZDf8SODJ5Dad7uHvw=",
+    "shasum": "mGKJ1s3TMRHRpWEB274UktA7EBsNRbVfWwnms6BE434=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/manage-state/snap.manifest.json b/packages/examples/packages/manage-state/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "SzHiX2GC8aoBExEgj5G09/89Lu6O54VcSsL3mWD3jjs=",
+    "shasum": "zP59BnhJYduugozloTON06CZSbzVAE1h3ktZs+qK94s=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/notifications/snap.manifest.json b/packages/examples/packages/notifications/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "Zkp4KW44svcE/TeX2RccTLWaj5GYnksM+hp1KYP3sUQ=",
+    "shasum": "uRjhwtFYVPOgRw1VrLKnUlymmVCA0E37WCldywWvRds=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/examples/packages/transaction-insights/snap.manifest.json b/packages/examples/packages/transaction-insights/snap.manifest.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/MetaMask/snaps.git"
   },
   "source": {
-    "shasum": "A2ry7NMMa+c8vSduxDSDzcKXk8qBIU7JChnrnyy7/nk=",
+    "shasum": "nA7PTqhnqnS5xJ+V9Pkql2BN4t2wMb3q38esxkTuOus=",
     "location": {
       "npm": {
         "filePath": "dist/bundle.js",

diff --git a/packages/snaps-controllers/src/snaps/SnapController.ts b/packages/snaps-controllers/src/snaps/SnapController.ts
@@ -36,7 +36,7 @@ import type {
   RequestSnapsResult,
   SnapId,
 } from '@metamask/snaps-sdk';
-import { AuxiliaryFileEncoding } from '@metamask/snaps-sdk';
+import { AuxiliaryFileEncoding, getErrorMessage } from '@metamask/snaps-sdk';
 import { assertUILinksAreSafe } from '@metamask/snaps-ui';
 import type {
   FetchedSnapFiles,
@@ -56,7 +56,6 @@ import {
   DEFAULT_ENDOWMENTS,
   DEFAULT_REQUESTED_SNAP_VERSION,
   encodeAuxiliaryFile,
-  getErrorMessage,
   HandlerType,
   isOriginAllowed,
   logError,

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/iframe/policy.json
@@ -308,11 +308,29 @@
         "eslint>debug>ms": true
       }
     },
+    "external:../snaps-sdk/src/errors.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/index.ts": true
+      }
+    },
     "external:../snaps-sdk/src/index.ts": {
       "packages": {
+        "external:../snaps-sdk/src/errors.ts": true,
+        "external:../snaps-sdk/src/internals/index.ts": true,
         "external:../snaps-sdk/src/types/index.ts": true
       }
     },
+    "external:../snaps-sdk/src/internals/errors.ts": {
+      "packages": {
+        "@metamask/utils": true
+      }
+    },
+    "external:../snaps-sdk/src/internals/index.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/errors.ts": true,
+        "external:../snaps-sdk/src/internals/helpers.ts": true
+      }
+    },
     "external:../snaps-sdk/src/types/handlers/index.ts": {
       "packages": {
         "external:../snaps-sdk/src/types/handlers/cronjob.ts": true,
@@ -386,7 +404,8 @@
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/utils": true
+        "@metamask/utils": true,
+        "external:../snaps-sdk/src/index.ts": true
       }
     },
     "external:../snaps-utils/src/handlers.ts": {

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-process/policy.json
@@ -372,11 +372,29 @@
         "util": true
       }
     },
+    "external:../snaps-sdk/src/errors.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/index.ts": true
+      }
+    },
     "external:../snaps-sdk/src/index.ts": {
       "packages": {
+        "external:../snaps-sdk/src/errors.ts": true,
+        "external:../snaps-sdk/src/internals/index.ts": true,
         "external:../snaps-sdk/src/types/index.ts": true
       }
     },
+    "external:../snaps-sdk/src/internals/errors.ts": {
+      "packages": {
+        "@metamask/utils": true
+      }
+    },
+    "external:../snaps-sdk/src/internals/index.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/errors.ts": true,
+        "external:../snaps-sdk/src/internals/helpers.ts": true
+      }
+    },
     "external:../snaps-sdk/src/types/handlers/index.ts": {
       "packages": {
         "external:../snaps-sdk/src/types/handlers/cronjob.ts": true,
@@ -450,7 +468,8 @@
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/utils": true
+        "@metamask/utils": true,
+        "external:../snaps-sdk/src/index.ts": true
       }
     },
     "external:../snaps-utils/src/handlers.ts": {

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/node-thread/policy.json
@@ -372,11 +372,29 @@
         "util": true
       }
     },
+    "external:../snaps-sdk/src/errors.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/index.ts": true
+      }
+    },
     "external:../snaps-sdk/src/index.ts": {
       "packages": {
+        "external:../snaps-sdk/src/errors.ts": true,
+        "external:../snaps-sdk/src/internals/index.ts": true,
         "external:../snaps-sdk/src/types/index.ts": true
       }
     },
+    "external:../snaps-sdk/src/internals/errors.ts": {
+      "packages": {
+        "@metamask/utils": true
+      }
+    },
+    "external:../snaps-sdk/src/internals/index.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/errors.ts": true,
+        "external:../snaps-sdk/src/internals/helpers.ts": true
+      }
+    },
     "external:../snaps-sdk/src/types/handlers/index.ts": {
       "packages": {
         "external:../snaps-sdk/src/types/handlers/cronjob.ts": true,
@@ -450,7 +468,8 @@
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/utils": true
+        "@metamask/utils": true,
+        "external:../snaps-sdk/src/index.ts": true
       }
     },
     "external:../snaps-utils/src/handlers.ts": {

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/offscreen/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/offscreen/policy.json
@@ -142,11 +142,29 @@
         "eslint>debug>ms": true
       }
     },
+    "external:../snaps-sdk/src/errors.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/index.ts": true
+      }
+    },
     "external:../snaps-sdk/src/index.ts": {
       "packages": {
+        "external:../snaps-sdk/src/errors.ts": true,
+        "external:../snaps-sdk/src/internals/index.ts": true,
         "external:../snaps-sdk/src/types/index.ts": true
       }
     },
+    "external:../snaps-sdk/src/internals/errors.ts": {
+      "packages": {
+        "@metamask/utils": true
+      }
+    },
+    "external:../snaps-sdk/src/internals/index.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/errors.ts": true,
+        "external:../snaps-sdk/src/internals/helpers.ts": true
+      }
+    },
     "external:../snaps-sdk/src/types/handlers/index.ts": {
       "packages": {
         "external:../snaps-sdk/src/types/handlers/cronjob.ts": true,
@@ -220,7 +238,8 @@
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/utils": true
+        "@metamask/utils": true,
+        "external:../snaps-sdk/src/index.ts": true
       }
     },
     "external:../snaps-utils/src/handlers.ts": {

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-executor/policy.json
@@ -308,11 +308,29 @@
         "eslint>debug>ms": true
       }
     },
+    "external:../snaps-sdk/src/errors.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/index.ts": true
+      }
+    },
     "external:../snaps-sdk/src/index.ts": {
       "packages": {
+        "external:../snaps-sdk/src/errors.ts": true,
+        "external:../snaps-sdk/src/internals/index.ts": true,
         "external:../snaps-sdk/src/types/index.ts": true
       }
     },
+    "external:../snaps-sdk/src/internals/errors.ts": {
+      "packages": {
+        "@metamask/utils": true
+      }
+    },
+    "external:../snaps-sdk/src/internals/index.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/errors.ts": true,
+        "external:../snaps-sdk/src/internals/helpers.ts": true
+      }
+    },
     "external:../snaps-sdk/src/types/handlers/index.ts": {
       "packages": {
         "external:../snaps-sdk/src/types/handlers/cronjob.ts": true,
@@ -386,7 +404,8 @@
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/utils": true
+        "@metamask/utils": true,
+        "external:../snaps-sdk/src/index.ts": true
       }
     },
     "external:../snaps-utils/src/handlers.ts": {

diff --git a/packages/snaps-execution-environments/lavamoat/browserify/worker-pool/policy.json b/packages/snaps-execution-environments/lavamoat/browserify/worker-pool/policy.json
@@ -142,11 +142,29 @@
         "eslint>debug>ms": true
       }
     },
+    "external:../snaps-sdk/src/errors.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/index.ts": true
+      }
+    },
     "external:../snaps-sdk/src/index.ts": {
       "packages": {
+        "external:../snaps-sdk/src/errors.ts": true,
+        "external:../snaps-sdk/src/internals/index.ts": true,
         "external:../snaps-sdk/src/types/index.ts": true
       }
     },
+    "external:../snaps-sdk/src/internals/errors.ts": {
+      "packages": {
+        "@metamask/utils": true
+      }
+    },
+    "external:../snaps-sdk/src/internals/index.ts": {
+      "packages": {
+        "external:../snaps-sdk/src/internals/errors.ts": true,
+        "external:../snaps-sdk/src/internals/helpers.ts": true
+      }
+    },
     "external:../snaps-sdk/src/types/handlers/index.ts": {
       "packages": {
         "external:../snaps-sdk/src/types/handlers/cronjob.ts": true,
@@ -220,7 +238,8 @@
     "external:../snaps-utils/src/errors.ts": {
       "packages": {
         "@metamask/rpc-errors": true,
-        "@metamask/utils": true
+        "@metamask/utils": true,
+        "external:../snaps-sdk/src/index.ts": true
       }
     },
     "external:../snaps-utils/src/handlers.ts": {

diff --git a/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts b/packages/snaps-execution-environments/src/common/BaseSnapExecutor.ts
@@ -5,6 +5,7 @@ import { StreamProvider } from '@metamask/providers';
 import type { RequestArguments } from '@metamask/providers/dist/BaseProvider';
 import { errorCodes, rpcErrors, serializeError } from '@metamask/rpc-errors';
 import type { SnapsProvider } from '@metamask/snaps-sdk';
+import { getErrorData } from '@metamask/snaps-sdk';
 import type {
   SnapExports,
   HandlerType,
@@ -15,7 +16,6 @@ import {
   logError,
   SNAP_EXPORTS,
   WrappedSnapError,
-  getErrorData,
   unwrapError,
 } from '@metamask/snaps-utils';
 import type {

diff --git a/packages/snaps-sdk/package.json b/packages/snaps-sdk/package.json
@@ -47,6 +47,7 @@
     "@metamask/eslint-config-jest": "^12.1.0",
     "@metamask/eslint-config-nodejs": "^12.1.0",
     "@metamask/eslint-config-typescript": "^12.1.0",
+    "@metamask/rpc-errors": "^6.1.0",
     "@swc/cli": "^0.1.62",
     "@swc/core": "1.3.78",
     "@swc/jest": "^0.2.26",