feat(SDKConnectV2): RPC Message Handling

app/components/hooks/useMetrics/useMetrics.types.ts

@@ -10,6 +10,7 @@ import { MetricsEventBuilder } from '../../../core/Analytics/MetricsEventBuilder
 
 export const SourceType = {
   SDK: 'sdk',
+  SDK_CONNECT_V2: 'sdk_connect_v2',
   WALLET_CONNECT: 'walletconnect',
   IN_APP_BROWSER: 'in-app browser',
   PERMISSION_SYSTEM: 'permission system',

app/components/hooks/useOriginSource.ts

@@ -21,6 +21,11 @@ export const useOriginSource = ({
     return undefined;
   }
 
+  // Check for V2 connections
+  if (origin.startsWith(AppConstants.MM_SDK.SDK_CONNECT_V2_ORIGIN)) {
+    return SourceType.SDK_CONNECT_V2;
+  }
+
   // Check if origin is a UUID (SDK channel ID format) or starts with SDK_REMOTE_ORIGIN
   const isChannelId = isUUID(origin);
   const isSDKRemoteOrigin = origin.startsWith(

app/core/AppConstants.ts

@@ -212,6 +212,7 @@ export default {
     SERVER_URL: process.env.SDK_COMMLAYER_URL ?? DEFAULT_SERVER_URL,
     PLATFORM: 'metamask-mobile',
     SDK_REMOTE_ORIGIN: 'MMSDKREMOTE::',
+    SDK_CONNECT_V2_ORIGIN: 'MMSDKCONNECTV2::',
     UNKNOWN_PARAM: 'UNKNOWN',
   },
   CANCEL_RATE: 'Transactions (Cancel)',

app/core/BackgroundBridge/BackgroundBridge.js

@@ -201,7 +201,7 @@ export class BackgroundBridge extends EventEmitter {
       this.onUnlock.bind(this),
     );
 
-    if (!this.isMMSDK && !this.isWalletConnect) {
+    if (!this.isWalletConnect) {
       this.multichainSubscriptionManager = new MultichainSubscriptionManager({
         getNetworkClientById:
           Engine.context.NetworkController.getNetworkClientById.bind(
@@ -462,7 +462,7 @@ export class BackgroundBridge extends EventEmitter {
       this.sendStateUpdate,
     );
 
-    if (!this.isMMSDK && !this.isWalletConnect) {
+    if (!this.isWalletConnect) {
       controllerMessenger.unsubscribe(
         `${PermissionController.name}:stateChange`,
         this.handleCaipSessionScopeChanges,

app/core/RPCMethods/RPCMethodMiddleware.ts

@@ -408,7 +408,9 @@ export const getRpcMethodMiddleware = ({
   analytics,
 }: RPCMethodsMiddleParameters) => {
   // Make sure to always have the correct origin
-  hostname = hostname.replace(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN, '');
+  hostname = hostname
+    .replace(AppConstants.MM_SDK.SDK_REMOTE_ORIGIN, '')
+    .replace(AppConstants.MM_SDK.SDK_CONNECT_V2_ORIGIN, '');
   const origin = channelId ?? hostname;
   const hooks = getRpcMethodMiddlewareHooks(origin);
 

app/core/SDKConnectV2/adapters/host-application-adapter.test.ts

@@ -1,4 +1,5 @@
 import { HostApplicationAdapter } from './host-application-adapter';
+import { ConnectionInfo } from '../types/connection-info';
 import { Connection } from '../services/connection';
 import { store } from '../../../store';
 import { setSdkV2Connections } from '../../../actions/sdk';
@@ -26,21 +27,20 @@ jest.mock('../../../core/Permissions', () => ({
   removePermittedAccounts: jest.fn(),
 }));
 
-const createMockConnection = (id: string, name: string): Connection =>
-  ({
-    id,
-    metadata: {
-      dapp: {
-        name: `${name} DApp`,
-        url: `https://testdapp${id}.com`,
-        icon: `https://testdapp${id}.com/icon.png`,
-      },
-      sdk: {
-        version: '2.1.0',
-        platform: 'JavaScript',
-      },
+const createMockConnection = (id: string, name: string): ConnectionInfo => ({
+  id,
+  metadata: {
+    dapp: {
+      name: `${name} DApp`,
+      url: `https://testdapp${id}.com`,
+      icon: `https://testdapp${id}.com/icon.png`,
     },
-  } as Connection);
+    sdk: {
+      version: '2.1.0',
+      platform: 'JavaScript',
+    },
+  },
+});
 
 describe('HostApplicationAdapter', () => {
   let adapter: HostApplicationAdapter;
@@ -63,23 +63,25 @@ describe('HostApplicationAdapter', () => {
 
   describe('syncConnectionList', () => {
     it('should correctly transform a single Connection object and dispatch it to the Redux store', () => {
-      const mockConnection = createMockConnection('conn1', 'Test');
-      const connections: Connection[] = [mockConnection];
+      const mockConnectionInfo = createMockConnection('conn1', 'Test');
+      const connections = [
+        { id: mockConnectionInfo.id, info: mockConnectionInfo },
+      ] as unknown as Connection[];
 
       adapter.syncConnectionList(connections);
 
       const expectedSessions = {
-        [mockConnection.id]: {
-          id: mockConnection.id,
+        [mockConnectionInfo.id]: {
+          id: mockConnectionInfo.id,
           otherPublicKey: '',
-          origin: mockConnection.metadata.dapp.url,
+          origin: mockConnectionInfo.metadata.dapp.url,
           originatorInfo: {
-            title: mockConnection.metadata.dapp.name,
-            url: mockConnection.metadata.dapp.url,
-            icon: mockConnection.metadata.dapp.icon,
-            dappId: mockConnection.metadata.dapp.name,
-            apiVersion: mockConnection.metadata.sdk.version,
-            platform: mockConnection.metadata.sdk.platform,
+            title: mockConnectionInfo.metadata.dapp.name,
+            url: mockConnectionInfo.metadata.dapp.url,
+            icon: mockConnectionInfo.metadata.dapp.icon,
+            dappId: mockConnectionInfo.metadata.dapp.name,
+            apiVersion: mockConnectionInfo.metadata.sdk.version,
+            platform: mockConnectionInfo.metadata.sdk.platform,
           },
           isV2: true,
         },
@@ -106,38 +108,41 @@ describe('HostApplicationAdapter', () => {
     });
 
     it('should correctly transform an array of multiple Connection objects', () => {
-      const mockConnection1 = createMockConnection('conn1', 'Test1');
-      const mockConnection2 = createMockConnection('conn2', 'Test2');
-      const connections: Connection[] = [mockConnection1, mockConnection2];
+      const mockConnectionInfo1 = createMockConnection('conn1', 'Test1');
+      const mockConnectionInfo2 = createMockConnection('conn2', 'Test2');
+      const connections = [
+        { id: mockConnectionInfo1.id, info: mockConnectionInfo1 },
+        { id: mockConnectionInfo2.id, info: mockConnectionInfo2 },
+      ] as unknown as Connection[];
 
       adapter.syncConnectionList(connections);
 
       const expectedSessions = {
-        [mockConnection1.id]: {
-          id: mockConnection1.id,
+        [mockConnectionInfo1.id]: {
+          id: mockConnectionInfo1.id,
           otherPublicKey: '',
-          origin: mockConnection1.metadata.dapp.url,
+          origin: mockConnectionInfo1.metadata.dapp.url,
           originatorInfo: {
-            title: mockConnection1.metadata.dapp.name,
-            url: mockConnection1.metadata.dapp.url,
-            icon: mockConnection1.metadata.dapp.icon,
-            dappId: mockConnection1.metadata.dapp.name,
-            apiVersion: mockConnection1.metadata.sdk.version,
-            platform: mockConnection1.metadata.sdk.platform,
+            title: mockConnectionInfo1.metadata.dapp.name,
+            url: mockConnectionInfo1.metadata.dapp.url,
+            icon: mockConnectionInfo1.metadata.dapp.icon,
+            dappId: mockConnectionInfo1.metadata.dapp.name,
+            apiVersion: mockConnectionInfo1.metadata.sdk.version,
+            platform: mockConnectionInfo1.metadata.sdk.platform,
           },
           isV2: true,
         },
-        [mockConnection2.id]: {
-          id: mockConnection2.id,
+        [mockConnectionInfo2.id]: {
+          id: mockConnectionInfo2.id,
           otherPublicKey: '',
-          origin: mockConnection2.metadata.dapp.url,
+          origin: mockConnectionInfo2.metadata.dapp.url,
           originatorInfo: {
-            title: mockConnection2.metadata.dapp.name,
-            url: mockConnection2.metadata.dapp.url,
-            icon: mockConnection2.metadata.dapp.icon,
-            dappId: mockConnection2.metadata.dapp.name,
-            apiVersion: mockConnection2.metadata.sdk.version,
-            platform: mockConnection2.metadata.sdk.platform,
+            title: mockConnectionInfo2.metadata.dapp.name,
+            url: mockConnectionInfo2.metadata.dapp.url,
+            icon: mockConnectionInfo2.metadata.dapp.icon,
+            dappId: mockConnectionInfo2.metadata.dapp.name,
+            apiVersion: mockConnectionInfo2.metadata.sdk.version,
+            platform: mockConnectionInfo2.metadata.sdk.platform,
           },
           isV2: true,
         },

app/core/SDKConnectV2/adapters/host-application-adapter.ts

@@ -40,14 +40,14 @@ export class HostApplicationAdapter implements IHostApplicationAdapter {
       const connectionProps: ConnectionProps & { isV2: boolean } = {
         id: connection.id,
         otherPublicKey: '',
-        origin: connection.metadata.dapp.url,
+        origin: connection.info.metadata.dapp.url,
         originatorInfo: {
-          title: connection.metadata.dapp.name,
-          url: connection.metadata.dapp.url,
-          icon: connection.metadata.dapp.icon,
-          dappId: connection.metadata.dapp.name,
-          apiVersion: connection.metadata.sdk.version,
-          platform: connection.metadata.sdk.platform,
+          title: connection.info.metadata.dapp.name,
+          url: connection.info.metadata.dapp.url,
+          icon: connection.info.metadata.dapp.icon,
+          dappId: connection.info.metadata.dapp.name,
+          apiVersion: connection.info.metadata.sdk.version,
+          platform: connection.info.metadata.sdk.platform,
         },
         isV2: true, // Flag to identify this as a V2 connection
       };