Skip to content

Commit

Permalink
chore: Update @metamask/gas-fee-controller and peer deps
Browse files Browse the repository at this point in the history 
Update the `@metamask/gas-fee-controller` package to v21 to satisfy the
peer dependency on `@metamask/network-controller@^21.0.0`, and update
the `@metamask/user-operation-controller` to satisfy its peer
dependency upon `@metamask/gas-fee-controller`.

Note that an older version of `@metamask/gas-fee-controller` (v18)
remains in the dependency tree, but only because it's imported by
`@metamask/smart-transaction-controller` for type reasons. It has no
runtime impact on the application, so the associated peer dependency
warnings from this older release can be ignored. This will be
eliminated soon, in an upcoming PR.

The updated `@metamask/user-operation-controller` still does not have
its peer dependencies satisfied, but the problems are pre-existing. The
`@metamask/keyring-controller` and `@metamask/transaction-controller`
packages are head of where this package expects them to be. This is not
made worse by this PR though, and will be addressed in a future PR.
  • Loading branch information
@Gudahtt
Gudahtt committed Nov 26, 2024
1 parent 86d6c05 commit aa8e265
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 23 deletions.
5 changes: 2 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@
"@expo/config-plugins/glob": "^10.3.10",
"@solana/web3.js/rpc-websockets": "^8.0.1",
"@metamask/message-manager": "^10.1.0",
"@metamask/gas-fee-controller@npm:^15.1.1": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch",
"@metamask/nonce-tracker@npm:^5.0.0": "patch:@metamask/nonce-tracker@npm%3A5.0.0#~/.yarn/patches/@metamask-nonce-tracker-npm-5.0.0-d81478218e.patch",
"@metamask/network-controller@npm:^17.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
"@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A21.0.0#~/.yarn/patches/@metamask-network-controller-npm-21.0.0-559aa8e395.patch",
Expand Down Expand Up @@ -310,7 +309,7 @@
"@metamask/ethjs": "^0.6.0",
"@metamask/ethjs-contract": "^0.4.1",
"@metamask/ethjs-query": "^0.7.1",
"@metamask/gas-fee-controller": "^18.0.0",
"@metamask/gas-fee-controller": "^21.0.0",
"@metamask/jazzicon": "^2.0.0",
"@metamask/json-rpc-engine": "^10.0.0",
"@metamask/json-rpc-middleware-stream": "^8.0.4",
Expand Down Expand Up @@ -351,7 +350,7 @@
"@metamask/snaps-utils": "^8.6.0",
"@metamask/solana-wallet-snap": "^0.1.9",
"@metamask/transaction-controller": "^40.1.0",
"@metamask/user-operation-controller": "^13.0.0",
"@metamask/user-operation-controller": "^16.0.0",
"@metamask/utils": "^10.0.1",
"@ngraveio/bc-ur": "^1.1.12",
"@noble/hashes": "^1.3.3",
Expand Down
71 changes: 51 additions & 20 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5695,6 +5695,26 @@ __metadata:
languageName: node
linkType: hard

"@metamask/gas-fee-controller@npm:^21.0.0":
version: 21.0.0
resolution: "@metamask/gas-fee-controller@npm:21.0.0"
dependencies:
"@metamask/base-controller": "npm:^7.0.1"
"@metamask/controller-utils": "npm:^11.3.0"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/ethjs-unit": "npm:^0.3.0"
"@metamask/polling-controller": "npm:^11.0.0"
"@metamask/utils": "npm:^9.1.0"
"@types/bn.js": "npm:^5.1.5"
"@types/uuid": "npm:^8.3.0"
bn.js: "npm:^5.2.1"
uuid: "npm:^8.3.2"
peerDependencies:
"@metamask/network-controller": ^21.0.0
checksum: 10/8b41c7257f7dc17deb3f550cfdde0288da142d11536bb55c998bec8267fa62243e36fb6468a44224cd90ed2f49ba3ba1dbe93c2b0834a725752c5a66ae283303
languageName: node
linkType: hard

"@metamask/jazzicon@npm:^2.0.0":
version: 2.0.0
resolution: "@metamask/jazzicon@npm:2.0.0"
Expand Down Expand Up @@ -6183,6 +6203,22 @@ __metadata:
languageName: node
linkType: hard

