From 0036869d84f5e497a046f3c4a30c66694fecd881 Mon Sep 17 00:00:00 2001 From: Vinicius Stevam Date: Wed, 20 Sep 2023 10:42:46 +0100 Subject: [PATCH 1/6] Refactor: Throw standardized RPC errors --- .../transaction-controller/src/utils.test.ts | 53 +++++++++++++++---- packages/transaction-controller/src/utils.ts | 15 +++--- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/packages/transaction-controller/src/utils.test.ts b/packages/transaction-controller/src/utils.test.ts index c326af2532..36bebd7b13 100644 --- a/packages/transaction-controller/src/utils.test.ts +++ b/packages/transaction-controller/src/utils.test.ts @@ -1,3 +1,4 @@ +import { ethErrors } from 'eth-rpc-errors'; import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker/dist/NonceTracker'; import type { @@ -49,19 +50,25 @@ describe('utils', () => { describe('validateTxParams', () => { it('should throw if no from address', () => { expect(() => util.validateTxParams({} as any)).toThrow( - 'Invalid "from" address: undefined must be a valid string.', + ethErrors.rpc.invalidParams( + 'Invalid "from" address: undefined must be a valid string.', + ), ); }); it('should throw if non-string from address', () => { expect(() => util.validateTxParams({ from: 1337 } as any)).toThrow( - 'Invalid "from" address: 1337 must be a valid string.', + ethErrors.rpc.invalidParams( + 'Invalid "from" address: 1337 must be a valid string.', + ), ); }); it('should throw if invalid from address', () => { expect(() => util.validateTxParams({ from: '1337' } as any)).toThrow( - 'Invalid "from" address: 1337 must be a valid string.', + ethErrors.rpc.invalidParams( + 'Invalid "from" address: 1337 must be a valid string.', + ), ); }); @@ -71,13 +78,21 @@ describe('utils', () => { from: '0x3244e191f1b4903970224322180f1fbbc415696b', to: '0x', } as any), - ).toThrow('Invalid "to" address: 0x must be a valid string.'); + ).toThrow( + ethErrors.rpc.invalidParams( + 'Invalid "to" address: 0x must be a valid string.', + ), + ); expect(() => util.validateTxParams({ from: '0x3244e191f1b4903970224322180f1fbbc415696b', } as any), - ).toThrow('Invalid "to" address: undefined must be a valid string.'); + ).toThrow( + ethErrors.rpc.invalidParams( + 'Invalid "to" address: undefined must be a valid string.', + ), + ); }); it('should delete data', () => { @@ -96,7 +111,11 @@ describe('utils', () => { from: '0x3244e191f1b4903970224322180f1fbbc415696b', to: '1337', } as any), - ).toThrow('Invalid "to" address: 1337 must be a valid string.'); + ).toThrow( + ethErrors.rpc.invalidParams( + 'Invalid "to" address: 1337 must be a valid string.', + ), + ); }); it('should throw if value is invalid', () => { @@ -106,7 +125,11 @@ describe('utils', () => { to: '0x3244e191f1b4903970224322180f1fbbc415696b', value: '133-7', } as any), - ).toThrow('Invalid "value": 133-7 is not a positive number.'); + ).toThrow( + ethErrors.rpc.invalidParams( + 'Invalid "value": 133-7 is not a positive number.', + ), + ); expect(() => util.validateTxParams({ @@ -114,7 +137,11 @@ describe('utils', () => { to: '0x3244e191f1b4903970224322180f1fbbc415696b', value: '133.7', } as any), - ).toThrow('Invalid "value": 133.7 number must be denominated in wei.'); + ).toThrow( + ethErrors.rpc.invalidParams( + 'Invalid "value": 133.7 number must be denominated in wei.', + ), + ); expect(() => util.validateTxParams({ @@ -122,7 +149,11 @@ describe('utils', () => { to: '0x3244e191f1b4903970224322180f1fbbc415696b', value: 'hello', } as any), - ).toThrow('Invalid "value": hello number must be a valid number.'); + ).toThrow( + ethErrors.rpc.invalidParams( + 'Invalid "value": hello number must be a valid number.', + ), + ); expect(() => util.validateTxParams({ @@ -131,7 +162,9 @@ describe('utils', () => { value: 'one million dollar$', } as any), ).toThrow( - 'Invalid "value": one million dollar$ number must be a valid number.', + ethErrors.rpc.invalidParams( + 'Invalid "value": one million dollar$ number must be a valid number.', + ), ); expect(() => diff --git a/packages/transaction-controller/src/utils.ts b/packages/transaction-controller/src/utils.ts index e3856f454c..b06d249353 100644 --- a/packages/transaction-controller/src/utils.ts +++ b/packages/transaction-controller/src/utils.ts @@ -3,6 +3,7 @@ import { isValidHexAddress, } from '@metamask/controller-utils'; import type { Hex } from '@metamask/utils'; +import { ethErrors } from 'eth-rpc-errors'; import { addHexPrefix, isHexString } from 'ethereumjs-util'; import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker/dist/NonceTracker'; @@ -60,7 +61,7 @@ export function validateTxParams(txParams: TransactionParams) { typeof txParams.from !== 'string' || !isValidHexAddress(txParams.from) ) { - throw new Error( + throw ethErrors.rpc.invalidParams( `Invalid "from" address: ${txParams.from} must be a valid string.`, ); } @@ -69,12 +70,12 @@ export function validateTxParams(txParams: TransactionParams) { if (txParams.data) { delete txParams.to; } else { - throw new Error( + throw ethErrors.rpc.invalidParams( `Invalid "to" address: ${txParams.to} must be a valid string.`, ); } } else if (txParams.to !== undefined && !isValidHexAddress(txParams.to)) { - throw new Error( + throw ethErrors.rpc.invalidParams( `Invalid "to" address: ${txParams.to} must be a valid string.`, ); } @@ -82,11 +83,13 @@ export function validateTxParams(txParams: TransactionParams) { if (txParams.value !== undefined) { const value = txParams.value.toString(); if (value.includes('-')) { - throw new Error(`Invalid "value": ${value} is not a positive number.`); + throw ethErrors.rpc.invalidParams( + `Invalid "value": ${value} is not a positive number.`, + ); } if (value.includes('.')) { - throw new Error( + throw ethErrors.rpc.invalidParams( `Invalid "value": ${value} number must be denominated in wei.`, ); } @@ -97,7 +100,7 @@ export function validateTxParams(txParams: TransactionParams) { !isNaN(Number(value)) && Number.isSafeInteger(intValue); if (!isValid) { - throw new Error( + throw ethErrors.rpc.invalidParams( `Invalid "value": ${value} number must be a valid number.`, ); } From c989fdcb463c999862b3b7b1141bea4ad8830b6a Mon Sep 17 00:00:00 2001 From: Vinicius Stevam Date: Fri, 22 Sep 2023 13:13:13 +0100 Subject: [PATCH 2/6] use @metamask/rpc-errors to standardize errors --- packages/transaction-controller/package.json | 2 +- .../src/TransactionController.test.ts | 2 +- .../src/TransactionController.ts | 10 ++++----- .../src/external-transactions.test.ts | 12 +++++----- .../src/external-transactions.ts | 10 ++++----- .../transaction-controller/src/utils.test.ts | 22 +++++++++---------- packages/transaction-controller/src/utils.ts | 14 ++++++------ yarn.lock | 12 +++++++++- 8 files changed, 47 insertions(+), 37 deletions(-) diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 348ab81905..a81ab47f73 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -35,10 +35,10 @@ "@metamask/controller-utils": "^4.3.2", "@metamask/eth-query": "^3.0.1", "@metamask/network-controller": "^12.1.2", + "@metamask/rpc-errors": "^5.1.1", "@metamask/utils": "^6.2.0", "async-mutex": "^0.2.6", "eth-method-registry": "1.1.0", - "eth-rpc-errors": "^4.0.2", "ethereumjs-util": "^7.0.10", "fast-json-patch": "^3.1.1", "lodash": "^4.17.21", diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index 60d1e15ae6..e54bbd7a79 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -13,7 +13,7 @@ import type { Provider, } from '@metamask/network-controller'; import { NetworkClientType, NetworkStatus } from '@metamask/network-controller'; -import { errorCodes } from 'eth-rpc-errors'; +import { errorCodes } from '@metamask/rpc-errors'; import HttpProvider from 'ethjs-provider-http'; import NonceTracker from 'nonce-tracker'; diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts index 061877914b..a398d6b151 100644 --- a/packages/transaction-controller/src/TransactionController.ts +++ b/packages/transaction-controller/src/TransactionController.ts @@ -30,10 +30,10 @@ import type { NetworkState, Provider, } from '@metamask/network-controller'; +import { errorCodes, rpcErrors, providerErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; import { Mutex } from 'async-mutex'; import MethodRegistry from 'eth-method-registry'; -import { errorCodes, ethErrors } from 'eth-rpc-errors'; import { addHexPrefix, bufferToHex } from 'ethereumjs-util'; import { EventEmitter } from 'events'; import { merge, pickBy } from 'lodash'; @@ -1166,7 +1166,7 @@ export class TransactionController extends BaseController< if (error.code === errorCodes.provider.userRejectedRequest) { this.cancelTransaction(transactionId); - throw ethErrors.provider.userRejectedRequest( + throw providerErrors.userRejectedRequest( 'User rejected the transaction', ); } else { @@ -1181,10 +1181,10 @@ export class TransactionController extends BaseController< switch (finalMeta?.status) { case TransactionStatus.failed: resultCallbacks?.error(finalMeta.error); - throw ethErrors.rpc.internal(finalMeta.error.message); + throw rpcErrors.internal(finalMeta.error.message); case TransactionStatus.cancelled: - const cancelError = ethErrors.rpc.internal( + const cancelError = rpcErrors.internal( 'User cancelled the transaction', ); @@ -1196,7 +1196,7 @@ export class TransactionController extends BaseController< return finalMeta.hash as string; default: - const internalError = ethErrors.rpc.internal( + const internalError = rpcErrors.internal( `MetaMask Tx Signature: Unknown problem: ${JSON.stringify( finalMeta || transactionId, )}`, diff --git a/packages/transaction-controller/src/external-transactions.test.ts b/packages/transaction-controller/src/external-transactions.test.ts index 959d693f18..477766e3cc 100644 --- a/packages/transaction-controller/src/external-transactions.test.ts +++ b/packages/transaction-controller/src/external-transactions.test.ts @@ -1,4 +1,4 @@ -import { ethErrors } from 'eth-rpc-errors'; +import { rpcErrors } from '@metamask/rpc-errors'; import { validateConfirmedExternalTransaction } from './external-transactions'; import type { TransactionMeta } from './types'; @@ -17,7 +17,7 @@ describe('validateConfirmedExternalTransaction', () => { expect(() => validateConfirmedExternalTransaction(undefined, [], []), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( '"transactionMeta" or "transactionMeta.txParams" is missing', ), ); @@ -25,7 +25,7 @@ describe('validateConfirmedExternalTransaction', () => { expect(() => validateConfirmedExternalTransaction({} as TransactionMeta, [], []), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( '"transactionMeta" or "transactionMeta.txParams" is missing', ), ); @@ -37,7 +37,7 @@ describe('validateConfirmedExternalTransaction', () => { '123', ); expect(() => validateConfirmedExternalTransaction(transactionMeta)).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'External transaction status should be "confirmed"', ), ); @@ -56,7 +56,7 @@ describe('validateConfirmedExternalTransaction', () => { expect(() => validateConfirmedExternalTransaction(transactionMeta, [], pendingTxs), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'External transaction nonce should not be in pending txs', ), ); @@ -75,7 +75,7 @@ describe('validateConfirmedExternalTransaction', () => { expect(() => validateConfirmedExternalTransaction(transactionMeta, confirmedTxs, []), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'External transaction nonce should not be in confirmed txs', ), ); diff --git a/packages/transaction-controller/src/external-transactions.ts b/packages/transaction-controller/src/external-transactions.ts index 0499b0deed..5326d78e2c 100644 --- a/packages/transaction-controller/src/external-transactions.ts +++ b/packages/transaction-controller/src/external-transactions.ts @@ -1,5 +1,5 @@ // These utility functions are exclusively used by `confirmExternalTransaction` method in controller -import { ethErrors } from 'eth-rpc-errors'; +import { rpcErrors } from '@metamask/rpc-errors'; import { TransactionStatus } from './types'; import type { TransactionMeta } from './types'; @@ -17,13 +17,13 @@ export function validateConfirmedExternalTransaction( pendingTxs?: TransactionMeta[], ) { if (!transactionMeta || !transactionMeta.txParams) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( '"transactionMeta" or "transactionMeta.txParams" is missing', ); } if (transactionMeta.status !== TransactionStatus.confirmed) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( 'External transaction status should be "confirmed"', ); } @@ -34,7 +34,7 @@ export function validateConfirmedExternalTransaction( (tx) => tx.txParams?.nonce === externalTxNonce, ); if (foundPendingTxByNonce) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( 'External transaction nonce should not be in pending txs', ); } @@ -45,7 +45,7 @@ export function validateConfirmedExternalTransaction( (tx) => tx.txParams?.nonce === externalTxNonce, ); if (foundConfirmedTxByNonce) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( 'External transaction nonce should not be in confirmed txs', ); } diff --git a/packages/transaction-controller/src/utils.test.ts b/packages/transaction-controller/src/utils.test.ts index 36bebd7b13..86353930ce 100644 --- a/packages/transaction-controller/src/utils.test.ts +++ b/packages/transaction-controller/src/utils.test.ts @@ -1,4 +1,4 @@ -import { ethErrors } from 'eth-rpc-errors'; +import { rpcErrors } from '@metamask/rpc-errors'; import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker/dist/NonceTracker'; import type { @@ -50,7 +50,7 @@ describe('utils', () => { describe('validateTxParams', () => { it('should throw if no from address', () => { expect(() => util.validateTxParams({} as any)).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "from" address: undefined must be a valid string.', ), ); @@ -58,7 +58,7 @@ describe('utils', () => { it('should throw if non-string from address', () => { expect(() => util.validateTxParams({ from: 1337 } as any)).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "from" address: 1337 must be a valid string.', ), ); @@ -66,7 +66,7 @@ describe('utils', () => { it('should throw if invalid from address', () => { expect(() => util.validateTxParams({ from: '1337' } as any)).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "from" address: 1337 must be a valid string.', ), ); @@ -79,7 +79,7 @@ describe('utils', () => { to: '0x', } as any), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "to" address: 0x must be a valid string.', ), ); @@ -89,7 +89,7 @@ describe('utils', () => { from: '0x3244e191f1b4903970224322180f1fbbc415696b', } as any), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "to" address: undefined must be a valid string.', ), ); @@ -112,7 +112,7 @@ describe('utils', () => { to: '1337', } as any), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "to" address: 1337 must be a valid string.', ), ); @@ -126,7 +126,7 @@ describe('utils', () => { value: '133-7', } as any), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "value": 133-7 is not a positive number.', ), ); @@ -138,7 +138,7 @@ describe('utils', () => { value: '133.7', } as any), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "value": 133.7 number must be denominated in wei.', ), ); @@ -150,7 +150,7 @@ describe('utils', () => { value: 'hello', } as any), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "value": hello number must be a valid number.', ), ); @@ -162,7 +162,7 @@ describe('utils', () => { value: 'one million dollar$', } as any), ).toThrow( - ethErrors.rpc.invalidParams( + rpcErrors.invalidParams( 'Invalid "value": one million dollar$ number must be a valid number.', ), ); diff --git a/packages/transaction-controller/src/utils.ts b/packages/transaction-controller/src/utils.ts index b06d249353..b0214f8433 100644 --- a/packages/transaction-controller/src/utils.ts +++ b/packages/transaction-controller/src/utils.ts @@ -2,8 +2,8 @@ import { convertHexToDecimal, isValidHexAddress, } from '@metamask/controller-utils'; +import { rpcErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; -import { ethErrors } from 'eth-rpc-errors'; import { addHexPrefix, isHexString } from 'ethereumjs-util'; import type { Transaction as NonceTrackerTransaction } from 'nonce-tracker/dist/NonceTracker'; @@ -61,7 +61,7 @@ export function validateTxParams(txParams: TransactionParams) { typeof txParams.from !== 'string' || !isValidHexAddress(txParams.from) ) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( `Invalid "from" address: ${txParams.from} must be a valid string.`, ); } @@ -70,12 +70,12 @@ export function validateTxParams(txParams: TransactionParams) { if (txParams.data) { delete txParams.to; } else { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( `Invalid "to" address: ${txParams.to} must be a valid string.`, ); } } else if (txParams.to !== undefined && !isValidHexAddress(txParams.to)) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( `Invalid "to" address: ${txParams.to} must be a valid string.`, ); } @@ -83,13 +83,13 @@ export function validateTxParams(txParams: TransactionParams) { if (txParams.value !== undefined) { const value = txParams.value.toString(); if (value.includes('-')) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( `Invalid "value": ${value} is not a positive number.`, ); } if (value.includes('.')) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( `Invalid "value": ${value} number must be denominated in wei.`, ); } @@ -100,7 +100,7 @@ export function validateTxParams(txParams: TransactionParams) { !isNaN(Number(value)) && Number.isSafeInteger(intValue); if (!isValid) { - throw ethErrors.rpc.invalidParams( + throw rpcErrors.invalidParams( `Invalid "value": ${value} number must be a valid number.`, ); } diff --git a/yarn.lock b/yarn.lock index 3da6f6a99a..21552568d3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2048,6 +2048,16 @@ __metadata: languageName: node linkType: hard +"@metamask/rpc-errors@npm:^6.0.0": + version: 6.0.0 + resolution: "@metamask/rpc-errors@npm:6.0.0" + dependencies: + "@metamask/utils": ^8.0.0 + fast-safe-stringify: ^2.0.6 + checksum: 7e1ee1a98972266af4a34f0bbc842cdc11dc565056f0b8fbc93aa95663a7027eab8ff1fecbe3e09c38a1dc199f8219a6c69b2237015b2fdb8de0e5b35027c3f8 + languageName: node + linkType: hard + "@metamask/safe-event-emitter@npm:^2.0.0": version: 2.0.0 resolution: "@metamask/safe-event-emitter@npm:2.0.0" @@ -2142,6 +2152,7 @@ __metadata: "@metamask/controller-utils": ^4.3.2 "@metamask/eth-query": ^3.0.1 "@metamask/network-controller": ^12.1.2 + "@metamask/rpc-errors": ^6.0.0 "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 @@ -2149,7 +2160,6 @@ __metadata: babel-runtime: ^6.26.0 deepmerge: ^4.2.2 eth-method-registry: 1.1.0 - eth-rpc-errors: ^4.0.2 ethereumjs-util: ^7.0.10 ethjs-provider-http: ^0.1.6 fast-json-patch: ^3.1.1 From 1c7e573e86a39839b137cd043c44c5ff6543ab36 Mon Sep 17 00:00:00 2001 From: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com> Date: Mon, 25 Sep 2023 09:08:35 +0100 Subject: [PATCH 3/6] Update packages/transaction-controller/package.json Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com> --- packages/transaction-controller/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 42e44f25dd..eacafff98d 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -35,7 +35,7 @@ "@metamask/controller-utils": "^4.3.2", "@metamask/eth-query": "^3.0.1", "@metamask/network-controller": "^12.2.0", - "@metamask/rpc-errors": "^5.1.1", + "@metamask/rpc-errors": "^6.0.0", "@metamask/utils": "^6.2.0", "async-mutex": "^0.2.6", "eth-method-registry": "1.1.0", From ca1900fa2c96864144ef63875ec311fc643b0ce9 Mon Sep 17 00:00:00 2001 From: Vinicius Stevam Date: Mon, 25 Sep 2023 09:31:42 +0100 Subject: [PATCH 4/6] update yarn.lock --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 0ca0555fd8..6820cdeddb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2562,7 +2562,7 @@ __metadata: "@metamask/eth-query": ^3.0.1 "@metamask/metamask-eth-abis": ^3.0.0 "@metamask/network-controller": ^12.2.0 - "@metamask/rpc-errors": ^5.1.1 + "@metamask/rpc-errors": ^6.0.0 "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 From 919d77bdcd574385de273a7c7031596dfc392f13 Mon Sep 17 00:00:00 2001 From: Vinicius Stevam Date: Mon, 25 Sep 2023 09:46:29 +0100 Subject: [PATCH 5/6] revert rpc-errors due constraint incompatibility --- packages/transaction-controller/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index f0682f6dba..5c82a8c226 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -37,7 +37,7 @@ "@metamask/eth-query": "^3.0.1", "@metamask/metamask-eth-abis": "^3.0.0", "@metamask/network-controller": "^12.2.0", - "@metamask/rpc-errors": "^6.0.0", + "@metamask/rpc-errors": "^5.1.1", "@metamask/utils": "^6.2.0", "async-mutex": "^0.2.6", "eth-method-registry": "1.1.0", diff --git a/yarn.lock b/yarn.lock index 6820cdeddb..0ca0555fd8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2562,7 +2562,7 @@ __metadata: "@metamask/eth-query": ^3.0.1 "@metamask/metamask-eth-abis": ^3.0.0 "@metamask/network-controller": ^12.2.0 - "@metamask/rpc-errors": ^6.0.0 + "@metamask/rpc-errors": ^5.1.1 "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 From 094c55ddf874b07ce9f0f8d8922ccf04d3fc98ba Mon Sep 17 00:00:00 2001 From: Vinicius Stevam Date: Mon, 25 Sep 2023 10:40:34 +0100 Subject: [PATCH 6/6] bump rpc-errors to v6 --- packages/assets-controllers/package.json | 2 +- packages/transaction-controller/package.json | 2 +- yarn.lock | 14 ++------------ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 27f37b2f78..f98da98503 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -41,7 +41,7 @@ "@metamask/metamask-eth-abis": "3.0.0", "@metamask/network-controller": "^12.2.0", "@metamask/preferences-controller": "^4.4.0", - "@metamask/rpc-errors": "^5.1.1", + "@metamask/rpc-errors": "^6.0.0", "@metamask/utils": "^6.2.0", "@types/uuid": "^8.3.0", "abort-controller": "^3.0.0", diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 5c82a8c226..f0682f6dba 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -37,7 +37,7 @@ "@metamask/eth-query": "^3.0.1", "@metamask/metamask-eth-abis": "^3.0.0", "@metamask/network-controller": "^12.2.0", - "@metamask/rpc-errors": "^5.1.1", + "@metamask/rpc-errors": "^6.0.0", "@metamask/utils": "^6.2.0", "async-mutex": "^0.2.6", "eth-method-registry": "1.1.0", diff --git a/yarn.lock b/yarn.lock index 3ef6bb0d87..330c134c93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1402,7 +1402,7 @@ __metadata: "@metamask/metamask-eth-abis": 3.0.0 "@metamask/network-controller": ^12.2.0 "@metamask/preferences-controller": ^4.4.0 - "@metamask/rpc-errors": ^5.1.1 + "@metamask/rpc-errors": ^6.0.0 "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 @@ -2224,16 +2224,6 @@ __metadata: languageName: unknown linkType: soft -"@metamask/rpc-errors@npm:^5.1.1": - version: 5.1.1 - resolution: "@metamask/rpc-errors@npm:5.1.1" - dependencies: - "@metamask/utils": ^5.0.0 - fast-safe-stringify: ^2.0.6 - checksum: ccd1b24da66af3ae63960b79c04b86efb8b96acb89ca6f7e0bbfe636d23ba5cddeba533c0692eafb87c44ec6f840085372d0f21b39e05df9a80700ff61538a30 - languageName: node - linkType: hard - "@metamask/rpc-errors@npm:^6.0.0": version: 6.0.0 resolution: "@metamask/rpc-errors@npm:6.0.0" @@ -2564,7 +2554,7 @@ __metadata: "@metamask/eth-query": ^3.0.1 "@metamask/metamask-eth-abis": ^3.0.0 "@metamask/network-controller": ^12.2.0 - "@metamask/rpc-errors": ^5.1.1 + "@metamask/rpc-errors": ^6.0.0 "@metamask/utils": ^6.2.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24