deps(approval-controller): move to @metamask/rpc-errors

package.json

@@ -41,7 +41,7 @@
     "@metamask/eslint-config-nodejs": "^12.0.0",
     "@metamask/eslint-config-typescript": "^12.0.0",
     "@metamask/eth-json-rpc-provider": "^1.0.0",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "@types/node": "^16.18.24",
     "@typescript-eslint/eslint-plugin": "^5.30.7",
     "@typescript-eslint/parser": "^5.30.7",

packages/accounts-controller/package.json

@@ -33,7 +33,7 @@
     "@metamask/eth-snap-keyring": "^0.2.2",
     "@metamask/keyring-api": "^0.2.5",
     "@metamask/snaps-utils": "^1.0.1",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "deepmerge": "^4.2.2",
     "eth-rpc-errors": "^4.0.2",
     "ethereumjs-util": "^7.0.10",

packages/address-book-controller/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "@metamask/base-controller": "^3.2.2",
     "@metamask/controller-utils": "^5.0.1",
-    "@metamask/utils": "^6.2.0"
+    "@metamask/utils": "^8.1.0"
   },
   "devDependencies": {
     "@metamask/auto-changelog": "^3.1.0",

packages/approval-controller/package.json

@@ -30,8 +30,8 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^3.2.2",
-    "@metamask/utils": "^6.2.0",
-    "eth-rpc-errors": "^4.0.2",
+    "@metamask/rpc-errors": "^6.0.0",
+    "@metamask/utils": "^8.1.0",
     "immer": "^9.0.6",
     "nanoid": "^3.1.31"
   },

packages/approval-controller/src/ApprovalController.test.ts

@@ -1,7 +1,7 @@
 /* eslint-disable jest/expect-expect */
 
 import { ControllerMessenger } from '@metamask/base-controller';
-import { errorCodes, EthereumRpcError } from 'eth-rpc-errors';
+import { errorCodes, JsonRpcError } from '@metamask/rpc-errors';
 
 import type {
   ApprovalControllerActions,
@@ -652,7 +652,7 @@ describe('approval controller', () => {
       approvalController.reject('2', new Error('foo'));
       expect(approvalController.getTotalApprovalCount()).toBe(2);
 
-      approvalController.clear(new EthereumRpcError(1, 'clear'));
+      approvalController.clear(new JsonRpcError(1, 'clear'));
       expect(approvalController.getTotalApprovalCount()).toBe(0);
     });
 
@@ -677,7 +677,7 @@ describe('approval controller', () => {
       approvalController.reject('2', new Error('foo'));
       expect(approvalController.getTotalApprovalCount()).toBe(1);
 
-      approvalController.clear(new EthereumRpcError(1, 'clear'));
+      approvalController.clear(new JsonRpcError(1, 'clear'));
       expect(approvalController.getTotalApprovalCount()).toBe(0);
     });
   });
