chore(runway): cherry-pick fix: bridge controllers bumps (#15973)

- fix: cp-7.47.0 bridge controllers bumps (#15862)

Author: runway-github[bot]

app/components/UI/Bridge/hooks/useInitialSourceToken/index.ts

@@ -6,7 +6,7 @@ import { selectEvmNetworkConfigurationsByChainId } from '../../../../../selector
 import { useSwitchNetworks } from '../../../../Views/NetworkSelector/useSwitchNetworks';
 import { useNetworkInfo } from '../../../../../selectors/selectedNetworkController';
 import { CaipChainId, Hex } from '@metamask/utils';
-import { getNativeAssetForChainId } from '@metamask/bridge-controller';
+import { getNativeAssetForChainId, isSolanaChainId } from '@metamask/bridge-controller';
 import { constants } from 'ethers';
 ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
 import { SolScope } from '@metamask/keyring-api';
@@ -15,8 +15,11 @@ import { SolScope } from '@metamask/keyring-api';
 export const getNativeSourceToken = (chainId: Hex | CaipChainId) => {
   const nativeAsset = getNativeAssetForChainId(chainId);
 
+  // getNativeAssetForChainId returns zero address for Solana, we need the assetId to get balances properly for native SOL
+  const address = isSolanaChainId(chainId) ? nativeAsset.assetId : nativeAsset.address;
+
   const nativeSourceTokenFormatted: BridgeToken = {
-    address: nativeAsset.address,
+    address,
     name: nativeAsset.name ?? '',
     symbol: nativeAsset.symbol,
     image: 'iconUrl' in nativeAsset ? nativeAsset.iconUrl : '',

app/components/UI/Bridge/hooks/useSwapBridgeNavigation/useSwapBridgeNavigation.test.ts

@@ -9,6 +9,7 @@ import Engine from '../../../../../core/Engine';
 import Routes from '../../../../../constants/navigation/Routes';
 import { selectChainId } from '../../../../../selectors/networkController';
 import { selectIsBridgeEnabledSource } from '../../../../../core/redux/slices/bridge';
+import { ethers } from 'ethers';
 
 // Mock dependencies
 const mockNavigate = jest.fn();
@@ -280,7 +281,7 @@ describe('useSwapBridgeNavigation', () => {
         screen: 'BridgeView',
         params: {
           token: {
-            address: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+            address: ethers.constants.AddressZero,
             name: 'Solana',
             symbol: 'SOL',
             image: '',
@@ -313,7 +314,7 @@ describe('useSwapBridgeNavigation', () => {
         screen: 'BridgeView',
         params: {
           token: {
-            address: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+            address: ethers.constants.AddressZero,
             name: 'Solana',
             symbol: 'SOL',
             image: '',

app/components/Views/WalletActions/WalletActions.test.tsx

@@ -32,6 +32,7 @@ import { trace, TraceName } from '../../../util/trace';
 import { RampType } from '../../../reducers/fiatOrders/types';
 import { selectStablecoinLendingEnabledFlag } from '../../UI/Earn/selectors/featureFlags';
 import { isBridgeAllowed } from '../../UI/Bridge/utils';
+import { ethers } from 'ethers';
 
 jest.mock('../../UI/Earn/selectors/featureFlags', () => ({
   selectStablecoinLendingEnabledFlag: jest.fn(),
@@ -456,7 +457,7 @@ describe('WalletActions', () => {
         bridgeViewMode: 'Swap',
         sourcePage: 'MainView',
         token: {
-          address: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+          address: ethers.constants.AddressZero,
           chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
           decimals: 9,
           image: '',

app/core/Engine/Engine.ts

@@ -988,7 +988,11 @@ export class Engine {
           'SnapController:handleRequest',
           'TransactionController:getState',
         ],
-        allowedEvents: [],
+        allowedEvents: [
+          'TransactionController:transactionConfirmed',
+          'TransactionController:transactionFailed',
+          'MultichainTransactionsController:transactionConfirmed',
+        ],
       }),
       state: initialState.BridgeStatusController,
       clientId: BridgeClientId.MOBILE,

app/core/Engine/messengers/multichain-transactions-controller-messenger/types.ts

@@ -4,6 +4,7 @@ import {
   AccountsControllerListMultichainAccountsAction,
   AccountsControllerAccountTransactionsUpdatedEvent,
 } from '@metamask/accounts-controller';
+import { MultichainTransactionsControllerTransactionConfirmedEvent } from '@metamask/multichain-transactions-controller';
 import { HandleSnapRequest } from '@metamask/snaps-controllers';
 
 export type MultichainTransactionsControllerActions =
@@ -17,4 +18,5 @@ export type MultichainTransactionsControllerEvents =
   | {
       type: 'MultichainTransactionsController:stateChange';
       payload: [unknown];
-    };
+    }
+  | MultichainTransactionsControllerTransactionConfirmedEvent

package.json

@@ -166,10 +166,10 @@
     "@metamask/approval-controller": "^7.1.3",
     "@metamask/assets-controllers": "^62.0.0",
     "@metamask/base-controller": "^8.0.0",
-    "@metamask/bitcoin-wallet-snap": "^0.9.0",
-    "@metamask/bridge-controller": "^23.0.0",
-    "@metamask/bridge-status-controller": "^20.0.0",
-    "@metamask/chain-agnostic-permission": "^0.3.0",
+    "@metamask/bitcoin-wallet-snap": "^0.12.1",
+    "@metamask/bridge-controller": "^28.0.0",
+    "@metamask/bridge-status-controller": "^25.0.0",
+    "@metamask/chain-agnostic-permission": "^0.6.0",
     "@metamask/composable-controller": "^11.0.0",
     "@metamask/controller-utils": "11.7.1-backport",
     "@metamask/design-tokens": "^7.0.0",