Fix PPOMController outdated base-controller version and missing `st…

…ateChange` event
MetaMask · Jul 26, 2024 · 1de86a9 · 1de86a9
1 parent 2b3d19c
commit 1de86a9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/app/core/Engine.ts b/app/core/Engine.ts
@@ -1457,6 +1457,7 @@ class Engine {
           'KeyringController:stateChange',
           'NetworkController:stateChange',
           'PermissionController:stateChange',
+          'PPOMController:stateChange',
           'PreferencesController:stateChange',
           'SignatureController:stateChange',
           'SnapController:stateChange',
@@ -1480,8 +1481,6 @@ class Engine {
           // @ts-expect-error BaseControllerV2, messenger defined without `stateChange` event type
           'PhishingController:stateChange',
           // @ts-expect-error BaseControllerV2, messenger defined without `stateChange` event type
-          'PPOMController:stateChange',
-          // @ts-expect-error BaseControllerV2, messenger defined without `stateChange` event type
           'SnapsRegistry:stateChange',
           // @ts-expect-error BaseControllerV2, `TokenBalancesControllerState` import error
           'TokenBalancesController:stateChange',

diff --git a/package.json b/package.json
@@ -164,7 +164,7 @@
     "@metamask/permission-controller": "^9.0.0",
     "@metamask/phishing-controller": "^9.0.0",
     "@metamask/post-message-stream": "^8.0.0",
-    "@metamask/ppom-validator": "0.32.0",
+    "@metamask/ppom-validator": "github:MetaMask/ppom-validator#bump-base-controller-to-6.0.2-expose-build",
     "@metamask/preferences-controller": "^11.0.0",
     "@metamask/profile-sync-controller": "^0.1.3",
     "@metamask/react-native-actionsheet": "2.4.2",

diff --git a/yarn.lock b/yarn.lock
@@ -4611,7 +4611,7 @@
     single-call-balance-checker-abi "^1.0.0"
     uuid "^8.3.2"
 
-"@metamask/base-controller@6.0.2", "@metamask/base-controller@^3.0.0", "@metamask/base-controller@^3.2.2", "@metamask/base-controller@^4.0.1", "@metamask/base-controller@^4.1.1", "@metamask/base-controller@^5.0.1", "@metamask/base-controller@^5.0.2", "@metamask/base-controller@^6.0.0", "@metamask/base-controller@^6.0.1", "@metamask/base-controller@^6.0.2":
+"@metamask/base-controller@6.0.2", "@metamask/base-controller@^3.2.2", "@metamask/base-controller@^4.0.1", "@metamask/base-controller@^4.1.1", "@metamask/base-controller@^5.0.1", "@metamask/base-controller@^5.0.2", "@metamask/base-controller@^6.0.0", "@metamask/base-controller@^6.0.1", "@metamask/base-controller@^6.0.2":
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/@metamask/base-controller/-/base-controller-6.0.2.tgz#710d4a1686616cc66c572099f065ebbfb6dbfcf5"
   integrity sha512-U6BWN/CLrXvDSsYOpx6QgavZO7XRi6n6zuz4Kqni2Sg2n6R9ixSS8JLZhYUbIBgosTf84tVURaSYsYavX3G5KQ==
@@ -4853,7 +4853,7 @@
     "@metamask/safe-event-emitter" "^3.0.0"
     "@metamask/utils" "^8.3.0"
 
-"@metamask/eth-json-rpc-provider@^4.0.0":
+"@metamask/eth-json-rpc-provider@^4.0.0", "@metamask/eth-json-rpc-provider@^4.1.2":
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/@metamask/eth-json-rpc-provider/-/eth-json-rpc-provider-4.1.2.tgz#f0a3f1985589fe56ef3d9c7b58ec975c66b21633"
   integrity sha512-gnTPk+vHCzugB120sv5f8CV/gfxCyMkq33jq0JeChLyhkRdFA13j0aHoz5NAjd9CeLweWkKL/EA4vXQwB7t6Ew==
@@ -5278,7 +5278,7 @@
     json-rpc-engine "^6.1.0"
     uuid "^8.3.2"
 
-"@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==
@@ -5338,6 +5338,27 @@
     immer "^9.0.6"
     uuid "^8.3.2"
 
+"@metamask/network-controller@^20.0.0":
+  version "20.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/network-controller/-/network-controller-20.1.0.tgz#e31d9ae327388f87e5071ca1dbf2023e081498b1"
+  integrity sha512-OB1b/mFaqUHXX6gyYio4EZHcUGSRhxHvcxVKEjLrbuznVcqB18nL0pPNbe2VczgVprhEGfn1wybmmuXZAPN7cQ==
+  dependencies:
+    "@metamask/base-controller" "^6.0.2"
+    "@metamask/controller-utils" "^11.0.2"
+    "@metamask/eth-block-tracker" "^9.0.3"
+    "@metamask/eth-json-rpc-infura" "^9.1.0"
+    "@metamask/eth-json-rpc-middleware" "^12.1.1"
+    "@metamask/eth-json-rpc-provider" "^4.1.2"
+    "@metamask/eth-query" "^4.0.0"
+    "@metamask/json-rpc-engine" "^9.0.2"
+    "@metamask/rpc-errors" "^6.3.1"
+    "@metamask/swappable-obj-proxy" "^2.2.0"
+    "@metamask/utils" "^9.1.0"
+    async-mutex "^0.5.0"
+    immer "^9.0.6"
+    loglevel "^1.8.1"
+    uuid "^8.3.2"
+
 "@metamask/nonce-tracker@^5.0.0":
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/@metamask/nonce-tracker/-/nonce-tracker-5.0.0.tgz#4f24e4eb7be685ddbf0757df918e807c2961ccc8"
@@ -5518,14 +5539,14 @@
     "@metamask/utils" "^9.0.0"
     readable-stream "3.6.2"
 
-"@metamask/ppom-validator@0.32.0":
+"@metamask/ppom-validator@github:MetaMask/ppom-validator#bump-base-controller-to-6.0.2-expose-build":
   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==
+  resolved "https://codeload.github.com/MetaMask/ppom-validator/tar.gz/114cfceedded7bdf85faa4699b4efb8d5621f2d1"
   dependencies:
-    "@metamask/base-controller" "^3.0.0"
+    "@metamask/base-controller" "^6.0.2"
     "@metamask/controller-utils" "^8.0.1"
-    "@metamask/network-controller" "^17.0.0"
+    "@metamask/network-controller" "^20.0.0"
+    "@metamask/rpc-errors" "^6.3.1"
     "@metamask/utils" "^8.3.0"
     await-semaphore "^0.1.3"
     crypto-js "^4.2.0"