Merge branch 'main' into controller-utils-isEqualCaseInsensitive

package.json

@@ -56,7 +56,7 @@
     "@metamask/eslint-config-jest": "^12.1.0",
     "@metamask/eslint-config-nodejs": "^12.1.0",
     "@metamask/eslint-config-typescript": "^12.1.0",
-    "@metamask/eth-block-tracker": "^10.0.0",
+    "@metamask/eth-block-tracker": "^11.0.2",
     "@metamask/eth-json-rpc-provider": "^4.1.5",
     "@metamask/json-rpc-engine": "^10.0.0",
     "@metamask/utils": "^9.1.0",

packages/approval-controller/package.json

@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@metamask/base-controller": "^7.0.1",
-    "@metamask/rpc-errors": "^6.3.1",
+    "@metamask/rpc-errors": "^7.0.0",
     "@metamask/utils": "^9.1.0",
     "nanoid": "^3.1.31"
   },

packages/assets-controllers/package.json

@@ -59,7 +59,7 @@
     "@metamask/eth-query": "^4.0.0",
     "@metamask/metamask-eth-abis": "^3.1.1",
     "@metamask/polling-controller": "^10.0.1",
-    "@metamask/rpc-errors": "^6.3.1",
+    "@metamask/rpc-errors": "^7.0.0",
     "@metamask/utils": "^9.1.0",
     "@types/bn.js": "^5.1.5",
     "@types/uuid": "^8.3.0",

packages/eth-json-rpc-provider/src/safe-event-emitter-provider.test.ts

