feat: Enable ppom on other chains

app/scripts/lib/createStreamSink.js

@@ -1,7 +1,7 @@
-import { Writable as WritableStream } from 'readable-stream';
+import { Writable } from 'readable-stream';
 import promiseToCallback from 'promise-to-callback';
 
-class AsyncWritableStream extends WritableStream {
+class AsyncWritableStream extends Writable {
   constructor(asyncWriteFn, _opts) {
     const opts = { objectMode: true, ..._opts };
     super(opts);

app/scripts/lib/ppom/ppom-middleware.ts

@@ -22,6 +22,16 @@ const ConfirmationMethods = Object.freeze([
   'personal_sign',
 ]);
 
+export const SUPPORTED_CHAIN_IDS: string[] = [
+  CHAIN_IDS.MAINNET,
+  CHAIN_IDS.BSC,
+  CHAIN_IDS.POLYGON,
+  CHAIN_IDS.ARBITRUM,
+  CHAIN_IDS.OPTIMISM,
+  CHAIN_IDS.AVALANCHE,
+  CHAIN_IDS.LINEA_MAINNET,
+];
+
 /**
  * Middleware function that handles JSON RPC requests.
  * This function will be called for every JSON RPC request.
@@ -49,7 +59,7 @@ export function createPPOMMiddleware(
       if (
         securityAlertsEnabled &&
         ConfirmationMethods.includes(req.method) &&
-        chainId === CHAIN_IDS.MAINNET
+        SUPPORTED_CHAIN_IDS.includes(chainId)
       ) {
         // eslint-disable-next-line require-atomic-updates
         req.securityAlertResponse = await ppomController.usePPOM(

app/scripts/metamask-controller.js

@@ -769,16 +769,13 @@ export default class MetamaskController extends EventEmitter {
     this.ppomController = new PPOMController({
       messenger: this.controllerMessenger.getRestricted({
         name: 'PPOMController',
+        allowedEvents: ['NetworkController:stateChange'],
       }),
       storageBackend: new IndexedDBPPOMStorage('PPOMDB', 1),
       provider: this.provider,
       ppomProvider: { PPOM: PPOMModule.PPOM, ppomInit: PPOMModule.default },
       state: initState.PPOMController,
       chainId: this.networkController.state.providerConfig.chainId,
-      onNetworkChange: networkControllerMessenger.subscribe.bind(
-        networkControllerMessenger,
-        'NetworkController:stateChange',
-      ),
       securityAlertsEnabled:
         this.preferencesController.store.getState().securityAlertsEnabled,
       onPreferencesChange: this.preferencesController.store.subscribe.bind(

lavamoat/browserify/flask/policy.json

@@ -1886,12 +1886,14 @@
         "URL": true,
         "clearInterval": true,
         "console.error": true,
+        "crypto": true,
         "setInterval": true
       },
       "packages": {
         "@metamask/eth-query>json-rpc-random-id": true,
         "@metamask/ppom-validator>@metamask/base-controller": true,
         "@metamask/ppom-validator>@metamask/controller-utils": true,
+        "@metamask/ppom-validator>crypto-js": true,
         "@metamask/ppom-validator>elliptic": true,
         "await-semaphore": true,
         "browserify>buffer": true
@@ -1914,25 +1916,22 @@
       },
       "packages": {
         "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/controller-utils>ethjs-unit": true,
-        "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
         "ethereumjs-util": true
       }
     },
-    "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": {
+    "@metamask/ppom-validator>crypto-js": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
       },
       "packages": {
-        "@metamask/utils>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
+        "browserify>browser-resolve": true
       }
     },
     "@metamask/ppom-validator>elliptic": {

lavamoat/browserify/main/policy.json

@@ -1809,12 +1809,14 @@
         "URL": true,
         "clearInterval": true,
         "console.error": true,
+        "crypto": true,
         "setInterval": true
       },
       "packages": {
         "@metamask/eth-query>json-rpc-random-id": true,
         "@metamask/ppom-validator>@metamask/base-controller": true,
         "@metamask/ppom-validator>@metamask/controller-utils": true,
+        "@metamask/ppom-validator>crypto-js": true,
         "@metamask/ppom-validator>elliptic": true,
         "await-semaphore": true,
         "browserify>buffer": true
@@ -1837,25 +1839,22 @@
       },
       "packages": {
         "@metamask/controller-utils>@spruceid/siwe-parser": true,
-        "@metamask/controller-utils>ethjs-unit": true,
-        "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": true,
+        "@metamask/ethjs>@metamask/ethjs-unit": true,
+        "@metamask/utils": true,
         "browserify>buffer": true,
         "eslint>fast-deep-equal": true,
         "eth-ens-namehash": true,
         "ethereumjs-util": true
       }
     },
-    "@metamask/ppom-validator>@metamask/controller-utils>@metamask/utils": {
+    "@metamask/ppom-validator>crypto-js": {
       "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+        "crypto": true,
+        "define": true,
+        "msCrypto": true
       },
       "packages": {
-        "@metamask/utils>@noble/hashes": true,
-        "browserify>buffer": true,
-        "nock>debug": true,
-        "semver": true,
-        "superstruct": true
+        "browserify>browser-resolve": true
       }
     },
     "@metamask/ppom-validator>elliptic": {

lavamoat/build-system/policy.json

@@ -575,10 +575,10 @@
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-optimise-call-expression": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-replace-supers": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>globals": true,
         "depcheck>@babel/traverse>@babel/helper-environment-visitor": true,
         "depcheck>@babel/traverse>@babel/helper-function-name": true,
-        "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true,
-        "depcheck>@babel/traverse>globals": true
+        "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": {
@@ -3116,8 +3116,8 @@
         "eslint-plugin-prettier": true,
         "eslint-plugin-react": true,
         "eslint-plugin-react-hooks": true,
-        "eslint>@eslint/eslintrc>globals": true,
         "eslint>ajv": true,
+        "eslint>globals": true,
         "eslint>ignore": true,
         "eslint>minimatch": true,
         "mocha>strip-json-comments": true,

package.json

@@ -283,7 +283,7 @@
     "@metamask/phishing-controller": "^8.0.0",
     "@metamask/polling-controller": "^4.0.0",
     "@metamask/post-message-stream": "^7.0.0",
-    "@metamask/ppom-validator": "^0.10.0",
+    "@metamask/ppom-validator": "^0.22.0",
     "@metamask/providers": "^14.0.2",
     "@metamask/queued-request-controller": "^0.3.0",
     "@metamask/rate-limit-controller": "^3.0.0",

test/e2e/tests/errors.spec.js

@@ -46,6 +46,7 @@ const removedBackgroundFields = [
   'AppStateController.currentPopupId',
   'AppStateController.timeoutMinutes',
   'PPOMController.chainStatus.0x539.lastVisited',
+  'PPOMController.versionInfo',
 ];
 
 const removedUiFields = removedBackgroundFields.map(backgroundToUiField);

test/e2e/tests/state-snapshots/errors-after-init-opt-in-background-state.json

@@ -132,7 +132,7 @@
     "versionInfo": {},
     "storageMetadata": {},
     "chainStatus": {
-      "0x539": { "chainId": "0x539", "dataFetched": false, "versionInfo": [] }
+      "0x539": { "chainId": "0x539", "versionInfo": [] }
     },
     "versionFileETag": "string"
   },

test/e2e/tests/state-snapshots/errors-after-init-opt-in-ui-state.json

@@ -217,7 +217,7 @@
     "versionInfo": {},
     "storageMetadata": {},
     "chainStatus": {
-      "0x539": { "chainId": "0x539", "dataFetched": false, "versionInfo": [] }
+      "0x539": { "chainId": "0x539", "versionInfo": [] }
     },
     "versionFileETag": "string",
     "userOperations": "object"

ui/components/component-library/icon/icon.types.ts

@@ -171,6 +171,7 @@ export enum IconName {
   Bold = 'bold',
   CircleX = 'circle-x',
   Download = 'download',
+  // eslint-disable-next-line @typescript-eslint/no-shadow
   File = 'file',
   Flask = 'flask',
   Plug = 'plug',