dmrazzy · pull · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  cancel-in-progress: ${{ !contains(github.ref, 'refs/heads/main') }}
 
 jobs:
   check-workflows:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "377.0.0",
+  "version": "378.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

diff --git a/packages/assets-controllers/CHANGELOG.md b/packages/assets-controllers/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [60.0.0]
+
+### Added
+
+- Add support for 'Sonic Mainnet' chainId in the list of SUPPORTED_CHAIN_IDS. ([#5711](https://github.com/MetaMask/core/pull/5711))
+
 ### Changed
 
 - Refactor `TokensController` to remove reliance on a single selected network ([#5659](https://github.com/MetaMask/core/pull/5659))
@@ -23,7 +29,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Add support for 'Sonic Mainnet' chainId in the list of SUPPORTED_CHAIN_IDS. ([#5711](https://github.com/MetaMask/core/pull/5711))
 - Add `SEI` network support ([#5610](https://github.com/MetaMask/core/pull/5610))
   - Add token detection support
   - Add NFT detection support
@@ -1589,7 +1594,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Use Ethers for AssetsContractController ([#845](https://github.com/MetaMask/core/pull/845))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@59.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@60.0.0...HEAD
+[60.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@59.0.0...@metamask/assets-controllers@60.0.0
 [59.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@58.0.0...@metamask/assets-controllers@59.0.0
 [58.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@57.0.0...@metamask/assets-controllers@58.0.0
 [57.0.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@56.0.0...@metamask/assets-controllers@57.0.0

diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/assets-controllers",
-  "version": "59.0.0",
+  "version": "60.0.0",
   "description": "Controllers which manage interactions involving ERC-20, ERC-721, and ERC-1155 tokens (including NFTs)",
   "keywords": [
     "MetaMask",

diff --git a/packages/bridge-controller/CHANGELOG.md b/packages/bridge-controller/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [19.0.0]
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/assets-controllers` peer dependency to `^60.0.0` ([#5717](https://github.com/MetaMask/core/pull/5717))
+
 ## [18.0.0]
 
 ### Changed
@@ -176,7 +182,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@18.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@19.0.0...HEAD
+[19.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@18.0.0...@metamask/bridge-controller@19.0.0
 [18.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@17.0.0...@metamask/bridge-controller@18.0.0
 [17.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@16.0.0...@metamask/bridge-controller@17.0.0
 [16.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-controller@15.0.0...@metamask/bridge-controller@16.0.0

diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/bridge-controller",
-  "version": "18.0.0",
+  "version": "19.0.0",
   "description": "Manages bridge-related quote fetching functionality for MetaMask",
   "keywords": [
     "MetaMask",
@@ -65,7 +65,7 @@
   },
   "devDependencies": {
     "@metamask/accounts-controller": "^27.0.0",
-    "@metamask/assets-controllers": "^59.0.0",
+    "@metamask/assets-controllers": "^60.0.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-provider": "^4.1.8",
     "@metamask/network-controller": "^23.2.0",
@@ -85,7 +85,7 @@
   },
   "peerDependencies": {
     "@metamask/accounts-controller": "^27.0.0",
-    "@metamask/assets-controllers": "^59.0.0",
+    "@metamask/assets-controllers": "^60.0.0",
     "@metamask/network-controller": "^23.0.0",
     "@metamask/snaps-controllers": "^11.0.0",
     "@metamask/transaction-controller": "^54.0.0"

diff --git a/packages/bridge-status-controller/CHANGELOG.md b/packages/bridge-status-controller/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [16.0.0]
+
+### Changed
+
+- **BREAKING:** Bump `@metamask/bridge-controller` peer dependency to `^19.0.0` ([#5717](https://github.com/MetaMask/core/pull/5717))
+- Remove `@metamask/assets-controllers` peer dependency ([#5716](https://github.com/MetaMask/core/pull/5716))
+
+### Fixed
+
+- Fixes transaction polling failures caused by adding tokens with the incorrect account address to the TokensControler ([#5716](https://github.com/MetaMask/core/pull/5716))
+
 ## [15.0.0]
 
 ### Changed
@@ -161,7 +172,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@15.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@16.0.0...HEAD
+[16.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@15.0.0...@metamask/bridge-status-controller@16.0.0
 [15.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@14.0.0...@metamask/bridge-status-controller@15.0.0
 [14.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@13.1.0...@metamask/bridge-status-controller@14.0.0
 [13.1.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@13.0.0...@metamask/bridge-status-controller@13.1.0

diff --git a/packages/bridge-status-controller/package.json b/packages/bridge-status-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/bridge-status-controller",
-  "version": "15.0.0",
+  "version": "16.0.0",
   "description": "Manages bridge-related status fetching functionality for MetaMask",
   "keywords": [
     "MetaMask",
@@ -59,9 +59,8 @@
   },
   "devDependencies": {
     "@metamask/accounts-controller": "^27.0.0",
-    "@metamask/assets-controllers": "^59.0.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/bridge-controller": "^18.0.0",
+    "@metamask/bridge-controller": "^19.0.0",
     "@metamask/gas-fee-controller": "^23.0.0",
     "@metamask/network-controller": "^23.2.0",
     "@metamask/snaps-controllers": "^11.2.1",
@@ -79,8 +78,7 @@
   },
   "peerDependencies": {
     "@metamask/accounts-controller": "^27.0.0",
-    "@metamask/assets-controllers": "^59.0.0",
-    "@metamask/bridge-controller": "^18.0.0",
+    "@metamask/bridge-controller": "^19.0.0",
     "@metamask/gas-fee-controller": "^23.0.0",
     "@metamask/network-controller": "^23.0.0",
     "@metamask/snaps-controllers": "^11.0.0",

diff --git a/packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap b/packages/bridge-status-controller/src/__snapshots__/bridge-status-controller.test.ts.snap
@@ -1781,25 +1781,6 @@ Array [
       "usd_quoted_return": 0,
     },
   ],
-  Array [
-    "AccountsController:getSelectedMultichainAccount",
-  ],
-  Array [
-    "TokensController:addDetectedTokens",
-    Array [
-      Object {
-        "address": "0x0000000000000000000000000000000000000032",
-        "decimals": 18,
-        "image": undefined,
-        "name": "WETH",
-        "symbol": "WETH",
-      },
-    ],
-    Object {
-      "chainId": "0xa",
-      "selectedAddress": "",
-    },
-  ],
 ]
 `;
 
@@ -1968,25 +1949,6 @@ Array [
       "usd_quoted_return": 1000,
     },
   ],
-  Array [
-    "AccountsController:getSelectedMultichainAccount",
-  ],
-  Array [
-    "TokensController:addDetectedTokens",
-    Array [
-      Object {
-        "address": "0x...",
-        "decimals": 18,
-        "image": undefined,
-        "name": "Ethereum",
-        "symbol": "ETH",
-      },
-    ],
-    Object {
-      "chainId": "0x1",
-      "selectedAddress": "",
-    },
-  ],
 ]
 `;
 

diff --git a/packages/bridge-status-controller/src/bridge-status-controller.test.ts b/packages/bridge-status-controller/src/bridge-status-controller.test.ts
@@ -1571,7 +1571,7 @@ describe('BridgeStatusController', () => {
       });
     };
 
-    const setupBridgeMocks = (shouldAddDetectedTokensResolve = true) => {
+    const setupBridgeMocks = () => {
       mockMessengerCall.mockReturnValueOnce(mockSelectedAccount);
       mockMessengerCall.mockReturnValueOnce('arbitrum');
       mockMessengerCall.mockReturnValueOnce({
@@ -1588,13 +1588,6 @@ describe('BridgeStatusController', () => {
 
       mockMessengerCall.mockReturnValueOnce(mockSelectedAccount);
       mockMessengerCall.mockReturnValueOnce(mockSelectedAccount);
-
-      // addDetectedTokens
-      if (shouldAddDetectedTokensResolve) {
-        mockMessengerCall.mockReturnValueOnce(true);
-      } else {
-        mockMessengerCall.mockRejectedValueOnce(shouldAddDetectedTokensResolve);
-      }
     };
 
     it('should successfully submit an EVM bridge transaction with approval', async () => {
@@ -1623,7 +1616,7 @@ describe('BridgeStatusController', () => {
     });
 
     it('should successfully submit an EVM bridge transaction with no approval', async () => {
-      setupBridgeMocks(true);
+      setupBridgeMocks();
 
       const { controller, startPollingForBridgeTxStatusSpy } =
         getController(mockMessengerCall);

diff --git a/packages/bridge-status-controller/src/bridge-status-controller.ts b/packages/bridge-status-controller/src/bridge-status-controller.ts
@@ -1,6 +1,5 @@
 import type { StateMetadata } from '@metamask/base-controller';
 import type {
-  BridgeAsset,
   QuoteMetadata,
   RequiredEventContextFromClient,
   TxData,
@@ -10,7 +9,6 @@ import {
   formatChainIdToHex,
   getEthUsdtResetData,
   isEthUsdt,
-  isNativeAddress,
   isSolanaChainId,
   StatusTypes,
   UnifiedSwapBridgeEventName,
@@ -662,43 +660,12 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
       return await this.#waitForHashAndReturnFinalTxMeta(result);
     }
 
-    // TODO why is this needed?
-    // Note that updateTransaction doesn't actually error if you add fields that don't conform the to the txMeta type
-    // they will be there at runtime, but you just don't get any type safety checks on them
-    // const fieldsToAddToTxMeta = getTxMetaFields(quoteResponse, approvalTxId);
-    // dispatch(updateTransaction(completeTxMeta);
-
     return {
       ...getTxMetaFields(quoteResponse, approvalTxId),
       ...transactionMeta,
     };
   };
 
-  // Only adds tokens if the source or dest chain is an EVM chain bc non-evm tokens
-  // are detected by the multichain asset controllers
-  readonly #addTokens = (asset: BridgeAsset) => {
-    if (isNativeAddress(asset.address) || isSolanaChainId(asset.chainId)) {
-      return;
-    }
-    // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    this.messagingSystem.call(
-      'TokensController:addDetectedTokens',
-      [
-        {
-          address: asset.address,
-          decimals: asset.decimals,
-          image: asset.iconUrl,
-          name: asset.name,
-          symbol: asset.symbol,
-        },
-      ],
-      {
-        chainId: formatChainIdToHex(asset.chainId),
-        selectedAddress: this.#getMultichainSelectedAccountAddress(),
-      },
-    );
-  };
-
   readonly #handleUSDTAllowanceReset = async (
     quoteResponse: QuoteResponse<TxData | string> & QuoteMetadata,
   ) => {
@@ -827,10 +794,6 @@ export class BridgeStatusController extends StaticIntervalPollingController<Brid
         UnifiedSwapBridgeEventName.Submitted,
         txMeta.id,
       );
-
-      // Add tokens to the token list
-      this.#addTokens(quoteResponse.quote.srcAsset);
-      this.#addTokens(quoteResponse.quote.destAsset);
     } catch {
       // Ignore errors here, we don't want to crash the app if this fails and tx submission succeeds
     }

diff --git a/packages/bridge-status-controller/src/types.ts b/packages/bridge-status-controller/src/types.ts
@@ -2,7 +2,6 @@ import type {
   AccountsControllerGetAccountByAddressAction,
   AccountsControllerGetSelectedMultichainAccountAction,
 } from '@metamask/accounts-controller';
-import type { TokensControllerAddDetectedTokensAction } from '@metamask/assets-controllers';
 import type {
   ControllerGetStateAction,
   ControllerStateChangeEvent,
@@ -345,8 +344,7 @@ type AllowedActions =
   | BridgeControllerAction<BridgeBackgroundAction.GET_BRIDGE_ERC20_ALLOWANCE>
   | BridgeControllerAction<BridgeBackgroundAction.TRACK_METAMETRICS_EVENT>
   | GetGasFeeState
-  | AccountsControllerGetAccountByAddressAction
-  | TokensControllerAddDetectedTokensAction;
+  | AccountsControllerGetAccountByAddressAction;
 
 /**
  * The external events available to the BridgeStatusController.

diff --git a/packages/bridge-status-controller/tsconfig.build.json b/packages/bridge-status-controller/tsconfig.build.json
@@ -10,7 +10,6 @@
     { "path": "../base-controller/tsconfig.build.json" },
     { "path": "../bridge-controller/tsconfig.build.json" },
     { "path": "../controller-utils/tsconfig.build.json" },
-    { "path": "../assets-controllers/tsconfig.build.json" },
     { "path": "../network-controller/tsconfig.build.json" },
     { "path": "../gas-fee-controller/tsconfig.build.json" },
     { "path": "../polling-controller/tsconfig.build.json" },

diff --git a/packages/bridge-status-controller/tsconfig.json b/packages/bridge-status-controller/tsconfig.json
@@ -11,7 +11,6 @@
     { "path": "../controller-utils" },
     { "path": "../network-controller" },
     { "path": "../polling-controller" },
-    { "path": "../assets-controllers" },
     { "path": "../transaction-controller" },
     { "path": "../gas-fee-controller" },
     { "path": "../user-operation-controller" }