"@metamask/polling-controller@npm:^11.0.0":
version: 11.0.0
resolution: "@metamask/polling-controller@npm:11.0.0"
dependencies:
"@metamask/base-controller": "npm:^7.0.1"
"@metamask/controller-utils": "npm:^11.3.0"
"@metamask/utils": "npm:^9.1.0"
"@types/uuid": "npm:^8.3.0"
fast-json-stable-stringify: "npm:^2.1.0"
uuid: "npm:^8.3.2"
peerDependencies:
"@metamask/network-controller": ^21.0.0
checksum: 10/67b563a5d1ce02dc9c2db25ad4ad1fb9f75d5578cf380cce85176ff2cd136addce612c3982653254647b9d8c535374e93d96abb6e500e42076bf3a524a72e75f
languageName: node
linkType: hard

"@metamask/polling-controller@npm:^12.0.1":
version: 12.0.1
resolution: "@metamask/polling-controller@npm:12.0.1"
Expand Down Expand Up @@ -6752,33 +6788,28 @@ __metadata:
languageName: node
linkType: hard

"@metamask/user-operation-controller@npm:^13.0.0":
version: 13.0.0
resolution: "@metamask/user-operation-controller@npm:13.0.0"
"@metamask/user-operation-controller@npm:^16.0.0":
version: 16.0.0
resolution: "@metamask/user-operation-controller@npm:16.0.0"
dependencies:
"@metamask/approval-controller": "npm:^7.0.0"
"@metamask/base-controller": "npm:^6.0.0"
"@metamask/controller-utils": "npm:^11.0.0"
"@metamask/base-controller": "npm:^7.0.1"
"@metamask/controller-utils": "npm:^11.3.0"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/gas-fee-controller": "npm:^18.0.0"
"@metamask/keyring-controller": "npm:^17.1.0"
"@metamask/network-controller": "npm:^19.0.0"
"@metamask/polling-controller": "npm:^8.0.0"
"@metamask/rpc-errors": "npm:^6.2.1"
"@metamask/transaction-controller": "npm:^34.0.0"
"@metamask/utils": "npm:^8.3.0"
"@metamask/polling-controller": "npm:^11.0.0"
"@metamask/rpc-errors": "npm:^7.0.0"
"@metamask/superstruct": "npm:^3.1.0"
"@metamask/utils": "npm:^9.1.0"
bn.js: "npm:^5.2.1"
immer: "npm:^9.0.6"
lodash: "npm:^4.17.21"
superstruct: "npm:^1.0.3"
uuid: "npm:^8.3.2"
peerDependencies:
"@metamask/approval-controller": ^7.0.0
"@metamask/gas-fee-controller": ^18.0.0
"@metamask/gas-fee-controller": ^21.0.0
"@metamask/keyring-controller": ^17.0.0
"@metamask/network-controller": ^19.0.0
"@metamask/transaction-controller": ^34.0.0
checksum: 10/600dd845dfc30ff852d766bd012ce40b4a6fb2276538d358cbe3ef1ce5815e4dba8f94e4911b7cb0506857133b185923b43af73ec39c7628eb86eedfdaf8dc59
"@metamask/network-controller": ^21.0.0
"@metamask/transaction-controller": ^37.0.0
checksum: 10/36ef43910f9e94ae7823902113acdaf7d4031423930f0a35fe4dd3b948a00e8088ea590354afbdb507b32712761720727f0ee905ad6d3db83ef3f0f145b8452d
languageName: node
linkType: hard

Expand Down Expand Up @@ -26828,7 +26859,7 @@ __metadata:
"@metamask/ethjs-contract": "npm:^0.4.1"
"@metamask/ethjs-query": "npm:^0.7.1"
"@metamask/forwarder": "npm:^1.1.0"
"@metamask/gas-fee-controller": "npm:^18.0.0"
"@metamask/gas-fee-controller": "npm:^21.0.0"
"@metamask/jazzicon": "npm:^2.0.0"
"@metamask/json-rpc-engine": "npm:^10.0.0"
"@metamask/json-rpc-middleware-stream": "npm:^8.0.4"
Expand Down Expand Up @@ -26873,7 +26904,7 @@ __metadata:
"@metamask/test-bundler": "npm:^1.0.0"
"@metamask/test-dapp": "npm:8.13.0"
"@metamask/transaction-controller": "npm:^40.1.0"
"@metamask/user-operation-controller": "npm:^13.0.0"
"@metamask/user-operation-controller": "npm:^16.0.0"
"@metamask/utils": "npm:^10.0.1"
"@ngraveio/bc-ur": "npm:^1.1.12"
"@noble/hashes": "npm:^1.3.3"
Expand Down

0 comments on commit aa8e265

Please sign in to comment.