Skip to content

Commit

Permalink
chore: Recategorize controllers as peer dependencies
Browse files Browse the repository at this point in the history
The `@metamask/network-controller` and
`@metamask/transaction-controller` dependencies have been moved from
`dependencies` to `peerDependencies` (and `devDependencies`). This was
done because we're not directly importing and using those controllers
directly from imports, they're instead passed in as constructor
parameters (indirectly), so it's critical that the versions we use here
match the versions used on the client exactly.

The peer dependency requirements of those two packages have been
silenced because they aren't actually instantiated here, just used for
type purposes (so we don't need their `peerDependencies` present).
  • Loading branch information
Gudahtt committed Nov 26, 2024
1 parent ab13733 commit 3e64d70
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 54 deletions.
16 changes: 14 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
"@metamask/controller-utils": "^11.0.0",
"@metamask/eth-json-rpc-provider": "^4.1.6",
"@metamask/eth-query": "^4.0.0",
"@metamask/network-controller": "^22.0.0",
"@metamask/polling-controller": "^12.0.0",
"@metamask/transaction-controller": "^38.0.0",
"bignumber.js": "^9.0.1",
"events": "^3.3.0",
"fast-json-patch": "^3.1.0",
Expand All @@ -51,6 +49,8 @@
"@metamask/eslint-config-typescript": "^12.1.0",
"@metamask/gas-fee-controller": "^22.0.0",
"@metamask/json-rpc-engine": "^10.0.1",
"@metamask/network-controller": "^22.0.0",
"@metamask/transaction-controller": "^38.0.0",
"@types/jest": "^26.0.24",
"@types/lodash": "^4.14.194",
"@types/node": "^18.19.17",
Expand All @@ -74,6 +74,18 @@
"ts-jest": "^29.1.4",
"typescript": "~4.8.4"
},
"peerDependencies": {
"@metamask/network-controller": "^22.0.0",
"@metamask/transaction-controller": "^38.0.0"
},
"peerDependenciesMeta": {
"@metamask/accounts-controller": {
"optional": true
},
"@metamask/approval-controller": {
"optional": true
}
},
"packageManager": "[email protected]",
"engines": {
"node": "^18.18 || >=20"
Expand Down
105 changes: 53 additions & 52 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1633,9 +1633,9 @@ __metadata:
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"
checksum: e24db4d7c20764bfc5b025065f92518c805f0ffb1da4820078b8cff7dcae964c0f354cf053fcb7ac659de015d5ffdf21aae5e8d44e191ee8faa9066855f22653
version: 3.1.2
resolution: "@metamask/safe-event-emitter@npm:3.1.2"
checksum: 8ef7579f9317eb5c94ecf3e6abb8d13b119af274b678805eac76abe4c0667bfdf539f385e552bb973e96333b71b77aa7c787cb3fce9cd5fb4b00f1dbbabf880d
languageName: node
linkType: hard

Expand Down Expand Up @@ -1689,6 +1689,14 @@ __metadata:
sinon: ^9.2.4
ts-jest: ^29.1.4
typescript: ~4.8.4
peerDependencies:
"@metamask/network-controller": ^22.0.0
"@metamask/transaction-controller": ^38.0.0
peerDependenciesMeta:
"@metamask/accounts-controller":
optional: true
"@metamask/approval-controller":
optional: true
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -1773,23 +1781,16 @@ __metadata:
languageName: node
linkType: hard

"@noble/curves@npm:1.3.0, @noble/curves@npm:~1.3.0":
version: 1.3.0
resolution: "@noble/curves@npm:1.3.0"
"@noble/curves@npm:1.4.2, @noble/curves@npm:~1.4.0":
version: 1.4.2
resolution: "@noble/curves@npm:1.4.2"
dependencies:
"@noble/hashes": 1.3.3
checksum: b65342ee66c4a440eee2978524412eabba9a9efdd16d6370e15218c6a7d80bddf35e66bb57ed52c0dfd32cb9a717b439ab3a72db618f1a0066dfebe3fd12a421
"@noble/hashes": 1.4.0
checksum: c475a83c4263e2c970eaba728895b9b5d67e0ca880651e9c6e3efdc5f6a4f07ceb5b043bf71c399fc80fada0b8706e69d0772bffdd7b9de2483b988973a34cba
languageName: node
linkType: hard

"@noble/hashes@npm:1.3.3, @noble/hashes@npm:~1.3.2":
version: 1.3.3
resolution: "@noble/hashes@npm:1.3.3"
checksum: 8a6496d1c0c64797339bc694ad06cdfaa0f9e56cd0c3f68ae3666cfb153a791a55deb0af9c653c7ed2db64d537aa3e3054629740d2f2338bb1dcb7ab60cd205b
languageName: node
linkType: hard

"@noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.3.1":
"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.4.0":
version: 1.4.0
resolution: "@noble/hashes@npm:1.4.0"
checksum: 8ba816ae26c90764b8c42493eea383716396096c5f7ba6bea559993194f49d80a73c081f315f4c367e51bd2d5891700bcdfa816b421d24ab45b41cb03e4f3342
Expand Down Expand Up @@ -1948,31 +1949,31 @@ __metadata:
languageName: node
linkType: hard

"@scure/base@npm:^1.1.3, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.4":
version: 1.1.7
resolution: "@scure/base@npm:1.1.7"
checksum: d9084be9a2f27971df1684af9e40bb750e86f549345e1bb3227fb61673c0c83569c92c1cb0a4ddccb32650b39d3cd3c145603b926ba751c9bc60c27317549b20
"@scure/base@npm:^1.1.3, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.6":
version: 1.1.9
resolution: "@scure/base@npm:1.1.9"
checksum: 120820a37dfe9dfe4cab2b7b7460552d08e67dee8057ed5354eb68d8e3440890ae983ce3bee957d2b45684950b454a2b6d71d5ee77c1fd3fddc022e2a510337f
languageName: node
linkType: hard

"@scure/bip32@npm:1.3.3":
version: 1.3.3
resolution: "@scure/bip32@npm:1.3.3"
"@scure/bip32@npm:1.4.0":
version: 1.4.0
resolution: "@scure/bip32@npm:1.4.0"
dependencies:
"@noble/curves": ~1.3.0
"@noble/hashes": ~1.3.2
"@scure/base": ~1.1.4
checksum: f939ca733972622fcc1e61d4fdf170a0ad294b24ddb7ed7cdd4c467e1ef283b970154cb101cf5f1a7b64cf5337e917ad31135911dfc36b1d76625320167df2fa
"@noble/curves": ~1.4.0
"@noble/hashes": ~1.4.0
"@scure/base": ~1.1.6
checksum: eff491651cbf2bea8784936de75af5fc020fc1bbb9bcb26b2cfeefbd1fb2440ebfaf30c0733ca11c0ae1e272a2ef4c3c34ba5c9fb3e1091c3285a4272045b0c6
languageName: node
linkType: hard

"@scure/bip39@npm:1.2.2":
version: 1.2.2
resolution: "@scure/bip39@npm:1.2.2"
"@scure/bip39@npm:1.3.0":
version: 1.3.0
resolution: "@scure/bip39@npm:1.3.0"
dependencies:
"@noble/hashes": ~1.3.2
"@scure/base": ~1.1.4
checksum: cb99505e6d2deef8e55e81df8c563ce8dbfdf1595596dc912bceadcf366c91b05a98130e928ecb090df74efdb20150b64acc4be55bc42768cab4d39a2833d234
"@noble/hashes": ~1.4.0
"@scure/base": ~1.1.6
checksum: dbb0b27df753eb6c6380010b25cc9a9ea31f9cb08864fc51e69e5880ff7e2b8f85b72caea1f1f28af165e83b72c48dd38617e43fc632779d025b50ba32ea759e
languageName: node
linkType: hard

Expand Down Expand Up @@ -2806,9 +2807,9 @@ __metadata:
linkType: hard

"bn.js@npm:^4.11.9":
version: 4.12.0
resolution: "bn.js@npm:4.12.0"
checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
version: 4.12.1
resolution: "bn.js@npm:4.12.1"
checksum: f7f84a909bd07bdcc6777cccbf280b629540792e6965fb1dd1aeafba96e944f197ca10cbec2692f51e0a906ff31da1eb4317f3d1cd659d6f68b8bcd211f7ecbc
languageName: node
linkType: hard

Expand Down Expand Up @@ -3982,14 +3983,14 @@ __metadata:
linkType: hard

"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2, ethereum-cryptography@npm:^2.1.3":
version: 2.1.3
resolution: "ethereum-cryptography@npm:2.1.3"
version: 2.2.1
resolution: "ethereum-cryptography@npm:2.2.1"
dependencies:
"@noble/curves": 1.3.0
"@noble/hashes": 1.3.3
"@scure/bip32": 1.3.3
"@scure/bip39": 1.2.2
checksum: 7f9c14f868a588641179cace3eb86c332c4743290865db699870710253cabc4dc74bd4bce5e7bc6db667482e032e94d6f79521219eb6be5dc422059d279a27b7
"@noble/curves": 1.4.2
"@noble/hashes": 1.4.0
"@scure/bip32": 1.4.0
"@scure/bip39": 1.3.0
checksum: 1466e4c417b315a6ac67f95088b769fafac8902b495aada3c6375d827e5a7882f9e0eea5f5451600d2250283d9198b8a3d4d996e374e07a80a324e29136f25c6
languageName: node
linkType: hard

Expand Down Expand Up @@ -5948,9 +5949,9 @@ __metadata:
linkType: hard

"loglevel@npm:^1.8.1":
version: 1.9.1
resolution: "loglevel@npm:1.9.1"
checksum: e1c8586108c4d566122e91f8a79c8df728920e3a714875affa5120566761a24077ec8ec9e5fc388b022e39fc411ec6e090cde1b5775871241b045139771eeb06
version: 1.9.2
resolution: "loglevel@npm:1.9.2"
checksum: 896c67b90a507bfcfc1e9a4daa7bf789a441dd70d95cd13b998d6dd46233a3bfadfb8fadb07250432bbfb53bf61e95f2520f9b11f9d3175cc460e5c251eca0af
languageName: node
linkType: hard

Expand Down Expand Up @@ -7150,9 +7151,9 @@ __metadata:
linkType: hard

"safe-stable-stringify@npm:^2.4.3":
version: 2.4.3
resolution: "safe-stable-stringify@npm:2.4.3"
checksum: 3aeb64449706ee1f5ad2459fc99648b131d48e7a1fbb608d7c628020177512dc9d94108a5cb61bbc953985d313d0afea6566d243237743e02870490afef04b43
version: 2.5.0
resolution: "safe-stable-stringify@npm:2.5.0"
checksum: d3ce103ed43c6c2f523e39607208bfb1c73aa48179fc5be53c3aa97c118390bffd4d55e012f5393b982b65eb3e0ee954dd57b547930d3f242b0053dcdb923d17
languageName: node
linkType: hard

Expand Down Expand Up @@ -7757,9 +7758,9 @@ __metadata:
linkType: hard

"tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
version: 2.6.3
resolution: "tslib@npm:2.6.3"
checksum: 74fce0e100f1ebd95b8995fbbd0e6c91bdd8f4c35c00d4da62e285a3363aaa534de40a80db30ecfd388ed7c313c42d930ee0eaf108e8114214b180eec3dbe6f5
version: 2.8.1
resolution: "tslib@npm:2.8.1"
checksum: e4aba30e632b8c8902b47587fd13345e2827fa639e7c3121074d5ee0880723282411a8838f830b55100cbe4517672f84a2472667d355b81e8af165a55dc6203a
languageName: node
linkType: hard

Expand Down

0 comments on commit 3e64d70

Please sign in to comment.