Skip to content

Commit

Permalink
build: bump gas-fee-controller to v18 and remove patch (#25679)
Browse files Browse the repository at this point in the history
## **Description**
* This PR bumps the gas-fee-controller to v18 and removes the patch for
that controller.
* This is a clean-up task from #25230 

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25679?quickstart=1)

## **Related issues**

## **Manual testing steps**

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

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

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

### **After**

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

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] 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-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **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.

---------

Co-authored-by: MetaMask Bot <[email protected]>
  • Loading branch information
dbrans and metamaskbot authored Jul 10, 2024
1 parent d445a4a commit 75c01cc
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 2,695 deletions.
2,630 changes: 0 additions & 2,630 deletions .yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch

This file was deleted.

14 changes: 1 addition & 13 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1525,9 +1525,9 @@
"setInterval": true
},
"packages": {
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/eth-query": true,
"@metamask/gas-fee-controller>@metamask/controller-utils": true,
"@metamask/gas-fee-controller>@metamask/polling-controller": true,
"bn.js": true,
"uuid": true
}
Expand All @@ -1550,18 +1550,6 @@
"eth-ens-namehash": true
}
},
"@metamask/gas-fee-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/jazzicon": {
"globals": {
"document.createElement": true,
Expand Down
14 changes: 1 addition & 13 deletions lavamoat/browserify/flask/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1525,9 +1525,9 @@
"setInterval": true
},
"packages": {
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/eth-query": true,
"@metamask/gas-fee-controller>@metamask/controller-utils": true,
"@metamask/gas-fee-controller>@metamask/polling-controller": true,
"bn.js": true,
"uuid": true
}
Expand All @@ -1550,18 +1550,6 @@
"eth-ens-namehash": true
}
},
"@metamask/gas-fee-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/jazzicon": {
"globals": {
"document.createElement": true,
Expand Down
14 changes: 1 addition & 13 deletions lavamoat/browserify/main/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1525,9 +1525,9 @@
"setInterval": true
},
"packages": {
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/eth-query": true,
"@metamask/gas-fee-controller>@metamask/controller-utils": true,
"@metamask/gas-fee-controller>@metamask/polling-controller": true,
"bn.js": true,
"uuid": true
}
Expand All @@ -1550,18 +1550,6 @@
"eth-ens-namehash": true
}
},
"@metamask/gas-fee-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/jazzicon": {
"globals": {
"document.createElement": true,
Expand Down
14 changes: 1 addition & 13 deletions lavamoat/browserify/mmi/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1617,9 +1617,9 @@
"setInterval": true
},
"packages": {
"@metamask/assets-controllers>@metamask/polling-controller": true,
"@metamask/eth-query": true,
"@metamask/gas-fee-controller>@metamask/controller-utils": true,
"@metamask/gas-fee-controller>@metamask/polling-controller": true,
"bn.js": true,
"uuid": true
}
Expand All @@ -1642,18 +1642,6 @@
"eth-ens-namehash": true
}
},
"@metamask/gas-fee-controller>@metamask/polling-controller": {
"globals": {
"clearTimeout": true,
"console.error": true,
"setTimeout": true
},
"packages": {
"@metamask/base-controller": true,
"@metamask/snaps-utils>fast-json-stable-stringify": true,
"uuid": true
}
},
"@metamask/jazzicon": {
"globals": {
"document.createElement": true,
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@
"@metamask/network-controller": "patch:@metamask/network-controller@npm%3A19.0.0#~/.yarn/patches/@metamask-network-controller-npm-19.0.0-a5e0d1fe14.patch",
"@solana/web3.js/rpc-websockets": "^8.0.1",
"@metamask/network-controller@npm:^19.0.0": "patch:@metamask/network-controller@npm%3A19.0.0#~/.yarn/patches/@metamask-network-controller-npm-19.0.0-a5e0d1fe14.patch",
"@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"
},
"dependencies": {
Expand Down Expand Up @@ -312,7 +311,7 @@
"@metamask/ethjs": "^0.6.0",
"@metamask/ethjs-contract": "^0.4.1",
"@metamask/ethjs-query": "^0.7.1",
"@metamask/gas-fee-controller": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch",
"@metamask/gas-fee-controller": "^18.0.0",
"@metamask/jazzicon": "^2.0.0",
"@metamask/keyring-api": "^8.0.0",
"@metamask/keyring-controller": "^16.1.0",
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5473,7 +5473,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/gas-fee-controller@npm:15.1.2":
"@metamask/gas-fee-controller@npm:^15.1.1":
version: 15.1.2
resolution: "@metamask/gas-fee-controller@npm:15.1.2"
dependencies:
Expand Down Expand Up @@ -5515,24 +5515,24 @@ __metadata:
languageName: node
linkType: hard

"@metamask/gas-fee-controller@patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch":
version: 15.1.2
resolution: "@metamask/gas-fee-controller@patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch::version=15.1.2&hash=c5be0a"
"@metamask/gas-fee-controller@npm:^18.0.0":
version: 18.0.0
resolution: "@metamask/gas-fee-controller@npm:18.0.0"
dependencies:
"@metamask/base-controller": "npm:^5.0.2"
"@metamask/controller-utils": "npm:^9.1.0"
"@metamask/base-controller": "npm:^6.0.0"
"@metamask/controller-utils": "npm:^11.0.0"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/ethjs-unit": "npm:^0.3.0"
"@metamask/network-controller": "npm:^18.1.0"
"@metamask/polling-controller": "npm:^6.0.2"
"@metamask/network-controller": "npm:^19.0.0"
"@metamask/polling-controller": "npm:^8.0.0"
"@metamask/utils": "npm:^8.3.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": ^18.0.0
checksum: 10/4785ff26e541911ffc5a280a9e1a9a648fb3d89e672afeedcd4951a8f176d8e6ae91192afe56fa943f6b4eeff3ce0dba7ec05228a62a8fee1664bb82642fcc15
"@metamask/network-controller": ^19.0.0
checksum: 10/c5a045da0cf73b01931d31060695f23a447f4ac92fb6f9c30f1570b69ab36249ff6c649aa088f8e8db40d22eb7331b17aabedf5a1e031ed49b78d8beadd7cbfc
languageName: node
linkType: hard

Expand Down Expand Up @@ -25220,7 +25220,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": "patch:@metamask/gas-fee-controller@npm%3A15.1.2#~/.yarn/patches/@metamask-gas-fee-controller-npm-15.1.2-db4d2976aa.patch"
"@metamask/gas-fee-controller": "npm:^18.0.0"
"@metamask/jazzicon": "npm:^2.0.0"
"@metamask/keyring-api": "npm:^8.0.0"
"@metamask/keyring-controller": "npm:^16.1.0"
Expand Down

0 comments on commit 75c01cc

Please sign in to comment.