From ee8546af5b8f8b23651d27bac4186925342f743e Mon Sep 17 00:00:00 2001 From: Jongsun Suh <34228073+MajorLift@users.noreply.github.com> Date: Tue, 26 Sep 2023 12:12:54 -0700 Subject: [PATCH 1/2] Update `@metamask/utils` to ^8.1.0 in all subrepos --- package.json | 2 +- packages/accounts-controller/package.json | 2 +- packages/address-book-controller/package.json | 2 +- packages/approval-controller/package.json | 2 +- packages/assets-controllers/package.json | 2 +- packages/base-controller/package.json | 2 +- packages/controller-utils/package.json | 2 +- packages/ens-controller/package.json | 2 +- packages/gas-fee-controller/package.json | 2 +- packages/keyring-controller/package.json | 2 +- packages/message-manager/package.json | 2 +- packages/name-controller/package.json | 2 +- packages/network-controller/package.json | 2 +- packages/notification-controller/package.json | 2 +- packages/permission-controller/package.json | 2 +- packages/polling-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 2 +- yarn.lock | 38 +++++++++---------- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 27d57c51f3e..18bbfb48114 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,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", diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 24191d9ba33..8442387438f 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -32,7 +32,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", diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index a3e4afe7d22..9364550f58f 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -30,7 +30,7 @@ "dependencies": { "@metamask/base-controller": "^3.2.1", "@metamask/controller-utils": "^5.0.0", - "@metamask/utils": "^6.2.0" + "@metamask/utils": "^8.1.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.1.0", diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index 27657d4ed44..9b0a43ad34d 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@metamask/base-controller": "^3.2.1", - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "eth-rpc-errors": "^4.0.2", "immer": "^9.0.6", "nanoid": "^3.1.31" diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index ea014ec3cb3..53b5d98f351 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -42,7 +42,7 @@ "@metamask/network-controller": "^13.0.0", "@metamask/preferences-controller": "^4.4.1", "@metamask/rpc-errors": "^5.1.1", - "@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", diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index 9d67bb3ff51..82c07cfc0a0 100644 --- a/packages/base-controller/package.json +++ b/packages/base-controller/package.json @@ -28,7 +28,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "immer": "^9.0.6" }, "devDependencies": { diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 60904687711..9d373ce2a31 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -29,7 +29,7 @@ }, "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", diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json index 3edbe15d70d..4f72422a7e7 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -32,7 +32,7 @@ "@metamask/base-controller": "^3.2.1", "@metamask/controller-utils": "^5.0.0", "@metamask/network-controller": "^13.0.0", - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "ethereum-ens-network-map": "^1.0.2", "punycode": "^2.1.1" }, diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index e5d2de0a0c9..105a9dd7436 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -32,7 +32,7 @@ "@metamask/controller-utils": "^5.0.0", "@metamask/eth-query": "^3.0.1", "@metamask/network-controller": "^13.0.0", - "@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", diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index d2b33d2a8b4..96ccfebacf5 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -33,7 +33,7 @@ "@metamask/eth-keyring-controller": "^13.0.1", "@metamask/message-manager": "^7.3.3", "@metamask/preferences-controller": "^4.4.1", - "@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", diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index ac55fe711b7..f60ea399e3a 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -31,7 +31,7 @@ "@metamask/base-controller": "^3.2.1", "@metamask/controller-utils": "^5.0.0", "@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", diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json index 38a0f99f0fc..a8cc3e9f6d2 100644 --- a/packages/name-controller/package.json +++ b/packages/name-controller/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@metamask/base-controller": "^3.2.1", - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "async-mutex": "^0.2.6", "immer": "^9.0.6" }, diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 2ad3570d8b3..ebdd2a9a627 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -35,7 +35,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", diff --git a/packages/notification-controller/package.json b/packages/notification-controller/package.json index fea9e4f35c2..32cabd5c1a2 100644 --- a/packages/notification-controller/package.json +++ b/packages/notification-controller/package.json @@ -29,7 +29,7 @@ }, "dependencies": { "@metamask/base-controller": "^3.2.1", - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "immer": "^9.0.6", "nanoid": "^3.1.31" }, diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index 28ac47accae..b0488efe626 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -31,7 +31,7 @@ "@metamask/approval-controller": "^3.5.1", "@metamask/base-controller": "^3.2.1", "@metamask/controller-utils": "^5.0.0", - "@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", diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index 40eb0868095..ab1be76a786 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -31,7 +31,7 @@ "@metamask/base-controller": "^3.2.1", "@metamask/controller-utils": "^5.0.0", "@metamask/network-controller": "^13.0.0", - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "@types/uuid": "^8.3.0", "uuid": "^8.3.2" }, diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index dbd7553ad11..16bda55af62 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -33,7 +33,7 @@ "@metamask/controller-utils": "^5.0.0", "@metamask/logging-controller": "^1.0.2", "@metamask/message-manager": "^7.3.3", - "@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", diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 252e8975504..9b8812b90be 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": "^13.0.0", - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "async-mutex": "^0.2.6", "eth-method-registry": "1.1.0", "eth-rpc-errors": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index bb678fa8161..164d1c12d64 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1298,7 +1298,7 @@ __metadata: "@metamask/keyring-controller": ^8.0.0 "@metamask/snaps-controllers": ^1.0.1 "@metamask/snaps-utils": ^1.0.1 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 "@types/readable-stream": ^2.3.0 deepmerge: ^4.2.2 @@ -1335,7 +1335,7 @@ __metadata: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^5.0.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 jest: ^27.5.1 @@ -1369,7 +1369,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.1 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 eth-rpc-errors: ^4.0.2 @@ -1403,7 +1403,7 @@ __metadata: "@metamask/network-controller": ^13.0.0 "@metamask/preferences-controller": ^4.4.1 "@metamask/rpc-errors": ^5.1.1 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 "@types/uuid": ^8.3.0 @@ -1449,7 +1449,7 @@ __metadata: resolution: "@metamask/base-controller@workspace:packages/base-controller" dependencies: "@metamask/auto-changelog": ^3.1.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 "@types/sinon": ^9.0.10 deepmerge: ^4.2.2 @@ -1501,7 +1501,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.1.0 "@metamask/eth-query": ^3.0.1 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@spruceid/siwe-parser": 1.1.3 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 @@ -1530,7 +1530,7 @@ __metadata: "@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 @@ -1586,7 +1586,7 @@ __metadata: "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^5.0.0 "@metamask/network-controller": ^13.0.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 ethereum-ens-network-map: ^1.0.2 @@ -1808,7 +1808,7 @@ __metadata: "@metamask/controller-utils": ^5.0.0 "@metamask/eth-query": ^3.0.1 "@metamask/network-controller": ^13.0.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 "@types/jest-when": ^2.7.3 "@types/uuid": ^8.3.0 @@ -1900,7 +1900,7 @@ __metadata: "@metamask/message-manager": ^7.3.3 "@metamask/preferences-controller": ^4.4.1 "@metamask/scure-bip39": ^2.1.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 async-mutex: ^0.2.6 deepmerge: ^4.2.2 @@ -1945,7 +1945,7 @@ __metadata: "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^5.0.0 "@metamask/eth-sig-util": ^7.0.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 "@types/uuid": ^8.3.0 deepmerge: ^4.2.2 @@ -1973,7 +1973,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.1 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 async-mutex: ^0.2.6 deepmerge: ^4.2.2 @@ -1999,7 +1999,7 @@ __metadata: "@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 "@types/jest": ^27.4.1 "@types/jest-when": ^2.7.3 "@types/lodash": ^4.14.191 @@ -2028,7 +2028,7 @@ __metadata: dependencies: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.1 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 immer: ^9.0.6 @@ -2080,7 +2080,7 @@ __metadata: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^5.0.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/deep-freeze-strict": ^1.1.0 "@types/jest": ^27.4.1 deep-freeze-strict: ^1.1.1 @@ -2129,7 +2129,7 @@ __metadata: "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^5.0.0 "@metamask/network-controller": ^13.0.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 "@types/uuid": ^8.3.0 deepmerge: ^4.2.2 @@ -2362,7 +2362,7 @@ __metadata: "@metamask/keyring-controller": ^8.0.0 "@metamask/logging-controller": ^1.0.2 "@metamask/message-manager": ^7.3.3 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 eth-rpc-errors: ^4.0.2 @@ -2587,7 +2587,7 @@ __metadata: "@metamask/eth-query": ^3.0.1 "@metamask/metamask-eth-abis": ^3.0.0 "@metamask/network-controller": ^13.0.0 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 "@types/node": ^16.18.24 async-mutex: ^0.2.6 @@ -2646,7 +2646,7 @@ __metadata: languageName: node linkType: hard -"@metamask/utils@npm:^6.0.1, @metamask/utils@npm:^6.2.0": +"@metamask/utils@npm:^6.0.1": version: 6.2.0 resolution: "@metamask/utils@npm:6.2.0" dependencies: From 747e2e974f60436ad7be3e26080dc272691d2383 Mon Sep 17 00:00:00 2001 From: Jongsun Suh <34228073+MajorLift@users.noreply.github.com> Date: Tue, 26 Sep 2023 12:45:27 -0700 Subject: [PATCH 2/2] Use empty array instead of `undefined` as empty type for `JsonRpcParams` --- .../permission-controller/src/rpc-methods/getPermissions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/permission-controller/src/rpc-methods/getPermissions.ts b/packages/permission-controller/src/rpc-methods/getPermissions.ts index 7a11734e15a..37c05395aa1 100644 --- a/packages/permission-controller/src/rpc-methods/getPermissions.ts +++ b/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],