Integrate SubjectMetadataController

MetaMask · Mar 19, 2023 · e03b85e · e03b85e
1 parent 639b9bd
commit e03b85e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/app/core/Engine.js b/app/core/Engine.js
@@ -33,6 +33,7 @@ import { ApprovalController } from '@metamask/approval-controller';
 import { PermissionController } from '@metamask/permission-controller';
 import SwapsController, { swapsUtils } from '@metamask/swaps-controller';
 import { SnapController } from '@metamask/snaps-controllers';
+import { SubjectMetadataController } from '@metamask/subject-metadata-controller';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { MetaMaskKeyring as QRHardwareKeyring } from '@keystonehq/metamask-airgapped-keyring';
 import Encryptor from './Encryptor';
@@ -362,20 +363,23 @@ class Engine {
         unrestrictedMethods,
       });
 
-      // const subjectMetadataController = new SubjectMetadataController({
-      //   messenger: this.controllerMessenger.getRestricted({
-      //     name: 'SubjectMetadataController',
-      //     allowedActions: [`${this.permissionController.name}:hasPermissions`],
-      //   }),
-      //   state: initState.SubjectMetadataController,
-      //   subjectCacheLimit: 100,
-      // });
+      const subjectMetadataController = new SubjectMetadataController({
+        messenger: this.controllerMessenger.getRestricted({
+          name: 'SubjectMetadataController',
+          allowedActions: [`${permissionController.name}:hasPermissions`],
+        }),
+        state: initialState.SubjectMetadataController || {},
+        subjectCacheLimit: 100,
+      });
 
       this.setupSnapProvider = (snapId, connectionStream) => {
         console.log(
           '[ENGINE LOG] Engine+setupSnapProvider: Setup stream for Snap',
           snapId,
         );
+        // TO DO:
+        // Develop a simpler getRpcMethodMiddleware object for SnapBridge
+        // Consider developing an abstract class to derived custom implementations for each use case
         const bridge = new SnapBridge({
           snapId,
           connectionStream,
@@ -431,7 +435,7 @@ class Engine {
           `${permissionController.name}:revokePermissions`,
           `${permissionController.name}:revokePermissionForAllSubjects`,
           `${permissionController.name}:grantPermissions`,
-          'SubjectMetadataController:getSubjectMetadata',
+          `${subjectMetadataController.name}:getSubjectMetadata`,
           'ExecutionService:executeSnap',
           'ExecutionService:getRpcRequestHandler',
           'ExecutionService:terminateSnap',
@@ -593,6 +597,7 @@ class Engine {
         approvalController,
         permissionController,
         snapController,
+        subjectMetadataController,
       ];
 
       // set initial state
@@ -1061,6 +1066,7 @@ export default {
       NftDetectionController,
       SnapController,
       PermissionController,
+      SubjectMetadataController,
     } = instance.datamodel.state;
 
     // normalize `null` currencyRate to `0`
@@ -1096,6 +1102,7 @@ export default {
       NftDetectionController,
       SnapController,
       PermissionController,
+      SubjectMetadataController,
     };
   },
   get datamodel() {

diff --git a/app/core/EngineService/EngineService.ts b/app/core/EngineService/EngineService.ts
@@ -75,6 +75,10 @@ class EngineService {
         name: 'PermissionController',
         key: `${engine.context.PermissionController.name}:stateChange`,
       },
+      {
+        name: 'subjectMetadataController',
+        key: `${engine.context.SubjectMetadataController.name}:stateChange`,
+      },
     ];
 
     engine?.datamodel?.subscribe?.(() => {

diff --git a/package.json b/package.json
@@ -159,6 +159,7 @@
     "@metamask/sdk-communication-layer": "^0.1.0",
     "@metamask/snaps-controllers": "0.26.2",
     "@metamask/snaps-utils": "0.26.2",
+    "@metamask/subject-metadata-controller": "^1.0.0",
     "@metamask/swaps-controller": "^6.8.0",
     "@metamask/transaction-controller": "^2.0.0",
     "@metamask/utils": "^5.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -4703,7 +4703,7 @@
     ses "^0.17.0"
     superstruct "^0.16.7"
 
-"@metamask/subject-metadata-controller@^1.0.1":
+"@metamask/subject-metadata-controller@^1.0.0", "@metamask/subject-metadata-controller@^1.0.1":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@metamask/subject-metadata-controller/-/subject-metadata-controller-1.0.2.tgz#35f571231cf99889bd413d683f8b7459adc655fb"
   integrity sha512-zOtgtS+NHnfhrzyaxlMi9iR6Wo4qm04TWp7c/bMFjCI8XY/Rs1VoJegxR/481ELwbzBNzGwnEc/TwSW2qBi39A==