refactor: migrate to @metamask/bridge-controller

.eslintrc.js

@@ -353,7 +353,6 @@ module.exports = {
         'app/scripts/controllers/alert-controller.test.ts',
         'app/scripts/metamask-controller.actions.test.js',
         'app/scripts/detect-multiple-instances.test.js',
-        'app/scripts/controllers/bridge.test.ts',
         'app/scripts/controllers/swaps/**/*.test.js',
         'app/scripts/controllers/swaps/**/*.test.ts',
         'app/scripts/controllers/metametrics.test.js',

app/scripts/constants/sentry-state.ts

@@ -112,29 +112,28 @@ export const SENTRY_BACKGROUND_STATE = {
     assetsRates: false,
   },
   BridgeController: {
-    bridgeState: {
-      bridgeFeatureFlags: {
-        extensionConfig: {
-          support: false,
-          chains: {},
-        },
+    bridgeFeatureFlags: {
+      extensionConfig: {
+        support: false,
+        chains: {},
       },
-      quoteRequest: {
-        walletAddress: false,
-        srcTokenAddress: true,
-        slippage: true,
-        srcChainId: true,
-        destChainId: true,
-        destTokenAddress: true,
-        srcTokenAmount: true,
-      },
-      quotes: [],
-      quotesInitialLoadTime: true,
-      quotesLastFetched: true,
-      quotesLoadingStatus: true,
-      quoteFetchError: true,
-      quotesRefreshCount: true,
+      mobileConfig: false,
+    },
+    quoteRequest: {
+      walletAddress: false,
+      srcTokenAddress: true,
+      slippage: true,
+      srcChainId: true,
+      destChainId: true,
+      destTokenAddress: true,
+      srcTokenAmount: true,
     },
+    quotes: [],
+    quotesInitialLoadTime: true,
+    quotesLastFetched: true,
+    quotesLoadingStatus: true,
+    quoteFetchError: true,
+    quotesRefreshCount: true,
   },
   BridgeStatusController: {
     bridgeStatusState: {

app/scripts/controllers/bridge-status/__snapshots__/bridge-status-controller.test.ts.snap

@@ -20,6 +20,7 @@ exports[`BridgeStatusController constructor rehydrates the tx history state 1`]
       ],
       "destAsset": {
         "address": "0x0000000000000000000000000000000000000000",
+        "assetId": "eip155:10/slip44:60",
         "chainId": 10,
         "coinKey": "ETH",
         "decimals": 18,
@@ -36,6 +37,7 @@ exports[`BridgeStatusController constructor rehydrates the tx history state 1`]
           "amount": "8750000000000",
           "asset": {
             "address": "0x0000000000000000000000000000000000000000",
+            "assetId": "eip155:42161/slip44:60",
             "chainId": 42161,
             "coinKey": "ETH",
             "decimals": 18,
@@ -50,6 +52,7 @@ exports[`BridgeStatusController constructor rehydrates the tx history state 1`]
       "requestId": "197c402f-cb96-4096-9f8c-54aed84ca776",
       "srcAsset": {
         "address": "0x0000000000000000000000000000000000000000",
+        "assetId": "eip155:42161/slip44:60",
         "chainId": 42161,
         "coinKey": "ETH",
         "decimals": 18,
@@ -67,6 +70,7 @@ exports[`BridgeStatusController constructor rehydrates the tx history state 1`]
           "destAmount": "990654755978612",
           "destAsset": {
             "address": "0x0000000000000000000000000000000000000000",
+            "assetId": "eip155:10/slip44:60",
             "chainId": 10,
             "coinKey": "ETH",
             "decimals": 18,
@@ -85,6 +89,7 @@ exports[`BridgeStatusController constructor rehydrates the tx history state 1`]
           "srcAmount": "991250000000000",
           "srcAsset": {
             "address": "0x0000000000000000000000000000000000000000",
+            "assetId": "eip155:42161/slip44:60",
             "chainId": 42161,
             "coinKey": "ETH",
             "decimals": 18,
@@ -133,6 +138,7 @@ exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx
       ],
       "destAsset": {
         "address": "0x0000000000000000000000000000000000000000",
+        "assetId": "eip155:10/slip44:60",
         "chainId": 10,
         "coinKey": "ETH",
         "decimals": 18,
@@ -149,6 +155,7 @@ exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx
           "amount": "8750000000000",
           "asset": {
             "address": "0x0000000000000000000000000000000000000000",
+            "assetId": "eip155:42161/slip44:60",
             "chainId": 42161,
             "coinKey": "ETH",
             "decimals": 18,
@@ -163,6 +170,7 @@ exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx
       "requestId": "197c402f-cb96-4096-9f8c-54aed84ca776",
       "srcAsset": {
         "address": "0x0000000000000000000000000000000000000000",
+        "assetId": "eip155:42161/slip44:60",
         "chainId": 42161,
         "coinKey": "ETH",
         "decimals": 18,
@@ -180,6 +188,7 @@ exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx
           "destAmount": "990654755978612",
           "destAsset": {
             "address": "0x0000000000000000000000000000000000000000",
+            "assetId": "eip155:10/slip44:60",
             "chainId": 10,
             "coinKey": "ETH",
             "decimals": 18,
@@ -198,6 +207,7 @@ exports[`BridgeStatusController startPollingForBridgeTxStatus sets the inital tx
           "srcAmount": "991250000000000",
           "srcAsset": {
             "address": "0x0000000000000000000000000000000000000000",
+            "assetId": "eip155:42161/slip44:60",
             "chainId": 42161,
             "coinKey": "ETH",
             "decimals": 18,

app/scripts/controllers/bridge-status/bridge-status-controller.test.ts

@@ -1,3 +1,4 @@
+import { ChainId } from '@metamask/bridge-controller';
 import { flushPromises } from '../../../../test/lib/timer-helpers';
 import { Numeric } from '../../../../shared/modules/Numeric';
 import BridgeStatusController from './bridge-status-controller';
@@ -358,7 +359,7 @@ describe('BridgeStatusController', () => {
           srcTxHash: '0xsrcTxHash2',
           txMetaId: 'bridgeTxMetaId2',
           srcChainId: 10,
-          destChainId: 123,
+          destChainId: ChainId.SOLANA,
         }),
       );
       jest.advanceTimersByTime(10_000);
@@ -381,7 +382,7 @@ describe('BridgeStatusController', () => {
       expect(
         bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId2
           .quote.destChainId,
-      ).toEqual(123);
+      ).toEqual(1151111081099710);
 
       bridgeStatusController.wipeBridgeStatus({
         address: '0xaccount1',
@@ -455,7 +456,7 @@ describe('BridgeStatusController', () => {
           srcTxHash: '0xsrcTxHash2',
           txMetaId: 'bridgeTxMetaId2',
           srcChainId: 10,
-          destChainId: 123,
+          destChainId: 137,
         }),
       );
       jest.advanceTimersByTime(10_000);
@@ -478,7 +479,7 @@ describe('BridgeStatusController', () => {
       expect(
         bridgeStatusController.state.bridgeStatusState.txHistory.bridgeTxMetaId2
           .quote.destChainId,
-      ).toEqual(123);
+      ).toEqual(137);
 
       bridgeStatusController.wipeBridgeStatus({
         address: '0xaccount1',
@@ -491,7 +492,7 @@ describe('BridgeStatusController', () => {
       );
       expect(txHistoryItems).toHaveLength(1);
       expect(txHistoryItems[0].quote.srcChainId).toEqual(10);
-      expect(txHistoryItems[0].quote.destChainId).toEqual(123);
+      expect(txHistoryItems[0].quote.destChainId).toEqual(137);
     });
   });
 });

app/scripts/controllers/bridge-status/mocks.ts

@@ -1,4 +1,5 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
+import { getNativeAssetForChainId } from '@metamask/bridge-controller';
 import {
   BridgeId,
   StatusResponse,
@@ -123,6 +124,7 @@ export const getMockQuote = ({
   srcTokenAmount: '991250000000000',
   srcAsset: {
     address: '0x0000000000000000000000000000000000000000',
+    assetId: getNativeAssetForChainId(srcChainId).assetId,
     chainId: srcChainId,
     symbol: 'ETH',
     decimals: 18,
@@ -137,6 +139,7 @@ export const getMockQuote = ({
   destTokenAmount: '990654755978612',
   destAsset: {
     address: '0x0000000000000000000000000000000000000000',
+    assetId: getNativeAssetForChainId(destChainId).assetId,
     chainId: destChainId,
     symbol: 'ETH',
     decimals: 18,
@@ -152,6 +155,7 @@ export const getMockQuote = ({
       amount: '8750000000000',
       asset: {
         address: '0x0000000000000000000000000000000000000000',
+        assetId: getNativeAssetForChainId(srcChainId).assetId,
         chainId: srcChainId,
         symbol: 'ETH',
         decimals: 18,
@@ -178,6 +182,7 @@ export const getMockQuote = ({
       },
       srcAsset: {
         address: '0x0000000000000000000000000000000000000000',
+        assetId: getNativeAssetForChainId(srcChainId).assetId,
         chainId: srcChainId,
         symbol: 'ETH',
         decimals: 18,
@@ -190,6 +195,7 @@ export const getMockQuote = ({
       },
       destAsset: {
         address: '0x0000000000000000000000000000000000000000',
+        assetId: getNativeAssetForChainId(destChainId).assetId,
         chainId: destChainId,
         symbol: 'ETH',
         decimals: 18,

app/scripts/controllers/bridge-status/utils.ts

@@ -1,15 +1,14 @@
-import { BRIDGE_CLIENT_ID } from '../../../../shared/constants/bridge';
+import { BridgeClientId, type Quote } from '@metamask/bridge-controller';
 import fetchWithCache from '../../../../shared/lib/fetch-with-cache';
 import {
   StatusResponse,
   StatusRequestWithSrcTxHash,
   StatusRequestDto,
 } from '../../../../shared/types/bridge-status';
-import type { Quote } from '../../../../shared/types/bridge';
 import { validateResponse, validators } from './validators';
 import { BRIDGE_STATUS_BASE_URL } from './constants';
 
-const CLIENT_ID_HEADER = { 'X-Client-Id': BRIDGE_CLIENT_ID };
+const CLIENT_ID_HEADER = { 'X-Client-Id': BridgeClientId.EXTENSION };
 
 export const getStatusRequestDto = (
   statusRequest: StatusRequestWithSrcTxHash,