@@ -1042,7 +1042,7 @@ describe('approval controller', () => {
   describe('clear', () => {
     it('does nothing if state is already empty', () => {
       expect(() =>
-        approvalController.clear(new EthereumRpcError(1, 'clear')),
+        approvalController.clear(new JsonRpcError(1, 'clear')),
       ).not.toThrow();
     });
 
@@ -1057,7 +1057,7 @@ describe('approval controller', () => {
         .add({ id: 'foo3', origin: 'fizz.buzz', type: 'myType' })
         .catch((_error) => undefined);
 
-      approvalController.clear(new EthereumRpcError(1, 'clear'));
+      approvalController.clear(new JsonRpcError(1, 'clear'));
 
       expect(
         approvalController.state[PENDING_APPROVALS_STORE_KEY],
@@ -1072,16 +1072,16 @@ describe('approval controller', () => {
         type: 'myType',
       });
 
-      approvalController.clear(new EthereumRpcError(1000, 'foo'));
+      approvalController.clear(new JsonRpcError(1000, 'foo'));
       await expect(rejectPromise).rejects.toThrow(
-        new EthereumRpcError(1000, 'foo'),
+        new JsonRpcError(1000, 'foo'),
       );
     });
 
     it('does not clear approval flows', async () => {
       approvalController.startFlow();
 
-      approvalController.clear(new EthereumRpcError(1, 'clear'));
+      approvalController.clear(new JsonRpcError(1, 'clear'));
 
       expect(approvalController.state[APPROVAL_FLOWS_STORE_KEY]).toHaveLength(
         1,

packages/approval-controller/src/ApprovalController.ts

@@ -1,8 +1,8 @@
 import type { RestrictedControllerMessenger } from '@metamask/base-controller';
 import { BaseControllerV2 } from '@metamask/base-controller';
+import type { JsonRpcError, DataWithOptionalCause } from '@metamask/rpc-errors';
+import { rpcErrors } from '@metamask/rpc-errors';
 import type { Json, OptionalField } from '@metamask/utils';
-import type { EthereumRpcError } from 'eth-rpc-errors';
-import { ethErrors } from 'eth-rpc-errors';
 import type { Patch } from 'immer';
 import { nanoid } from 'nanoid';
 
@@ -256,7 +256,7 @@ export type GetApprovalsState = {
 
 export type ClearApprovalRequests = {
   type: `${typeof controllerName}:clearRequests`;
-  handler: (error: EthereumRpcError<unknown>) => void;
+  handler: (error: JsonRpcError<DataWithOptionalCause>) => void;
 };
 
 export type AddApprovalRequest = {
@@ -719,10 +719,10 @@ export class ApprovalController extends BaseControllerV2<
   /**
    * Rejects and deletes all approval requests.
    *
-   * @param rejectionError - The EthereumRpcError to reject the approval
+   * @param rejectionError - The JsonRpcError to reject the approval
    * requests with.
    */
-  clear(rejectionError: EthereumRpcError<unknown>): void {
+  clear(rejectionError: JsonRpcError<DataWithOptionalCause>): void {
     for (const id of this.#approvals.keys()) {
       this.reject(id, rejectionError);
     }
@@ -878,7 +878,7 @@ export class ApprovalController extends BaseControllerV2<
       !this.#typesExcludedFromRateLimiting.includes(type) &&
       this.has({ origin, type })
     ) {
-      throw ethErrors.rpc.resourceUnavailable(
+      throw rpcErrors.resourceUnavailable(
         getAlreadyPendingMessage(origin, type),
       );
     }
@@ -937,7 +937,7 @@ export class ApprovalController extends BaseControllerV2<
     }
 
     if (errorMessage) {
-      throw ethErrors.rpc.internal(errorMessage);
+      throw rpcErrors.internal(errorMessage);
     }
   }
 

packages/assets-controllers/package.json

@@ -43,7 +43,7 @@
     "@metamask/network-controller": "^13.0.1",
     "@metamask/preferences-controller": "^4.4.2",
     "@metamask/rpc-errors": "^6.0.0",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "@types/uuid": "^8.3.0",
     "async-mutex": "^0.2.6",
     "ethereumjs-util": "^7.0.10",

packages/base-controller/package.json

@@ -29,7 +29,7 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "immer": "^9.0.6"
   },
   "devDependencies": {

packages/controller-utils/package.json

@@ -30,10 +30,9 @@
   },
   "dependencies": {
     "@metamask/eth-query": "^3.0.1",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "@spruceid/siwe-parser": "1.1.3",
     "eth-ens-namehash": "^2.0.8",
-    "eth-rpc-errors": "^4.0.2",
     "ethereumjs-util": "^7.0.10",
     "ethjs-unit": "^0.1.6",
     "fast-deep-equal": "^3.1.3"

packages/ens-controller/package.json

@@ -33,7 +33,7 @@
     "@metamask/base-controller": "^3.2.2",
     "@metamask/controller-utils": "^5.0.1",
     "@metamask/network-controller": "^13.0.1",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "ethereum-ens-network-map": "^1.0.2",
     "punycode": "^2.1.1"
   },

packages/gas-fee-controller/package.json

@@ -33,7 +33,7 @@
     "@metamask/controller-utils": "^5.0.1",
     "@metamask/eth-query": "^3.0.1",
     "@metamask/network-controller": "^13.0.1",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "@types/uuid": "^8.3.0",
     "ethereumjs-util": "^7.0.10",
     "ethjs-unit": "^0.1.6",

packages/keyring-controller/package.json

@@ -34,7 +34,7 @@
     "@metamask/eth-keyring-controller": "^13.0.1",
     "@metamask/message-manager": "^7.3.4",
     "@metamask/preferences-controller": "^4.4.2",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "async-mutex": "^0.2.6",
     "ethereumjs-util": "^7.0.10",
     "ethereumjs-wallet": "^1.0.1",

packages/message-manager/package.json

@@ -32,7 +32,7 @@
     "@metamask/base-controller": "^3.2.2",
     "@metamask/controller-utils": "^5.0.1",
     "@metamask/eth-sig-util": "^7.0.0",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "@types/uuid": "^8.3.0",
     "ethereumjs-util": "^7.0.10",
     "jsonschema": "^1.2.4",

packages/name-controller/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^3.2.2",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "async-mutex": "^0.2.6",
     "immer": "^9.0.6"
   },

packages/network-controller/package.json

@@ -36,7 +36,7 @@
     "@metamask/eth-json-rpc-provider": "^1.0.0",
     "@metamask/eth-query": "^3.0.1",
     "@metamask/swappable-obj-proxy": "^2.1.0",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "async-mutex": "^0.2.6",
     "eth-block-tracker": "^7.0.1",
     "eth-rpc-errors": "^4.0.2",

packages/notification-controller/package.json

@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^3.2.2",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "immer": "^9.0.6",
     "nanoid": "^3.1.31"
   },

packages/permission-controller/package.json

@@ -32,7 +32,7 @@
     "@metamask/approval-controller": "^3.5.2",
     "@metamask/base-controller": "^3.2.2",
     "@metamask/controller-utils": "^5.0.1",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "@types/deep-freeze-strict": "^1.1.0",
     "deep-freeze-strict": "^1.1.1",
     "eth-rpc-errors": "^4.0.2",

packages/permission-controller/src/rpc-methods/getPermissions.ts

@@ -8,7 +8,7 @@ import { MethodNames } from '../utils';
 
 export const getPermissionsHandler: PermittedHandlerExport<
   GetPermissionsHooks,
-  undefined,
+  [],
   PermissionConstraint[]
 > = {
   methodNames: [MethodNames.getPermissions],

packages/polling-controller/package.json

@@ -32,7 +32,7 @@
     "@metamask/base-controller": "^3.2.2",
     "@metamask/controller-utils": "^5.0.1",
     "@metamask/network-controller": "^13.0.1",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "@types/uuid": "^8.3.0",
     "uuid": "^8.3.2"
   },

packages/signature-controller/package.json

@@ -34,7 +34,7 @@
     "@metamask/controller-utils": "^5.0.1",
     "@metamask/logging-controller": "^1.0.3",
     "@metamask/message-manager": "^7.3.4",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "eth-rpc-errors": "^4.0.2",
     "ethereumjs-util": "^7.0.10",
     "immer": "^9.0.6",

packages/transaction-controller/package.json

@@ -39,7 +39,7 @@
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/network-controller": "^13.0.1",
     "@metamask/rpc-errors": "^6.0.0",
-    "@metamask/utils": "^6.2.0",
+    "@metamask/utils": "^8.1.0",
     "async-mutex": "^0.2.6",
     "eth-method-registry": "1.1.0",
     "ethereumjs-util": "^7.0.10",