From 6ed26840d814eeb3e1648fa02d512094d5bbdc21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 31 Aug 2023 13:00:31 +0000 Subject: [PATCH 1/3] Bump @metamask/utils from 6.2.0 to 8.1.0 Bumps [@metamask/utils](https://github.com/MetaMask/utils) from 6.2.0 to 8.1.0. - [Release notes](https://github.com/MetaMask/utils/releases) - [Changelog](https://github.com/MetaMask/utils/blob/main/CHANGELOG.md) - [Commits](https://github.com/MetaMask/utils/compare/v6.2.0...v8.1.0) --- updated-dependencies: - dependency-name: "@metamask/utils" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- 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/network-controller/package.json | 2 +- packages/notification-controller/package.json | 2 +- packages/permission-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 2 +- yarn.lock | 46 ++++++++++++------- 16 files changed, 45 insertions(+), 31 deletions(-) diff --git a/package.json b/package.json index e4566ab469..9ff6a7c40f 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/address-book-controller/package.json b/packages/address-book-controller/package.json index 396d11810a..57c83c4d3f 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": "^4.3.2", - "@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 bfcde9c024..018e76901a 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 628149f84e..fc8b7595bf 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -42,7 +42,7 @@ "@metamask/network-controller": "^12.1.2", "@metamask/preferences-controller": "^4.4.0", "@metamask/rpc-errors": "^5.1.1", - "@metamask/utils": "^6.2.0", + "@metamask/utils": "^8.1.0", "@types/uuid": "^8.3.0", "abort-controller": "^3.0.0", "async-mutex": "^0.2.6", diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index e6ac76f22a..b4ff32a936 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 7470b81709..eea9f6ec12 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 1e92f4b083..74fad6bd7f 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": "^4.3.2", "@metamask/network-controller": "^12.1.2", - "@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 7932c2c630..54d56d6811 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -32,7 +32,7 @@ "@metamask/controller-utils": "^4.3.2", "@metamask/eth-query": "^3.0.1", "@metamask/network-controller": "^12.1.2", - "@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 9892c00144..57def4a9db 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -33,7 +33,7 @@ "@metamask/eth-keyring-controller": "^13.0.0", "@metamask/message-manager": "^7.3.1", "@metamask/preferences-controller": "^4.4.0", - "@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 d4025311ae..eca28a7396 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": "^4.3.2", "@metamask/eth-sig-util": "^6.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/network-controller/package.json b/packages/network-controller/package.json index 0973d3299b..1d711ccbc5 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 0cb8b5966d..935e5b8a8e 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 7225f0ea52..85abdc9af7 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": "^4.3.2", - "@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/signature-controller/package.json b/packages/signature-controller/package.json index 9e63446e87..3c5a57d33d 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -32,7 +32,7 @@ "@metamask/base-controller": "^3.2.1", "@metamask/controller-utils": "^4.3.2", "@metamask/message-manager": "^7.3.1", - "@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 5776f5ebb7..e6904ea2b5 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.1.2", - "@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 d9dbfa601b..781cd0f6eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1299,7 +1299,7 @@ __metadata: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^4.3.2 - "@metamask/utils": ^6.2.0 + "@metamask/utils": ^8.1.0 "@types/jest": ^27.4.1 deepmerge: ^4.2.2 jest: ^27.5.1 @@ -1333,7 +1333,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 @@ -1367,7 +1367,7 @@ __metadata: "@metamask/network-controller": ^12.1.2 "@metamask/preferences-controller": ^4.4.0 "@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 @@ -1414,7 +1414,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 @@ -1466,7 +1466,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 abort-controller: ^3.0.0 @@ -1496,7 +1496,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 @@ -1552,7 +1552,7 @@ __metadata: "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^4.3.2 "@metamask/network-controller": ^12.1.2 - "@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 @@ -1743,7 +1743,7 @@ __metadata: "@metamask/controller-utils": ^4.3.2 "@metamask/eth-query": ^3.0.1 "@metamask/network-controller": ^12.1.2 - "@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 @@ -1780,7 +1780,7 @@ __metadata: "@metamask/message-manager": ^7.3.1 "@metamask/preferences-controller": ^4.4.0 "@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 @@ -1825,7 +1825,7 @@ __metadata: "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^4.3.2 "@metamask/eth-sig-util": ^6.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 @@ -1860,7 +1860,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 @@ -1889,7 +1889,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 @@ -1930,7 +1930,7 @@ __metadata: "@metamask/auto-changelog": ^3.1.0 "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^4.3.2 - "@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 @@ -2049,7 +2049,7 @@ __metadata: "@metamask/base-controller": ^3.2.1 "@metamask/controller-utils": ^4.3.2 "@metamask/message-manager": ^7.3.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 @@ -2085,7 +2085,7 @@ __metadata: "@metamask/controller-utils": ^4.3.2 "@metamask/eth-query": ^3.0.1 "@metamask/network-controller": ^12.1.2 - "@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 @@ -2149,6 +2149,20 @@ __metadata: languageName: node linkType: hard +"@metamask/utils@npm:^8.1.0": + version: 8.1.0 + resolution: "@metamask/utils@npm:8.1.0" + dependencies: + "@ethereumjs/tx": ^4.1.2 + "@noble/hashes": ^1.3.1 + "@types/debug": ^4.1.7 + debug: ^4.3.4 + semver: ^7.5.4 + superstruct: ^1.0.3 + checksum: 4cbee36d0c227f3e528930e83f75a0c6b71b55b332c3e162f0e87f3dd86ae017d0b20405d76ea054ab99e4d924d3d9b8b896ed12a12aae57b090350e5a625999 + languageName: node + linkType: hard + "@ngraveio/bc-ur@npm:^1.1.5": version: 1.1.6 resolution: "@ngraveio/bc-ur@npm:1.1.6" @@ -8323,7 +8337,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0": +"semver@npm:7.x, semver@npm:^7.0.0, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.4": version: 7.5.4 resolution: "semver@npm:7.5.4" dependencies: From a1855dde1f3bc63a886f21b3f322e5db51f9bf94 Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Tue, 29 Aug 2023 22:33:16 +0000 Subject: [PATCH 2/3] types(permission-controller): utils compat fix --- .../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 7a11734e15..0f0951f7f4 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, + any, PermissionConstraint[] > = { methodNames: [MethodNames.getPermissions], From 1bc36b4dae25b7332af5ff311940caba49b08a2b Mon Sep 17 00:00:00 2001 From: legobt <6wbvkn0j@anonaddy.me> Date: Fri, 1 Sep 2023 20:12:44 +0000 Subject: [PATCH 3/3] yarn dedupe --- yarn.lock | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/yarn.lock b/yarn.lock index 781cd0f6eb..f6e83ad275 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6035,20 +6035,7 @@ __metadata: languageName: node linkType: hard -"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3": - version: 1.1.10 - resolution: "is-typed-array@npm:1.1.10" - dependencies: - available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 - for-each: ^0.3.3 - gopd: ^1.0.1 - has-tostringtag: ^1.0.0 - checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017 - languageName: node - linkType: hard - -"is-typed-array@npm:^1.1.9": +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.3, is-typed-array@npm:^1.1.9": version: 1.1.12 resolution: "is-typed-array@npm:1.1.12" dependencies: @@ -9461,7 +9448,7 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11": +"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2": version: 1.1.11 resolution: "which-typed-array@npm:1.1.11" dependencies: @@ -9474,20 +9461,6 @@ __metadata: languageName: node linkType: hard -"which-typed-array@npm:^1.1.2": - version: 1.1.10 - resolution: "which-typed-array@npm:1.1.10" - dependencies: - available-typed-arrays: ^1.0.5 - call-bind: ^1.0.2 - for-each: ^0.3.3 - gopd: ^1.0.1 - has-tostringtag: ^1.0.0 - is-typed-array: ^1.1.10 - checksum: 149f54f5d11773ce938c60a2c36306720a1824eccb62bda0620170932c2783fa50ad0226254c5741a962e35c7ccba5f4e4c402b8618cb3b4f2cf47bf5e6ade31 - languageName: node - linkType: hard - "which@npm:^2.0.1, which@npm:^2.0.2": version: 2.0.2 resolution: "which@npm:2.0.2"