Add feature flag for CAIP-25 permission

Author: Mrtenz

packages/snaps-controllers/src/snaps/SnapController.test.tsx

@@ -5330,7 +5330,7 @@ describe('SnapController', () => {
       snapController.destroy();
     });
 
-    it('grants the `endowment:caip25` permission to a Snap with `endowment:ethereum-provider`', async () => {
+    it('grants the `endowment:caip25` permission to a Snap with `endowment:ethereum-provider` if the `useCaip25Permission` feature flag is enabled', async () => {
       const rootMessenger = getControllerMessenger();
       const messenger = getSnapControllerMessenger(rootMessenger);
 
@@ -5366,6 +5366,9 @@ describe('SnapController', () => {
         getSnapControllerOptions({
           messenger,
           detectSnapLocation: loopbackDetect({ manifest }),
+          featureFlags: {
+            useCaip25Permission: true,
+          },
         }),
       );
 
@@ -5409,6 +5412,71 @@ describe('SnapController', () => {
       snapController.destroy();
     });
 
+    it('does not grant the `endowment:caip25` permission to a Snap with `endowment:ethereum-provider` if the `useCaip25Permission` feature flag is disabled', async () => {
+      const rootMessenger = getControllerMessenger();
+      const messenger = getSnapControllerMessenger(rootMessenger);
+
+      rootMessenger.registerActionHandler(
+        'PermissionController:getPermissions',
+        () => ({}),
+      );
+
+      rootMessenger.registerActionHandler(
+        'SelectedNetworkController:getNetworkClientIdForDomain',
+        () => 'mainnet',
+      );
+
+      rootMessenger.registerActionHandler(
+        'NetworkController:getNetworkClientById',
+        () => ({
+          configuration: {
+            chainId: '0x1',
+          },
+        }),
+      );
+
+      const { manifest } = await getMockSnapFilesWithUpdatedChecksum({
+        manifest: getSnapManifest({
+          initialPermissions: {
+            'endowment:page-home': {},
+            'endowment:ethereum-provider': {},
+          },
+        }),
+      });
+
+      const snapController = getSnapController(
+        getSnapControllerOptions({
+          messenger,
+          detectSnapLocation: loopbackDetect({ manifest }),
+          featureFlags: {
+            useCaip25Permission: false,
+          },
+        }),
+      );
+
+      await snapController.installSnaps(MOCK_ORIGIN, {
+        [MOCK_SNAP_ID]: {},
+      });
+
+      const approvedPermissions = {
+        'endowment:page-home': {
+          caveats: null,
+        },
+        'endowment:ethereum-provider': {},
+      };
+
+      expect(messenger.call).toHaveBeenCalledWith(
+        'PermissionController:grantPermissions',
+        {
+          approvedPermissions,
+          subject: { origin: MOCK_SNAP_ID },
+          requestData: expect.any(Object),
+        },
+      );
+
+      snapController.destroy();
+    });
+
     it('does not grant the `endowment:caip25` permission if the Snap does not have the `endowment:ethereum-provider` permission', async () => {
       const rootMessenger = getControllerMessenger();
       const messenger = getSnapControllerMessenger(rootMessenger);
@@ -5444,6 +5512,9 @@ describe('SnapController', () => {
         getSnapControllerOptions({
           messenger,
           detectSnapLocation: loopbackDetect({ manifest }),
+          featureFlags: {
+            useCaip25Permission: true,
+          },
         }),
       );
 

packages/snaps-controllers/src/snaps/SnapController.ts

@@ -675,6 +675,7 @@ type FeatureFlags = {
   allowLocalSnaps?: boolean;
   disableSnapInstallation?: boolean;
   rejectInvalidPlatformVersion?: boolean;
+  useCaip25Permission?: boolean;
 };
 
 type DynamicFeatureFlags = {
@@ -4086,7 +4087,10 @@ export class SnapController extends BaseController<
    * @returns The permissions to grant to the Snap.
    */
   #getPermissionsToGrant(snapId: SnapId, newPermissions: RequestedPermissions) {
-    if (Object.keys(newPermissions).includes(SnapEndowments.EthereumProvider)) {
+    if (
+      this.#featureFlags.useCaip25Permission &&
+      Object.keys(newPermissions).includes(SnapEndowments.EthereumProvider)
+    ) {
       // This will return the globally selected network if the Snap doesn't have
       // one set.
       const networkClientId = this.messagingSystem.call(