wip

MetaMask · Feb 8, 2024 · 99e2006 · 99e2006
1 parent 57d8a4a
commit 99e2006
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 24 deletions.
diff --git a/packages/selected-network-controller/package.json b/packages/selected-network-controller/package.json
@@ -34,6 +34,7 @@
     "@metamask/base-controller": "^4.1.1",
     "@metamask/json-rpc-engine": "^7.3.2",
     "@metamask/network-controller": "^17.2.0",
+    "@metamask/permission-controller": "^8.0.0",
     "@metamask/swappable-obj-proxy": "^2.2.0",
     "@metamask/utils": "^8.3.0"
   },

diff --git a/packages/selected-network-controller/src/SelectedNetworkController.ts b/packages/selected-network-controller/src/SelectedNetworkController.ts
@@ -1,4 +1,7 @@
-import type { RestrictedControllerMessenger } from '@metamask/base-controller';
+import type {
+  ActionHandler,
+  RestrictedControllerMessenger,
+} from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
 import type {
   BlockTrackerProxy,
@@ -9,6 +12,7 @@ import type {
 } from '@metamask/network-controller';
 import { createEventEmitterProxy } from '@metamask/swappable-obj-proxy';
 import type { Patch } from 'immer';
+import type { HasPermissions } from '@metamask/permissions-controller';
 
 export const controllerName = 'SelectedNetworkController';
 
@@ -73,7 +77,11 @@ export type SelectedNetworkControllerActions =
   | SelectedNetworkControllerGetNetworkClientIdForDomainAction
   | SelectedNetworkControllerSetNetworkClientIdForDomainAction;
 
-export type AllowedActions = NetworkControllerGetNetworkClientByIdAction;
+export type AllowedActions =
+  | NetworkControllerGetNetworkClientByIdAction
+  | HasPermissions;
+
+// export type AllowedActions = NetworkControllerGetNetworkClientByIdAction;
 
 export type SelectedNetworkControllerEvents =
   SelectedNetworkControllerStateChangeEvent;
@@ -131,12 +139,21 @@ export class SelectedNetworkController extends BaseController<
   #registerMessageHandlers(): void {
     this.messagingSystem.registerActionHandler(
       SelectedNetworkControllerActionTypes.getNetworkClientIdForDomain,
-      this.getNetworkClientIdForDomain.bind(this),
+      this.getNetworkClientIdForDomain.bind(this) as ActionHandler<
+        { type: string; handler: (domain: string) => NetworkClientId },
+        'SelectedNetworkController:getNetworkClientIdForDomain'
+      >,
     );
 
     this.messagingSystem.registerActionHandler(
       SelectedNetworkControllerActionTypes.setNetworkClientIdForDomain,
-      this.setNetworkClientIdForDomain.bind(this),
+      this.setNetworkClientIdForDomain.bind(this) as ActionHandler<
+        {
+          type: string;
+          handler: (domain: string, networkClientId: NetworkClientId) => void;
+        },
+        'SelectedNetworkController:setNetworkClientIdForDomain'
+      >,
     );
   }
 
@@ -155,13 +172,23 @@ export class SelectedNetworkController extends BaseController<
     const networkProxy = this.#proxies.get(domain);
     if (networkProxy === undefined) {
       this.#proxies.set(domain, {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore-next-line
         provider: createEventEmitterProxy(networkClient.provider),
+
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore-next-line
         blockTracker: createEventEmitterProxy(networkClient.blockTracker, {
           eventFilter: 'skipInternal',
         }),
       });
     } else {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore-next-line
       networkProxy.provider.setTarget(networkClient.provider);
+
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore-next-line
       networkProxy.blockTracker.setTarget(networkClient.blockTracker);
     }
 
