From 4416162e25c1a182b5e5d81de86123728365f2a9 Mon Sep 17 00:00:00 2001 From: Jongsun Suh Date: Thu, 11 Jul 2024 10:23:29 -0400 Subject: [PATCH 1/5] Bump `@metamask/utils` from `^8.3.0` to `^9.0.0` --- 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/build-utils/package.json | 2 +- packages/chain-controller/package.json | 2 +- packages/controller-utils/package.json | 2 +- packages/ens-controller/package.json | 2 +- packages/eth-json-rpc-provider/package.json | 2 +- packages/gas-fee-controller/package.json | 2 +- packages/json-rpc-engine/package.json | 2 +- .../json-rpc-middleware-stream/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 +- .../permission-log-controller/package.json | 2 +- packages/polling-controller/package.json | 2 +- .../queued-request-controller/package.json | 2 +- packages/rate-limit-controller/package.json | 2 +- .../selected-network-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 2 +- .../user-operation-controller/package.json | 2 +- yarn.lock | 80 ++++++++++++------- 29 files changed, 80 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index f4f005d53d..d4016276eb 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@metamask/eth-block-tracker": "^9.0.3", "@metamask/eth-json-rpc-provider": "^4.1.0", "@metamask/json-rpc-engine": "^9.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@types/jest": "^27.4.1", "@types/node": "^16.18.54", "@typescript-eslint/eslint-plugin": "^5.62.0", diff --git a/packages/accounts-controller/package.json b/packages/accounts-controller/package.json index 0c8103e552..3b9020eeca 100644 --- a/packages/accounts-controller/package.json +++ b/packages/accounts-controller/package.json @@ -48,7 +48,7 @@ "@metamask/keyring-controller": "^17.1.0", "@metamask/snaps-sdk": "^4.2.0", "@metamask/snaps-utils": "^7.4.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "deepmerge": "^4.2.2", "ethereum-cryptography": "^2.1.2", "immer": "^9.0.6", diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index 262ef3af82..3f275384e8 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -43,7 +43,7 @@ "dependencies": { "@metamask/base-controller": "^6.0.0", "@metamask/controller-utils": "^11.0.0", - "@metamask/utils": "^8.3.0" + "@metamask/utils": "^9.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index f8f6e61aea..c8f48e2c25 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -43,7 +43,7 @@ "dependencies": { "@metamask/base-controller": "^6.0.0", "@metamask/rpc-errors": "^6.2.1", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "nanoid": "^3.1.31" }, "devDependencies": { diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index b52424af72..1223d907e4 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -59,7 +59,7 @@ "@metamask/polling-controller": "^9.0.0", "@metamask/preferences-controller": "^13.0.0", "@metamask/rpc-errors": "^6.2.1", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@types/bn.js": "^5.1.5", "@types/uuid": "^8.3.0", "async-mutex": "^0.5.0", diff --git a/packages/base-controller/package.json b/packages/base-controller/package.json index 8cb9641134..1bc94add6f 100644 --- a/packages/base-controller/package.json +++ b/packages/base-controller/package.json @@ -40,7 +40,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "immer": "^9.0.6" }, "devDependencies": { diff --git a/packages/build-utils/package.json b/packages/build-utils/package.json index 29b7eec38e..c29a01942d 100644 --- a/packages/build-utils/package.json +++ b/packages/build-utils/package.json @@ -41,7 +41,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@types/eslint": "^8.44.7" }, "devDependencies": { diff --git a/packages/chain-controller/package.json b/packages/chain-controller/package.json index cebebef3c7..998613431b 100644 --- a/packages/chain-controller/package.json +++ b/packages/chain-controller/package.json @@ -47,7 +47,7 @@ "@metamask/snaps-controllers": "^8.1.1", "@metamask/snaps-sdk": "^4.2.0", "@metamask/snaps-utils": "^7.4.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json index 893a4bd1f3..e56f5ea8ae 100644 --- a/packages/controller-utils/package.json +++ b/packages/controller-utils/package.json @@ -44,7 +44,7 @@ "@ethereumjs/util": "^8.1.0", "@metamask/eth-query": "^4.0.0", "@metamask/ethjs-unit": "^0.3.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@spruceid/siwe-parser": "2.1.0", "@types/bn.js": "^5.1.5", "bn.js": "^5.2.1", diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json index 71a3f1b22e..98e6ce1305 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -44,7 +44,7 @@ "@ethersproject/providers": "^5.7.0", "@metamask/base-controller": "^6.0.0", "@metamask/controller-utils": "^11.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "punycode": "^2.1.1" }, "devDependencies": { diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json index 650a026ff1..c86233a6b9 100644 --- a/packages/eth-json-rpc-provider/package.json +++ b/packages/eth-json-rpc-provider/package.json @@ -49,7 +49,7 @@ "@metamask/json-rpc-engine": "^9.0.0", "@metamask/rpc-errors": "^6.2.1", "@metamask/safe-event-emitter": "^3.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index b301f92683..73afe9c0e6 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -47,7 +47,7 @@ "@metamask/ethjs-unit": "^0.3.0", "@metamask/network-controller": "^20.0.0", "@metamask/polling-controller": "^9.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@types/bn.js": "^5.1.5", "@types/uuid": "^8.3.0", "bn.js": "^5.2.1", diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json index effe2f3984..71182fc59d 100644 --- a/packages/json-rpc-engine/package.json +++ b/packages/json-rpc-engine/package.json @@ -52,7 +52,7 @@ "dependencies": { "@metamask/rpc-errors": "^6.2.1", "@metamask/safe-event-emitter": "^3.0.0", - "@metamask/utils": "^8.3.0" + "@metamask/utils": "^9.0.0" }, "devDependencies": { "@lavamoat/allow-scripts": "^3.0.4", diff --git a/packages/json-rpc-middleware-stream/package.json b/packages/json-rpc-middleware-stream/package.json index 88d92353c6..b744f0119e 100644 --- a/packages/json-rpc-middleware-stream/package.json +++ b/packages/json-rpc-middleware-stream/package.json @@ -43,7 +43,7 @@ "dependencies": { "@metamask/json-rpc-engine": "^9.0.0", "@metamask/safe-event-emitter": "^3.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "readable-stream": "^3.6.2" }, "devDependencies": { diff --git a/packages/keyring-controller/package.json b/packages/keyring-controller/package.json index 88dc40a577..11dac2492c 100644 --- a/packages/keyring-controller/package.json +++ b/packages/keyring-controller/package.json @@ -50,7 +50,7 @@ "@metamask/eth-simple-keyring": "^6.0.1", "@metamask/keyring-api": "^8.0.0", "@metamask/message-manager": "^10.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "async-mutex": "^0.5.0", "ethereumjs-wallet": "^1.0.1", "immer": "^9.0.6" diff --git a/packages/message-manager/package.json b/packages/message-manager/package.json index efbffd04d7..f58be69971 100644 --- a/packages/message-manager/package.json +++ b/packages/message-manager/package.json @@ -44,7 +44,7 @@ "@metamask/base-controller": "^6.0.0", "@metamask/controller-utils": "^11.0.0", "@metamask/eth-sig-util": "^7.0.1", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@types/uuid": "^8.3.0", "jsonschema": "^1.2.4", "uuid": "^8.3.2" diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json index 01fe50988e..d578f1092e 100644 --- a/packages/name-controller/package.json +++ b/packages/name-controller/package.json @@ -44,7 +44,7 @@ "dependencies": { "@metamask/base-controller": "^6.0.0", "@metamask/controller-utils": "^11.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "async-mutex": "^0.5.0" }, "devDependencies": { diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index aa89a1ea44..01521bf3bd 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -51,7 +51,7 @@ "@metamask/json-rpc-engine": "^9.0.0", "@metamask/rpc-errors": "^6.2.1", "@metamask/swappable-obj-proxy": "^2.2.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "async-mutex": "^0.5.0", "immer": "^9.0.6", "loglevel": "^1.8.1", diff --git a/packages/notification-controller/package.json b/packages/notification-controller/package.json index a95c51a01b..83375f76c7 100644 --- a/packages/notification-controller/package.json +++ b/packages/notification-controller/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@metamask/base-controller": "^6.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "nanoid": "^3.1.31" }, "devDependencies": { diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index eaff8633b6..88dae5fe1f 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -45,7 +45,7 @@ "@metamask/controller-utils": "^11.0.0", "@metamask/json-rpc-engine": "^9.0.0", "@metamask/rpc-errors": "^6.2.1", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@types/deep-freeze-strict": "^1.1.0", "deep-freeze-strict": "^1.1.1", "immer": "^9.0.6", diff --git a/packages/permission-log-controller/package.json b/packages/permission-log-controller/package.json index 7310111406..80f280979c 100644 --- a/packages/permission-log-controller/package.json +++ b/packages/permission-log-controller/package.json @@ -43,7 +43,7 @@ "dependencies": { "@metamask/base-controller": "^6.0.0", "@metamask/json-rpc-engine": "^9.0.0", - "@metamask/utils": "^8.3.0" + "@metamask/utils": "^9.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/polling-controller/package.json b/packages/polling-controller/package.json index 76bb1fb35b..b087872a61 100644 --- a/packages/polling-controller/package.json +++ b/packages/polling-controller/package.json @@ -44,7 +44,7 @@ "@metamask/base-controller": "^6.0.0", "@metamask/controller-utils": "^11.0.0", "@metamask/network-controller": "^20.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "@types/uuid": "^8.3.0", "fast-json-stable-stringify": "^2.1.0", "uuid": "^8.3.2" diff --git a/packages/queued-request-controller/package.json b/packages/queued-request-controller/package.json index a4239f8991..d90be4af51 100644 --- a/packages/queued-request-controller/package.json +++ b/packages/queued-request-controller/package.json @@ -46,7 +46,7 @@ "@metamask/json-rpc-engine": "^9.0.0", "@metamask/rpc-errors": "^6.2.1", "@metamask/swappable-obj-proxy": "^2.2.0", - "@metamask/utils": "^8.3.0" + "@metamask/utils": "^9.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/rate-limit-controller/package.json b/packages/rate-limit-controller/package.json index 3d7e697610..6855cdf71d 100644 --- a/packages/rate-limit-controller/package.json +++ b/packages/rate-limit-controller/package.json @@ -43,7 +43,7 @@ "dependencies": { "@metamask/base-controller": "^6.0.0", "@metamask/rpc-errors": "^6.2.1", - "@metamask/utils": "^8.3.0" + "@metamask/utils": "^9.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json index 0ec175cd39..11e276dca4 100644 --- a/packages/selected-network-controller/package.json +++ b/packages/selected-network-controller/package.json @@ -46,7 +46,7 @@ "@metamask/network-controller": "^20.0.0", "@metamask/permission-controller": "^10.0.0", "@metamask/swappable-obj-proxy": "^2.2.0", - "@metamask/utils": "^8.3.0" + "@metamask/utils": "^9.0.0" }, "devDependencies": { "@metamask/auto-changelog": "^3.4.4", diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 245b89d31f..3aafe74d62 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -48,7 +48,7 @@ "@metamask/logging-controller": "^5.0.0", "@metamask/message-manager": "^10.0.0", "@metamask/rpc-errors": "^6.2.1", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "lodash": "^4.17.21" }, "devDependencies": { diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index d52c9d20dd..8ce17e0937 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -57,7 +57,7 @@ "@metamask/network-controller": "^20.0.0", "@metamask/nonce-tracker": "^5.0.0", "@metamask/rpc-errors": "^6.2.1", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "async-mutex": "^0.5.0", "bn.js": "^5.2.1", "eth-method-registry": "^4.0.0", diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index ba0fc1a415..3539be442d 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -52,7 +52,7 @@ "@metamask/polling-controller": "^9.0.0", "@metamask/rpc-errors": "^6.2.1", "@metamask/transaction-controller": "^35.0.0", - "@metamask/utils": "^8.3.0", + "@metamask/utils": "^9.0.0", "bn.js": "^5.2.1", "immer": "^9.0.6", "lodash": "^4.17.21", diff --git a/yarn.lock b/yarn.lock index 98ff2d1bb8..70839f3096 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2208,7 +2208,7 @@ __metadata: "@metamask/snaps-controllers": "npm:^8.1.1" "@metamask/snaps-sdk": "npm:^4.2.0" "@metamask/snaps-utils": "npm:^7.4.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -2244,7 +2244,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2290,7 +2290,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2328,7 +2328,7 @@ __metadata: "@metamask/polling-controller": "npm:^9.0.0" "@metamask/preferences-controller": "npm:^13.0.0" "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" "@types/lodash": "npm:^4.14.191" @@ -2404,7 +2404,7 @@ __metadata: resolution: "@metamask/base-controller@workspace:packages/base-controller" dependencies: "@metamask/auto-changelog": "npm:^3.4.4" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/sinon": "npm:^9.0.10" deepmerge: "npm:^4.2.2" @@ -2432,7 +2432,7 @@ __metadata: resolution: "@metamask/build-utils@workspace:packages/build-utils" dependencies: "@metamask/auto-changelog": "npm:^3.4.4" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/eslint": "npm:^8.44.7" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -2466,7 +2466,7 @@ __metadata: "@metamask/snaps-controllers": "npm:^8.1.1" "@metamask/snaps-sdk": "npm:^4.2.0" "@metamask/snaps-utils": "npm:^7.4.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -2530,7 +2530,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-unit": "npm:^0.3.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@spruceid/siwe-parser": "npm:2.1.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" @@ -2563,7 +2563,7 @@ __metadata: "@metamask/eth-block-tracker": "npm:^9.0.3" "@metamask/eth-json-rpc-provider": "npm:^4.1.0" "@metamask/json-rpc-engine": "npm:^9.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/node": "npm:^16.18.54" "@typescript-eslint/eslint-plugin": "npm:^5.62.0" @@ -2626,7 +2626,7 @@ __metadata: "@metamask/base-controller": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.0.0" "@metamask/network-controller": "npm:^20.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -2779,7 +2779,7 @@ __metadata: "@metamask/json-rpc-engine": "npm:^9.0.0" "@metamask/rpc-errors": "npm:^6.2.1" "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" ethers: "npm:^6.12.0" @@ -3002,7 +3002,7 @@ __metadata: "@metamask/ethjs-unit": "npm:^0.3.0" "@metamask/network-controller": "npm:^20.0.0" "@metamask/polling-controller": "npm:^9.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" "@types/jest-when": "npm:^2.7.3" @@ -3053,7 +3053,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/rpc-errors": "npm:^6.2.1" "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -3083,7 +3083,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/json-rpc-engine": "npm:^9.0.0" "@metamask/safe-event-emitter": "npm:^3.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/readable-stream": "npm:^2.3.0" deepmerge: "npm:^4.2.2" @@ -3147,7 +3147,7 @@ __metadata: "@metamask/keyring-api": "npm:^8.0.0" "@metamask/message-manager": "npm:^10.0.0" "@metamask/scure-bip39": "npm:^2.1.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -3190,7 +3190,7 @@ __metadata: "@metamask/base-controller": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.0.0" "@metamask/eth-sig-util": "npm:^7.0.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -3218,7 +3218,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" async-mutex: "npm:^0.5.0" deepmerge: "npm:^4.2.2" @@ -3246,7 +3246,7 @@ __metadata: "@metamask/json-rpc-engine": "npm:^9.0.0" "@metamask/rpc-errors": "npm:^6.2.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/jest-when": "npm:^2.7.3" "@types/lodash": "npm:^4.14.191" @@ -3285,7 +3285,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -3369,7 +3369,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.0.0" "@metamask/json-rpc-engine": "npm:^9.0.0" "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^27.4.1" deep-freeze-strict: "npm:^1.1.1" @@ -3412,7 +3412,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" "@metamask/json-rpc-engine": "npm:^9.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^27.4.1" deep-freeze-strict: "npm:^1.1.1" @@ -3470,7 +3470,7 @@ __metadata: "@metamask/base-controller": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.0.0" "@metamask/network-controller": "npm:^20.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" "@types/uuid": "npm:^8.3.0" deepmerge: "npm:^4.2.2" @@ -3581,7 +3581,7 @@ __metadata: "@metamask/rpc-errors": "npm:^6.2.1" "@metamask/selected-network-controller": "npm:^16.0.0" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -3606,7 +3606,7 @@ __metadata: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -3654,7 +3654,7 @@ __metadata: "@metamask/network-controller": "npm:^20.0.0" "@metamask/permission-controller": "npm:^10.0.0" "@metamask/swappable-obj-proxy": "npm:^2.2.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" immer: "npm:^9.0.6" @@ -3684,7 +3684,7 @@ __metadata: "@metamask/logging-controller": "npm:^5.0.0" "@metamask/message-manager": "npm:^10.0.0" "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" jest: "npm:^27.5.1" @@ -3816,6 +3816,13 @@ __metadata: languageName: node linkType: hard +"@metamask/superstruct@npm:^3.1.0": + version: 3.1.0 + resolution: "@metamask/superstruct@npm:3.1.0" + checksum: 10/5066fe228d5f11da387606d7f9545de2b473ab5a9e0f1bb8aea2f52d3e2c9d25e427151acde61f4a2de80a07a9871fe9505ad06abca6a61b7c3b54ed5c403b01 + languageName: node + linkType: hard + "@metamask/swappable-obj-proxy@npm:^2.2.0": version: 2.2.0 resolution: "@metamask/swappable-obj-proxy@npm:2.2.0" @@ -3848,7 +3855,7 @@ __metadata: "@metamask/network-controller": "npm:^20.0.0" "@metamask/nonce-tracker": "npm:^5.0.0" "@metamask/rpc-errors": "npm:^6.2.1" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" "@types/node": "npm:^16.18.54" @@ -3891,7 +3898,7 @@ __metadata: "@metamask/polling-controller": "npm:^9.0.0" "@metamask/rpc-errors": "npm:^6.2.1" "@metamask/transaction-controller": "npm:^35.0.0" - "@metamask/utils": "npm:^8.3.0" + "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" bn.js: "npm:^5.2.1" deepmerge: "npm:^4.2.2" @@ -3930,6 +3937,23 @@ __metadata: languageName: node linkType: hard +"@metamask/utils@npm:^9.0.0": + version: 9.0.0 + resolution: "@metamask/utils@npm:9.0.0" + dependencies: + "@ethereumjs/tx": "npm:^4.2.0" + "@metamask/superstruct": "npm:^3.1.0" + "@noble/hashes": "npm:^1.3.1" + "@scure/base": "npm:^1.1.3" + "@types/debug": "npm:^4.1.7" + debug: "npm:^4.3.4" + pony-cause: "npm:^2.1.10" + semver: "npm:^7.5.4" + uuid: "npm:^9.0.1" + checksum: 10/04a4eaba79e166fc6d23ecdba8b60625235a3a8c81fa615de64b845e74fa099ea7afd031060206c24809cfa161e7bca5aeb0bfd26079c5cbb82cb37f6a55ddb2 + languageName: node + linkType: hard + "@ngraveio/bc-ur@npm:^1.1.5": version: 1.1.12 resolution: "@ngraveio/bc-ur@npm:1.1.12" From df28e8c92c871f31ee6dd4c2e8c07e8c45d2f6cb Mon Sep 17 00:00:00 2001 From: Jongsun Suh Date: Thu, 11 Jul 2024 10:24:01 -0400 Subject: [PATCH 2/5] Bump `@metamask/rpc-errors` from `^6.2.1` to `^6.3.1` --- packages/approval-controller/package.json | 2 +- packages/assets-controllers/package.json | 2 +- packages/eth-json-rpc-provider/package.json | 2 +- packages/json-rpc-engine/package.json | 2 +- packages/network-controller/package.json | 2 +- packages/permission-controller/package.json | 2 +- .../queued-request-controller/package.json | 2 +- packages/rate-limit-controller/package.json | 2 +- packages/signature-controller/package.json | 2 +- packages/transaction-controller/package.json | 2 +- .../user-operation-controller/package.json | 2 +- yarn.lock | 32 ++++++++++++------- 12 files changed, 32 insertions(+), 22 deletions(-) diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index c8f48e2c25..0ba732ae8d 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@metamask/base-controller": "^6.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/utils": "^9.0.0", "nanoid": "^3.1.31" }, diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json index 1223d907e4..a562190233 100644 --- a/packages/assets-controllers/package.json +++ b/packages/assets-controllers/package.json @@ -58,7 +58,7 @@ "@metamask/network-controller": "^20.0.0", "@metamask/polling-controller": "^9.0.0", "@metamask/preferences-controller": "^13.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/utils": "^9.0.0", "@types/bn.js": "^5.1.5", "@types/uuid": "^8.3.0", diff --git a/packages/eth-json-rpc-provider/package.json b/packages/eth-json-rpc-provider/package.json index c86233a6b9..4c5e049404 100644 --- a/packages/eth-json-rpc-provider/package.json +++ b/packages/eth-json-rpc-provider/package.json @@ -47,7 +47,7 @@ }, "dependencies": { "@metamask/json-rpc-engine": "^9.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/safe-event-emitter": "^3.0.0", "@metamask/utils": "^9.0.0", "uuid": "^8.3.2" diff --git a/packages/json-rpc-engine/package.json b/packages/json-rpc-engine/package.json index 71182fc59d..d161a23d5c 100644 --- a/packages/json-rpc-engine/package.json +++ b/packages/json-rpc-engine/package.json @@ -50,7 +50,7 @@ "test:watch": "jest --watch" }, "dependencies": { - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/safe-event-emitter": "^3.0.0", "@metamask/utils": "^9.0.0" }, diff --git a/packages/network-controller/package.json b/packages/network-controller/package.json index 01521bf3bd..8bddefe1dd 100644 --- a/packages/network-controller/package.json +++ b/packages/network-controller/package.json @@ -49,7 +49,7 @@ "@metamask/eth-json-rpc-provider": "^4.1.0", "@metamask/eth-query": "^4.0.0", "@metamask/json-rpc-engine": "^9.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/swappable-obj-proxy": "^2.2.0", "@metamask/utils": "^9.0.0", "async-mutex": "^0.5.0", diff --git a/packages/permission-controller/package.json b/packages/permission-controller/package.json index 88dae5fe1f..22db590dc0 100644 --- a/packages/permission-controller/package.json +++ b/packages/permission-controller/package.json @@ -44,7 +44,7 @@ "@metamask/base-controller": "^6.0.0", "@metamask/controller-utils": "^11.0.0", "@metamask/json-rpc-engine": "^9.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/utils": "^9.0.0", "@types/deep-freeze-strict": "^1.1.0", "deep-freeze-strict": "^1.1.1", diff --git a/packages/queued-request-controller/package.json b/packages/queued-request-controller/package.json index d90be4af51..b32aeda775 100644 --- a/packages/queued-request-controller/package.json +++ b/packages/queued-request-controller/package.json @@ -44,7 +44,7 @@ "@metamask/base-controller": "^6.0.0", "@metamask/controller-utils": "^11.0.0", "@metamask/json-rpc-engine": "^9.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/swappable-obj-proxy": "^2.2.0", "@metamask/utils": "^9.0.0" }, diff --git a/packages/rate-limit-controller/package.json b/packages/rate-limit-controller/package.json index 6855cdf71d..42b3613ace 100644 --- a/packages/rate-limit-controller/package.json +++ b/packages/rate-limit-controller/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@metamask/base-controller": "^6.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/utils": "^9.0.0" }, "devDependencies": { diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 3aafe74d62..05f98890cf 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -47,7 +47,7 @@ "@metamask/keyring-controller": "^17.1.0", "@metamask/logging-controller": "^5.0.0", "@metamask/message-manager": "^10.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/utils": "^9.0.0", "lodash": "^4.17.21" }, diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 8ce17e0937..29f058b796 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -56,7 +56,7 @@ "@metamask/metamask-eth-abis": "^3.1.1", "@metamask/network-controller": "^20.0.0", "@metamask/nonce-tracker": "^5.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/utils": "^9.0.0", "async-mutex": "^0.5.0", "bn.js": "^5.2.1", diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index 3539be442d..cd15ad2519 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -50,7 +50,7 @@ "@metamask/keyring-controller": "^17.1.0", "@metamask/network-controller": "^20.0.0", "@metamask/polling-controller": "^9.0.0", - "@metamask/rpc-errors": "^6.2.1", + "@metamask/rpc-errors": "^6.3.1", "@metamask/transaction-controller": "^35.0.0", "@metamask/utils": "^9.0.0", "bn.js": "^5.2.1", diff --git a/yarn.lock b/yarn.lock index 70839f3096..f09dd96c7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2289,7 +2289,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -2327,7 +2327,7 @@ __metadata: "@metamask/network-controller": "npm:^20.0.0" "@metamask/polling-controller": "npm:^9.0.0" "@metamask/preferences-controller": "npm:^13.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/utils": "npm:^9.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" @@ -2777,7 +2777,7 @@ __metadata: "@metamask/eth-query": "npm:^4.0.0" "@metamask/ethjs-query": "npm:^0.5.3" "@metamask/json-rpc-engine": "npm:^9.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/safe-event-emitter": "npm:^3.0.0" "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" @@ -3051,7 +3051,7 @@ __metadata: dependencies: "@lavamoat/allow-scripts": "npm:^3.0.4" "@metamask/auto-changelog": "npm:^3.4.4" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/safe-event-emitter": "npm:^3.0.0" "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" @@ -3244,7 +3244,7 @@ __metadata: "@metamask/eth-json-rpc-provider": "npm:^4.1.0" "@metamask/eth-query": "npm:^4.0.0" "@metamask/json-rpc-engine": "npm:^9.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" @@ -3368,7 +3368,7 @@ __metadata: "@metamask/base-controller": "npm:^6.0.0" "@metamask/controller-utils": "npm:^11.0.0" "@metamask/json-rpc-engine": "npm:^9.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/utils": "npm:^9.0.0" "@types/deep-freeze-strict": "npm:^1.1.0" "@types/jest": "npm:^27.4.1" @@ -3578,7 +3578,7 @@ __metadata: "@metamask/controller-utils": "npm:^11.0.0" "@metamask/json-rpc-engine": "npm:^9.0.0" "@metamask/network-controller": "npm:^20.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/selected-network-controller": "npm:^16.0.0" "@metamask/swappable-obj-proxy": "npm:^2.2.0" "@metamask/utils": "npm:^9.0.0" @@ -3605,7 +3605,7 @@ __metadata: dependencies: "@metamask/auto-changelog": "npm:^3.4.4" "@metamask/base-controller": "npm:^6.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -3627,6 +3627,16 @@ __metadata: languageName: node linkType: hard +"@metamask/rpc-errors@npm:^6.3.1": + version: 6.3.1 + resolution: "@metamask/rpc-errors@npm:6.3.1" + dependencies: + "@metamask/utils": "npm:^9.0.0" + fast-safe-stringify: "npm:^2.0.6" + checksum: 10/f968fb490b13b632c2ad4770a144d67cecdff8d539cb8b489c732b08dab7a62fae65d7a2908ce8c5b77260317aa618948a52463f093fa8d9f84aee1c5f6f5daf + languageName: node + linkType: hard + "@metamask/safe-event-emitter@npm:^3.0.0, @metamask/safe-event-emitter@npm:^3.1.1": version: 3.1.1 resolution: "@metamask/safe-event-emitter@npm:3.1.1" @@ -3683,7 +3693,7 @@ __metadata: "@metamask/keyring-controller": "npm:^17.1.0" "@metamask/logging-controller": "npm:^5.0.0" "@metamask/message-manager": "npm:^10.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" deepmerge: "npm:^4.2.2" @@ -3854,7 +3864,7 @@ __metadata: "@metamask/metamask-eth-abis": "npm:^3.1.1" "@metamask/network-controller": "npm:^20.0.0" "@metamask/nonce-tracker": "npm:^5.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/utils": "npm:^9.0.0" "@types/bn.js": "npm:^5.1.5" "@types/jest": "npm:^27.4.1" @@ -3896,7 +3906,7 @@ __metadata: "@metamask/keyring-controller": "npm:^17.1.0" "@metamask/network-controller": "npm:^20.0.0" "@metamask/polling-controller": "npm:^9.0.0" - "@metamask/rpc-errors": "npm:^6.2.1" + "@metamask/rpc-errors": "npm:^6.3.1" "@metamask/transaction-controller": "npm:^35.0.0" "@metamask/utils": "npm:^9.0.0" "@types/jest": "npm:^27.4.1" From df7436d5ed7c995d31c4abc5637d19d7d662fca7 Mon Sep 17 00:00:00 2001 From: Jongsun Suh Date: Thu, 11 Jul 2024 10:30:03 -0400 Subject: [PATCH 3/5] Suppress ts(2589) error on immer `Draft` type See https://github.com/MetaMask/utils/issues/168 --- packages/accounts-controller/src/AccountsController.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/accounts-controller/src/AccountsController.ts b/packages/accounts-controller/src/AccountsController.ts index dde5f31a11..8882d23ad5 100644 --- a/packages/accounts-controller/src/AccountsController.ts +++ b/packages/accounts-controller/src/AccountsController.ts @@ -423,6 +423,7 @@ export class AccountsController extends BaseController< ...account, metadata: { ...account.metadata, name: accountName }, }; + // @ts-expect-error ts(2589) currentState.internalAccounts.accounts[accountId] = internalAccount; }); } From 720e20a8414fbd458fd0f1074afa16b8c5e92670 Mon Sep 17 00:00:00 2001 From: Jongsun Suh Date: Thu, 11 Jul 2024 10:35:36 -0400 Subject: [PATCH 4/5] Fix `jest.config.scripts.js` to resolve subpath export for `@metamask/utils` with `cjs` extension --- jest.config.scripts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jest.config.scripts.js b/jest.config.scripts.js index 7ab725ca7d..343c51b9d2 100644 --- a/jest.config.scripts.js +++ b/jest.config.scripts.js @@ -39,10 +39,10 @@ module.exports = { }, // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module - // This ensures that Babel can resolve ESM exports correctly. + // This ensures that Babel can resolve subpath exports correctly. moduleNameMapper: { '^@metamask/utils/(.+)$': [ - '/node_modules/@metamask/utils/dist/$1.js', + '/node_modules/@metamask/utils/dist/$1.cjs', ], }, From 6133a5e2a35d3181c3c19d65b7bbf8b84692b264 Mon Sep 17 00:00:00 2001 From: Jongsun Suh Date: Thu, 11 Jul 2024 10:48:02 -0400 Subject: [PATCH 5/5] Dedupe lockfile --- yarn.lock | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index f09dd96c7f..52d1d7cc44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3617,17 +3617,7 @@ __metadata: languageName: unknown linkType: soft -"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1": - version: 6.2.1 - resolution: "@metamask/rpc-errors@npm:6.2.1" - dependencies: - "@metamask/utils": "npm:^8.3.0" - fast-safe-stringify: "npm:^2.0.6" - checksum: 10/789f0a2090339c1aa43d45ee496f4f115e141bc55b98e4ce27498497568f9e85fb5527ecf1f113b156d88fc4f1e63a572ced74bdc1ba16826bf648391b223f7b - languageName: node - linkType: hard - -"@metamask/rpc-errors@npm:^6.3.1": +"@metamask/rpc-errors@npm:^6.0.0, @metamask/rpc-errors@npm:^6.2.1, @metamask/rpc-errors@npm:^6.3.1": version: 6.3.1 resolution: "@metamask/rpc-errors@npm:6.3.1" dependencies: