We should enabled it on the following networks:

Ethereum Mainnet (already done)
BNB chain
Polygon
Arbitrum
Optimism
Avalanche

Test case for supported chain id

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

Add linea mainnet to supported chain IDs.

Lint fixes

Fix tests

Signed-off-by: Akintayo A. Olusegun <akintayo.segun@gmail.com>

Author: segun

src/ppom-controller.test.ts

@@ -192,7 +192,32 @@ describe('PPOMController', () => {
       }).rejects.toThrow('User has securityAlertsEnabled set to false');
     });
 
-    it('should throw error if the user is not on ethereum mainnet', async () => {
+    it('should NOT throw error if the user is on any supported chain id', async () => {
+      buildFetchSpy();
+      ppomController = buildPPOMController({
+        chainId: '0x38',
+        state: {
+          versionInfo: [
+            {
+              name: 'blob',
+              chainId: '0x38',
+              version: '1.0.0',
+              checksum:
+                '409a7f83ac6b31dc8c77e3ec18038f209bd2f545e0f4177c2e2381aa4e067b49',
+              filePath: 'blob',
+            },
+          ],
+        },
+      });
+      jest.runOnlyPendingTimers();
+      const result = await ppomController.usePPOM(async () => {
+        return Promise.resolve(buildDummyResponse());
+      });
+
+      expect(result).toStrictEqual(dummyResponse);
+    });
+
+    it('should throw error if the user is not on supported chain id', async () => {
       buildFetchSpy();
       ppomController = buildPPOMController({
         chainId: '0x2',
@@ -203,7 +228,7 @@ describe('PPOMController', () => {
           return Promise.resolve();
         });
       }).rejects.toThrow(
-        'Blockaid validation is available only on ethereum mainnet',
+        'Blockaid validation is not available on selected network',
       );
     });
 
@@ -593,11 +618,14 @@ describe('PPOMController', () => {
       jest.useFakeTimers().setSystemTime(new Date('2023-01-04'));
       callBack({ providerConfig: { chainId: '0x6' } });
 
-      expect(Object.keys(ppomController.state.chainStatus)).toHaveLength(5);
+      jest.useFakeTimers().setSystemTime(new Date('2023-01-04'));
+      callBack({ providerConfig: { chainId: '0x8' } });
+
+      expect(Object.keys(ppomController.state.chainStatus)).toHaveLength(6);
 
       jest.useFakeTimers().setSystemTime(new Date('2023-01-06'));
       callBack({ providerConfig: { chainId: '0x7' } });
-      expect(Object.keys(ppomController.state.chainStatus)).toHaveLength(5);
+      expect(Object.keys(ppomController.state.chainStatus)).toHaveLength(6);
 
       expect(ppomController.state.chainStatus['0x1']).toBeUndefined();
     });

src/ppom-controller.ts

@@ -51,7 +51,15 @@ const ALLOWED_PROVIDER_CALLS = [
   'trace_filter',
 ];
 
-const ETHEREUM_CHAIN_ID = '0x1';
+export const SUPPORTED_CHAIN_IDS = [
+  '0x1', // mainnet chain id
+  '0x38', // bnb chain id
+  '0x89', // polygon chain id
+  '0xa4b1', // arbitrum chain id
+  '0xa', // optimism chain id
+  '0xa86a', // avalanche chain id
+  '0xe708', // Linea chain id
+];
 
 /**
  * @type PPOMFileVersion
@@ -343,7 +351,7 @@ export class PPOMController extends BaseControllerV2<
       throw Error('User has securityAlertsEnabled set to false');
     }
     if (!this.#networkIsSupported(this.#chainId)) {
-      throw Error('Blockaid validation is available only on ethereum mainnet');
+      throw Error('Blockaid validation is not available on selected network');
     }
 
     await this.#reinitPPOMForNetworkIfRequired();
@@ -387,11 +395,10 @@ export class PPOMController extends BaseControllerV2<
   }
 
   /*
-   * The function check if ethereum chainId is supported for validation
-   * Currently it checks for only Ethereum Mainnet but it will include more networks in future.
+   * The function check if chainId is supported for validation
    */
   #networkIsSupported(chainId: string) {
-    return chainId === ETHEREUM_CHAIN_ID;
+    return SUPPORTED_CHAIN_IDS.includes(chainId);
   }
 
   /*
@@ -474,7 +481,7 @@ export class PPOMController extends BaseControllerV2<
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this.#initialisePPOM();
       this.#checkScheduleFileDownloadForAllChains();
-      this.#getNewFilesForChain(ETHEREUM_CHAIN_ID).finally(() => {
+      this.#getNewFilesForChain(this.#chainId).finally(() => {
         if (this.#ppomInitialisationCallback) {
           this.#ppomInitialisationCallback();
         }
@@ -738,8 +745,9 @@ export class PPOMController extends BaseControllerV2<
     const currentTimestamp = new Date().getTime();
 
     const chainIds = Object.keys(this.state.chainStatus).filter(
-      (id) => id !== ETHEREUM_CHAIN_ID,
+      (id) => id !== this.#chainId,
     );
+
     const oldChaninIds: any[] = chainIds.filter(
       (chainId) =>
         (this.state.chainStatus[chainId] as any).lastVisited <
@@ -807,7 +815,7 @@ export class PPOMController extends BaseControllerV2<
               if (isLastFileOfNetwork) {
                 // if this was last file for the chainId set dataFetched for chainId to true
                 await this.#setChainIdDataFetched(fileVersionInfo.chainId);
-                if (fileVersionInfo.chainId === ETHEREUM_CHAIN_ID) {
+                if (fileVersionInfo.chainId === this.#chainId) {
                   await this.#reinitPPOM();
                 }
               }

test/test-utils.ts

@@ -1,8 +1,8 @@
 import { ControllerMessenger } from '@metamask/base-controller';
 import * as ControllerUtils from '@metamask/controller-utils';
 
-import { PPOMController } from '../src/ppom-controller';
-import { StorageKey } from '../src/ppom-storage';
+import { PPOMController, SUPPORTED_CHAIN_IDS } from '../src/ppom-controller';
+import { FileMetadata, StorageKey } from '../src/ppom-storage';
 
 export const buildDummyResponse = (
   resultType = 'DUMMY_RESULT_TYPE',
@@ -37,28 +37,35 @@ export const storageBackendReturningData = buildStorageBackend({
     Promise.resolve(DUMMY_ARRAY_BUFFER_DATA),
 });
 
-export const VERSION_INFO = [
-  {
-    name: 'blob',
-    chainId: '0x1',
-    version: '1.0.0',
-    checksum:
-      '409a7f83ac6b31dc8c77e3ec18038f209bd2f545e0f4177c2e2381aa4e067b49',
-    signature:
-      '0x304402206d433e9172960de6717d94ae263e47eefacd3584a3274a452f8f9567b3a797db02201b2e423188fb3f9daa6ce6a8723f69df26bd3ceeee81f77250526b91e093614f',
-    filePath: 'blob',
-  },
-  {
-    name: 'data',
-    chainId: '0x1',
-    version: '1.0.3',
-    checksum:
-      '409a7f83ac6b31dc8c77e3ec18038f209bd2f545e0f4177c2e2381aa4e067b49',
-    signature:
-      '0x304402206d433e9172960de6717d94ae263e47eefacd3584a3274a452f8f9567b3a797db02201b2e423188fb3f9daa6ce6a8723f69df26bd3ceeee81f77250526b91e093614f',
-    filePath: 'data',
-  },
-];
+export const VERSION_INFO: (FileMetadata & {
+  signature: string;
+  filePath: string;
+})[] = [];
+
+SUPPORTED_CHAIN_IDS.forEach((chainId) => {
+  VERSION_INFO.push(
+    {
+      name: `${chainId}_blob`,
+      chainId,
+      version: '1.0.0',
+      checksum:
+        '409a7f83ac6b31dc8c77e3ec18038f209bd2f545e0f4177c2e2381aa4e067b49',
+      signature:
+        '0x304402206d433e9172960de6717d94ae263e47eefacd3584a3274a452f8f9567b3a797db02201b2e423188fb3f9daa6ce6a8723f69df26bd3ceeee81f77250526b91e093614f',
+      filePath: `${chainId}_blob`,
+    },
+    {
+      name: `${chainId}_blob`,
+      chainId,
+      version: '1.0.3',
+      checksum:
+        '409a7f83ac6b31dc8c77e3ec18038f209bd2f545e0f4177c2e2381aa4e067b49',
+      signature:
+        '0x304402206d433e9172960de6717d94ae263e47eefacd3584a3274a452f8f9567b3a797db02201b2e423188fb3f9daa6ce6a8723f69df26bd3ceeee81f77250526b91e093614f',
+      filePath: `${chainId}_data`,
+    },
+  );
+});
 
 const PPOM_VERSION_PATH = 'https://ppom_cdn_base_url/ppom_version.json';