@@ -177,6 +204,17 @@ export class SelectedNetworkController extends BaseController<
     domain: Domain,
     networkClientId: NetworkClientId,
   ) {
+    // check if permissions exist for this domain if there are none, return early
+    const hasPermissions = this.messagingSystem.call(
+      'PermissionController:hasPermissions',
+      origin,
+    );
+    if (!hasPermissions) {
+      return;
+    }
+
+    // if perDomainNetwork is false, set the networkClientId for all domains to the same value
+    // this ensures the proxies are updated for all domains
     if (!this.state.perDomainNetwork) {
       Object.entries(this.state.domains).forEach(
         ([entryDomain, networkClientIdForDomain]) => {
@@ -189,6 +227,7 @@ export class SelectedNetworkController extends BaseController<
         },
       );
     }
+
     this.#setNetworkClientIdForDomain(domain, networkClientId);
   }
 
@@ -213,7 +252,12 @@ export class SelectedNetworkController extends BaseController<
         this.getNetworkClientIdForDomain(domain),
       );
       networkProxy = {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore-next-line
         provider: createEventEmitterProxy(networkClient.provider),
+
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore-next-line
         blockTracker: createEventEmitterProxy(networkClient.blockTracker, {
           eventFilter: 'skipInternal',
         }),

diff --git a/yarn.lock b/yarn.lock
@@ -2392,26 +2392,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/permission-controller@npm:^7.0.0, @metamask/permission-controller@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "@metamask/permission-controller@npm:7.1.0"
-  dependencies:
-    "@metamask/base-controller": ^4.0.1
-    "@metamask/controller-utils": ^8.0.1
-    "@metamask/json-rpc-engine": ^7.3.1
-    "@metamask/rpc-errors": ^6.1.0
-    "@metamask/utils": ^8.2.0
-    "@types/deep-freeze-strict": ^1.1.0
-    deep-freeze-strict: ^1.1.1
-    immer: ^9.0.6
-    nanoid: ^3.1.31
-  peerDependencies:
-    "@metamask/approval-controller": ^5.1.1
-  checksum: 889213cca32cbf5b32b7e71c70ded0aeea32eae169ec67fb0d0bc8dcaa183b222f9d5417f657e331d7fb21ecb71f250cf1c932110d4b1e2167972b30bd012098
-  languageName: node
-  linkType: hard
-
-"@metamask/permission-controller@workspace:packages/permission-controller":
+"@metamask/permission-controller@^8.0.0, @metamask/permission-controller@workspace:packages/permission-controller":
   version: 0.0.0-use.local
   resolution: "@metamask/permission-controller@workspace:packages/permission-controller"
   dependencies:
@@ -2438,6 +2419,25 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@metamask/permission-controller@npm:^7.0.0, @metamask/permission-controller@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "@metamask/permission-controller@npm:7.1.0"
+  dependencies:
+    "@metamask/base-controller": ^4.0.1
+    "@metamask/controller-utils": ^8.0.1
+    "@metamask/json-rpc-engine": ^7.3.1
+    "@metamask/rpc-errors": ^6.1.0
+    "@metamask/utils": ^8.2.0
+    "@types/deep-freeze-strict": ^1.1.0
+    deep-freeze-strict: ^1.1.1
+    immer: ^9.0.6
+    nanoid: ^3.1.31
+  peerDependencies:
+    "@metamask/approval-controller": ^5.1.1
+  checksum: 889213cca32cbf5b32b7e71c70ded0aeea32eae169ec67fb0d0bc8dcaa183b222f9d5417f657e331d7fb21ecb71f250cf1c932110d4b1e2167972b30bd012098
+  languageName: node
+  linkType: hard
+
 "@metamask/permission-log-controller@workspace:packages/permission-log-controller":
   version: 0.0.0-use.local
   resolution: "@metamask/permission-log-controller@workspace:packages/permission-log-controller"
@@ -2648,6 +2648,7 @@ __metadata:
     "@metamask/base-controller": ^4.1.1
     "@metamask/json-rpc-engine": ^7.3.2
     "@metamask/network-controller": ^17.2.0
+    "@metamask/permission-controller": ^8.0.0
     "@metamask/swappable-obj-proxy": ^2.2.0
     "@metamask/utils": ^8.3.0
     "@types/jest": ^27.4.1