chore: mms-2101 port multi chain

packages/bridge-status-controller/CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Bump `@metamask/bridge-controller` dependency to `^11.0.0` ([#5525](https://github.com/MetaMask/core/pull/5525))
+- **BREAKING:** Change controller to fetch multichain address instead of EVM ([#5554](https://github.com/MetaMask/core/pull/5540))
 
 ## [10.0.0]
 

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

@@ -377,7 +377,7 @@ const getMessengerMock = ({
 } = {}) =>
   ({
     call: jest.fn((method: string) => {
-      if (method === 'AccountsController:getSelectedAccount') {
+      if (method === 'AccountsController:getSelectedMultichainAccount') {
         return { address: account };
       } else if (method === 'NetworkController:findNetworkClientIdByChainId') {
         return 'networkClientId';
@@ -572,7 +572,7 @@ describe('BridgeStatusController', () => {
 
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             return { address: '0xaccount1' };
           } else if (
             method === 'NetworkController:findNetworkClientIdByChainId'
@@ -730,7 +730,7 @@ describe('BridgeStatusController', () => {
 
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             return { address: '0xaccount1' };
           } else if (
             method === 'NetworkController:findNetworkClientIdByChainId'
@@ -812,18 +812,18 @@ describe('BridgeStatusController', () => {
       // Setup
       jest.useFakeTimers();
 
-      let getSelectedAccountCalledTimes = 0;
+      let getSelectedMultichainAccountCalledTimes = 0;
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             let account;
 
-            if (getSelectedAccountCalledTimes === 0) {
+            if (getSelectedMultichainAccountCalledTimes === 0) {
               account = '0xaccount1';
             } else {
               account = '0xaccount2';
             }
-            getSelectedAccountCalledTimes += 1;
+            getSelectedMultichainAccountCalledTimes += 1;
             return { address: account };
           } else if (
             method === 'NetworkController:findNetworkClientIdByChainId'
@@ -905,7 +905,7 @@ describe('BridgeStatusController', () => {
       jest.useFakeTimers();
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             return { address: '0xaccount1' };
           } else if (
             method === 'NetworkController:findNetworkClientIdByChainId'
@@ -1001,7 +1001,7 @@ describe('BridgeStatusController', () => {
       jest.useFakeTimers();
       const messengerMock = {
         call: jest.fn((method: string) => {
-          if (method === 'AccountsController:getSelectedAccount') {
+          if (method === 'AccountsController:getSelectedMultichainAccount') {
             return { address: '0xaccount1' };
           } else if (
             method === 'NetworkController:findNetworkClientIdByChainId'

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

@@ -176,8 +176,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
       initialDestAssetBalance,
       targetContractAddress,
     } = startPollingForBridgeTxStatusArgs;
-    const { address: account } = this.#getSelectedAccount();
-
+    const accountAddress = this.#getMultichainSelectedAccountAddress();
     // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
     // We know it's in progress but not the exact status yet
     const txHistoryItem = {
@@ -195,7 +194,7 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
       },
       initialDestAssetBalance,
       targetContractAddress,
-      account,
+      account: accountAddress,
       status: {
         // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that
         // Also we know the bare minimum fields for status at this point in time
@@ -223,8 +222,12 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
     await this.#fetchBridgeTxStatus(pollingInput);
   };
 
-  #getSelectedAccount() {
-    return this.messagingSystem.call('AccountsController:getSelectedAccount');
+  #getMultichainSelectedAccountAddress() {
+    return (
+      this.messagingSystem.call(
+        'AccountsController:getSelectedMultichainAccount',
+      )?.address ?? ''
+    );
   }
 
   readonly #fetchBridgeTxStatus = async ({

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

@@ -1,4 +1,4 @@
-import type { AccountsControllerGetSelectedAccountAction } from '@metamask/accounts-controller';
+import type { AccountsControllerGetSelectedMultichainAccountAction } from '@metamask/accounts-controller';
 import type {
   ControllerGetStateAction,
   ControllerStateChangeEvent,
@@ -310,7 +310,7 @@ type AllowedActions =
   | NetworkControllerFindNetworkClientIdByChainIdAction
   | NetworkControllerGetStateAction
   | NetworkControllerGetNetworkClientByIdAction
-  | AccountsControllerGetSelectedAccountAction
+  | AccountsControllerGetSelectedMultichainAccountAction
   | TransactionControllerGetStateAction;
 
 /**