chore: upgrade to @metamask/messenger@2.0.0 + TC 68.4.0, match main

- Bump @metamask/messenger resolution from ^1.2.0 to ^2.0.0
- Bump @metamask/transaction-controller from 68.2.2 to 68.4.0
- Drop @metamask/snaps-rpc-methods pin (17.0.0)
- Drop stale @metamask/messenger@^0.3.0 override
- Restore SnapsMethodMiddleware getMessenger buildChild hook (matches main)
- Update caveat specifications test to expect 15 (snaps-rpc-methods@17.1.0)

TC 68.3.0 fixes bridge transactions being stuck-as-pending when a user
has saved advanced gas fees; this is likely responsible for the e2e swap
suite's 'Bridge transaction should show Confirmed status' timeout.

TC 68.3.0 requires @metamask/messenger@^2.0.0, which is what mobile main
now uses; align everything with main's versions to keep the surface area
minimal.

Author: matthewwalsh0

app/core/Permissions/specifications.test.js

@@ -25,7 +25,7 @@ describe('PermissionController specifications', () => {
   describe('caveat specifications', () => {
     it('getCaveatSpecifications returns the expected specifications object', () => {
       const caveatSpecifications = getCaveatSpecifications({});
-      expect(Object.keys(caveatSpecifications)).toHaveLength(14);
+      expect(Object.keys(caveatSpecifications)).toHaveLength(15);
       expect(caveatSpecifications[Caip25CaveatType].type).toStrictEqual(
         Caip25CaveatType,
       );

app/core/Snaps/SnapsMethodMiddleware.ts

@@ -1,13 +1,16 @@
 ///: BEGIN:ONLY_INCLUDE_IF(snaps)
-import { createSnapsMethodMiddleware } from '@metamask/snaps-rpc-methods';
+import {
+  createSnapsMethodMiddleware,
+  type PermittedRpcMethodHooks,
+} from '@metamask/snaps-rpc-methods';
 import { SubjectType } from '@metamask/permission-controller';
 import { Json } from '@metamask/utils';
 import { captureException } from '@sentry/react-native';
 import { AppState } from 'react-native';
 import { getVersion } from 'react-native-device-info';
 
 import { keyringSnapPermissionsBuilder } from '../SnapKeyring/keyringSnapsPermissions';
-import { RootExtendedMessenger, EngineContext } from '../Engine';
+import { RootExtendedMessenger, GlobalActions, GlobalEvents } from '../Engine';
 import { analytics } from '../../util/analytics/analytics';
 import { AnalyticsEventBuilder } from '../../util/analytics/AnalyticsEventBuilder';
 import { endTrace, trace } from '../../util/trace';
@@ -55,6 +58,12 @@ const snapMethodMiddlewareBuilder = (
 
         return `${baseVersion}-${buildType}.0`;
       },
+      getMessenger: ({ actions, events }) =>
+        controllerMessenger.buildChild<string, GlobalActions, GlobalEvents>({
+          namespace: origin,
+          actions: (actions ?? []) as GlobalActions['type'][],
+          events: (events ?? []) as GlobalEvents['type'][],
+        }) as ReturnType<PermittedRpcMethodHooks['getMessenger']>,
       // @ts-expect-error Type 'string' is not assignable to type 'TraceName'.
       startTrace: trace,
       // @ts-expect-error Type 'string' is not assignable to type 'TraceName'.

package.json

@@ -204,9 +204,7 @@
     "pretty-format/react-is": "^19.0.0",
     "bn.js@npm:4.11.6": "4.12.3",
     "bn.js@npm:5.2.1": "5.2.3",
-    "@metamask/messenger@^0.3.0": "^1.0.0",
-    "@metamask/messenger": "^1.2.0",
-    "@metamask/snaps-rpc-methods": "17.0.0",
+    "@metamask/messenger": "^2.0.0",
     "@metamask/keyring-internal-api": "^11.0.1",
     "@metamask/keyring-api@npm:^21.3.0": "^23.3.0",
     "@metamask/keyring-api@npm:^21.4.0": "^23.3.0",
@@ -216,7 +214,7 @@
     "react-native-quick-base64@npm:^2.0.5": "patch:react-native-quick-base64@npm%3A2.2.0#~/.yarn/patches/react-native-quick-base64-npm-2.2.0-9083eb316a.patch",
     "@metamask/permission-controller": "^13.1.1",
     "react-native-ble-plx@npm:3.4.0": "patch:react-native-ble-plx@npm%3A3.4.0#~/.yarn/patches/react-native-ble-plx-npm-3.4.0-401e8b3343.patch",
-    "@metamask/transaction-controller": "68.2.2",
+    "@metamask/transaction-controller": "68.4.0",
     "@metamask/keyring-controller": "^27.1.0",
     "@metamask/accounts-controller": "^39.0.3",
     "expo-web-browser@npm:~55.0.16": "55.0.16",
@@ -303,7 +301,7 @@
     "@metamask/keyring-utils": "^3.3.1",
     "@metamask/logging-controller": "^8.0.0",
     "@metamask/message-signing-snap": "^1.1.2",
-    "@metamask/messenger": "^1.2.0",
+    "@metamask/messenger": "^2.0.0",
     "@metamask/metamask-eth-abis": "3.1.1",
     "@metamask/mobile-wallet-protocol-core": "^0.4.0",
     "@metamask/mobile-wallet-protocol-wallet-client": "^0.3.0",
@@ -358,7 +356,7 @@
     "@metamask/storage-service": "^1.0.0",
     "@metamask/superstruct": "^3.2.1",
     "@metamask/swappable-obj-proxy": "^2.1.0",
-    "@metamask/transaction-controller": "^68.2.2",
+    "@metamask/transaction-controller": "^68.4.0",
     "@metamask/transaction-pay-controller": "^23.17.4",
     "@metamask/tron-wallet-snap": "^1.29.1",
     "@metamask/utils": "^11.11.0",

yarn.lock

@@ -9353,17 +9353,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/messenger@npm:^1.0.0, @metamask/messenger@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@metamask/messenger@npm:1.2.0"
+"@metamask/messenger@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@metamask/messenger@npm:2.0.0"
   dependencies:
-    "@metamask/utils": "npm:^11.9.0"
-    yargs: "npm:^17.7.2"
+    "@metamask/utils": "npm:^11.11.0"
   peerDependencies:
     typescript: ">=5.0.0"
-  bin:
-    messenger-generate-action-types: ./dist/generate-action-types/cli.mjs
-  checksum: 10/6818e4609d6162a436cc07955905f9e57ff6dbef841e9066a5fb9cc0538e981526fbcb5eef1fa1968d79212d57ddda2fce4dda5f87eb64d8d98f7db1216a6a98
+  checksum: 10/c387511edd89db73b774f631fb4bb382c9254af2dd7f80f9bd45f776e618cf90f653cc0e9744b1bf491f71f99c8318b16e8230a847f619a4fca655ea3f6a08e1
   languageName: node
   linkType: hard
 
@@ -10399,20 +10396,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/snaps-rpc-methods@npm:17.0.0":
-  version: 17.0.0
-  resolution: "@metamask/snaps-rpc-methods@npm:17.0.0"
+"@metamask/snaps-rpc-methods@npm:^15.0.2":
+  version: 15.1.1
+  resolution: "@metamask/snaps-rpc-methods@npm:15.1.1"
   dependencies:
     "@metamask/key-tree": "npm:^10.1.1"
-    "@metamask/permission-controller": "npm:^13.1.1"
+    "@metamask/permission-controller": "npm:^12.3.0"
     "@metamask/rpc-errors": "npm:^7.0.3"
-    "@metamask/snaps-sdk": "npm:^11.1.1"
-    "@metamask/snaps-utils": "npm:^12.2.1"
+    "@metamask/snaps-sdk": "npm:^11.1.0"
+    "@metamask/snaps-utils": "npm:^12.2.0"
     "@metamask/superstruct": "npm:^3.2.1"
     "@metamask/utils": "npm:^11.11.0"
     "@noble/hashes": "npm:^1.7.1"
     async-mutex: "npm:^0.5.0"
-  checksum: 10/731696bf6118a7ae1d75776fcb6948a6ee1b3659a1871dced2b78dbedd349c2bba6a3f767ad53b2af3e7bf04ec46798392a4463d316a68d30766c90129410480
+  checksum: 10/906eafa8a2d4944e50d73b8aa4d32a7070c33367ad3d58843e892e62b3bd8facb0a02e1d88a9245c18a281637435d97266212b7706ef67ee6a68db85a5991ea3
+  languageName: node
+  linkType: hard
+
+"@metamask/snaps-rpc-methods@npm:^17.0.0, @metamask/snaps-rpc-methods@npm:^17.1.0":
+  version: 17.1.0
+  resolution: "@metamask/snaps-rpc-methods@npm:17.1.0"
+  dependencies:
+    "@metamask/key-tree": "npm:^10.1.1"
+    "@metamask/permission-controller": "npm:^13.1.1"
+    "@metamask/rpc-errors": "npm:^7.0.3"
+    "@metamask/snaps-sdk": "npm:^11.2.0"
+    "@metamask/snaps-utils": "npm:^12.3.0"
+    "@metamask/superstruct": "npm:^3.3.0"
+    "@metamask/utils": "npm:^11.11.0"
+    "@noble/hashes": "npm:^1.7.1"
+    async-mutex: "npm:^0.5.0"
+  checksum: 10/0afcd10f7f45611b74845c757bf9cad49044b51bfa1cf4043690f2084ad422684405aac405abed2b1c7f314857a6d208e902204dc82055d40f3a40c49c00c81d
   languageName: node
   linkType: hard
 
@@ -10597,9 +10611,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:68.2.2":
-  version: 68.2.2
-  resolution: "@metamask/transaction-controller@npm:68.2.2"
+"@metamask/transaction-controller@npm:68.4.0":
+  version: 68.4.0
+  resolution: "@metamask/transaction-controller@npm:68.4.0"
   dependencies:
     "@ethereumjs/common": "npm:^4.4.0"
     "@ethereumjs/tx": "npm:^5.4.0"
@@ -10614,7 +10628,7 @@ __metadata:
     "@metamask/controller-utils": "npm:^12.3.0"
     "@metamask/core-backend": "npm:^6.5.0"
     "@metamask/gas-fee-controller": "npm:^26.2.4"
-    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/messenger": "npm:^2.0.0"
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/network-controller": "npm:^34.0.0"
     "@metamask/nonce-tracker": "npm:^6.0.0"
@@ -10631,7 +10645,7 @@ __metadata:
   peerDependencies:
     "@babel/runtime": ^7.0.0
     "@metamask/eth-block-tracker": ">=9"
-  checksum: 10/299741f8c238c70be1008e8a2768e9f64052fefd8582a59879d58c669551b23f4c0b55ffcecbfed56cafb5be3edb577ccfee11d910ebad14bfcbfb9b1b11003e
+  checksum: 10/12a9ea21e6a5d7d0ca8a504dde2a453fdfb74d826e80432f775bbaaab1acae5faf561bcfbef37d5cc36acf927f0bba53e4f56353ca0e0fb0ae866e450226e73b
   languageName: node
   linkType: hard
 
@@ -35862,7 +35876,7 @@ __metadata:
     "@metamask/keyring-utils": "npm:^3.3.1"
     "@metamask/logging-controller": "npm:^8.0.0"
     "@metamask/message-signing-snap": "npm:^1.1.2"
-    "@metamask/messenger": "npm:^1.2.0"
+    "@metamask/messenger": "npm:^2.0.0"
     "@metamask/messenger-cli": "npm:^0.2.0"
     "@metamask/metamask-eth-abis": "npm:3.1.1"
     "@metamask/mobile-provider": "npm:^3.0.0"
@@ -35926,7 +35940,7 @@ __metadata:
     "@metamask/test-dapp-bitcoin": "npm:^0.2.0"
     "@metamask/test-dapp-multichain": "npm:^0.17.1"
     "@metamask/test-dapp-solana": "npm:^0.3.0"
-    "@metamask/transaction-controller": "npm:^68.2.2"
+    "@metamask/transaction-controller": "npm:^68.4.0"
     "@metamask/transaction-pay-controller": "npm:^23.17.4"
     "@metamask/tron-wallet-snap": "npm:^1.29.1"
     "@metamask/utils": "npm:^11.11.0"