Skip to content

Commit 42e161c

Browse files
authored
chore: Recategorize controllers as peer dependencies (#472)
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).
1 parent ab13733 commit 42e161c

File tree

2 files changed

+67
-54
lines changed

2 files changed

+67
-54
lines changed

package.json

+14-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
"@metamask/controller-utils": "^11.0.0",
3434
"@metamask/eth-json-rpc-provider": "^4.1.6",
3535
"@metamask/eth-query": "^4.0.0",
36-
"@metamask/network-controller": "^22.0.0",
3736
"@metamask/polling-controller": "^12.0.0",
38-
"@metamask/transaction-controller": "^38.0.0",
3937
"bignumber.js": "^9.0.1",
4038
"events": "^3.3.0",
4139
"fast-json-patch": "^3.1.0",
@@ -51,6 +49,8 @@
5149
"@metamask/eslint-config-typescript": "^12.1.0",
5250
"@metamask/gas-fee-controller": "^22.0.0",
5351
"@metamask/json-rpc-engine": "^10.0.1",
52+
"@metamask/network-controller": "^22.0.0",
53+
"@metamask/transaction-controller": "^38.0.0",
5454
"@types/jest": "^26.0.24",
5555
"@types/lodash": "^4.14.194",
5656
"@types/node": "^18.19.17",
@@ -74,6 +74,18 @@
7474
"ts-jest": "^29.1.4",
7575
"typescript": "~4.8.4"
7676
},
77+
"peerDependencies": {
78+
"@metamask/network-controller": "^22.0.0",
79+
"@metamask/transaction-controller": "^38.0.0"
80+
},
81+
"peerDependenciesMeta": {
82+
"@metamask/accounts-controller": {
83+
"optional": true
84+
},
85+
"@metamask/approval-controller": {
86+
"optional": true
87+
}
88+
},
7789
"packageManager": "[email protected]",
7890
"engines": {
7991
"node": "^18.18 || >=20"

yarn.lock

+53-52
Original file line numberDiff line numberDiff line change
@@ -1633,9 +1633,9 @@ __metadata:
16331633
linkType: hard
16341634

16351635
"@metamask/safe-event-emitter@npm:^3.0.0, @metamask/safe-event-emitter@npm:^3.1.1":
1636-
version: 3.1.1
1637-
resolution: "@metamask/safe-event-emitter@npm:3.1.1"
1638-
checksum: e24db4d7c20764bfc5b025065f92518c805f0ffb1da4820078b8cff7dcae964c0f354cf053fcb7ac659de015d5ffdf21aae5e8d44e191ee8faa9066855f22653
1636+
version: 3.1.2
1637+
resolution: "@metamask/safe-event-emitter@npm:3.1.2"
1638+
checksum: 8ef7579f9317eb5c94ecf3e6abb8d13b119af274b678805eac76abe4c0667bfdf539f385e552bb973e96333b71b77aa7c787cb3fce9cd5fb4b00f1dbbabf880d
16391639
languageName: node
16401640
linkType: hard
16411641

@@ -1689,6 +1689,14 @@ __metadata:
16891689
sinon: ^9.2.4
16901690
ts-jest: ^29.1.4
16911691
typescript: ~4.8.4
1692+
peerDependencies:
1693+
"@metamask/network-controller": ^22.0.0
1694+
"@metamask/transaction-controller": ^38.0.0
1695+
peerDependenciesMeta:
1696+
"@metamask/accounts-controller":
1697+
optional: true
1698+
"@metamask/approval-controller":
1699+
optional: true
16921700
languageName: unknown
16931701
linkType: soft
16941702

@@ -1773,23 +1781,16 @@ __metadata:
17731781
languageName: node
17741782
linkType: hard
17751783

1776-
"@noble/curves@npm:1.3.0, @noble/curves@npm:~1.3.0":
1777-
version: 1.3.0
1778-
resolution: "@noble/curves@npm:1.3.0"
1784+
"@noble/curves@npm:1.4.2, @noble/curves@npm:~1.4.0":
1785+
version: 1.4.2
1786+
resolution: "@noble/curves@npm:1.4.2"
17791787
dependencies:
1780-
"@noble/hashes": 1.3.3
1781-
checksum: b65342ee66c4a440eee2978524412eabba9a9efdd16d6370e15218c6a7d80bddf35e66bb57ed52c0dfd32cb9a717b439ab3a72db618f1a0066dfebe3fd12a421
1788+
"@noble/hashes": 1.4.0
1789+
checksum: c475a83c4263e2c970eaba728895b9b5d67e0ca880651e9c6e3efdc5f6a4f07ceb5b043bf71c399fc80fada0b8706e69d0772bffdd7b9de2483b988973a34cba
17821790
languageName: node
17831791
linkType: hard
17841792

1785-
"@noble/hashes@npm:1.3.3, @noble/hashes@npm:~1.3.2":
1786-
version: 1.3.3
1787-
resolution: "@noble/hashes@npm:1.3.3"
1788-
checksum: 8a6496d1c0c64797339bc694ad06cdfaa0f9e56cd0c3f68ae3666cfb153a791a55deb0af9c653c7ed2db64d537aa3e3054629740d2f2338bb1dcb7ab60cd205b
1789-
languageName: node
1790-
linkType: hard
1791-
1792-
"@noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.3.1":
1793+
"@noble/hashes@npm:1.4.0, @noble/hashes@npm:^1.1.2, @noble/hashes@npm:^1.3.1, @noble/hashes@npm:~1.4.0":
17931794
version: 1.4.0
17941795
resolution: "@noble/hashes@npm:1.4.0"
17951796
checksum: 8ba816ae26c90764b8c42493eea383716396096c5f7ba6bea559993194f49d80a73c081f315f4c367e51bd2d5891700bcdfa816b421d24ab45b41cb03e4f3342
@@ -1948,31 +1949,31 @@ __metadata:
19481949
languageName: node
19491950
linkType: hard
19501951

1951-
"@scure/base@npm:^1.1.3, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.4":
1952-
version: 1.1.7
1953-
resolution: "@scure/base@npm:1.1.7"
1954-
checksum: d9084be9a2f27971df1684af9e40bb750e86f549345e1bb3227fb61673c0c83569c92c1cb0a4ddccb32650b39d3cd3c145603b926ba751c9bc60c27317549b20
1952+
"@scure/base@npm:^1.1.3, @scure/base@npm:~1.1.3, @scure/base@npm:~1.1.6":
1953+
version: 1.1.9
1954+
resolution: "@scure/base@npm:1.1.9"
1955+
checksum: 120820a37dfe9dfe4cab2b7b7460552d08e67dee8057ed5354eb68d8e3440890ae983ce3bee957d2b45684950b454a2b6d71d5ee77c1fd3fddc022e2a510337f
19551956
languageName: node
19561957
linkType: hard
19571958

1958-
"@scure/bip32@npm:1.3.3":
1959-
version: 1.3.3
1960-
resolution: "@scure/bip32@npm:1.3.3"
1959+
"@scure/bip32@npm:1.4.0":
1960+
version: 1.4.0
1961+
resolution: "@scure/bip32@npm:1.4.0"
19611962
dependencies:
1962-
"@noble/curves": ~1.3.0
1963-
"@noble/hashes": ~1.3.2
1964-
"@scure/base": ~1.1.4
1965-
checksum: f939ca733972622fcc1e61d4fdf170a0ad294b24ddb7ed7cdd4c467e1ef283b970154cb101cf5f1a7b64cf5337e917ad31135911dfc36b1d76625320167df2fa
1963+
"@noble/curves": ~1.4.0
1964+
"@noble/hashes": ~1.4.0
1965+
"@scure/base": ~1.1.6
1966+
checksum: eff491651cbf2bea8784936de75af5fc020fc1bbb9bcb26b2cfeefbd1fb2440ebfaf30c0733ca11c0ae1e272a2ef4c3c34ba5c9fb3e1091c3285a4272045b0c6
19661967
languageName: node
19671968
linkType: hard
19681969

1969-
"@scure/bip39@npm:1.2.2":
1970-
version: 1.2.2
1971-
resolution: "@scure/bip39@npm:1.2.2"
1970+
"@scure/bip39@npm:1.3.0":
1971+
version: 1.3.0
1972+
resolution: "@scure/bip39@npm:1.3.0"
19721973
dependencies:
1973-
"@noble/hashes": ~1.3.2
1974-
"@scure/base": ~1.1.4
1975-
checksum: cb99505e6d2deef8e55e81df8c563ce8dbfdf1595596dc912bceadcf366c91b05a98130e928ecb090df74efdb20150b64acc4be55bc42768cab4d39a2833d234
1974+
"@noble/hashes": ~1.4.0
1975+
"@scure/base": ~1.1.6
1976+
checksum: dbb0b27df753eb6c6380010b25cc9a9ea31f9cb08864fc51e69e5880ff7e2b8f85b72caea1f1f28af165e83b72c48dd38617e43fc632779d025b50ba32ea759e
19761977
languageName: node
19771978
linkType: hard
19781979

@@ -2806,9 +2807,9 @@ __metadata:
28062807
linkType: hard
28072808

28082809
"bn.js@npm:^4.11.9":
2809-
version: 4.12.0
2810-
resolution: "bn.js@npm:4.12.0"
2811-
checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
2810+
version: 4.12.1
2811+
resolution: "bn.js@npm:4.12.1"
2812+
checksum: f7f84a909bd07bdcc6777cccbf280b629540792e6965fb1dd1aeafba96e944f197ca10cbec2692f51e0a906ff31da1eb4317f3d1cd659d6f68b8bcd211f7ecbc
28122813
languageName: node
28132814
linkType: hard
28142815

@@ -3982,14 +3983,14 @@ __metadata:
39823983
linkType: hard
39833984

39843985
"ethereum-cryptography@npm:^2.0.0, ethereum-cryptography@npm:^2.1.2, ethereum-cryptography@npm:^2.1.3":
3985-
version: 2.1.3
3986-
resolution: "ethereum-cryptography@npm:2.1.3"
3986+
version: 2.2.1
3987+
resolution: "ethereum-cryptography@npm:2.2.1"
39873988
dependencies:
3988-
"@noble/curves": 1.3.0
3989-
"@noble/hashes": 1.3.3
3990-
"@scure/bip32": 1.3.3
3991-
"@scure/bip39": 1.2.2
3992-
checksum: 7f9c14f868a588641179cace3eb86c332c4743290865db699870710253cabc4dc74bd4bce5e7bc6db667482e032e94d6f79521219eb6be5dc422059d279a27b7
3989+
"@noble/curves": 1.4.2
3990+
"@noble/hashes": 1.4.0
3991+
"@scure/bip32": 1.4.0
3992+
"@scure/bip39": 1.3.0
3993+
checksum: 1466e4c417b315a6ac67f95088b769fafac8902b495aada3c6375d827e5a7882f9e0eea5f5451600d2250283d9198b8a3d4d996e374e07a80a324e29136f25c6
39933994
languageName: node
39943995
linkType: hard
39953996

@@ -5948,9 +5949,9 @@ __metadata:
59485949
linkType: hard
59495950

59505951
"loglevel@npm:^1.8.1":
5951-
version: 1.9.1
5952-
resolution: "loglevel@npm:1.9.1"
5953-
checksum: e1c8586108c4d566122e91f8a79c8df728920e3a714875affa5120566761a24077ec8ec9e5fc388b022e39fc411ec6e090cde1b5775871241b045139771eeb06
5952+
version: 1.9.2
5953+
resolution: "loglevel@npm:1.9.2"
5954+
checksum: 896c67b90a507bfcfc1e9a4daa7bf789a441dd70d95cd13b998d6dd46233a3bfadfb8fadb07250432bbfb53bf61e95f2520f9b11f9d3175cc460e5c251eca0af
59545955
languageName: node
59555956
linkType: hard
59565957

@@ -7150,9 +7151,9 @@ __metadata:
71507151
linkType: hard
71517152

71527153
"safe-stable-stringify@npm:^2.4.3":
7153-
version: 2.4.3
7154-
resolution: "safe-stable-stringify@npm:2.4.3"
7155-
checksum: 3aeb64449706ee1f5ad2459fc99648b131d48e7a1fbb608d7c628020177512dc9d94108a5cb61bbc953985d313d0afea6566d243237743e02870490afef04b43
7154+
version: 2.5.0
7155+
resolution: "safe-stable-stringify@npm:2.5.0"
7156+
checksum: d3ce103ed43c6c2f523e39607208bfb1c73aa48179fc5be53c3aa97c118390bffd4d55e012f5393b982b65eb3e0ee954dd57b547930d3f242b0053dcdb923d17
71567157
languageName: node
71577158
linkType: hard
71587159

@@ -7757,9 +7758,9 @@ __metadata:
77577758
linkType: hard
77587759

77597760
"tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
7760-
version: 2.6.3
7761-
resolution: "tslib@npm:2.6.3"
7762-
checksum: 74fce0e100f1ebd95b8995fbbd0e6c91bdd8f4c35c00d4da62e285a3363aaa534de40a80db30ecfd388ed7c313c42d930ee0eaf108e8114214b180eec3dbe6f5
7761+
version: 2.8.1
7762+
resolution: "tslib@npm:2.8.1"
7763+
checksum: e4aba30e632b8c8902b47587fd13345e2827fa639e7c3121074d5ee0880723282411a8838f830b55100cbe4517672f84a2472667d355b81e8af165a55dc6203a
77637764
languageName: node
77647765
linkType: hard
77657766

0 commit comments

Comments
 (0)