fix(deps): eth-rpc-errors@^4.0.3 -> @metamask/rpc-errors@^6.2.1

app/components/UI/Transactions/index.js

@@ -52,7 +52,7 @@ import RetryModal from './RetryModal';
 import PriceChartContext, {
   PriceChartProvider,
 } from '../AssetOverview/PriceChart/PriceChart.context';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 import {
   selectConversionRate,
   selectCurrentCurrency,
@@ -578,7 +578,7 @@ class Transactions extends PureComponent {
   cancelUnsignedQRTransaction = async (tx) => {
     await Engine.context.ApprovalController.reject(
       tx.id,
-      ethErrors.provider.userRejectedRequest(),
+      providerErrors.userRejectedRequest(),
     );
   };
 

app/components/Views/confirmations/Approval/index.js

@@ -41,7 +41,7 @@ import {
   selectProviderType,
 } from '../../../../selectors/networkController';
 import { selectSelectedAddress } from '../../../../selectors/preferencesController';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 import { getLedgerKeyring } from '../../../../core/Ledger/Ledger';
 import ExtendedKeyringTypes from '../../../../constants/keyringTypes';
 import { getBlockaidMetricsParams } from '../../../../util/blockaid';
@@ -153,7 +153,7 @@ class Approval extends PureComponent {
         } else {
           Engine.rejectPendingApproval(
             transaction?.id,
-            ethErrors.provider.userRejectedRequest(),
+            providerErrors.userRejectedRequest(),
             {
               ignoreMissing: true,
               logErrors: false,
@@ -197,7 +197,7 @@ class Approval extends PureComponent {
         if (transaction?.id && this.isTxStatusCancellable(currentTransaction)) {
           Engine.rejectPendingApproval(
             transaction.id,
-            ethErrors.provider.userRejectedRequest(),
+            providerErrors.userRejectedRequest(),
             {
               ignoreMissing: true,
               logErrors: false,

app/components/Views/confirmations/ApproveView/Approve/index.js

@@ -69,7 +69,7 @@ import {
 } from '../../../../../selectors/accountTrackerController';
 import ShowBlockExplorer from '../../components/ApproveTransactionReview/ShowBlockExplorer';
 import createStyles from './styles';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 import { getLedgerKeyring } from '../../../../../core/Ledger/Ledger';
 import ExtendedKeyringTypes from '../../../../../constants/keyringTypes';
 import { updateTransaction } from '../../../../../util/transaction-controller';
@@ -337,7 +337,7 @@ class Approve extends PureComponent {
       if (!approved)
         Engine.rejectPendingApproval(
           transaction.id,
-          ethErrors.provider.userRejectedRequest(),
+          providerErrors.userRejectedRequest(),
           {
             ignoreMissing: true,
             logErrors: false,
@@ -351,7 +351,7 @@ class Approve extends PureComponent {
       const { transaction } = this.props;
       Engine.rejectPendingApproval(
         transaction?.id,
-        ethErrors.provider.userRejectedRequest(),
+        providerErrors.userRejectedRequest(),
         {
           ignoreMissing: true,
           logErrors: false,
@@ -594,7 +594,7 @@ class Approve extends PureComponent {
     const { metrics, hideModal } = this.props;
     Engine.rejectPendingApproval(
       this.props.transaction.id,
-      ethErrors.provider.userRejectedRequest(),
+      providerErrors.userRejectedRequest(),
       {
         ignoreMissing: true,
         logErrors: false,

app/components/Views/confirmations/Send/index.js

@@ -60,7 +60,7 @@ import {
   selectIdentities,
   selectSelectedAddress,
 } from '../../../../selectors/preferencesController';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 import { withMetricsAwareness } from '../../../../components/hooks/useMetrics';
 
 const REVIEW = 'review';
@@ -520,7 +520,7 @@ class Send extends PureComponent {
   onCancel = (id) => {
     Engine.context.ApprovalController.reject(
       id,
-      ethErrors.provider.userRejectedRequest(),
+      providerErrors.userRejectedRequest(),
     );
     this.props.navigation.pop();
     this.unmountHandled = true;

app/components/Views/confirmations/hooks/useApprovalRequest.test.ts

@@ -2,7 +2,7 @@ import { ApprovalControllerState } from '@metamask/approval-controller';
 import { useSelector } from 'react-redux';
 import useApprovalRequest from './useApprovalRequest';
 import Engine from '../../../../core/Engine';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
@@ -143,7 +143,7 @@ describe('useApprovalRequest', () => {
       expect(Engine.rejectPendingApproval).toHaveBeenCalledTimes(1);
       expect(Engine.rejectPendingApproval).toHaveBeenCalledWith(
         APPROVAL_REQUEST.id,
-        ethErrors.provider.userRejectedRequest(),
+        providerErrors.userRejectedRequest(),
       );
     });
 

app/components/Views/confirmations/hooks/useApprovalRequest.ts

@@ -1,6 +1,6 @@
 import Engine from '../../../../core/Engine';
 import { useCallback } from 'react';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 import { useSelector } from 'react-redux';
 import { selectPendingApprovals } from '../../../../selectors/approvalController';
 import { cloneDeep, isEqual } from 'lodash';
@@ -36,7 +36,7 @@ const useApprovalRequest = () => {
 
     Engine.rejectPendingApproval(
       approvalRequest.id,
-      ethErrors.provider.userRejectedRequest(),
+      providerErrors.userRejectedRequest(),
     );
   }, [approvalRequest]);
 

app/core/Engine.ts

@@ -171,7 +171,7 @@ import {
 import { hasProperty, Json } from '@metamask/utils';
 // TODO: Export this type from the package directly
 import { SwapsState } from '@metamask/swaps-controller/dist/SwapsController';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 
 import { PPOM, ppomInit } from '../lib/ppom/PPOMView';
 import RNFSStorageBackend from '../lib/ppom/ppom-storage-backend';
@@ -1549,7 +1549,7 @@ class Engine {
 
   rejectPendingApproval(
     id: string,
-    reason: Error = ethErrors.provider.userRejectedRequest(),
+    reason: Error = providerErrors.userRejectedRequest(),
     opts: { ignoreMissing?: boolean; logErrors?: boolean } = {},
   ) {
     const { ApprovalController } = this.context;

app/core/Permissions/index.ts

@@ -1,4 +1,4 @@
-import { errorCodes as rpcErrorCodes } from 'eth-rpc-errors';
+import { errorCodes as rpcErrorCodes } from '@metamask/rpc-errors';
 import { orderBy } from 'lodash';
 import { RestrictedMethods, CaveatTypes } from './constants';
 import ImportedEngine from '../Engine';

app/core/RPCMethods/RPCMethodMiddleware.test.ts

@@ -8,7 +8,7 @@ import {
 } from 'json-rpc-engine';
 import type { Transaction } from '@metamask/transaction-controller';
 import type { ProviderConfig } from '@metamask/network-controller';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors, rpcErrors } from '@metamask/rpc-errors';
 import Engine from '../Engine';
 import { store } from '../../store';
 import { getPermittedAccounts } from '../Permissions';
@@ -572,7 +572,7 @@ describe('getRpcMethodMiddleware', () => {
           method: 'eth_sendTransaction',
           params: [mockTransactionParameters],
         };
-        const expectedError = ethErrors.provider.userRejectedRequest();
+        const expectedError = providerErrors.userRejectedRequest();
 
         const response = await callMiddleware({ middleware, request });
 
@@ -611,7 +611,7 @@ describe('getRpcMethodMiddleware', () => {
           method: 'eth_sendTransaction',
           params: [mockTransactionParameters],
         };
-        const expectedError = ethErrors.rpc.invalidParams({
+        const expectedError = rpcErrors.invalidParams({
           message: `Invalid parameters: must provide an Ethereum address.`,
         });
 
@@ -684,7 +684,7 @@ describe('getRpcMethodMiddleware', () => {
           method: 'eth_sendTransaction',
           params: [mockTransactionParameters],
         };
-        const expectedError = ethErrors.rpc.invalidParams({
+        const expectedError = rpcErrors.invalidParams({
           message: `Invalid parameters: must provide an Ethereum address.`,
         });
 
@@ -759,7 +759,7 @@ describe('getRpcMethodMiddleware', () => {
           method: 'eth_sendTransaction',
           params: [mockTransactionParameters],
         };
-        const expectedError = ethErrors.rpc.invalidParams({
+        const expectedError = rpcErrors.invalidParams({
           message: `Invalid parameters: must provide an Ethereum address.`,
         });
 
@@ -845,7 +845,7 @@ describe('getRpcMethodMiddleware', () => {
         method: 'eth_sendTransaction',
         params: [mockTransactionParameters],
       };
-      const expectedError = ethErrors.rpc.internal('Failed to add transaction');
+      const expectedError = rpcErrors.internal('Failed to add transaction');
 
       const response = await callMiddleware({ middleware, request });
 
@@ -874,9 +874,7 @@ describe('getRpcMethodMiddleware', () => {
         method: 'eth_sendTransaction',
         params: [mockTransactionParameters],
       };
-      const expectedError = ethErrors.rpc.internal(
-        'Failed to process transaction',
-      );
+      const expectedError = rpcErrors.internal('Failed to process transaction');
 
       const response = await callMiddleware({ middleware, request });
 
@@ -949,9 +947,7 @@ describe('getRpcMethodMiddleware', () => {
         method: 'personal_ecRecover',
         params: [helloWorldMessage],
       };
-      const expectedError = ethErrors.rpc.internal(
-        'Missing signature parameter',
-      );
+      const expectedError = rpcErrors.internal('Missing signature parameter');
 
       const response = await callMiddleware({ middleware, request });
 
@@ -972,7 +968,7 @@ describe('getRpcMethodMiddleware', () => {
         method: 'personal_ecRecover',
         params: [undefined, helloWorldSignature],
       };
-      const expectedError = ethErrors.rpc.internal('Missing data parameter');
+      const expectedError = rpcErrors.internal('Missing data parameter');
 
       const response = await callMiddleware({ middleware, request });
 

app/core/RPCMethods/RPCMethodMiddleware.ts

@@ -4,7 +4,7 @@ import {
   createAsyncMiddleware,
   JsonRpcEngineCallbackError,
 } from 'json-rpc-engine';
-import { ethErrors } from 'eth-rpc-errors';
+import { providerErrors, rpcErrors } from '@metamask/rpc-errors';
 import {
   EndFlowOptions,
   StartFlowOptions,
@@ -146,14 +146,14 @@ export const checkActiveAccountAndChainId = async ({
       isInvalidAccount = true;
       if (accounts.length > 0) {
         // Permissions issue --- requesting incorrect address
-        throw ethErrors.rpc.invalidParams({
+        throw rpcErrors.invalidParams({
           message: `Invalid parameters: must provide a permitted Ethereum address.`,
         });
       }
     }
 
     if (isInvalidAccount) {
-      throw ethErrors.rpc.invalidParams({
+      throw rpcErrors.invalidParams({
         message: `Invalid parameters: must provide an Ethereum address.`,
       });
     }
@@ -190,7 +190,7 @@ export const checkActiveAccountAndChainId = async ({
       Alert.alert(
         `Active chainId is ${activeChainId} but received ${chainIdRequest}`,
       );
-      throw ethErrors.rpc.invalidParams({
+      throw rpcErrors.invalidParams({
         message: `Invalid parameters: active chainId is different than the one provided.`,
       });
     }
@@ -317,7 +317,7 @@ export const getRpcMethodMiddleware = ({
       if (!tabId) return true;
       const { browser } = store.getState();
       if (tabId !== browser.activeTab)
-        throw ethErrors.provider.userRejectedRequest();
+        throw providerErrors.userRejectedRequest();
     };
 
     const getSource = () => {
@@ -330,7 +330,7 @@ export const getRpcMethodMiddleware = ({
     const startApprovalFlow = (opts: StartFlowOptions) => {
       checkTabActive();
       Engine.context.ApprovalController.clear(
-        ethErrors.provider.userRejectedRequest(),
+        providerErrors.userRejectedRequest(),
       );
 
       return Engine.context.ApprovalController.startFlow(opts);
@@ -348,7 +348,7 @@ export const getRpcMethodMiddleware = ({
     const requestUserApproval = async ({ type = '', requestData = {} }) => {
       checkTabActive();
       await Engine.context.ApprovalController.clear(
-        ethErrors.provider.userRejectedRequest(),
+        providerErrors.userRejectedRequest(),
       );
 
       const responseData = await Engine.context.ApprovalController.add({
@@ -528,7 +528,7 @@ export const getRpcMethodMiddleware = ({
           } catch (error) {
             DevLogger.log(`eth_requestAccounts error`, error);
             if (error) {
-              throw ethErrors.provider.userRejectedRequest(
+              throw providerErrors.userRejectedRequest(
                 'User denied account authorization.',
               );
             }
@@ -576,15 +576,15 @@ export const getRpcMethodMiddleware = ({
       eth_signTransaction: async () => {
         // This is implemented later in our middleware stack – specifically, in
         // eth-json-rpc-middleware – but our UI does not support it.
-        throw ethErrors.rpc.methodNotSupported();
+        throw rpcErrors.methodNotSupported();
       },
       eth_sign: async () => {
         const { SignatureController, PreferencesController } = Engine.context;
         const { disabledRpcMethodPreferences } = PreferencesController.state;
         const { eth_sign } = disabledRpcMethodPreferences;
 
         if (!eth_sign) {
-          throw ethErrors.rpc.methodNotFound(
+          throw rpcErrors.methodNotFound(
             'eth_sign has been disabled. You must enable it in the advanced settings',
           );
         }
@@ -620,7 +620,7 @@ export const getRpcMethodMiddleware = ({
           res.result = rawSig;
         } else {
           res.result = AppConstants.ETH_SIGN_ERROR;
-          throw ethErrors.rpc.invalidParams(AppConstants.ETH_SIGN_ERROR);
+          throw rpcErrors.invalidParams(AppConstants.ETH_SIGN_ERROR);
         }
       },
 
@@ -797,7 +797,7 @@ export const getRpcMethodMiddleware = ({
               resolve();
             },
             onScanError: (e: { toString: () => any }) => {
-              throw ethErrors.rpc.internal(e.toString());
+              throw rpcErrors.internal(e.toString());
             },
           });
         }),
@@ -808,7 +808,7 @@ export const getRpcMethodMiddleware = ({
       metamask_removeFavorite: async () => {
         checkTabActive();
         if (!isHomepage()) {
-          throw ethErrors.provider.unauthorized('Forbidden.');
+          throw providerErrors.unauthorized('Forbidden.');
         }
 
         const { bookmarks } = store.getState();
@@ -851,7 +851,7 @@ export const getRpcMethodMiddleware = ({
       metamask_showTutorial: async () => {
         checkTabActive();
         if (!isHomepage()) {
-          throw ethErrors.provider.unauthorized('Forbidden.');
+          throw providerErrors.unauthorized('Forbidden.');
         }
         wizardScrollAdjusted.current = false;
 
@@ -865,7 +865,7 @@ export const getRpcMethodMiddleware = ({
       metamask_showAutocomplete: async () => {
         checkTabActive();
         if (!isHomepage()) {
-          throw ethErrors.provider.unauthorized('Forbidden.');
+          throw providerErrors.unauthorized('Forbidden.');
         }
         fromHomepage.current = true;
         toggleUrlModal(true);