feat: implement solana snap onClientRequest (MetaMask#5961)

Author: bfullam

packages/bridge-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Export feature flag util for bridge status controller ([#5961](https://github.com/MetaMask/core/pull/5961))
+
 ## [32.1.2]
 
 ### Changed

packages/bridge-controller/src/index.ts

@@ -129,3 +129,5 @@ export {
 } from './selectors';
 
 export { DEFAULT_FEATURE_FLAG_CONFIG } from './constants/bridge';
+
+export { getBridgeFeatureFlags } from './utils/feature-flags';

packages/bridge-controller/src/types.ts

@@ -65,6 +65,7 @@ export type ChainConfiguration = {
   refreshRate?: number;
   topAssets?: string[];
   isUnifiedUIEnabled?: boolean;
+  isSnapConfirmationEnabled?: boolean;
 };
 
 export type L1GasFees = {

packages/bridge-controller/src/utils/feature-flags.ts

@@ -1,11 +1,9 @@
+import type { RemoteFeatureFlagControllerState } from '@metamask/remote-feature-flag-controller';
+
 import { formatChainIdToCaip } from './caip-formatters';
 import { validateFeatureFlagsResponse } from './validators';
 import { DEFAULT_FEATURE_FLAG_CONFIG } from '../constants/bridge';
-import type {
-  FeatureFlagsPlatformConfig,
-  ChainConfiguration,
-  BridgeControllerMessenger,
-} from '../types';
+import type { FeatureFlagsPlatformConfig, ChainConfiguration } from '../types';
 
 export const formatFeatureFlags = (
   bridgeFeatureFlags: FeatureFlagsPlatformConfig,
@@ -37,12 +35,16 @@ export const processFeatureFlags = (
 /**
  * Gets the bridge feature flags from the remote feature flag controller
  *
- * @param messenger - The messenger instance
+ * @param messenger - Any messenger with access to RemoteFeatureFlagController:getState
  * @returns The bridge feature flags
  */
-export function getBridgeFeatureFlags(
-  messenger: BridgeControllerMessenger,
-): FeatureFlagsPlatformConfig {
+export function getBridgeFeatureFlags<
+  T extends {
+    call(
+      action: 'RemoteFeatureFlagController:getState',
+    ): RemoteFeatureFlagControllerState;
+  },
+>(messenger: T): FeatureFlagsPlatformConfig {
   // This will return the bridgeConfig for the current platform even without specifying the platform
   const remoteFeatureFlagControllerState = messenger.call(
     'RemoteFeatureFlagController:getState',

packages/bridge-status-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- **BREAKING:** Implement onClientRequest for Solana snap transactions, now requires action permission for RemoteFeatureFlagController:getState ([#5961](https://github.com/MetaMask/core/pull/5961))
+
 ## [29.1.1]
 
 ### Changed

packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap

@@ -2854,29 +2854,24 @@ Array [
   Array [
     "AccountsController:getSelectedMultichainAccount",
   ],
+  Array [
+    "RemoteFeatureFlagController:getState",
+  ],
   Array [
     "SnapController:handleRequest",
     Object {
-      "handler": "onKeyringRequest",
+      "handler": "onClientRequest",
       "origin": "metamask",
       "request": Object {
         "id": "test-uuid-1234",
         "jsonrpc": "2.0",
-        "method": "keyring_submitRequest",
+        "method": "signAndSendTransactionWithoutConfirmation",
         "params": Object {
-          "account": undefined,
-          "id": "test-uuid-1234",
-          "request": Object {
-            "method": "signAndSendTransaction",
-            "params": Object {
-              "account": Object {
-                "address": "0x123...",
-              },
-              "scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
-              "transaction": "AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAHDXLY8oVRIwA8ZdRSGjM5RIZJW8Wv+Twyw3NqU4Hov+OHoHp/dmeDvstKbICW3ezeGR69t3/PTAvdXgZVdJFJXaxkoKXUTWfEAyQyCCG9nwVoDsd10OFdnM9ldSi+9SLqHpqWVDV+zzkmftkF//DpbXxqeH8obNXHFR7pUlxG9uNVOn64oNsFdeUvD139j1M51iRmUY839Y25ET4jDRscT081oGb+rLnywLjLSrIQx6MkqNBhCFbxqY1YmoGZVORW/QMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAAjJclj04kifG7PRApFI4NgwtaE5na/xCEBI572Nvp+FkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpBHnVW/IxwG7udMVuzmgVB/2xst6j9I5RArHNola8E4+0P/on9df2SnTAmx8pWHneSwmrNt/J3VFLMhqns4zl6JmXkZ+niuxMhAGrmKBaBo94uMv2Sl+Xh3i+VOO0m5BdNZ1ElenbwQylHQY+VW1ydG1MaUEeNpG+EVgswzPMwPoLBgAFAsBcFQAGAAkDQA0DAAAAAAAHBgABAhMICQAHBgADABYICQEBCAIAAwwCAAAAUEYVOwAAAAAJAQMBEQoUCQADBAETCgsKFw0ODxARAwQACRQj5RfLl3rjrSoBAAAAQ2QAAVBGFTsAAAAAyYZnBwAAAABkAAAJAwMAAAEJDAkAAAIBBBMVCQjGASBMKQwnooTbKNxdBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUHTKomh4KXvNgA0ovYKS5F8GIOBgAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAEIF7RFOAwAAAAAAAAAAAAAAaAIAAAAAAAC4CwAAAAAAAOAA2mcAAAAAAAAAAAAAAAAAAAAApapuIXG0FuHSfsU8qME9s/kaic0AAwGCsZdSuxV5eCm+Ria4LEQPgTg4bg65gNrTAefEzpAfPQgCABIMAgAAAAAAAAAAAAAACAIABQwCAAAAsIOFAAAAAAADWk6DVOZO8lMFQg2r0dgfltD6tRL/B1hH3u00UzZdgqkAAxEqIPdq2eRt/F6mHNmFe7iwZpdrtGmHNJMFlK7c6Bc6k6kjBezr6u/tAgvu3OGsJSwSElmcOHZ21imqH/rhJ2KgqDJdBPFH4SYIM1kBAAA=",
-            },
+          "account": Object {
+            "address": "0x123...",
           },
           "scope": "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
+          "transaction": "AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAHDXLY8oVRIwA8ZdRSGjM5RIZJW8Wv+Twyw3NqU4Hov+OHoHp/dmeDvstKbICW3ezeGR69t3/PTAvdXgZVdJFJXaxkoKXUTWfEAyQyCCG9nwVoDsd10OFdnM9ldSi+9SLqHpqWVDV+zzkmftkF//DpbXxqeH8obNXHFR7pUlxG9uNVOn64oNsFdeUvD139j1M51iRmUY839Y25ET4jDRscT081oGb+rLnywLjLSrIQx6MkqNBhCFbxqY1YmoGZVORW/QMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAAjJclj04kifG7PRApFI4NgwtaE5na/xCEBI572Nvp+FkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpBHnVW/IxwG7udMVuzmgVB/2xst6j9I5RArHNola8E4+0P/on9df2SnTAmx8pWHneSwmrNt/J3VFLMhqns4zl6JmXkZ+niuxMhAGrmKBaBo94uMv2Sl+Xh3i+VOO0m5BdNZ1ElenbwQylHQY+VW1ydG1MaUEeNpG+EVgswzPMwPoLBgAFAsBcFQAGAAkDQA0DAAAAAAAHBgABAhMICQAHBgADABYICQEBCAIAAwwCAAAAUEYVOwAAAAAJAQMBEQoUCQADBAETCgsKFw0ODxARAwQACRQj5RfLl3rjrSoBAAAAQ2QAAVBGFTsAAAAAyYZnBwAAAABkAAAJAwMAAAEJDAkAAAIBBBMVCQjGASBMKQwnooTbKNxdBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUHTKomh4KXvNgA0ovYKS5F8GIOBgAAAAAAAAAAAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAEIF7RFOAwAAAAAAAAAAAAAAaAIAAAAAAAC4CwAAAAAAAOAA2mcAAAAAAAAAAAAAAAAAAAAApapuIXG0FuHSfsU8qME9s/kaic0AAwGCsZdSuxV5eCm+Ria4LEQPgTg4bg65gNrTAefEzpAfPQgCABIMAgAAAAAAAAAAAAAACAIABQwCAAAAsIOFAAAAAAADWk6DVOZO8lMFQg2r0dgfltD6tRL/B1hH3u00UzZdgqkAAxEqIPdq2eRt/F6mHNmFe7iwZpdrtGmHNJMFlK7c6Bc6k6kjBezr6u/tAgvu3OGsJSwSElmcOHZ21imqH/rhJ2KgqDJdBPFH4SYIM1kBAAA=",
         },
       },
       "snapId": "test-snap",
@@ -2892,7 +2887,7 @@ Array [
   ],
   Array [
     "AccountsController:getAccountByAddress",
-    "0x123...",
+    "",
   ],
   Array [
     "BridgeController:trackUnifiedSwapBridgeEvent",
@@ -2916,7 +2911,7 @@ Array [
       "quoted_vs_used_gas_ratio": 1,
       "security_warnings": Array [],
       "slippage_limit": 0,
-      "source_transaction": "COMPLETE",
+      "source_transaction": "PENDING",
       "stx_enabled": false,
       "swap_type": "crosschain",
       "token_address_destination": "eip155:1/slip44:60",
@@ -2942,7 +2937,7 @@ Object {
   "destinationTokenAmount": "0.5",
   "destinationTokenDecimals": 18,
   "destinationTokenSymbol": "ETH",
-  "hash": "signature",
+  "hash": undefined,
   "id": "test-uuid-1234",
   "isBridgeTx": true,
   "isSolana": true,
@@ -2974,7 +2969,7 @@ Object {
     "destinationTokenAmount": "0.5",
     "destinationTokenDecimals": 18,
     "destinationTokenSymbol": "ETH",
-    "hash": "signature",
+    "hash": undefined,
     "id": "test-uuid-1234",
     "isBridgeTx": true,
     "isSolana": true,
@@ -3180,7 +3175,7 @@ Object {
     },
     "refuel": false,
     "srcChainId": 1151111081099710,
-    "srcTxHash": "signature",
+    "srcTxHash": undefined,
   },
 }
 `;

packages/bridge-status-controller/src/bridge-status-controller.test.ts

@@ -520,6 +520,19 @@ const getMessengerMock = ({
             },
           ],
         };
+      } else if (method === 'RemoteFeatureFlagController:getState') {
+        return {
+          remoteFeatureFlags: {
+            bridgeConfig: {
+              support: true,
+              chains: {
+                [ChainId.SOLANA]: {
+                  isSnapConfirmationEnabled: false,
+                },
+              },
+            },
+          },
+        };
       }
       return null;
     }),
@@ -566,7 +579,23 @@ const executePollingWithPendingStatus = async () => {
 
 // Define mocks at the top level
 const mockFetchFn = jest.fn();
-const mockMessengerCall = jest.fn();
+const mockMessengerCall = jest.fn().mockImplementation((method: string) => {
+  if (method === 'RemoteFeatureFlagController:getState') {
+    return {
+      remoteFeatureFlags: {
+        bridgeConfig: {
+          support: true,
+          chains: {
+            [ChainId.SOLANA]: {
+              isSnapConfirmationEnabled: false,
+            },
+          },
+        },
+      },
+    };
+  }
+  return null;
+});
 const mockSelectedAccount = {
   id: 'test-account-id',
   address: '0xaccount1',
@@ -1486,6 +1515,19 @@ describe('BridgeStatusController', () => {
 
     it('should handle snap controller errors', async () => {
       mockMessengerCall.mockReturnValueOnce(mockSolanaAccount);
+      // Mock the RemoteFeatureFlagController:getState call that happens in getBridgeFeatureFlags
+      mockMessengerCall.mockReturnValueOnce({
+        remoteFeatureFlags: {
+          bridgeConfig: {
+            support: true,
+            chains: {
+              [ChainId.SOLANA]: {
+                isSnapConfirmationEnabled: false,
+              },
+            },
+          },
+        },
+      });
       mockMessengerCall.mockRejectedValueOnce(new Error('Snap error'));
 
       const { controller, startPollingForBridgeTxStatusSpy } =

packages/bridge-status-controller/src/bridge-status-controller.ts

@@ -15,11 +15,12 @@ import {
   getActionType,
   formatChainIdToCaip,
   isCrossChain,
+  getBridgeFeatureFlags,
   isHardwareWallet,
 } from '@metamask/bridge-controller';
 import type { TraceCallback } from '@metamask/controller-utils';
 import { toHex } from '@metamask/controller-utils';
-import { EthAccountType } from '@metamask/keyring-api';
+import { EthAccountType, SolScope } from '@metamask/keyring-api';
 import { StaticIntervalPollingController } from '@metamask/polling-controller';
 import type {
   TransactionController,
@@ -63,6 +64,7 @@ import {
   getTxStatusesFromHistory,
 } from './utils/metrics';
 import {
+  getClientRequest,
   getKeyringRequest,
   getStatusRequestParams,
   getTxMetaFields,
@@ -560,15 +562,20 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
         'Failed to submit cross-chain swap transaction: undefined snap id',
       );
     }
-    const keyringRequest = getKeyringRequest(quoteResponse, selectedAccount);
-    const keyringResponse = (await this.messagingSystem.call(
+
+    const bridgeFeatureFlags = getBridgeFeatureFlags(this.messagingSystem);
+    const request = bridgeFeatureFlags?.chains?.[SolScope.Mainnet]
+      ?.isSnapConfirmationEnabled
+      ? getKeyringRequest(quoteResponse, selectedAccount)
+      : getClientRequest(quoteResponse, selectedAccount);
+    const requestResponse = (await this.messagingSystem.call(
       'SnapController:handleRequest',
-      keyringRequest,
+      request,
     )) as string | { result: Record<string, string> };
 
     // The extension client actually redirects before it can do anytyhing with this meta
     const txMeta = handleSolanaTxResponse(
-      keyringResponse,
+      requestResponse,
       quoteResponse,
       selectedAccount,
     );

packages/bridge-status-controller/src/types.ts

@@ -24,6 +24,7 @@ import type {
   NetworkControllerGetNetworkClientByIdAction,
   NetworkControllerGetStateAction,
 } from '@metamask/network-controller';
+import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
 import type { HandleSnapRequest } from '@metamask/snaps-controllers';
 import type {
   TransactionControllerGetStateAction,
@@ -335,7 +336,8 @@ type AllowedActions =
   | BridgeControllerAction<BridgeBackgroundAction.GET_BRIDGE_ERC20_ALLOWANCE>
   | BridgeControllerAction<BridgeBackgroundAction.TRACK_METAMETRICS_EVENT>
   | GetGasFeeState
-  | AccountsControllerGetAccountByAddressAction;
+  | AccountsControllerGetAccountByAddressAction
+  | RemoteFeatureFlagControllerGetStateAction;
 
 /**
  * The external events available to the BridgeStatusController.