chore(deps): Bump @metamask/ppom-validator from 0.32.0 to 0.35.0

app/core/Engine.ts

@@ -110,6 +110,7 @@
 import SwapsController, { swapsUtils } from '@metamask/swaps-controller';
 import {
   PPOMController,
+  PPOMControllerActions,
   PPOMControllerEvents,
   PPOMState,
 } from '@metamask/ppom-validator';
@@ -301,6 +302,7 @@
   | KeyringControllerActions
   | AccountsControllerActions
   | PreferencesControllerActions
+  | PPOMControllerActions
   | TokensControllerActions
   | TokenListControllerActions
   | SelectedNetworkControllerActions
@@ -679,7 +681,7 @@
       onNetworkStateChange: (listener) =>
         this.controllerMessenger.subscribe(
           AppConstants.NETWORK_STATE_CHANGE_EVENT,
           listener,
         ),
       // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
       messenger: this.controllerMessenger.getRestricted({
@@ -1606,11 +1608,10 @@
         ).configuration.chainId,
         blockaidPublicKey: process.env.BLOCKAID_PUBLIC_KEY as string,
         cdnBaseUrl: process.env.BLOCKAID_FILE_CDN as string,
-        // @ts-expect-error TODO: Resolve/patch mismatch between base-controller versions. Before: never, never. Now: string, string, which expects 3rd and 4th args to be informed for restrictedControllerMessengers
         messenger: this.controllerMessenger.getRestricted({
           name: 'PPOMController',
           allowedActions: ['NetworkController:getNetworkClientById'],
-          allowedEvents: [`${networkController.name}:stateChange`],
+          allowedEvents: [`${networkController.name}:networkDidChange`],
         }),
         onPreferencesChange: (listener) =>
           this.controllerMessenger.subscribe(

package.json

@@ -162,7 +162,7 @@
     "@metamask/permission-controller": "^11.0.0",
     "@metamask/phishing-controller": "^12.0.3",
     "@metamask/post-message-stream": "^8.0.0",
-    "@metamask/ppom-validator": "0.32.0",
+    "@metamask/ppom-validator": "0.35.1",
     "@metamask/preferences-controller": "^11.0.0",
     "@metamask/profile-sync-controller": "^0.9.7",
     "@metamask/react-native-actionsheet": "2.4.2",

patches/@metamask+rpc-errors+6.4.0.patch

@@ -0,0 +1,38 @@
+diff --git a/node_modules/@metamask/rpc-errors/dist/classes.cjs b/node_modules/@metamask/rpc-errors/dist/classes.cjs
+index 2cf07ef..63d76e8 100644
+--- a/node_modules/@metamask/rpc-errors/dist/classes.cjs
++++ b/node_modules/@metamask/rpc-errors/dist/classes.cjs
+@@ -56,9 +56,14 @@ class JsonRpcError extends Error {
+                 serialized.data.cause = (0, utils_2.serializeCause)(this.data.cause);
+             }
+         }
++        /**
++         * passing the stack creates a loop, possible conflicting with hermes, since it's hermes that throws an error
++         */
++        /*
+         if (this.stack) {
+             serialized.stack = this.stack;
+         }
++        */
+         return serialized;
+     }
+     /**
+diff --git a/node_modules/@metamask/rpc-errors/dist/classes.mjs b/node_modules/@metamask/rpc-errors/dist/classes.mjs
+index 9d4c652..81f8518 100644
+--- a/node_modules/@metamask/rpc-errors/dist/classes.mjs
++++ b/node_modules/@metamask/rpc-errors/dist/classes.mjs
+@@ -57,9 +57,14 @@ export class JsonRpcError extends Error {
+                 serialized.data.cause = serializeCause(this.data.cause);
+             }
+         }
++        /**
++         * passing the stack creates a loop, possible conflicting with hermes, since it's hermes that throws an error
++         */
++        /*
+         if (this.stack) {
+             serialized.stack = this.stack;
+         }
++        */
+         return serialized;
+     }
+     /**

yarn.lock

@@ -4364,7 +4364,7 @@
     single-call-balance-checker-abi "^1.0.0"
     uuid "^8.3.2"
 
-"@metamask/base-controller@^3.0.0", "@metamask/base-controller@^3.2.3":
+"@metamask/base-controller@^3.2.3":
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/@metamask/base-controller/-/base-controller-3.2.3.tgz#7436a14f6789acf0814952dabaa70ee4fb7d473c"
   integrity sha512-k66oZe7BOEx0D5N5X8feE/32QlrUTmiEHHAZU/yCac2+VHllJOCEQV/cTeaAtgepnEf8O7SskvYZN+eIjgS99w==
@@ -4910,7 +4910,7 @@
   resolved "https://registry.yarnpkg.com/@metamask/mobile-provider/-/mobile-provider-3.0.0.tgz#8a6a5a0874c8cbe4b468f63dfc57117d207f9595"
   integrity sha512-XwFJk0rd9lAZR5xS3VC7ypEhD7DvZR2gi2Ch6PHnODIqeS9Te3OdVKK5+jHI4his8v/zs6LWdFdlRtx5/jL96w==
 
-"@metamask/network-controller@^17.0.0", "@metamask/network-controller@^17.1.0":
+"@metamask/network-controller@^17.1.0":
   version "17.2.1"
   resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-17.2.1.tgz#55d846e9e6000f3264e9ac1cc9c5b1493bac335a"
   integrity sha512-+cWbnqJyuLO+a3c9Rmdr10onNXv03J2Knl+IAR8QztAczqegtXB0pwTYlclU+j73Rsi9XWrUxS6fMGK1Vb3r9g==
@@ -5142,15 +5142,14 @@
     "@metamask/utils" "^9.0.0"
     readable-stream "3.6.2"
 
-"@metamask/ppom-validator@0.32.0":
-  version "0.32.0"
-  resolved "https://registry.yarnpkg.com/@metamask/ppom-validator/-/ppom-validator-0.32.0.tgz#e732cd946605c3abb0e11f175013dab879166004"
-  integrity sha512-BHfKp2wZRhyamQ8YooD+r24wKrYb+ORO6zvwqOva3niWo/5iTNgFt/iQ6CS5dPeklCvyVH8RAxS6Fgk7Mu7XKA==
+"@metamask/ppom-validator@0.35.1":
+  version "0.35.1"
+  resolved "https://registry.yarnpkg.com/@metamask/ppom-validator/-/ppom-validator-0.35.1.tgz#9ccece28f9f8947caef575849ef41f2ca15baa13"
+  integrity sha512-iaJRIFUXNBeuQwy+6B10mkPJDAmhvSyu5PAehSNSj+J2Q7Vy3AJe9GWI5t62j3IeDnwuny+Av+x/T+iI5D/b8w==
   dependencies:
-    "@metamask/base-controller" "^3.0.0"
-    "@metamask/controller-utils" "^8.0.1"
-    "@metamask/network-controller" "^17.0.0"
-    "@metamask/utils" "^8.3.0"
+    "@metamask/base-controller" "^7.0.1"
+    "@metamask/controller-utils" "^11.3.0"
+    "@metamask/utils" "^9.2.1"
     await-semaphore "^0.1.3"
     crypto-js "^4.2.0"
     elliptic "^6.5.4"
@@ -5276,9 +5275,9 @@
     invariant "2.2.4"
 
 "@metamask/rpc-errors@^6.0.0", "@metamask/rpc-errors@^6.2.1", "@metamask/rpc-errors@^6.3.1":
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/@metamask/rpc-errors/-/rpc-errors-6.3.1.tgz#d5bb4740e070c3d87e91717ff4c3c6061a081cab"
-  integrity sha512-ugDY7cKjF4/yH5LtBaOIKHw/AiGGSAmzptAUEiAEGr/78LwuzcXAxmzEQfSfMIfI+f9Djr8cttq1pRJJKfTuCg==
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@metamask/rpc-errors/-/rpc-errors-6.4.0.tgz#a7ce01c06c9a347ab853e55818ac5654a73bd006"
+  integrity sha512-1ugFO1UoirU2esS3juZanS/Fo8C8XYocCuBpfZI5N7ECtoG+zu0wF+uWZASik6CkO6w9n/Iebt4iI4pT0vptpg==
   dependencies:
     "@metamask/utils" "^9.0.0"
     fast-safe-stringify "^2.0.6"