Skip to content

Commit

Permalink
feat: Gas Fee Controller minor update to version 6.1.0 (#8850)
Browse files Browse the repository at this point in the history
## **Description**
This is a minor update to gas fee controller update

ts-expect-error added on the `onNetworkStateChange` of
gas-fee-controller, since does not use the ticker property on this
method it isn't blocked by the network controller update to v11

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**
Sepolia and Linea goerli testnet transactions:
https://recordit.co/J3ESQ8hxkR

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
tommasini authored Mar 6, 2024
1 parent f636a78 commit 6abafb6
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
2 changes: 2 additions & 0 deletions app/core/Engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,8 @@ class Engine {
onNetworkStateChange: (listener) =>
this.controllerMessenger.subscribe(
AppConstants.NETWORK_STATE_CHANGE_EVENT,
// @ts-expect-error network controller will be updated on this PR: https://github.com/MetaMask/metamask-mobile/pull/8812 and this type error will be addressed
// This is not a blocker because gas fee controller does not need ticker to be defined
listener,
),
getCurrentNetworkEIP1559Compatibility: async () =>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
"@metamask/design-tokens": "^2.0.0",
"@metamask/eth-sig-util": "^4.0.1",
"@metamask/etherscan-link": "^2.0.0",
"@metamask/gas-fee-controller": "6.0.0",
"@metamask/gas-fee-controller": "6.1.0",
"@metamask/key-tree": "^9.0.0",
"@metamask/keyring-controller": "^8.1.0",
"@metamask/logging-controller": "^1.0.1",
Expand Down
60 changes: 29 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3807,7 +3807,7 @@
"@metamask/scure-bip39" "^2.0.3"
ethereum-cryptography "^1.1.2"

"@metamask/eth-json-rpc-infura@^8.0.0", "@metamask/eth-json-rpc-infura@^8.1.0":
"@metamask/eth-json-rpc-infura@^8.1.0", "@metamask/eth-json-rpc-infura@^8.1.1":
version "8.1.1"
resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-infura/-/eth-json-rpc-infura-8.1.1.tgz#e877284634fb0727b347575115c74dc9ddd4400c"
integrity sha512-Ey05VRIMqvF845+pbJeptPm4RrzwHSfmT3QiJfQGWLG4yKdkhvlgOJ7xxYxqbdvPIywA5qCLI7Kszk0gAbWiKA==
Expand Down Expand Up @@ -3985,17 +3985,16 @@
"@metamask/number-to-bn" "^1.7.1"
bn.js "^5.2.1"

"@metamask/gas-fee-controller@6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-6.0.0.tgz#a0fc8233284708cd7924517ca7b4a7624dfe5c42"
integrity sha512-B01j41B89hWAGUhJBQAvojuYre10Ef7nlMGrd8dxjW+6BE82hR6BkwOHDWd2evonVUQQuhyekbBl3BjCgzzOUg==
"@metamask/gas-fee-controller@6.1.0":
version "6.1.0"
resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-6.1.0.tgz#97021b2ffa0a7faa68b3847226bf9cea6a1e395d"
integrity sha512-pFooCqBjw2wKFsgMSN1Rsnw3xDMqkkeLhx2OCMOoGx4IHTaxK+KpoUWrKX9J4yLQNsj0jYs584jT1ekoa1kknQ==
dependencies:
"@metamask/base-controller" "^3.0.0"
"@metamask/controller-utils" "^4.0.0"
"@metamask/network-controller" "^9.0.0"
"@metamask/utils" "^5.0.2"
"@metamask/base-controller" "^3.2.0"
"@metamask/controller-utils" "^4.3.0"
"@metamask/network-controller" "^11.0.0"
"@metamask/utils" "^6.2.0"
"@types/uuid" "^8.3.0"
babel-runtime "^6.26.0"
eth-query "^2.1.2"
ethereumjs-util "^7.0.10"
ethjs-unit "^0.1.6"
Expand Down Expand Up @@ -4093,6 +4092,26 @@
json-rpc-engine "^6.1.0"
uuid "^8.3.2"

"@metamask/network-controller@^11.0.0":
version "11.0.0"
resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-11.0.0.tgz#c128e3aae9e3c1c721aa52ad85cb42e003e847c3"
integrity sha512-wgxZo7BVpJrS3WOZwqQBNisoLGrUYMBIZ5IIWUTMkTfzvLJ9LtDHQFriEP/fHpubj6Nfsr6aKs4fCCs8nsVFPQ==
dependencies:
"@metamask/base-controller" "^3.2.0"
"@metamask/controller-utils" "^4.3.0"
"@metamask/eth-json-rpc-infura" "^8.1.1"
"@metamask/eth-json-rpc-middleware" "^11.0.0"
"@metamask/eth-json-rpc-provider" "^1.0.0"
"@metamask/swappable-obj-proxy" "^2.1.0"
"@metamask/utils" "^6.2.0"
async-mutex "^0.2.6"
eth-block-tracker "^7.0.1"
eth-query "^2.1.2"
eth-rpc-errors "^4.0.2"
immer "^9.0.6"
json-rpc-engine "^6.1.0"
uuid "^8.3.2"

"@metamask/network-controller@^17.0.0":
version "17.0.0"
resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-17.0.0.tgz#ba43edbc9e98bde59c43a467ec3dbaf8f8cab6cd"
Expand All @@ -4113,27 +4132,6 @@
immer "^9.0.6"
uuid "^8.3.2"

"@metamask/network-controller@^9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-9.0.0.tgz#f27300ef8fd0bf633de9199d613ad1bef1ed704d"
integrity sha512-6JhHVohUWQPV+hpRYtiM8Bc2rFXRhwJONPEwXQElI3f7YtYKdwmCl59KjY6gpytr5yr4+uMt2zNXMpGlJuZYuw==
dependencies:
"@metamask/base-controller" "^3.0.0"
"@metamask/controller-utils" "^4.0.0"
"@metamask/eth-json-rpc-infura" "^8.0.0"
"@metamask/eth-json-rpc-middleware" "^11.0.0"
"@metamask/eth-json-rpc-provider" "^1.0.0"
"@metamask/swappable-obj-proxy" "^2.1.0"
"@metamask/utils" "^5.0.2"
async-mutex "^0.2.6"
babel-runtime "^6.26.0"
eth-block-tracker "^7.0.1"
eth-query "^2.1.2"
eth-rpc-errors "^4.0.2"
immer "^9.0.6"
json-rpc-engine "^6.1.0"
uuid "^8.3.2"

"@metamask/number-to-bn@^1.7.1":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@metamask/number-to-bn/-/number-to-bn-1.7.1.tgz#a449ec8b2edba211e0dc3e1e0428ff2cc2bf7ab4"
Expand Down

0 comments on commit 6abafb6

Please sign in to comment.