Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: gas fee controller update v^7 #9183

Merged
merged 39 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5add7ae
Update network controller to version 13.0.1. Also created migration t…
tommasini Mar 26, 2024
22887ba
remove unusable import
tommasini Mar 27, 2024
e2b926e
Merge branch 'main' into feat/1629-update-network-controller-v13-0-1
tommasini Mar 27, 2024
b9ae3c4
Changed from subscribe network state change to network did change to …
tommasini Mar 27, 2024
6210b09
added js doc and unit tests for deprecatedGetNetworkId
tommasini Mar 27, 2024
6f53c81
fix new unit test, since we are not spying the convertNetworkId funct…
tommasini Mar 27, 2024
2f9622f
remove unnecessary async and unnecessary check
tommasini Mar 28, 2024
d2c8dc9
return loading if networkId is undefined on backgroundBridge
tommasini Mar 28, 2024
893aaf7
created a new action and a new reducer, a new state property called n…
tommasini Mar 28, 2024
d3decf6
merge main and solve migrations conflicts
tommasini Mar 28, 2024
9df5483
address bug on the new action and reducer of networkProvider
tommasini Mar 28, 2024
bb6b1ff
replace sentry capture exception for the Logger error since we do not…
tommasini Mar 28, 2024
e2e71bc
change Logger error to console error on engine file catch when trying…
tommasini Mar 29, 2024
e4235d1
added new slice with ducks pattern, creating a new reducer called inp…
tommasini Mar 29, 2024
21ef7c5
update test name
tommasini Mar 29, 2024
c10d981
merge main and solve lock file conflicts
tommasini Mar 29, 2024
19c8ccf
address ts issues
tommasini Mar 29, 2024
01c34ae
merge main and solve conflicts
tommasini Mar 31, 2024
cd6f0b5
Merge branch 'main' into feat/1629-update-network-controller-v13-0-1
tommasini Apr 2, 2024
8537709
fix fixture-builder type
tommasini Apr 2, 2024
60e62ac
merge main and solve conflicts
tommasini Apr 5, 2024
4a36f97
re add comment
tommasini Apr 5, 2024
60c3c48
remove unnecessary ts expect error comment
tommasini Apr 5, 2024
0f6b255
Merge branch 'main' into feat/1629-update-network-controller-v13-0-1
tommasini Apr 5, 2024
1db2228
Merge branch 'main' into feat/1629-update-network-controller-v13-0-1
tommasini Apr 8, 2024
8294f70
Merge branch 'main' into feat/1629-update-network-controller-v13-0-1
tommasini Apr 9, 2024
eb5f0c0
Merge branch 'main' into feat/1629-update-network-controller-v13-0-1
tommasini Apr 9, 2024
6ed2efa
change subscribe of network id to network state change event since on…
tommasini Apr 9, 2024
1c840b5
Merge branch 'main' into feat/1629-update-network-controller-v13-0-1
tommasini Apr 9, 2024
4c26c1e
Update gas fee controller to v^7
tommasini Apr 10, 2024
a1981d7
Revert "Update gas fee controller to v^7"
tommasini Apr 10, 2024
51e428a
Update gas fee controller to v^7
tommasini Apr 10, 2024
46e4084
merge main and solve conflicts
tommasini Apr 11, 2024
21e1fce
remove unnecessary ts expect error from engine
tommasini Apr 11, 2024
a91e54a
Merge branch 'main' into feat/1623-gas-fee-controller-v7
tommasini Apr 12, 2024
afe52bd
merge main and solve yarn lock conflicts
tommasini Apr 12, 2024
2c40643
Merge branch 'main' into feat/1623-gas-fee-controller-v7
tommasini Apr 15, 2024
432021f
Merge branch 'main' into feat/1623-gas-fee-controller-v7
tommasini Apr 15, 2024
0bf1cc1
merge main and solve conflicts
tommasini Apr 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/core/Engine.ts
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ class Engine {
onNetworkStateChange: (listener) =>
this.controllerMessenger.subscribe(
AppConstants.NETWORK_STATE_CHANGE_EVENT,
//@ts-expect-error GasFeeController needs to be updated to v7 for this error disappears
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 @@ -147,7 +147,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.1.2",
"@metamask/gas-fee-controller": "^7.0.0",
"@metamask/key-tree": "^9.0.0",
"@metamask/keyring-api": "^4.0.0",
"@metamask/keyring-controller": "^8.1.0",
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3993,15 +3993,15 @@
"@metamask/number-to-bn" "^1.7.1"
bn.js "^5.2.1"

"@metamask/gas-fee-controller@6.1.2":
version "6.1.2"
resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-6.1.2.tgz#b7a9a611e15a8914636a05411d18686bd554ddf3"
integrity sha512-NN1Hlmq5u/q2jIJxuGpPwDQaCIZCnKv+v3SghXajmFSAMYC1REgfay/VITI1A0Drfv3dQ8gHlYll2hAK+lu5oQ==
"@metamask/gas-fee-controller@^7.0.0":
version "7.0.1"
resolved "https://registry.yarnpkg.com/@metamask/gas-fee-controller/-/gas-fee-controller-7.0.1.tgz#34744c942b2c6764d079cb653f187150da385327"
integrity sha512-WewTccRTrdt0/W8TEeSrLnVbuB4FjOsLqcX6nzftol5hvAcK342ErvF3mpu71660xYTTAR2VM0BlZPyBzjPyNg==
dependencies:
"@metamask/base-controller" "^3.2.1"
"@metamask/controller-utils" "^4.3.2"
"@metamask/base-controller" "^3.2.2"
"@metamask/controller-utils" "^5.0.1"
"@metamask/eth-query" "^3.0.1"
"@metamask/network-controller" "^12.1.2"
"@metamask/network-controller" "^13.0.1"
"@metamask/utils" "^6.2.0"
"@types/uuid" "^8.3.0"
ethereumjs-util "^7.0.10"
Expand Down Expand Up @@ -4102,7 +4102,7 @@
resolved "https://registry.yarnpkg.com/@metamask/mobile-provider/-/mobile-provider-3.0.0.tgz#8a6a5a0874c8cbe4b468f63dfc57117d207f9595"
integrity sha512-XwFJk0rd9lAZR5xS3VC7ypEhD7DvZR2gi2Ch6PHnODIqeS9Te3OdVKK5+jHI4his8v/zs6LWdFdlRtx5/jL96w==

"@metamask/network-controller@^12.0.0", "@metamask/network-controller@^12.1.2":
"@metamask/network-controller@^12.0.0":
version "12.2.0"
resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-12.2.0.tgz#679d81e009cfd2b9fdaf884267d7a11b535f1922"
integrity sha512-MBsEOy8htQtN46s/pbmEPsfe+UyOe3aUGTeswG0Iy0qGKyqu+uEx/nhydaLpMHFlOLbboPWtUmnPRLFE9pQDEA==
Expand Down
Loading