Skip to content

Align NetworkController provider type w/ eth-query #2028

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.

Sign up for GitHub

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

Merged
mcmire merged 2 commits into from
Nov 14, 2023
Merged

Align NetworkController provider type w/ eth-query #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29ba05e
Align NetworkController provider type w/ eth-query
mcmire Nov 9, 2023
0de6643
Update changelogs
mcmire Nov 13, 2023
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
2 changes: 2 additions & 0 deletions packages/assets-controllers/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
Copy link
Contributor Author

@mcmire mcmire Nov 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm experimenting with adding changelogs directly to PRs. One thing I noticed is that in order to know which PR number to put here, I had to first push up this PR, then add these entries, so we'll have to note that if/when we decide to stick with this process.

- Bump dependency `@metamask/eth-query` from ^3.0.1 to ^4.0.0 ([#2028](https://github.com/MetaMask/core/pull/2028))

## [18.0.0]
### Changed
Expand Down
2 changes: 1 addition & 1 deletion packages/assets-controllers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@metamask/base-controller": "^3.2.3",
"@metamask/contract-metadata": "^2.4.0",
"@metamask/controller-utils": "^5.0.2",
"@metamask/eth-query": "^3.0.1",
"@metamask/eth-query": "^4.0.0",
"@metamask/metamask-eth-abis": "3.0.0",
"@metamask/network-controller": "^15.2.0",
"@metamask/polling-controller": "^1.0.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/controller-utils/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Bump dependency `@metamask/eth-query` from ^3.0.1 to ^4.0.0 ([#2028](https://github.com/MetaMask/core/pull/2028))

## [5.0.2]
### Changed
Expand Down
2 changes: 1 addition & 1 deletion packages/controller-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"devDependencies": {
"@metamask/auto-changelog": "^3.4.3",
"@metamask/eth-query": "^3.0.1",
"@metamask/eth-query": "^4.0.0",
"@types/jest": "^27.4.1",
"deepmerge": "^4.2.2",
"jest": "^27.5.1",
Expand Down
2 changes: 2 additions & 0 deletions packages/gas-fee-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Bump dependency `@metamask/eth-query` from ^3.0.1 to ^4.0.0 ([#2028](https://github.com/MetaMask/core/pull/2028))

## [10.0.0]
### Added
Expand Down
2 changes: 1 addition & 1 deletion packages/gas-fee-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"dependencies": {
"@metamask/base-controller": "^3.2.3",
"@metamask/controller-utils": "^5.0.2",
"@metamask/eth-query": "^3.0.1",
"@metamask/eth-query": "^4.0.0",
"@metamask/network-controller": "^15.2.0",
"@metamask/polling-controller": "^1.0.1",
"@metamask/utils": "^8.2.0",
Expand Down
3 changes: 0 additions & 3 deletions packages/gas-fee-controller/src/GasFeeController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,6 @@ export class GasFeeController extends PollingController<
this.legacyAPIEndpoint = legacyAPIEndpoint;
this.clientId = clientId;

// @ts-expect-error TODO: Provider type alignment
this.ethQuery = new EthQuery(this.#getProvider());

if (onNetworkStateChange && getChainId) {
Expand Down Expand Up @@ -435,7 +434,6 @@ export class GasFeeController extends PollingController<
} catch {
isEIP1559Compatible = false;
}
// @ts-expect-error TODO: Provider type alignment
ethQuery = new EthQuery(networkClient.provider);
}

Expand Down Expand Up @@ -581,7 +579,6 @@ export class GasFeeController extends PollingController<
const newChainId = networkControllerState.providerConfig.chainId;

if (newChainId !== this.currentChainId) {
// @ts-expect-error TODO: Provider type alignment
this.ethQuery = new EthQuery(this.#getProvider());
await this.resetPolling();

Expand Down
2 changes: 2 additions & 0 deletions packages/network-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Bump dependency `@metamask/eth-query` from ^3.0.1 to ^4.0.0 ([#2028](https://github.com/MetaMask/core/pull/2028))

## [15.2.0]
### Changed
Expand Down
2 changes: 1 addition & 1 deletion packages/network-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@metamask/eth-json-rpc-infura": "^9.0.0",
"@metamask/eth-json-rpc-middleware": "^12.0.1",
"@metamask/eth-json-rpc-provider": "^2.3.0",
"@metamask/eth-query": "^3.0.1",
"@metamask/eth-query": "^4.0.0",
"@metamask/json-rpc-engine": "^7.3.0",
"@metamask/rpc-errors": "^6.1.0",
"@metamask/swappable-obj-proxy": "^2.1.0",
Expand Down
2 changes: 0 additions & 2 deletions packages/network-controller/src/NetworkController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,6 @@ export class NetworkController extends BaseControllerV2<
}

const networkClient = this.getNetworkClientById(networkClientId);
// @ts-expect-error TODO: Provider type alignment
const ethQuery = new EthQuery(networkClient.provider);

return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -1583,7 +1582,6 @@ export class NetworkController extends BaseControllerV2<
});
}

// @ts-expect-error TODO: Provider type alignment
this.#ethQuery = new EthQuery(this.#providerProxy);
}
}
1 change: 0 additions & 1 deletion packages/network-controller/tests/provider-api-tests/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,6 @@ export async function withNetworkClient(

const { provider, blockTracker } = clientUnderTest;

// @ts-expect-error TODO: Provider type alignment
const ethQuery = new EthQuery(provider);
const curriedMakeRpcCall = (request: Request) =>
makeRpcCall(ethQuery, request);
Expand Down
2 changes: 2 additions & 0 deletions packages/transaction-controller/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Bump dependency `@metamask/eth-query` from ^3.0.1 to ^4.0.0 ([#2028](https://github.com/MetaMask/core/pull/2028))

## [16.0.0]
### Changed
Expand Down
2 changes: 1 addition & 1 deletion packages/transaction-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"@metamask/approval-controller": "^4.1.0",
"@metamask/base-controller": "^3.2.3",
"@metamask/controller-utils": "^5.0.2",
"@metamask/eth-query": "^3.0.1",
"@metamask/eth-query": "^4.0.0",
"@metamask/gas-fee-controller": "^10.0.0",
"@metamask/metamask-eth-abis": "^3.0.0",
"@metamask/network-controller": "^15.2.0",
Expand Down
2 changes: 0 additions & 2 deletions packages/transaction-controller/src/TransactionController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,6 @@ export class TransactionController extends BaseController<
this.provider = provider;
this.messagingSystem = messenger;
this.getNetworkState = getNetworkState;
// @ts-expect-error TODO: Provider type alignment
this.ethQuery = new EthQuery(provider);
this.isSendFlowHistoryDisabled = disableSendFlowHistory ?? false;
this.isHistoryDisabled = disableHistory ?? false;
Expand Down Expand Up @@ -523,7 +522,6 @@ export class TransactionController extends BaseController<
this.addPendingTransactionTrackerListeners();

onNetworkStateChange(() => {
// @ts-expect-error TODO: Provider type alignment
this.ethQuery = new EthQuery(this.provider);
this.registry = new MethodRegistry({ provider: this.provider });
this.onBootCleanup();
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,7 +1474,7 @@ __metadata:
"@metamask/base-controller": ^3.2.3
"@metamask/contract-metadata": ^2.4.0
"@metamask/controller-utils": ^5.0.2
"@metamask/eth-query": ^3.0.1
"@metamask/eth-query": ^4.0.0
"@metamask/metamask-eth-abis": 3.0.0
"@metamask/network-controller": ^15.2.0
"@metamask/polling-controller": ^1.0.1
Expand Down Expand Up @@ -1578,7 +1578,7 @@ __metadata:
resolution: "@metamask/controller-utils@workspace:packages/controller-utils"
dependencies:
"@metamask/auto-changelog": ^3.4.3
"@metamask/eth-query": ^3.0.1
"@metamask/eth-query": ^4.0.0
"@metamask/utils": ^8.2.0
"@spruceid/siwe-parser": 1.1.3
"@types/jest": ^27.4.1
Expand Down Expand Up @@ -1806,13 +1806,13 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-query@npm:^3.0.1":
version: 3.0.1
resolution: "@metamask/eth-query@npm:3.0.1"
"@metamask/eth-query@npm:^4.0.0":
version: 4.0.0
resolution: "@metamask/eth-query@npm:4.0.0"
dependencies:
json-rpc-random-id: ^1.0.0
xtend: ^4.0.1
checksum: b9a323dff67328eace7d54fc8b0bc4dd763bf15760870656cbd5aad5380d1ee4489fb5c59506290d5f77cf55e74e530ee97b52702a329f1090ec03a6158434b7
checksum: f2e529cf2aa362c20b81433f69840c2830444b3e060a3d9cc778235b8f595f4e1e3a6505b7f14930c4e1566efc9de0ee879e4566f3a6ab184521bdf40f5895d4
languageName: node
linkType: hard

Expand Down Expand Up @@ -1867,7 +1867,7 @@ __metadata:
"@metamask/auto-changelog": ^3.4.3
"@metamask/base-controller": ^3.2.3
"@metamask/controller-utils": ^5.0.2
"@metamask/eth-query": ^3.0.1
"@metamask/eth-query": ^4.0.0
"@metamask/network-controller": ^15.2.0
"@metamask/polling-controller": ^1.0.1
"@metamask/utils": ^8.2.0
Expand Down Expand Up @@ -2077,7 +2077,7 @@ __metadata:
"@metamask/eth-json-rpc-infura": ^9.0.0
"@metamask/eth-json-rpc-middleware": ^12.0.1
"@metamask/eth-json-rpc-provider": ^2.3.0
"@metamask/eth-query": ^3.0.1
"@metamask/eth-query": ^4.0.0
"@metamask/json-rpc-engine": ^7.3.0
"@metamask/rpc-errors": ^6.1.0
"@metamask/swappable-obj-proxy": ^2.1.0
Expand Down Expand Up @@ -2629,7 +2629,7 @@ __metadata:
"@metamask/auto-changelog": ^3.4.3
"@metamask/base-controller": ^3.2.3
"@metamask/controller-utils": ^5.0.2
"@metamask/eth-query": ^3.0.1
"@metamask/eth-query": ^4.0.0
"@metamask/gas-fee-controller": ^10.0.0
"@metamask/metamask-eth-abis": ^3.0.0
"@metamask/network-controller": ^15.2.0
Expand Down