feat: use migration selectors for new assets controller

app/core/Engine/controllers/transaction-controller/metrics_properties/gas.ts

@@ -11,6 +11,7 @@ import type {
   TransactionMetricsBuilderRequest,
 } from '../types';
 import type { RootState } from '../../../../../reducers';
+import { selectAccountsByChainId } from '../../../../../selectors/accountTrackerController';
 
 export function getGasMetricsProperties({
   transactionMeta,
@@ -82,8 +83,7 @@ function getNativeBalance(
   chainId: string,
   address: string,
 ): BigNumber {
-  const accountsByChainId =
-    state.engine?.backgroundState?.AccountTrackerController?.accountsByChainId;
+  const accountsByChainId = selectAccountsByChainId(state);
 
   const account = accountsByChainId?.[chainId]?.[address?.toLowerCase()];
 

app/selectors/accountTrackerController.ts

@@ -1,24 +1,16 @@
 import { createSelector } from 'reselect';
-import { AccountTrackerControllerState } from '@metamask/assets-controllers';
 import { RootState } from '../reducers';
 import { createDeepEqualSelector } from './util';
 import { selectEvmChainId } from './networkController';
 import { selectSelectedInternalAccountFormattedAddress } from './accountsController';
 import { Hex } from '@metamask/utils';
+import { getAccountTrackerControllerAccountsByChainId } from './assets/assets-migration';
 
-const selectAccountTrackerControllerState = (state: RootState) =>
-  state.engine.backgroundState.AccountTrackerController;
-
-export const selectAccountsByChainId = createDeepEqualSelector(
-  selectAccountTrackerControllerState,
-  (accountTrackerControllerState: AccountTrackerControllerState) =>
-    accountTrackerControllerState?.accountsByChainId ?? {},
-);
+export { getAccountTrackerControllerAccountsByChainId as selectAccountsByChainId };
 
 export const selectAccounts = createDeepEqualSelector(
-  selectAccountsByChainId,
+  getAccountTrackerControllerAccountsByChainId,
   selectEvmChainId,
-  selectSelectedInternalAccountFormattedAddress,
   (accountsByChainId, chainId) => accountsByChainId?.[chainId] || {},
 );
 
@@ -28,7 +20,7 @@ export const selectAccountsLength = createSelector(
 );
 
 export const selectAccountBalanceByChainId = createDeepEqualSelector(
-  selectAccountsByChainId,
+  getAccountTrackerControllerAccountsByChainId,
   selectEvmChainId,
   selectSelectedInternalAccountFormattedAddress,
   (_state: RootState, chainId?: Hex) => chainId,

app/selectors/assets/assets-migration.ts

@@ -0,0 +1,100 @@
+import { createDeepEqualSelector } from '../util';
+import { selectIsAssetsUnifyStateEnabled } from '../featureFlagController/assetsUnifyState';
+import { AccountTrackerControllerState } from '@metamask/assets-controllers';
+import { isEvmAccountType } from '@metamask/keyring-api';
+import { toChecksumHexAddress } from '@metamask/controller-utils';
+import {
+  bigIntToHex,
+  CaipAssetType,
+  Hex,
+  parseCaipAssetType,
+} from '@metamask/utils';
+import { decimalToPrefixedHex } from '../../util/conversions';
+import { AssetsControllerState } from '@metamask/assets-controller';
+import { AccountsControllerState } from '@metamask/accounts-controller';
+
+// ChainId (hex) -> AccountAddress (hex checksummed) -> Balance (hex)
+export const getAccountTrackerControllerAccountsByChainId =
+  createDeepEqualSelector(
+    [
+      selectIsAssetsUnifyStateEnabled,
+      (state) => state.AccountTrackerController?.accountsByChainId ?? {},
+      (state) => state.AssetsController?.assetsBalance ?? {},
+      (state) => state.AssetsController?.assetsInfo ?? {},
+      (state) => state.AccountsController?.internalAccounts?.accounts ?? {},
+    ],
+    (
+      isAssetsUnifyStateEnabled: boolean,
+      accountsByChainId: AccountTrackerControllerState['accountsByChainId'],
+      assetsBalance: AssetsControllerState['assetsBalance'],
+      assetsInfo: AssetsControllerState['assetsInfo'],
+      internalAccountsById: AccountsControllerState['internalAccounts']['accounts'],
+    ) => {
+      if (!isAssetsUnifyStateEnabled) {
+        return accountsByChainId;
+      }
+
+      const result: AccountTrackerControllerState['accountsByChainId'] = {};
+
+      for (const [accountId, accountBalances] of Object.entries(
+        assetsBalance,
+      )) {
+        const internalAccount = internalAccountsById[accountId];
+        if (!internalAccount || !isEvmAccountType(internalAccount.type)) {
+          continue;
+        }
+
+        const checksummedAddress = toChecksumHexAddress(
+          internalAccount.address,
+        );
+
+        for (const [assetId, balanceData] of Object.entries(accountBalances)) {
+          const metadata = assetsInfo[assetId];
+          if (metadata?.type !== 'native') {
+            continue;
+          }
+
+          const { chain: parsedChain } = parseCaipAssetType(
+            assetId as CaipAssetType,
+          );
+
+          // No need to check if the chain is EVM, we already filtered out non-EVM accounts
+          const hexChainId = decimalToPrefixedHex(parsedChain.reference);
+          const amount = balanceData?.amount ?? '0';
+
+          result[hexChainId] ??= {};
+          result[hexChainId][checksummedAddress] = {
+            // TODO: Use raw value from state when available
+            balance: parseBalanceWithDecimals(amount, metadata.decimals),
+          };
+        }
+      }
+
+      return result;
+    },
+  );
+
+function parseBalanceWithDecimals(
+  balanceString: string,
+  decimals: number,
+): Hex {
+  const [integerPart, fractionalPart = ''] = balanceString.split('.');
+
+  if (decimals === 0) {
+    return bigIntToHex(BigInt(integerPart));
+  }
+
+  if (fractionalPart.length >= decimals) {
+    return bigIntToHex(
+      BigInt(`${integerPart}${fractionalPart.slice(0, decimals)}`),
+    );
+  }
+
+  return bigIntToHex(
+    BigInt(
+      `${integerPart}${fractionalPart}${'0'.repeat(
+        decimals - fractionalPart.length,
+      )}`,
+    ),
+  );
+}

package.json

@@ -202,7 +202,7 @@
     "@metamask/analytics-controller": "^1.0.0",
     "@metamask/app-metadata-controller": "^2.0.0",
     "@metamask/approval-controller": "^8.0.0",
-    "@metamask/assets-controller": "^2.0.0",
+    "@metamask/assets-controller": "^2.2.0",
     "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A100.0.3#~/.yarn/patches/@metamask-assets-controllers-npm-100.0.3-ea172b88c9.patch",
     "@metamask/base-controller": "^9.0.0",
     "@metamask/bitcoin-wallet-snap": "^1.10.0",

yarn.lock

@@ -7674,36 +7674,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/assets-controller@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@metamask/assets-controller@npm:2.0.0"
+"@metamask/assets-controller@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "@metamask/assets-controller@npm:2.2.0"
   dependencies:
     "@ethereumjs/util": "npm:^9.1.0"
     "@ethersproject/abi": "npm:^5.7.0"
     "@ethersproject/providers": "npm:^5.7.0"
     "@metamask/account-tree-controller": "npm:^4.1.1"
-    "@metamask/assets-controllers": "npm:^99.4.0"
+    "@metamask/assets-controllers": "npm:^100.0.3"
     "@metamask/base-controller": "npm:^9.0.0"
-    "@metamask/controller-utils": "npm:^11.18.0"
-    "@metamask/core-backend": "npm:^5.1.1"
+    "@metamask/client-controller": "npm:^1.0.0"
+    "@metamask/controller-utils": "npm:^11.19.0"
+    "@metamask/core-backend": "npm:^6.0.0"
     "@metamask/keyring-api": "npm:^21.5.0"
     "@metamask/keyring-controller": "npm:^25.1.0"
     "@metamask/keyring-internal-api": "npm:^10.0.0"
     "@metamask/keyring-snap-client": "npm:^8.2.0"
     "@metamask/messenger": "npm:^0.3.0"
-    "@metamask/network-controller": "npm:^29.0.0"
-    "@metamask/network-enablement-controller": "npm:^4.1.0"
+    "@metamask/network-controller": "npm:^30.0.0"
+    "@metamask/network-enablement-controller": "npm:^4.1.2"
     "@metamask/permission-controller": "npm:^12.2.0"
-    "@metamask/polling-controller": "npm:^16.0.2"
+    "@metamask/polling-controller": "npm:^16.0.3"
     "@metamask/preferences-controller": "npm:^22.1.0"
     "@metamask/snaps-controllers": "npm:^17.2.0"
     "@metamask/snaps-utils": "npm:^11.7.0"
-    "@metamask/transaction-controller": "npm:^62.17.0"
+    "@metamask/transaction-controller": "npm:^62.19.0"
     "@metamask/utils": "npm:^11.9.0"
     async-mutex: "npm:^0.5.0"
     bignumber.js: "npm:^9.1.2"
     lodash: "npm:^4.17.21"
-  checksum: 10/dc31db672976d57e16731fff9769363617a8ffb775efc125233d3690766f7752ff4cbcc5d47ceaab293560812ec6de988d532c4c8499f6cb172aa5010bd3c7a8
+    p-limit: "npm:^3.1.0"
+  checksum: 10/a1501d4bef2f01e0e8358d44615c3b79c8af2072e3551a9969688b3d7e0926fb64dedb8b7ac9dda1dbf66698a389d82ffd0cc488c3a8c0ad36785b6af66453e9
   languageName: node
   linkType: hard
 
@@ -8078,6 +8080,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/client-controller@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@metamask/client-controller@npm:1.0.0"
+  dependencies:
+    "@metamask/base-controller": "npm:^9.0.0"
+    "@metamask/messenger": "npm:^0.3.0"
+  checksum: 10/79a81ebae21fbe41cc110c5f8593751aebd64c3df98e23c4ec1b2129fa4d86d301afc3a8aa8ff65fc0c917f65c171aa6c90bce00753ec1378966cfca95f89d9c
+  languageName: node
+  linkType: hard
+
 "@metamask/connectivity-controller@npm:^0.1.0":
   version: 0.1.0
   resolution: "@metamask/connectivity-controller@npm:0.1.0"
@@ -9155,7 +9167,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/network-enablement-controller@npm:^4.1.0, @metamask/network-enablement-controller@npm:^4.1.1, @metamask/network-enablement-controller@npm:^4.1.2":
+"@metamask/network-enablement-controller@npm:^4.1.1, @metamask/network-enablement-controller@npm:^4.1.2":
   version: 4.1.2
   resolution: "@metamask/network-enablement-controller@npm:4.1.2"
   dependencies:
@@ -35377,7 +35389,7 @@ __metadata:
     "@metamask/analytics-controller": "npm:^1.0.0"
     "@metamask/app-metadata-controller": "npm:^2.0.0"
     "@metamask/approval-controller": "npm:^8.0.0"
-    "@metamask/assets-controller": "npm:^2.0.0"
+    "@metamask/assets-controller": "npm:^2.2.0"
     "@metamask/assets-controllers": "patch:@metamask/assets-controllers@npm%3A100.0.3#~/.yarn/patches/@metamask-assets-controllers-npm-100.0.3-ea172b88c9.patch"
     "@metamask/auto-changelog": "npm:^5.3.0"
     "@metamask/base-controller": "npm:^9.0.0"