@@ -222,7 +222,7 @@ describe('SafeEventEmitterProvider', () => {
       ).rejects.toThrow(
         expect.objectContaining({
           code: -32603,
-          message: 'Internal JSON-RPC error.',
+          message: 'Test error',
           data: {
             cause: expect.objectContaining({
               stack: expect.stringContaining(

packages/network-controller/package.json

@@ -49,13 +49,13 @@
   "dependencies": {
     "@metamask/base-controller": "^7.0.1",
     "@metamask/controller-utils": "^11.3.0",
-    "@metamask/eth-block-tracker": "^10.0.0",
-    "@metamask/eth-json-rpc-infura": "^9.1.0",
-    "@metamask/eth-json-rpc-middleware": "^13.0.0",
+    "@metamask/eth-block-tracker": "^11.0.2",
+    "@metamask/eth-json-rpc-infura": "^10.0.0",
+    "@metamask/eth-json-rpc-middleware": "^15.0.0",
     "@metamask/eth-json-rpc-provider": "^4.1.5",
     "@metamask/eth-query": "^4.0.0",
-    "@metamask/json-rpc-engine": "^9.0.3",
-    "@metamask/rpc-errors": "^6.3.1",
+    "@metamask/json-rpc-engine": "^10.0.0",
+    "@metamask/rpc-errors": "^7.0.0",
     "@metamask/swappable-obj-proxy": "^2.2.0",
     "@metamask/utils": "^9.1.0",
     "async-mutex": "^0.5.0",

packages/notification-services-controller/package.json

@@ -102,6 +102,7 @@
     "@contentful/rich-text-html-renderer": "^16.5.2",
     "@metamask/base-controller": "^7.0.1",
     "@metamask/controller-utils": "^11.3.0",
+    "@metamask/utils": "^9.1.0",
     "bignumber.js": "^4.1.0",
     "firebase": "^10.11.0",
     "loglevel": "^1.8.1",

packages/notification-services-controller/src/NotificationServicesController/NotificationServicesController.test.ts

@@ -7,6 +7,7 @@ import type {
 import type { UserStorageController } from '@metamask/profile-sync-controller';
 import { AuthenticationController } from '@metamask/profile-sync-controller';
 
+import { createMockSnapNotification } from './__fixtures__';
 import {
   createMockFeatureAnnouncementAPIResult,
   createMockFeatureAnnouncementRaw,
@@ -25,6 +26,7 @@ import {
   mockMarkNotificationsAsRead,
 } from './__fixtures__/mockServices';
 import { waitFor } from './__fixtures__/test-utils';
+import { TRIGGER_TYPES } from './constants';
 import NotificationServicesController, {
   defaultState,
 } from './NotificationServicesController';
@@ -35,7 +37,9 @@ import type {
   NotificationServicesPushControllerDisablePushNotifications,
   NotificationServicesPushControllerUpdateTriggerPushNotifications,
 } from './NotificationServicesController';
+import { processFeatureAnnouncement } from './processors';
 import { processNotification } from './processors/process-notifications';
+import { processSnapNotification } from './processors/process-snap-notifications';
 import * as OnChainNotifications from './services/onchain-notifications';
 import type { UserStorage } from './types/user-storage/user-storage';
 import * as Utils from './utils/utils';
@@ -472,23 +476,30 @@ describe('metamask-notifications - fetchAndUpdateMetamaskNotifications()', () =>
     };
   };
 
-  it('processes and shows feature announcements and wallet notifications', async () => {
+  it('processes and shows feature announcements, wallet and snap notifications', async () => {
     const {
       messenger,
       mockFeatureAnnouncementAPIResult,
       mockListNotificationsAPIResult,
     } = arrangeMocks();
 
+    const snapNotification = createMockSnapNotification();
+    const processedSnapNotification = processSnapNotification(snapNotification);
+
     const controller = new NotificationServicesController({
       messenger,
       env: { featureAnnouncements: featureAnnouncementsEnv },
-      state: { ...defaultState, isFeatureAnnouncementsEnabled: true },
+      state: {
+        ...defaultState,
+        isFeatureAnnouncementsEnabled: true,
+        metamaskNotificationsList: [processedSnapNotification],
+      },
     });
 
     const result = await controller.fetchAndUpdateMetamaskNotifications();
 
     // Should have 1 feature announcement and 1 wallet notification
-    expect(result).toHaveLength(2);
+    expect(result).toHaveLength(3);
     expect(
       result.find(
         (n) => n.id === mockFeatureAnnouncementAPIResult.items?.[0].fields.id,
@@ -497,9 +508,10 @@ describe('metamask-notifications - fetchAndUpdateMetamaskNotifications()', () =>
     expect(
       result.find((n) => n.id === mockListNotificationsAPIResult[0].id),
     ).toBeDefined();
+    expect(result.find((n) => n.type === TRIGGER_TYPES.SNAP)).toBeDefined();
 
     // State is also updated
-    expect(controller.state.metamaskNotificationsList).toHaveLength(2);
+    expect(controller.state.metamaskNotificationsList).toHaveLength(3);
   });
 
   it('only fetches and processes feature announcements if not authenticated', async () => {
@@ -529,6 +541,148 @@ describe('metamask-notifications - fetchAndUpdateMetamaskNotifications()', () =>
   });
 });
 
+describe('metamask-notifications - getNotificationsByType', () => {
+  it('can fetch notifications by their type', async () => {
+    const { messenger } = mockNotificationMessenger();
+    const controller = new NotificationServicesController({
+      messenger,
+      env: { featureAnnouncements: featureAnnouncementsEnv },
+    });
+
+    const processedSnapNotification = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    const processedFeatureAnnouncement = processFeatureAnnouncement(
+      createMockFeatureAnnouncementRaw(),
+    );
+
+    await controller.updateMetamaskNotificationsList(processedSnapNotification);
+    await controller.updateMetamaskNotificationsList(
+      processedFeatureAnnouncement,
+    );
+
+    expect(controller.state.metamaskNotificationsList).toHaveLength(2);
+
+    const filteredNotifications = controller.getNotificationsByType(
+      TRIGGER_TYPES.SNAP,
+    );
+
+    expect(filteredNotifications).toHaveLength(1);
+    expect(filteredNotifications).toStrictEqual([
+      {
+        type: TRIGGER_TYPES.SNAP,
+        id: expect.any(String),
+        createdAt: expect.any(String),
+        isRead: false,
+        readDate: null,
+        data: {
+          message: 'fooBar',
+          origin: '@metamask/example-snap',
+          detailedView: {
+            title: 'Detailed View',
+            interfaceId: '1',
+            footerLink: {
+              text: 'Go Home',
+              href: 'metamask://client/',
+            },
+          },
+        },
+      },
+    ]);
+  });
+});
+
+describe('metamask-notifications - deleteNotificationsById', () => {
+  it('will delete a notification by its id', async () => {
+    const { messenger } = mockNotificationMessenger();
+    const processedSnapNotification = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    const controller = new NotificationServicesController({
+      messenger,
+      env: { featureAnnouncements: featureAnnouncementsEnv },
+      state: { metamaskNotificationsList: [processedSnapNotification] },
+    });
+
+    await controller.deleteNotificationsById([processedSnapNotification.id]);
+
+    expect(controller.state.metamaskNotificationsList).toHaveLength(0);
+  });
+
+  it('will batch delete notifications', async () => {
+    const { messenger } = mockNotificationMessenger();
+    const processedSnapNotification1 = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    const processedSnapNotification2 = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    const controller = new NotificationServicesController({
+      messenger,
+      env: { featureAnnouncements: featureAnnouncementsEnv },
+      state: {
+        metamaskNotificationsList: [
+          processedSnapNotification1,
+          processedSnapNotification2,
+        ],
+      },
+    });
+
+    await controller.deleteNotificationsById([
+      processedSnapNotification1.id,
+      processedSnapNotification2.id,
+    ]);
+
+    expect(controller.state.metamaskNotificationsList).toHaveLength(0);
+  });
+
+  it('will throw if a notification is not found', async () => {
+    const { messenger } = mockNotificationMessenger();
+    const processedSnapNotification = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    const controller = new NotificationServicesController({
+      messenger,
+      env: { featureAnnouncements: featureAnnouncementsEnv },
+      state: { metamaskNotificationsList: [processedSnapNotification] },
+    });
+
+    await expect(controller.deleteNotificationsById(['foo'])).rejects.toThrow(
+      'The notification to be deleted does not exist.',
+    );
+
+    expect(controller.state.metamaskNotificationsList).toHaveLength(1);
+  });
+
+  it('will throw if the notification to be deleted is not locally persisted', async () => {
+    const { messenger } = mockNotificationMessenger();
+    const processedSnapNotification = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    const processedFeatureAnnouncement = processFeatureAnnouncement(
+      createMockFeatureAnnouncementRaw(),
+    );
+    const controller = new NotificationServicesController({
+      messenger,
+      env: { featureAnnouncements: featureAnnouncementsEnv },
+      state: {
+        metamaskNotificationsList: [
+          processedFeatureAnnouncement,
+          processedSnapNotification,
+        ],
+      },
+    });
+
+    await expect(
+      controller.deleteNotificationsById([processedFeatureAnnouncement.id]),
+    ).rejects.toThrow(
+      'The notification type of "features_announcement" is not locally persisted, only the following types can use this function: snap.',
+    );
+
+    expect(controller.state.metamaskNotificationsList).toHaveLength(2);
+  });
+});
+
 describe('metamask-notifications - markMetamaskNotificationsAsRead()', () => {
   const arrangeMocks = (options?: { onChainMarkAsReadFails: boolean }) => {
     const messengerMocks = mockNotificationMessenger();
@@ -576,6 +730,38 @@ describe('metamask-notifications - markMetamaskNotificationsAsRead()', () => {
     // We can debate & change implementation if it makes sense to mark as read locally if external APIs fail.
     expect(controller.state.metamaskNotificationsReadList).toHaveLength(1);
   });
+
+  it('updates snap notifications as read', async () => {
+    const { messenger } = arrangeMocks();
+    const processedSnapNotification = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    const controller = new NotificationServicesController({
+      messenger,
+      env: { featureAnnouncements: featureAnnouncementsEnv },
+      state: {
+        metamaskNotificationsList: [processedSnapNotification],
+      },
+    });
+
+    await controller.markMetamaskNotificationsAsRead([
+      {
+        type: TRIGGER_TYPES.SNAP,
+        id: processedSnapNotification.id,
+        isRead: false,
+      },
+    ]);
+
+    // Should see 1 item in controller read state
+    expect(controller.state.metamaskNotificationsReadList).toHaveLength(1);
+
+    // The notification should have a read date
+    expect(
+      // @ts-expect-error readDate property is guaranteed to exist
+      // as we're dealing with a snap notification
+      controller.state.metamaskNotificationsList[0].readDate,
+    ).not.toBeNull();
+  });
 });
 
 describe('metamask-notifications - enableMetamaskNotifications()', () => {
@@ -670,6 +856,42 @@ describe('metamask-notifications - disableMetamaskNotifications()', () => {
   });
 });
 
+describe('metamask-notifications - updateMetamaskNotificationsList', () => {
+  it('can add and process a new notification to the notifications list', async () => {
+    const { messenger } = mockNotificationMessenger();
+    const controller = new NotificationServicesController({
+      messenger,
+      env: { featureAnnouncements: featureAnnouncementsEnv },
+      state: { isNotificationServicesEnabled: true },
+    });
+    const processedSnapNotification = processSnapNotification(
+      createMockSnapNotification(),
+    );
+    await controller.updateMetamaskNotificationsList(processedSnapNotification);
+    expect(controller.state.metamaskNotificationsList).toStrictEqual([
+      {
+        type: TRIGGER_TYPES.SNAP,
+        id: expect.any(String),
+        createdAt: expect.any(String),
+        readDate: null,
+        isRead: false,
+        data: {
+          message: 'fooBar',
+          origin: '@metamask/example-snap',
+          detailedView: {
+            title: 'Detailed View',
+            interfaceId: '1',
+            footerLink: {
+              text: 'Go Home',
+              href: 'metamask://client/',
+            },
+          },
+        },
+      },
+    ]);
+  });
+});
+
 // Type-Computation - we are extracting args and parameters from a generic type utility
 // Thus this `AnyFunc` can be used to help constrain the generic parameters correctly
 // eslint-disable-next-line @typescript-eslint/no-explicit-any