From f722bc5b51c1f0d1e24aaf116dea3ed10be59e04 Mon Sep 17 00:00:00 2001 From: Frederik Bolding Date: Fri, 9 Feb 2024 13:43:22 +0100 Subject: [PATCH] Use SnapError in all examples --- packages/examples/packages/bip32/package.json | 1 - .../packages/bip32/snap.manifest.json | 2 +- packages/examples/packages/bip32/src/index.ts | 17 ++++++-------- packages/examples/packages/bip44/package.json | 1 - .../packages/bip44/snap.manifest.json | 2 +- packages/examples/packages/bip44/src/index.ts | 9 ++++---- .../packages/browserify-plugin/package.json | 1 - .../browserify-plugin/snap.manifest.json | 2 +- .../packages/browserify-plugin/src/index.ts | 7 ++---- .../examples/packages/browserify/package.json | 1 - .../packages/browserify/snap.manifest.json | 2 +- .../examples/packages/browserify/src/index.ts | 7 ++---- .../packages/client-status/package.json | 1 - .../packages/client-status/snap.manifest.json | 2 +- .../packages/client-status/src/index.ts | 9 ++------ .../examples/packages/cronjobs/package.json | 1 - .../packages/cronjobs/snap.manifest.json | 2 +- .../examples/packages/cronjobs/src/index.ts | 9 ++------ .../examples/packages/dialogs/package.json | 1 - .../packages/dialogs/snap.manifest.json | 2 +- .../examples/packages/dialogs/src/index.ts | 9 ++------ .../packages/ethereum-provider/package.json | 1 - .../ethereum-provider/snap.manifest.json | 2 +- .../packages/ethereum-provider/src/index.ts | 9 ++------ .../examples/packages/ethers-js/package.json | 1 - .../packages/ethers-js/snap.manifest.json | 2 +- .../examples/packages/ethers-js/src/index.ts | 9 +++----- .../packages/get-entropy/package.json | 1 - .../packages/get-entropy/snap.manifest.json | 2 +- .../packages/get-entropy/src/index.ts | 9 ++++---- .../examples/packages/get-file/package.json | 1 - .../packages/get-file/snap.manifest.json | 2 +- .../examples/packages/get-file/src/index.ts | 7 ++---- .../packages/home-page/snap.manifest.json | 2 +- .../examples/packages/images/package.json | 1 - .../packages/images/snap.manifest.json | 2 +- .../examples/packages/images/src/index.ts | 6 ++--- .../packages/consumer-signer/package.json | 1 - .../consumer-signer/snap.manifest.json | 2 +- .../packages/consumer-signer/src/index.ts | 18 +++++++-------- .../packages/core-signer/package.json | 1 - .../packages/core-signer/snap.manifest.json | 2 +- .../packages/core-signer/src/index.ts | 9 ++++---- .../examples/packages/json-rpc/package.json | 1 - .../packages/json-rpc/snap.manifest.json | 2 +- .../examples/packages/json-rpc/src/index.ts | 9 ++------ .../lifecycle-hooks/snap.manifest.json | 2 +- .../packages/localization/package.json | 1 - .../packages/localization/snap.manifest.json | 2 +- .../packages/localization/src/index.ts | 7 ++---- .../packages/manage-state/package.json | 1 - .../packages/manage-state/snap.manifest.json | 2 +- .../packages/manage-state/src/index.ts | 9 ++------ .../packages/network-access/package.json | 1 - .../network-access/snap.manifest.json | 2 +- .../packages/network-access/src/index.ts | 9 ++------ .../packages/notifications/package.json | 1 - .../packages/notifications/snap.manifest.json | 2 +- .../packages/notifications/src/index.ts | 7 ++---- .../packages/rollup-plugin/package.json | 1 - .../packages/rollup-plugin/snap.manifest.json | 2 +- .../packages/rollup-plugin/src/index.ts | 10 +++------ .../signature-insights/snap.manifest.json | 2 +- .../transaction-insights/snap.manifest.json | 2 +- packages/examples/packages/wasm/package.json | 1 - .../examples/packages/wasm/snap.manifest.json | 2 +- packages/examples/packages/wasm/src/index.ts | 5 ++--- .../packages/webpack-plugin/package.json | 1 - .../webpack-plugin/snap.manifest.json | 2 +- .../packages/webpack-plugin/src/index.ts | 13 +++++------ yarn.lock | 22 ------------------- 71 files changed, 94 insertions(+), 205 deletions(-) diff --git a/packages/examples/packages/bip32/package.json b/packages/examples/packages/bip32/package.json index 4e10ea32fe..eb0306944a 100644 --- a/packages/examples/packages/bip32/package.json +++ b/packages/examples/packages/bip32/package.json @@ -32,7 +32,6 @@ }, "dependencies": { "@metamask/key-tree": "^9.0.0", - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^8.3.0", "@noble/ed25519": "^1.6.0", diff --git a/packages/examples/packages/bip32/snap.manifest.json b/packages/examples/packages/bip32/snap.manifest.json index 74b53878c3..905c2e3bc2 100644 --- 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": "ALkwbuS0MFVTbJB0zQXPRdDmyis8TAfZayoVY0dDAow=", + "shasum": "J5mhpAAtjnZ6erOc2GTacSpR7Afz1cxJcssOFTtylvs=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/bip32/src/index.ts b/packages/examples/packages/bip32/src/index.ts index 0a13c0a730..5d22328f64 100644 --- a/packages/examples/packages/bip32/src/index.ts +++ b/packages/examples/packages/bip32/src/index.ts @@ -1,4 +1,3 @@ -import { providerErrors, rpcErrors } from '@metamask/rpc-errors'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; import { DialogType, @@ -6,6 +5,9 @@ import { text, heading, copyable, + InvalidParamsError, + UserRejectedRequestError, + MethodNotFoundError, } from '@metamask/snaps-sdk'; import { add0x, @@ -46,9 +48,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { const { message, curve, ...params } = request.params as SignMessageParams; if (!message || typeof message !== 'string') { - throw rpcErrors.invalidParams({ - message: `Invalid signature data: "${message}".`, - }); + throw new InvalidParamsError(`Invalid signature data: "${message}".`); } const node = await getPrivateNode({ ...params, curve }); @@ -71,7 +71,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { }); if (!approved) { - throw providerErrors.userRejectedRequest(); + throw new UserRejectedRequestError(); } if (curve === 'ed25519') { @@ -95,10 +95,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { throw new Error(`Unsupported curve: ${String(curve)}.`); } - default: { - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); - } + default: + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/bip44/package.json b/packages/examples/packages/bip44/package.json index 04004b238a..80539484be 100644 --- a/packages/examples/packages/bip44/package.json +++ b/packages/examples/packages/bip44/package.json @@ -32,7 +32,6 @@ }, "dependencies": { "@metamask/key-tree": "^9.0.0", - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^8.3.0", "@noble/bls12-381": "^1.2.0" diff --git a/packages/examples/packages/bip44/snap.manifest.json b/packages/examples/packages/bip44/snap.manifest.json index 1307a21c4e..d46a1ad8e6 100644 --- 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": "ivu8DqblrnqDucyKZQRFKcsT6uc7Vw+DsQJRJgIXn9Y=", + "shasum": "6DBoUIrZECIq0rT8yj309Inh7p4GqUZdmqDEdVowCGs=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/bip44/src/index.ts b/packages/examples/packages/bip44/src/index.ts index bac330dcac..4025ea5155 100644 --- a/packages/examples/packages/bip44/src/index.ts +++ b/packages/examples/packages/bip44/src/index.ts @@ -1,4 +1,3 @@ -import { rpcErrors, providerErrors } from '@metamask/rpc-errors'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; import { DialogType, @@ -6,6 +5,8 @@ import { text, heading, copyable, + MethodNotFoundError, + UserRejectedRequestError, } from '@metamask/snaps-sdk'; import { bytesToHex, stringToBytes } from '@metamask/utils'; import { getPublicKey, sign } from '@noble/bls12-381'; @@ -58,7 +59,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { }); if (!approved) { - throw providerErrors.userRejectedRequest(); + throw new UserRejectedRequestError(); } const newLocal = await sign(stringToBytes(message), privateKey); @@ -66,8 +67,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/browserify-plugin/package.json b/packages/examples/packages/browserify-plugin/package.json index 9cd2c2433f..3f258553b0 100644 --- a/packages/examples/packages/browserify-plugin/package.json +++ b/packages/examples/packages/browserify-plugin/package.json @@ -30,7 +30,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/browserify-plugin/snap.manifest.json b/packages/examples/packages/browserify-plugin/snap.manifest.json index 3c41e6fd7a..cd50493b57 100644 --- a/packages/examples/packages/browserify-plugin/snap.manifest.json +++ b/packages/examples/packages/browserify-plugin/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "DaHfreDPC/NRNuyWF68CqEZYwrAae5LWuGnf3XN1h+w=", + "shasum": "A3hd5c69jrirLCpvWB1g/JgPr99TOJBowhBlFuq1Nwg=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/browserify-plugin/src/index.ts b/packages/examples/packages/browserify-plugin/src/index.ts index 660d49a6d2..de3d33854f 100644 --- a/packages/examples/packages/browserify-plugin/src/index.ts +++ b/packages/examples/packages/browserify-plugin/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -21,9 +20,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { return 'Hello from Browserify!'; default: { - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } } }; diff --git a/packages/examples/packages/browserify/package.json b/packages/examples/packages/browserify/package.json index b78f2222ea..b99817e920 100644 --- a/packages/examples/packages/browserify/package.json +++ b/packages/examples/packages/browserify/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/browserify/snap.manifest.json b/packages/examples/packages/browserify/snap.manifest.json index 72dd47814a..50c096d36b 100644 --- a/packages/examples/packages/browserify/snap.manifest.json +++ b/packages/examples/packages/browserify/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "GzrcImsaySqM1HMkjTADZOUqZXmFykvBQiv1gQJCw1w=", + "shasum": "95Quh+P0Twz147oYzCoirGX4cD//CznsElPR0o+Eg6g=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/browserify/src/index.ts b/packages/examples/packages/browserify/src/index.ts index de8c3482d9..ed8909605c 100644 --- a/packages/examples/packages/browserify/src/index.ts +++ b/packages/examples/packages/browserify/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -23,9 +22,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { return 'Hello from the MetaMask Snaps CLI using Browserify!'; default: { - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } } }; diff --git a/packages/examples/packages/client-status/package.json b/packages/examples/packages/client-status/package.json index edfeff250c..cc14b0c8e7 100644 --- a/packages/examples/packages/client-status/package.json +++ b/packages/examples/packages/client-status/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/client-status/snap.manifest.json b/packages/examples/packages/client-status/snap.manifest.json index 0f5996ea9b..ee9356caec 100644 --- a/packages/examples/packages/client-status/snap.manifest.json +++ b/packages/examples/packages/client-status/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "nJN72lSBRDfROObGpijTtKtZjRSoWSTgbdo6/CScl1I=", + "shasum": "AcXvYNa51+q0lmnxoA7JbDqs2GFChKSdOsZzNtQjs58=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/client-status/src/index.ts b/packages/examples/packages/client-status/src/index.ts index ba26986cc3..368425644d 100644 --- a/packages/examples/packages/client-status/src/index.ts +++ b/packages/examples/packages/client-status/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -21,10 +20,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { - method: request.method, - }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/cronjobs/package.json b/packages/examples/packages/cronjobs/package.json index c72320a9b9..757e852220 100644 --- a/packages/examples/packages/cronjobs/package.json +++ b/packages/examples/packages/cronjobs/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/cronjobs/snap.manifest.json b/packages/examples/packages/cronjobs/snap.manifest.json index 7526eb2376..d88e04d7c1 100644 --- a/packages/examples/packages/cronjobs/snap.manifest.json +++ b/packages/examples/packages/cronjobs/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "xBvDzo5oiGIbKEVGmzlI39BCzvh/l/nNkkAcOABQqoo=", + "shasum": "OX8vhmU71QIHyYKPZC3PneMjgiEpB7/4+BxhIULLPCM=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/cronjobs/src/index.ts b/packages/examples/packages/cronjobs/src/index.ts index eacfe3ca63..6bb7d7b738 100644 --- a/packages/examples/packages/cronjobs/src/index.ts +++ b/packages/examples/packages/cronjobs/src/index.ts @@ -1,6 +1,5 @@ -import { rpcErrors } from '@metamask/rpc-errors'; import type { OnCronjobHandler } from '@metamask/snaps-sdk'; -import { panel, text, heading } from '@metamask/snaps-sdk'; +import { panel, text, heading, MethodNotFoundError } from '@metamask/snaps-sdk'; /** * Handle cronjob execution requests from MetaMask. This handler handles one @@ -31,10 +30,6 @@ export const onCronjob: OnCronjobHandler = async ({ request }) => { }, }); default: - throw rpcErrors.methodNotFound({ - data: { - method: request.method, - }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/dialogs/package.json b/packages/examples/packages/dialogs/package.json index ffe6634b68..6cabb6fa2e 100644 --- a/packages/examples/packages/dialogs/package.json +++ b/packages/examples/packages/dialogs/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/dialogs/snap.manifest.json b/packages/examples/packages/dialogs/snap.manifest.json index 7a30a04e3a..33a41bd4b9 100644 --- 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": "wFgSmNho6eVxo+nEE2XlWRFVR8tLqKghhh86ozrwmAg=", + "shasum": "ipag4FRtdkJBJorSx5kyQ4+0i37b2EQH/aoq28zIvcc=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/dialogs/src/index.ts b/packages/examples/packages/dialogs/src/index.ts index 7e7428a8c1..294034a568 100644 --- a/packages/examples/packages/dialogs/src/index.ts +++ b/packages/examples/packages/dialogs/src/index.ts @@ -1,6 +1,5 @@ -import { rpcErrors } from '@metamask/rpc-errors'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; -import { DialogType, panel, text, heading } from '@metamask/snaps-sdk'; +import { DialogType, panel, text, heading, MethodNotFoundError } from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -71,10 +70,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { }); default: - throw rpcErrors.methodNotFound({ - data: { - method: request.method, - }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/ethereum-provider/package.json b/packages/examples/packages/ethereum-provider/package.json index 0cbc017f4f..ee3b4d8ae9 100644 --- a/packages/examples/packages/ethereum-provider/package.json +++ b/packages/examples/packages/ethereum-provider/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^8.3.0" }, diff --git a/packages/examples/packages/ethereum-provider/snap.manifest.json b/packages/examples/packages/ethereum-provider/snap.manifest.json index 08090ed68e..cc1eb98582 100644 --- a/packages/examples/packages/ethereum-provider/snap.manifest.json +++ b/packages/examples/packages/ethereum-provider/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "m4jFP39tZIR1XMosUJ3u8YIfepiI9aRIMna3Hg8RlQQ=", + "shasum": "aOMvJu4RhWbR+7VyEdQA8axcIb42z0mLpGf7jLJcCf8=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/ethereum-provider/src/index.ts b/packages/examples/packages/ethereum-provider/src/index.ts index ef28a7aefa..d1e52240cd 100644 --- a/packages/examples/packages/ethereum-provider/src/index.ts +++ b/packages/examples/packages/ethereum-provider/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; import type { Hex } from '@metamask/utils'; import { assert, stringToBytes, bytesToHex } from '@metamask/utils'; @@ -121,10 +120,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { - method: request.method, - }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/ethers-js/package.json b/packages/examples/packages/ethers-js/package.json index e92928d735..f98e87e243 100644 --- a/packages/examples/packages/ethers-js/package.json +++ b/packages/examples/packages/ethers-js/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "ethers": "^6.3.0" }, diff --git a/packages/examples/packages/ethers-js/snap.manifest.json b/packages/examples/packages/ethers-js/snap.manifest.json index bb39f17e23..71c31f63a2 100644 --- a/packages/examples/packages/ethers-js/snap.manifest.json +++ b/packages/examples/packages/ethers-js/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "t9CVxyl+WB6UwtynS8zhgA76KWUmQUdGGP+E0Rj+fR0=", + "shasum": "UbpOFJK8QM+jA23PsQFBI0TF/wfCfhkJ3PDIPMxMquc=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/ethers-js/src/index.ts b/packages/examples/packages/ethers-js/src/index.ts index 7ca645bb5f..0f6a79620b 100644 --- a/packages/examples/packages/ethers-js/src/index.ts +++ b/packages/examples/packages/ethers-js/src/index.ts @@ -1,6 +1,5 @@ -import { providerErrors, rpcErrors } from '@metamask/rpc-errors'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; -import { panel, heading, copyable, text } from '@metamask/snaps-sdk'; +import { panel, heading, copyable, text, UserRejectedRequestError, MethodNotFoundError } from '@metamask/snaps-sdk'; import { Wallet } from 'ethers'; import type { SignMessageParams } from './types'; @@ -50,15 +49,13 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { }); if (!result) { - throw providerErrors.userRejectedRequest(); + throw new UserRejectedRequestError(); } return wallet.signMessage(params.message); } default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/get-entropy/package.json b/packages/examples/packages/get-entropy/package.json index fa4f0469e7..c4db4688b0 100644 --- a/packages/examples/packages/get-entropy/package.json +++ b/packages/examples/packages/get-entropy/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^8.3.0", "@noble/bls12-381": "^1.2.0" diff --git a/packages/examples/packages/get-entropy/snap.manifest.json b/packages/examples/packages/get-entropy/snap.manifest.json index 723f267458..ebb41ae953 100644 --- 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": "BLq144YW0hKG00k8SN3+7F9rKy6hggZVjjx9WkraNEI=", + "shasum": "V6xn/HXuwCpDKZsHeX8yHWUbkW1cC1onClrZTU5kbIs=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/get-entropy/src/index.ts b/packages/examples/packages/get-entropy/src/index.ts index 62d01a92a3..4a680d2e07 100644 --- a/packages/examples/packages/get-entropy/src/index.ts +++ b/packages/examples/packages/get-entropy/src/index.ts @@ -1,4 +1,3 @@ -import { rpcErrors, providerErrors } from '@metamask/rpc-errors'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; import { DialogType, @@ -6,6 +5,8 @@ import { text, heading, copyable, + UserRejectedRequestError, + MethodNotFoundError, } from '@metamask/snaps-sdk'; import { bytesToHex, stringToBytes } from '@metamask/utils'; import { sign } from '@noble/bls12-381'; @@ -47,7 +48,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { }); if (!approved) { - throw providerErrors.userRejectedRequest(); + throw new UserRejectedRequestError(); } const privateKey = await getEntropy(salt); @@ -56,8 +57,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/get-file/package.json b/packages/examples/packages/get-file/package.json index be5a0e5589..8b95b9013e 100644 --- a/packages/examples/packages/get-file/package.json +++ b/packages/examples/packages/get-file/package.json @@ -32,7 +32,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/get-file/snap.manifest.json b/packages/examples/packages/get-file/snap.manifest.json index 6c7b043a0d..da128e7075 100644 --- a/packages/examples/packages/get-file/snap.manifest.json +++ b/packages/examples/packages/get-file/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "20Z28B/48X1gTo6V+RSFpx0BNs13lMwD8FE+NiDn18o=", + "shasum": "9T2t+DzkH3xJROpPsnq8AtXdlodTcsktjCPb6KPY4Vg=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/get-file/src/index.ts b/packages/examples/packages/get-file/src/index.ts index 4164c35834..ba4e4768c5 100644 --- a/packages/examples/packages/get-file/src/index.ts +++ b/packages/examples/packages/get-file/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -45,8 +44,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/home-page/snap.manifest.json b/packages/examples/packages/home-page/snap.manifest.json index 90f5cdbb81..1648ed420f 100644 --- a/packages/examples/packages/home-page/snap.manifest.json +++ b/packages/examples/packages/home-page/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "rZXPzEYUFk5k8lG85JaR11U4wombdIZ8xM3go7dyhhg=", + "shasum": "V/8JmQ8wclvOhR0UzGAHE5MrCHOsaOe26x7NwF0euXQ=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/images/package.json b/packages/examples/packages/images/package.json index c6fd8cfe56..bc3264399e 100644 --- a/packages/examples/packages/images/package.json +++ b/packages/examples/packages/images/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "uqr": "^0.1.2" }, diff --git a/packages/examples/packages/images/snap.manifest.json b/packages/examples/packages/images/snap.manifest.json index 2bc5eadc61..d47a9da412 100644 --- a/packages/examples/packages/images/snap.manifest.json +++ b/packages/examples/packages/images/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "YRGwMaOJHIRegfuR/LmMR+fs2pOi3Wg31Fh3Y/lOJfk=", + "shasum": "G8w1Dq52BAD6BnQB6sXCU74PoNGsbZPe73Bd8AczIOY=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/images/src/index.ts b/packages/examples/packages/images/src/index.ts index d0b3faec9c..b81544d0ea 100644 --- a/packages/examples/packages/images/src/index.ts +++ b/packages/examples/packages/images/src/index.ts @@ -1,4 +1,3 @@ -import { rpcErrors } from '@metamask/rpc-errors'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; import { DialogType, @@ -6,6 +5,7 @@ import { image, panel, text, + MethodNotFoundError, } from '@metamask/snaps-sdk'; import { renderSVG } from 'uqr'; @@ -75,8 +75,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json b/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json index f22d8abdf2..0e375cc33a 100644 --- a/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json +++ b/packages/examples/packages/invoke-snap/packages/consumer-signer/package.json @@ -32,7 +32,6 @@ }, "dependencies": { "@metamask/key-tree": "^9.0.0", - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^8.3.0", "@noble/hashes": "^1.3.1" diff --git a/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json b/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json index 193686d359..471ae9a0e1 100644 --- a/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json +++ b/packages/examples/packages/invoke-snap/packages/consumer-signer/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "Zul7ybCncDcgpTUpQNx0iTTvy97JNd0TIzM9QpzVROc=", + "shasum": "gUO4bvlK1uPxl2aWXwTYGif4jnv7NXA8ouaNNaEtEFM=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/invoke-snap/packages/consumer-signer/src/index.ts b/packages/examples/packages/invoke-snap/packages/consumer-signer/src/index.ts index 7cdf5ee47a..0e6a482ff5 100644 --- a/packages/examples/packages/invoke-snap/packages/consumer-signer/src/index.ts +++ b/packages/examples/packages/invoke-snap/packages/consumer-signer/src/index.ts @@ -1,5 +1,8 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { + InvalidParamsError, + MethodNotFoundError, + type OnRpcRequestHandler, +} from '@metamask/snaps-sdk'; import { assert, stringToBytes } from '@metamask/utils'; import { keccak_256 as keccak256 } from '@noble/hashes/sha3'; @@ -37,10 +40,9 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { assert( path[1] === `bip32:60'`, - rpcErrors.invalidParams({ - message: - "This snap only supports the Ethereum mainnet. Please use the `bip32:60'` coin type.", - }), + new InvalidParamsError( + "This snap only supports the Ethereum mainnet. Please use the `bip32:60'` coin type.", + ), ); const account = await snap.request({ @@ -75,8 +77,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/package.json b/packages/examples/packages/invoke-snap/packages/core-signer/package.json index b6c6a3b4bf..d9fbde11f7 100644 --- a/packages/examples/packages/invoke-snap/packages/core-signer/package.json +++ b/packages/examples/packages/invoke-snap/packages/core-signer/package.json @@ -32,7 +32,6 @@ }, "dependencies": { "@metamask/key-tree": "^9.0.0", - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^8.3.0", "@noble/curves": "^1.1.0", 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 index 3798234941..eb6d908c40 100644 --- 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": "RVmSqvKdYxv4Ws0cCtkepbmXnQ+6Wj0pJ+/NR0WhqiI=", + "shasum": "KXg6RghBRko7eF8C58uKc8XycWzOsrOsZ4sM2J6Z71w=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/invoke-snap/packages/core-signer/src/index.ts b/packages/examples/packages/invoke-snap/packages/core-signer/src/index.ts index fe879bc9e4..a00cb87a7e 100644 --- a/packages/examples/packages/invoke-snap/packages/core-signer/src/index.ts +++ b/packages/examples/packages/invoke-snap/packages/core-signer/src/index.ts @@ -1,4 +1,3 @@ -import { rpcErrors, providerErrors } from '@metamask/rpc-errors'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; import { DialogType, @@ -6,6 +5,8 @@ import { text, heading, copyable, + MethodNotFoundError, + UserRejectedRequestError, } from '@metamask/snaps-sdk'; import { add0x, assert, hexToBytes } from '@metamask/utils'; import { secp256k1 } from '@noble/curves/secp256k1'; @@ -68,7 +69,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { }); if (!approved) { - throw providerErrors.userRejectedRequest(); + throw new UserRejectedRequestError(); } const signature = secp256k1.sign( @@ -80,8 +81,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/json-rpc/package.json b/packages/examples/packages/json-rpc/package.json index 0a01fe6b1b..243de54ebc 100644 --- a/packages/examples/packages/json-rpc/package.json +++ b/packages/examples/packages/json-rpc/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/json-rpc/snap.manifest.json b/packages/examples/packages/json-rpc/snap.manifest.json index 49bd46e941..232637f0ca 100644 --- a/packages/examples/packages/json-rpc/snap.manifest.json +++ b/packages/examples/packages/json-rpc/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "CF4xhZoqnfJt0pjTffWtNKNr8k4YDXh9ZuaszgPvoUU=", + "shasum": "Mx480HPDox0SqOZDi2mLTqawI7GYoh3X8/aAnPdHM7Y=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/json-rpc/src/index.ts b/packages/examples/packages/json-rpc/src/index.ts index 573c7c1bbc..d964f20b27 100644 --- a/packages/examples/packages/json-rpc/src/index.ts +++ b/packages/examples/packages/json-rpc/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -59,10 +58,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { - method: request.method, - }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/lifecycle-hooks/snap.manifest.json b/packages/examples/packages/lifecycle-hooks/snap.manifest.json index f870f6c4ef..17944cbf4c 100644 --- a/packages/examples/packages/lifecycle-hooks/snap.manifest.json +++ b/packages/examples/packages/lifecycle-hooks/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "tKAO/jlBp3BZubiu2HrD1idkHDIRPh7sAhOw+7htEN4=", + "shasum": "FMHgDcOPDtPTfTMJuhJy71DMYhzZxsDYdpX4xfVXsJU=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/localization/package.json b/packages/examples/packages/localization/package.json index eaadd6bce8..6ac6929f5a 100644 --- a/packages/examples/packages/localization/package.json +++ b/packages/examples/packages/localization/package.json @@ -32,7 +32,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/localization/snap.manifest.json b/packages/examples/packages/localization/snap.manifest.json index b27498d25f..abb6b54a10 100644 --- a/packages/examples/packages/localization/snap.manifest.json +++ b/packages/examples/packages/localization/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "1ag+BcW+rfL1qTmpnMA+Sd0h57/sZoprFB4qMFXBmPE=", + "shasum": "HkEMOJcfQC+eYrIWPFYc4FtyQuNmJBS5MPGXu+luOS0=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/localization/src/index.ts b/packages/examples/packages/localization/src/index.ts index ff513c4ba3..473fc77efa 100644 --- a/packages/examples/packages/localization/src/index.ts +++ b/packages/examples/packages/localization/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; import { getMessage } from './locales'; @@ -20,8 +19,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { return await getMessage('hello'); default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/manage-state/package.json b/packages/examples/packages/manage-state/package.json index f894c76853..9ebdfa7512 100644 --- a/packages/examples/packages/manage-state/package.json +++ b/packages/examples/packages/manage-state/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/manage-state/snap.manifest.json b/packages/examples/packages/manage-state/snap.manifest.json index f9c3625fff..44d6fe225a 100644 --- 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": "GFuYJnitc0nYDwAD8jhGyCw/Ufc5Ai9RbJbFWpydlFM=", + "shasum": "GhEWeuSSjrBrsmDP+TZ93sumakRa0RpVyJZ57ltciBE=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/manage-state/src/index.ts b/packages/examples/packages/manage-state/src/index.ts index 1502445ecc..35cb7fac8b 100644 --- a/packages/examples/packages/manage-state/src/index.ts +++ b/packages/examples/packages/manage-state/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; import type { BaseParams, SetStateParams } from './types'; import { clearState, getState, setState } from './utils'; @@ -51,10 +50,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { - method: request.method, - }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/network-access/package.json b/packages/examples/packages/network-access/package.json index 1e5a1f6adf..b1afe143c1 100644 --- a/packages/examples/packages/network-access/package.json +++ b/packages/examples/packages/network-access/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^", "@metamask/utils": "^8.3.0" }, diff --git a/packages/examples/packages/network-access/snap.manifest.json b/packages/examples/packages/network-access/snap.manifest.json index 7facdbcd14..034ac22824 100644 --- a/packages/examples/packages/network-access/snap.manifest.json +++ b/packages/examples/packages/network-access/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "7TGnfMZy7JaBMNhA62f6lmXWojpzMVSuSkxaKqfyPw0=", + "shasum": "SEdw1D71hdQpfnOBION11gKcPQZEcTUBAdRMCsgWq+U=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/network-access/src/index.ts b/packages/examples/packages/network-access/src/index.ts index 96761f8f59..5ec4b65fd0 100644 --- a/packages/examples/packages/network-access/src/index.ts +++ b/packages/examples/packages/network-access/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; import { assert } from '@metamask/utils'; import type { FetchParams } from './types'; @@ -46,10 +45,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { } default: - throw rpcErrors.methodNotFound({ - data: { - method: request.method, - }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/notifications/package.json b/packages/examples/packages/notifications/package.json index 1761b0904a..3ab03683ac 100644 --- a/packages/examples/packages/notifications/package.json +++ b/packages/examples/packages/notifications/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/notifications/snap.manifest.json b/packages/examples/packages/notifications/snap.manifest.json index 65a1ace6a4..9d4e85db24 100644 --- 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": "QxqKMFGyTlsrrf7nDj/JlbQHDIF2l+eO2E5TttzMS64=", + "shasum": "dZB/j2sX42LBgSy7YLSBCfVerS18VoCTE95rHbO8ZuQ=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/notifications/src/index.ts b/packages/examples/packages/notifications/src/index.ts index 4ec8fdbb5d..35de2ea484 100644 --- a/packages/examples/packages/notifications/src/index.ts +++ b/packages/examples/packages/notifications/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import { NotificationType } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, NotificationType } from '@metamask/snaps-sdk'; import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; /** @@ -45,8 +44,6 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ }); default: - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/rollup-plugin/package.json b/packages/examples/packages/rollup-plugin/package.json index cde7981204..97c5df2e92 100644 --- a/packages/examples/packages/rollup-plugin/package.json +++ b/packages/examples/packages/rollup-plugin/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/rollup-plugin/snap.manifest.json b/packages/examples/packages/rollup-plugin/snap.manifest.json index 8b4bc4e7d0..8d2fd4e176 100644 --- a/packages/examples/packages/rollup-plugin/snap.manifest.json +++ b/packages/examples/packages/rollup-plugin/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "cEOhXVkVM8rFpw50WpsE0Xyk+ka1f8FwdOdUvqQZ8ZY=", + "shasum": "4AhZwdLifuJG73BY2zQ+/tFxsdy6GJrjuMq5wpJAl/c=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/rollup-plugin/src/index.ts b/packages/examples/packages/rollup-plugin/src/index.ts index 4c03a59b17..d6f7074273 100644 --- a/packages/examples/packages/rollup-plugin/src/index.ts +++ b/packages/examples/packages/rollup-plugin/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -20,10 +19,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { case 'hello': return 'Hello from Rollup!'; - default: { - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); - } + default: + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/packages/examples/packages/signature-insights/snap.manifest.json b/packages/examples/packages/signature-insights/snap.manifest.json index dce3c9e48b..f0ef3bb76f 100644 --- a/packages/examples/packages/signature-insights/snap.manifest.json +++ b/packages/examples/packages/signature-insights/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "Rt8Li02ub7KWGSrpOkrf+P+mSZEYyUsLCQAln3LhYB0=", + "shasum": "3FiXkxRZWJ/ZprhN86f08wfeym3zeZRmATdXkWc4O2g=", "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 index d2d2ead2f5..95cfc12765 100644 --- 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": "s1ibpWtsuA2ku7WoMzpBHBFH+qQ1b2DI7as9fGPjDBY=", + "shasum": "0UnWFeXWEUJnbP7SMDDSeP5cG2ghBKphr3hA2thd3TI=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/wasm/package.json b/packages/examples/packages/wasm/package.json index 7d9da86da0..7d6f93a959 100644 --- a/packages/examples/packages/wasm/package.json +++ b/packages/examples/packages/wasm/package.json @@ -32,7 +32,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/wasm/snap.manifest.json b/packages/examples/packages/wasm/snap.manifest.json index 142ae51ddb..c6fe37d592 100644 --- a/packages/examples/packages/wasm/snap.manifest.json +++ b/packages/examples/packages/wasm/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "eQZoypi/2K6+BnPVvcwOp3I8uwLKzbzLtAahPHVjOY0=", + "shasum": "Y+xkj0xUt84dxhfE8ZC2qSJOPB7L9YpDpEERoYnXO80=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/wasm/src/index.ts b/packages/examples/packages/wasm/src/index.ts index 6ad9e5e6f8..5c46be99de 100644 --- a/packages/examples/packages/wasm/src/index.ts +++ b/packages/examples/packages/wasm/src/index.ts @@ -1,5 +1,4 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { MethodNotFoundError, type OnRpcRequestHandler } from '@metamask/snaps-sdk'; // This is only imported for its type. It is not used at runtime. // eslint-disable-next-line import/order @@ -48,5 +47,5 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { return program[method](...params); } - throw rpcErrors.methodNotFound({ data: { method } }); + throw new MethodNotFoundError({ method: request.method }); }; diff --git a/packages/examples/packages/webpack-plugin/package.json b/packages/examples/packages/webpack-plugin/package.json index efa9a94c11..d03fa2d0e1 100644 --- a/packages/examples/packages/webpack-plugin/package.json +++ b/packages/examples/packages/webpack-plugin/package.json @@ -31,7 +31,6 @@ "lint:dependencies": "depcheck" }, "dependencies": { - "@metamask/rpc-errors": "^6.1.0", "@metamask/snaps-sdk": "workspace:^" }, "devDependencies": { diff --git a/packages/examples/packages/webpack-plugin/snap.manifest.json b/packages/examples/packages/webpack-plugin/snap.manifest.json index 0f03e3a5a4..417ee0ed41 100644 --- a/packages/examples/packages/webpack-plugin/snap.manifest.json +++ b/packages/examples/packages/webpack-plugin/snap.manifest.json @@ -7,7 +7,7 @@ "url": "https://github.com/MetaMask/snaps.git" }, "source": { - "shasum": "/VavUZScnoL4bo/YT3S9oYqrObstcmteBSglCFw46S0=", + "shasum": "SlOv3TFUXvECxiF0UzebngQL8MNENTo2X//5fwKODqc=", "location": { "npm": { "filePath": "dist/bundle.js", diff --git a/packages/examples/packages/webpack-plugin/src/index.ts b/packages/examples/packages/webpack-plugin/src/index.ts index 01148acbad..d8cf691baf 100644 --- a/packages/examples/packages/webpack-plugin/src/index.ts +++ b/packages/examples/packages/webpack-plugin/src/index.ts @@ -1,5 +1,7 @@ -import { rpcErrors } from '@metamask/rpc-errors'; -import type { OnRpcRequestHandler } from '@metamask/snaps-sdk'; +import { + MethodNotFoundError, + type OnRpcRequestHandler, +} from '@metamask/snaps-sdk'; /** * Handle incoming JSON-RPC requests from the dapp, sent through the @@ -20,10 +22,7 @@ export const onRpcRequest: OnRpcRequestHandler = async ({ request }) => { case 'hello': return 'Hello from Webpack!'; - default: { - throw rpcErrors.methodNotFound({ - data: { method: request.method }, - }); - } + default: + throw new MethodNotFoundError({ method: request.method }); } }; diff --git a/yarn.lock b/yarn.lock index eefa7c7a24..d09dc160bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3725,7 +3725,6 @@ __metadata: "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 "@metamask/key-tree": ^9.0.0 - "@metamask/rpc-errors": ^6.1.0 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -3766,7 +3765,6 @@ __metadata: "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 "@metamask/key-tree": ^9.0.0 - "@metamask/rpc-errors": ^6.1.0 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -3815,7 +3813,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -3853,7 +3850,6 @@ __metadata: "@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 "@metamask/snaps-browserify-plugin": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -3892,7 +3888,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -3931,7 +3926,6 @@ __metadata: "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 "@metamask/key-tree": ^9.0.0 - "@metamask/rpc-errors": ^6.1.0 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -3986,7 +3980,6 @@ __metadata: "@metamask/eslint-config-nodejs": ^12.1.0 "@metamask/eslint-config-typescript": ^12.1.0 "@metamask/key-tree": ^9.0.0 - "@metamask/rpc-errors": ^6.1.0 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4095,7 +4088,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4133,7 +4125,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4319,7 +4310,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4357,7 +4347,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4435,7 +4424,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4474,7 +4462,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4547,7 +4534,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4661,7 +4647,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4760,7 +4745,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4797,7 +4781,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4870,7 +4853,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -4908,7 +4890,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -5020,7 +5001,6 @@ __metadata: "@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 "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-rollup-plugin": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -5989,7 +5969,6 @@ __metadata: "@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 "@metamask/snaps-cli": "workspace:^" "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" @@ -6027,7 +6006,6 @@ __metadata: "@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 "@metamask/snaps-jest": "workspace:^" "@metamask/snaps-sdk": "workspace:^" "@metamask/snaps-webpack-plugin": "workspace:^"