@metamask-previews/network-controller 22.1.1-preview-ee77a6d9 → 22.1.1-preview-4c4eb52a

package/CHANGELOG.md

@@ -11,12 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.0` ([#5079](https://github.com/MetaMask/core/pull/5079))
 
-### Fixed
-
-- Fix `selectAvailableNetworkClientIds` so that it is properly memoized ([#5193](https://github.com/MetaMask/core/pull/5193))
-- Fix `lookupNetwork` so that it will no longer throw an error if `networkDidChange` subscriptions have been removed before it returns ([#5116](https://github.com/MetaMask/core/pull/5116))
-  - This error could occur if the NetworkController's messenger is cleared of subscriptions, as in a "destroy" step.
-
 ## [22.1.1]
 
 ### Changed

package/dist/NetworkController.cjs

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _NetworkController_instances, _NetworkController_ethQuery, _NetworkController_infuraProjectId, _NetworkController_previouslySelectedNetworkClientId, _NetworkController_providerProxy, _NetworkController_blockTrackerProxy, _NetworkController_autoManagedNetworkClientRegistry, _NetworkController_autoManagedNetworkClient, _NetworkController_log, _NetworkController_networkConfigurationsByNetworkClientId, _NetworkController_refreshNetwork, _NetworkController_getLatestBlock, _NetworkController_determineEIP1559Compatibility, _NetworkController_validateNetworkFields, _NetworkController_determineNetworkConfigurationToPersist, _NetworkController_registerNetworkClientsAsNeeded, _NetworkController_unregisterNetworkClientsAsNeeded, _NetworkController_updateNetworkConfigurations, _NetworkController_ensureAutoManagedNetworkClientRegistryPopulated, _NetworkController_createAutoManagedNetworkClientRegistry, _NetworkController_applyNetworkSelection;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NetworkController = exports.selectAvailableNetworkClientIds = exports.getAvailableNetworkClientIds = exports.selectNetworkConfigurations = exports.getNetworkConfigurations = exports.getDefaultNetworkControllerState = exports.knownKeysOf = exports.RpcEndpointType = void 0;
+exports.NetworkController = exports.selectAvailableNetworkClientIds = exports.getAvailableNetworkClientIds = exports.getNetworkConfigurations = exports.getDefaultNetworkControllerState = exports.knownKeysOf = exports.RpcEndpointType = void 0;
 const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const eth_query_1 = __importDefault(require("@metamask/eth-query"));
@@ -148,14 +148,6 @@ function getDefaultNetworkControllerState() {
     };
 }
 exports.getDefaultNetworkControllerState = getDefaultNetworkControllerState;
-/**
- * Redux selector for getting all network configurations from NetworkController
- * state, keyed by chain ID.
- *
- * @param state - NetworkController state
- * @returns All registered network configurations, keyed by chain ID.
- */
-const selectNetworkConfigurationsByChainId = (state) => state.networkConfigurationsByChainId;
 /**
  * Get a list of all network configurations.
  *
@@ -167,17 +159,8 @@ function getNetworkConfigurations(state) {
 }
 exports.getNetworkConfigurations = getNetworkConfigurations;
 /**
- * Redux selector for getting a list of all network configurations from
- * NetworkController state.
- *
- * @param state - NetworkController state
- * @returns A list of all available network configurations
- */
-exports.selectNetworkConfigurations = (0, reselect_1.createSelector)(selectNetworkConfigurationsByChainId, (networkConfigurationsByChainId) => Object.values(networkConfigurationsByChainId));
-/**
- * Get a list of all available network client IDs from a list of network
- * configurations.
- *
+ * Get a list of all available client IDs from a list of
+ * network configurations
  * @param networkConfigurations - The array of network configurations
  * @returns A list of all available client IDs
  */
@@ -185,14 +168,7 @@ function getAvailableNetworkClientIds(networkConfigurations) {
     return networkConfigurations.flatMap((networkConfiguration) => networkConfiguration.rpcEndpoints.map((rpcEndpoint) => rpcEndpoint.networkClientId));
 }
 exports.getAvailableNetworkClientIds = getAvailableNetworkClientIds;
-/**
- * Redux selector for getting a list of all available network client IDs
- * from NetworkController state.
- *
- * @param state - NetworkController state
- * @returns A list of all available network client IDs.
- */
-exports.selectAvailableNetworkClientIds = (0, reselect_1.createSelector)(exports.selectNetworkConfigurations, getAvailableNetworkClientIds);
+exports.selectAvailableNetworkClientIds = (0, reselect_1.createSelector)([getNetworkConfigurations], getAvailableNetworkClientIds);
 /**
  * Determines whether the given URL is valid by attempting to parse it.
  *
@@ -238,7 +214,7 @@ function deriveInfuraNetworkNameFromRpcEndpointUrl(rpcEndpointUrl) {
  */
 function validateNetworkControllerState(state) {
     const networkConfigurationEntries = Object.entries(state.networkConfigurationsByChainId);
-    const networkClientIds = getAvailableNetworkClientIds(getNetworkConfigurations(state));
+    const networkClientIds = (0, exports.selectAvailableNetworkClientIds)(state);
     if (networkConfigurationEntries.length === 0) {
         throw new Error('NetworkController state is invalid: `networkConfigurationsByChainId` cannot be empty');
     }
@@ -550,26 +526,7 @@ class NetworkController extends base_controller_1.BaseController {
         let networkChanged = false;
         const listener = () => {
             networkChanged = true;
-            try {
-                this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
-            }
-            catch (error) {
-                // In theory, this `catch` should not be necessary given that this error
-                // would occur "inside" of the call to `#determineEIP1559Compatibility`
-                // below and so it should be caught by the `try`/`catch` below (it is
-                // impossible to reproduce in tests for that reason). However, somehow
-                // it occurs within Mobile and so we have to add our own `try`/`catch`
-                // here.
-                /* istanbul ignore next */
-                if (!(error instanceof Error) ||
-                    error.message !==
-                        'Subscription not found for event: NetworkController:networkDidChange') {
-                    // Again, this error should not happen and is impossible to reproduce
-                    // in tests.
-                    /* istanbul ignore next */
-                    throw error;
-                }
-            }
+            this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
         };
         this.messagingSystem.subscribe('NetworkController:networkDidChange', listener);
         let updatedNetworkStatus;
@@ -619,16 +576,7 @@ class NetworkController extends base_controller_1.BaseController {
             // in the process of being called, so we don't need to go further.
             return;
         }
-        try {
-            this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
-        }
-        catch (error) {
-            if (!(error instanceof Error) ||
-                error.message !==
-                    'Subscription not found for event: NetworkController:networkDidChange') {
-                throw error;
-            }
-        }
+        this.messagingSystem.unsubscribe('NetworkController:networkDidChange', listener);
         this.update((state) => {
             const meta = state.networksMetadata[state.selectedNetworkClientId];
             meta.status = updatedNetworkStatus;