diff --git a/packages/assets-controllers/src/AssetsContractController.ts b/packages/assets-controllers/src/AssetsContractController.ts index 31a276b93ec..694b61e7d52 100644 --- a/packages/assets-controllers/src/AssetsContractController.ts +++ b/packages/assets-controllers/src/AssetsContractController.ts @@ -7,7 +7,7 @@ import type { Messenger } from '@metamask/messenger'; import type { NetworkClientId, NetworkControllerGetNetworkClientByIdAction, - NetworkControllerGetNetworkConfigurationByNetworkClientId, + NetworkControllerGetNetworkConfigurationByNetworkClientIdAction, NetworkControllerGetSelectedNetworkClientAction, NetworkControllerGetStateAction, NetworkControllerNetworkDidChangeEvent, @@ -116,7 +116,7 @@ export type AssetsContractControllerEvents = never; */ export type AllowedActions = | NetworkControllerGetNetworkClientByIdAction - | NetworkControllerGetNetworkConfigurationByNetworkClientId + | NetworkControllerGetNetworkConfigurationByNetworkClientIdAction | NetworkControllerGetSelectedNetworkClientAction | NetworkControllerGetStateAction; diff --git a/packages/assets-controllers/src/TokenDetectionController.ts b/packages/assets-controllers/src/TokenDetectionController.ts index 9ac70d86452..0baf8a33311 100644 --- a/packages/assets-controllers/src/TokenDetectionController.ts +++ b/packages/assets-controllers/src/TokenDetectionController.ts @@ -27,7 +27,7 @@ import type { NetworkClientId, NetworkControllerFindNetworkClientIdByChainIdAction, NetworkControllerGetNetworkClientByIdAction, - NetworkControllerGetNetworkConfigurationByNetworkClientId, + NetworkControllerGetNetworkConfigurationByNetworkClientIdAction, NetworkControllerGetStateAction, NetworkControllerNetworkDidChangeEvent, } from '@metamask/network-controller'; @@ -121,7 +121,7 @@ export type AllowedActions = | AccountsControllerGetSelectedAccountAction | AccountsControllerGetAccountAction | NetworkControllerGetNetworkClientByIdAction - | NetworkControllerGetNetworkConfigurationByNetworkClientId + | NetworkControllerGetNetworkConfigurationByNetworkClientIdAction | NetworkControllerGetStateAction | KeyringControllerGetStateAction | PreferencesControllerGetStateAction diff --git a/packages/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md index 1b703f55531..60fb463b16c 100644 --- a/packages/network-controller/CHANGELOG.md +++ b/packages/network-controller/CHANGELOG.md @@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bump `@metamask/utils` from `^11.9.0` to `^11.11.0` ([#9074](https://github.com/MetaMask/core/pull/9074)) - Bump `@metamask/controller-utils` from `^12.1.0` to `^12.2.0` ([#9058](https://github.com/MetaMask/core/pull/9058), [#9083](https://github.com/MetaMask/core/pull/9083)) +- **BREAKING:** Remove deprecated `NetworkControllerGetNetworkConfigurationByNetworkClientId` type ([#9185](https://github.com/MetaMask/core/pull/9185)) + - Use `NetworkControllerGetNetworkConfigurationByNetworkClientIdAction` instead. - **BREAKING:** Automatically populate `isRpcFailoverEnabled` using `RemoteFeatureFlagController` ([#9013](https://github.com/MetaMask/core/pull/9013)) - `NetworkController.init` must now be called to fully initialize the controller. - The constructor argument `isRpcFailoverEnabled` is no longer available. diff --git a/packages/network-controller/src/NetworkController.ts b/packages/network-controller/src/NetworkController.ts index 93196822632..09c727ada4b 100644 --- a/packages/network-controller/src/NetworkController.ts +++ b/packages/network-controller/src/NetworkController.ts @@ -54,10 +54,7 @@ import type { import { createAutoManagedNetworkClient } from './create-auto-managed-network-client'; import type { DegradedEventType, RetryReason } from './create-network-client'; import { projectLogger, createModuleLogger } from './logger'; -import type { - NetworkControllerGetNetworkConfigurationByNetworkClientIdAction, - NetworkControllerMethodActions, -} from './NetworkController-method-action-types'; +import type { NetworkControllerMethodActions } from './NetworkController-method-action-types'; import type { RpcServiceOptionsWithDefaults } from './rpc-service/rpc-service'; import { getIsRpcFailoverEnabled } from './selectors'; import { NetworkClientType } from './types'; @@ -708,12 +705,6 @@ export type NetworkControllerActions = | NetworkControllerGetStateAction | NetworkControllerMethodActions; -/** - * @deprecated Use {@link NetworkControllerGetNetworkConfigurationByNetworkClientIdAction} instead. - */ -export type NetworkControllerGetNetworkConfigurationByNetworkClientId = - NetworkControllerGetNetworkConfigurationByNetworkClientIdAction; - /** * All actions that {@link NetworkController} calls internally. */ diff --git a/packages/network-controller/src/index.ts b/packages/network-controller/src/index.ts index 9b9179fc8a1..85d940d7c95 100644 --- a/packages/network-controller/src/index.ts +++ b/packages/network-controller/src/index.ts @@ -23,7 +23,6 @@ export type { NetworkControllerNetworkRemovedEvent, NetworkControllerEvents, NetworkControllerGetStateAction, - NetworkControllerGetNetworkConfigurationByNetworkClientId, NetworkControllerActions, NetworkControllerMessenger, NetworkControllerOptions,