wip

MetaMask · Feb 7, 2024 · 1067774 · 1067774
1 parent d3861d0
commit 1067774
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/packages/selected-network-controller/src/SelectedNetworkController.ts b/packages/selected-network-controller/src/SelectedNetworkController.ts
@@ -1,5 +1,6 @@
 import type { RestrictedControllerMessenger } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
+import 
 import type {
   BlockTrackerProxy,
   NetworkClientId,
@@ -24,7 +25,7 @@ const getDefaultState = () => ({
 
 type Domain = string;
 
-const METAMASK_DOMAIN = 'metamask' as const;
+export const METAMASK_DOMAIN = 'metamask' as const;
 
 export const SelectedNetworkControllerActionTypes = {
   getState: `${controllerName}:getState` as const,

diff --git a/packages/selected-network-controller/src/SelectedNetworkMiddleware.ts b/packages/selected-network-controller/src/SelectedNetworkMiddleware.ts
@@ -11,7 +11,10 @@ import type {
   SelectedNetworkControllerGetNetworkClientIdForDomainAction,
   SelectedNetworkControllerSetNetworkClientIdForDomainAction,
 } from './SelectedNetworkController';
-import { SelectedNetworkControllerActionTypes } from './SelectedNetworkController';
+import {
+  METAMASK_DOMAIN,
+  SelectedNetworkControllerActionTypes,
+} from './SelectedNetworkController';
 
 export type MiddlewareAllowedActions = NetworkControllerGetStateAction;
 export type MiddlewareAllowedEvents = NetworkControllerStateChangeEvent;
@@ -37,29 +40,32 @@ export const createSelectedNetworkMiddleware = (
       origin,
     );
 
-  const setNetworkClientIdForDomain = (
-    origin: string,
-    networkClientId: NetworkClientId,
-  ) =>
-    messenger.call(
-      SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,
-      origin,
-      networkClientId,
-    );
+  // const setNetworkClientIdForDomain = (
+  //   origin: string,
+  //   networkClientId: NetworkClientId,
+  // ) =>
+  //   messenger.call(
+  //     SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,
+  //     origin,
+  //     networkClientId,
+  //   );
 
-  const getDefaultNetworkClientId = () =>
-    messenger.call('NetworkController:getState').selectedNetworkClientId;
+  // const getDefaultNetworkClientId = () =>
+  //   messenger.call('NetworkController:getState').selectedNetworkClientId;
 
   return (req: SelectedNetworkMiddlewareJsonRpcRequest, _, next) => {
     if (!req.origin) {
       throw new Error("Request object is lacking an 'origin'");
     }
 
-    if (getNetworkClientIdForDomain(req.origin) === undefined) {
-      setNetworkClientIdForDomain(req.origin, getDefaultNetworkClientId());
-    }
+    // if (getNetworkClientIdForDomain(req.origin) === undefined) {
+    //   setNetworkClientIdForDomain(req.origin, getDefaultNetworkClientId());
+    // }
 
-    req.networkClientId = getNetworkClientIdForDomain(req.origin);
+    req.networkClientId =
+      getNetworkClientIdForDomain(req.origin) ??
+      // TODO once this PR (https://github.com/MetaMask/core/pull/3884) is merged this will be removed
+      getNetworkClientIdForDomain(METAMASK_DOMAIN);
     return next();
   };
 };