@metamask-previews/network-controller 26.0.0-preview-e3eb8eca → 26.0.0-preview-58cfb208

package/CHANGELOG.md

@@ -7,25 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Added
-
-- Add `NetworkController:rpcEndpointChainAvailable` messenger event ([#7166](https://github.com/MetaMask/core/pull/7166))
-  - This is a counterpart to the (new) `NetworkController:rpcEndpointChainUnavailable` and `NetworkController:rpcEndpointChainDegraded` events, but is published when a successful request to an endpoint within a chain of endpoints is made either initially or following a previously established degraded or unavailable status.
-
-### Changed
-
-- **BREAKING:** Split up and update payload data for `NetworkController:rpcEndpointDegraded` and `NetworkController:rpcEndpointUnavailable` ([#7166](https://github.com/MetaMask/core/pull/7166))
-  - `NetworkController:rpcEndpointDegraded` and `NetworkController:rpcEndpointUnavailable` still exist and retain the same behavior as before.
-  - New events are `NetworkController:rpcEndpointChainDegraded` and `NetworkController:rpcEndpointChainUnavailable`, and are designed to represent an entire chain of endpoints. They are also guaranteed to not be published multiple times in a row. In particular, `NetworkController:rpcEndpointUnavailable` is published only after trying all of the endpoints for a chain and when the underlying circuit for the last endpoint breaks, not as each primary's or failover's circuit breaks.
-  - The event payloads for all events have been changed as well: `failoverEndpointUrl` has been renamed to `endpointUrl`, and `endpointUrl` has been renamed to `primaryEndpointUrl`. In addition, `networkClientId` has been added to the payload.
-- **BREAKING:** Rename and update payload data for `NetworkController:rpcEndpointRequestRetried` ([#7166](https://github.com/MetaMask/core/pull/7166))
-  - This event is now called `NetworkController:rpcEndpointRetried`.
-  - The event payload has been changed as well: `failoverEndpointUrl` has been renamed to `endpointUrl`, and `endpointUrl` has been renamed to `primaryEndpointUrl`. In addition, `networkClientId` and `attempt` have been added to the payload.
-- **BREAKING:** Update `AbstractRpcService`/`RpcServiceRequestable` to remove `{ isolated: true }` from the `onBreak` event data type ([#7166](https://github.com/MetaMask/core/pull/7166))
-  - This represented the error produced when `.isolate` is called on a Cockatiel circuit breaker policy, which we never do.
-- Statuses of networks (captured in the NetworkController `networksMetadata` state property) are now kept up to date as requests are made ([#7186](https://github.com/MetaMask/core/pull/7186))
-- Bump `@metamask/controller-utils` from `^11.14.1` to `^11.15.0` ([#7003](https://github.com/MetaMask/core/pull/7003))
-
 ## [26.0.0]
 
 ### Added

package/dist/NetworkController.cjs

@@ -444,21 +444,6 @@ class NetworkController extends base_controller_1.BaseController {
         this.messenger.registerActionHandler(`${this.name}:addNetwork`, this.addNetwork.bind(this));
         this.messenger.registerActionHandler(`${this.name}:removeNetwork`, this.removeNetwork.bind(this));
         this.messenger.registerActionHandler(`${this.name}:updateNetwork`, this.updateNetwork.bind(this));
-        this.messenger.subscribe(`${this.name}:rpcEndpointChainUnavailable`, ({ networkClientId }) => {
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
-                networkStatus: constants_1.NetworkStatus.Unavailable,
-            });
-        });
-        this.messenger.subscribe(`${this.name}:rpcEndpointChainDegraded`, ({ networkClientId }) => {
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
-                networkStatus: constants_1.NetworkStatus.Degraded,
-            });
-        });
-        this.messenger.subscribe(`${this.name}:rpcEndpointChainAvailable`, ({ networkClientId }) => {
-            __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
-                networkStatus: constants_1.NetworkStatus.Available,
-            });
-        });
     }
     /**
      * Enables the RPC failover functionality. That is, if any RPC endpoints are
@@ -1159,10 +1144,7 @@ async function _NetworkController_determineNetworkMetadata(networkClientId) {
  */
 async function _NetworkController_lookupGivenNetwork(networkClientId) {
     const { networkStatus, isEIP1559Compatible } = await __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_determineNetworkMetadata).call(this, networkClientId);
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, {
-        networkStatus,
-        isEIP1559Compatible,
-    });
+    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, networkClientId, networkStatus, isEIP1559Compatible);
 }, _NetworkController_lookupSelectedNetwork = 
 /**
  * Uses a request for the latest block to gather the following information on
@@ -1222,10 +1204,7 @@ async function _NetworkController_lookupSelectedNetwork() {
             throw error;
         }
     }
-    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, this.state.selectedNetworkClientId, {
-        networkStatus,
-        isEIP1559Compatible,
-    });
+    __classPrivateFieldGet(this, _NetworkController_instances, "m", _NetworkController_updateMetadataForNetwork).call(this, this.state.selectedNetworkClientId, networkStatus, isEIP1559Compatible);
     if (isInfura) {
         if (networkStatus === constants_1.NetworkStatus.Available) {
             this.messenger.publish('NetworkController:infuraIsUnblocked');
@@ -1240,7 +1219,7 @@ async function _NetworkController_lookupSelectedNetwork() {
         // previously connected to an Infura network that was blocked
         this.messenger.publish('NetworkController:infuraIsUnblocked');
     }
-}, _NetworkController_updateMetadataForNetwork = function _NetworkController_updateMetadataForNetwork(networkClientId, metadata) {
+}, _NetworkController_updateMetadataForNetwork = function _NetworkController_updateMetadataForNetwork(networkClientId, networkStatus, isEIP1559Compatible) {
     this.update((state) => {
         if (state.networksMetadata[networkClientId] === undefined) {
             state.networksMetadata[networkClientId] = {
@@ -1248,15 +1227,13 @@ async function _NetworkController_lookupSelectedNetwork() {
                 EIPS: {},
             };
         }
-        const newMetadata = state.networksMetadata[networkClientId];
-        newMetadata.status = metadata.networkStatus;
-        if ('isEIP1559Compatible' in metadata) {
-            if (metadata.isEIP1559Compatible === undefined) {
-                delete newMetadata.EIPS[1559];
-            }
-            else {
-                newMetadata.EIPS[1559] = metadata.isEIP1559Compatible;
-            }
+        const meta = state.networksMetadata[networkClientId];
+        meta.status = networkStatus;
+        if (isEIP1559Compatible === undefined) {
+            delete meta.EIPS[1559];
+        }
+        else {
+            meta.EIPS[1559] = isEIP1559Compatible;
         }
     });
 }, _NetworkController_getLatestBlock = function _NetworkController_getLatestBlock(networkClientId) {
@@ -1422,7 +1399,6 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
     for (const addedRpcEndpoint of addedRpcEndpoints) {
         if (addedRpcEndpoint.type === RpcEndpointType.Infura) {
             autoManagedNetworkClientRegistry[types_1.NetworkClientType.Infura][addedRpcEndpoint.networkClientId] = (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
-                networkClientId: addedRpcEndpoint.networkClientId,
                 networkClientConfiguration: {
                     type: types_1.NetworkClientType.Infura,
                     chainId: networkFields.chainId,
@@ -1440,7 +1416,6 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
         }
         else {
             autoManagedNetworkClientRegistry[types_1.NetworkClientType.Custom][addedRpcEndpoint.networkClientId] = (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
-                networkClientId: addedRpcEndpoint.networkClientId,
                 networkClientConfiguration: {
                     type: types_1.NetworkClientType.Custom,
                     chainId: networkFields.chainId,
@@ -1500,7 +1475,6 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
                 return [
                     rpcEndpoint.networkClientId,
                     (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
-                        networkClientId: rpcEndpoint.networkClientId,
                         networkClientConfiguration: {
                             type: types_1.NetworkClientType.Infura,
                             network: infuraNetworkName,
@@ -1520,7 +1494,6 @@ async function _NetworkController_determineEIP1559Compatibility(networkClientId)
             return [
                 rpcEndpoint.networkClientId,
                 (0, create_auto_managed_network_client_1.createAutoManagedNetworkClient)({
-                    networkClientId: rpcEndpoint.networkClientId,
                     networkClientConfiguration: {
                         type: types_1.NetworkClientType.Custom,
                         chainId: networkConfiguration.chainId,