@metamask-previews/assets-controller 13.1.1-preview-58a4a8b71 → 13.1.1-preview-4c8a5dfcb

package/CHANGELOG.md

@@ -9,10 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Bump `@metamask/transaction-controller` from `^69.5.0` to `^69.5.1` ([#9798](https://github.com/MetaMask/core/pull/9798))
 - Bump `@metamask/account-tree-controller` from `^7.6.0` to `^7.6.1` ([#9791](https://github.com/MetaMask/core/pull/9791))
 - Bump `@metamask/accounts-controller` from `^39.0.6` to `^39.0.7` ([#9791](https://github.com/MetaMask/core/pull/9791))
 - Bump `@metamask/keyring-controller` from `^27.1.0` to `^27.1.1` ([#9791](https://github.com/MetaMask/core/pull/9791))
 - Bump `@metamask/network-enablement-controller` from `^6.0.2` to `^6.0.3` ([#9791](https://github.com/MetaMask/core/pull/9791))
+- Bump `@metamask/assets-controllers` from `^111.0.0` to `^111.1.0` ([#9793](https://github.com/MetaMask/core/pull/9793))
+
+### Fixed
+
+- Preserve pooled-staking balances across Accounts API chain-slice updates (e.g. network switch / `replaceCoveredChainBalances`): exclude staking contract asset IDs from `AccountsApiDataSource` v5/v6 balance processing, and keep prior staked amounts when a merge replace omits them so Accounts API cannot reset staked ETH to missing/0 ([#9753](https://github.com/MetaMask/core/pull/9753))
 
 ## [13.1.1]
 

package/dist/AssetsController.cjs

@@ -24,6 +24,7 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const lodash_1 = require("lodash");
 const AccountActivityDataSource_js_1 = require("./data-sources/AccountActivityDataSource.cjs");
 const AccountsApiDataSource_js_1 = require("./data-sources/AccountsApiDataSource.cjs");
+const index_js_1 = require("./data-sources/evm-rpc-services/index.cjs");
 const assets_js_1 = require("./data-sources/evm-rpc-services/utils/assets.cjs");
 const PriceDataSource_js_1 = require("./data-sources/PriceDataSource.cjs");
 const RpcDataSource_js_1 = require("./data-sources/RpcDataSource.cjs");
@@ -40,7 +41,7 @@ const RpcFallbackMiddleware_js_1 = require("./middlewares/RpcFallbackMiddleware.
 const healAssetsInfoMetadata_js_1 = require("./migrations/healAssetsInfoMetadata.cjs");
 const constants_js_1 = require("./utils/constants.cjs");
 const customAssetsRpcSupplement_js_1 = require("./utils/customAssetsRpcSupplement.cjs");
-const index_js_1 = require("./utils/index.cjs");
+const index_js_2 = require("./utils/index.cjs");
 const trace_js_1 = require("./utils/trace.cjs");
 const NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];
 /** Stable empty map so memoized formatters are not busted by `?? {}` identity churn. */
@@ -169,14 +170,14 @@ function normalizeResponse(response) {
     if (response.assetsInfo) {
         normalized.assetsInfo = {};
         for (const [assetId, metadata] of Object.entries(response.assetsInfo)) {
-            const normalizedId = (0, index_js_1.normalizeAssetId)(assetId);
+            const normalizedId = (0, index_js_2.normalizeAssetId)(assetId);
             normalized.assetsInfo[normalizedId] = metadata;
         }
     }
     if (response.assetsPrice) {
         normalized.assetsPrice = {};
         for (const [assetId, price] of Object.entries(response.assetsPrice)) {
-            const normalizedId = (0, index_js_1.normalizeAssetId)(assetId);
+            const normalizedId = (0, index_js_2.normalizeAssetId)(assetId);
             normalized.assetsPrice[normalizedId] = price;
         }
     }
@@ -185,7 +186,7 @@ function normalizeResponse(response) {
         for (const [accountId, balances] of Object.entries(response.assetsBalance)) {
             normalized.assetsBalance[accountId] = {};
             for (const [assetId, balance] of Object.entries(balances)) {
-                const normalizedId = (0, index_js_1.normalizeAssetId)(assetId);
+                const normalizedId = (0, index_js_2.normalizeAssetId)(assetId);
                 normalized.assetsBalance[accountId][normalizedId] = balance;
             }
         }
@@ -194,7 +195,7 @@ function normalizeResponse(response) {
     if (response.detectedAssets) {
         normalized.detectedAssets = {};
         for (const [accountId, assetIds] of Object.entries(response.detectedAssets)) {
-            normalized.detectedAssets[accountId] = assetIds.map((assetId) => (0, index_js_1.normalizeAssetId)(assetId));
+            normalized.detectedAssets[accountId] = assetIds.map((assetId) => (0, index_js_2.normalizeAssetId)(assetId));
         }
     }
     // Preserve errors (chain IDs don't need normalization)
@@ -237,6 +238,15 @@ function mergeAccountBalances(previousBalances, accountBalances, customAssetIds,
             next[customId] = prev ?? { amount: '0' };
         }
     }
+    // Staked vault balances are owned by StakedBalanceDataSource. When an
+    // Accounts API (or other) chain-slice replace omits them, keep the prior
+    // on-chain staked amount instead of clearing it to missing/0.
+    for (const [assetId, balance] of Object.entries(previousBalances)) {
+        if ((0, index_js_1.isStakingContractAssetId)(assetId) &&
+            !Object.prototype.hasOwnProperty.call(next, assetId)) {
+            next[assetId] = balance;
+        }
+    }
     return next;
 }
 // ============================================================================
@@ -746,7 +756,7 @@ class AssetsController extends base_controller_1.BaseController {
      */
     getExchangeRatesForBridge() {
         const { networkConfigurationsByChainId } = this.messenger.call('NetworkController:getState');
-        return (0, index_js_1.formatExchangeRatesForBridge)({
+        return (0, index_js_2.formatExchangeRatesForBridge)({
             assetsInfo: this.state.assetsInfo,
             assetsPrice: this.state.assetsPrice,
             selectedCurrency: this.state.selectedCurrency,
@@ -766,7 +776,7 @@ class AssetsController extends base_controller_1.BaseController {
     getStateForTransactionPay() {
         const accounts = __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_getSelectedAccounts).call(this);
         const { networkConfigurationsByChainId } = this.messenger.call('NetworkController:getState');
-        return (0, index_js_1.formatStateForTransactionPay)({
+        return (0, index_js_2.formatStateForTransactionPay)({
             assetsBalance: this.state.assetsBalance,
             assetsInfo: this.state.assetsInfo,
             assetsPrice: this.state.assetsPrice,
@@ -793,7 +803,7 @@ class AssetsController extends base_controller_1.BaseController {
      * @param pendingMetadata - Optional token metadata from the UI (pendingTokens format).
      */
     async addCustomAsset(accountId, assetId, pendingMetadata) {
-        const normalizedAssetId = (0, index_js_1.normalizeAssetId)(assetId);
+        const normalizedAssetId = (0, index_js_2.normalizeAssetId)(assetId);
         log('Adding custom asset', { accountId, assetId: normalizedAssetId });
         this.update((state) => {
             var _a;
@@ -865,7 +875,7 @@ class AssetsController extends base_controller_1.BaseController {
      * @param assetId - The CAIP-19 asset ID to remove.
      */
     removeCustomAsset(accountId, assetId) {
-        const normalizedAssetId = (0, index_js_1.normalizeAssetId)(assetId);
+        const normalizedAssetId = (0, index_js_2.normalizeAssetId)(assetId);
         log('Removing custom asset', { accountId, assetId: normalizedAssetId });
         this.update((state) => {
             if (state.customAssets[accountId]) {
@@ -900,7 +910,7 @@ class AssetsController extends base_controller_1.BaseController {
      * @param assetId - The CAIP-19 asset ID to hide.
      */
     hideAsset(assetId) {
-        const normalizedAssetId = (0, index_js_1.normalizeAssetId)(assetId);
+        const normalizedAssetId = (0, index_js_2.normalizeAssetId)(assetId);
         log('Hiding asset', { assetId: normalizedAssetId });
         this.update((state) => {
             if (!state.assetPreferences[normalizedAssetId]) {
@@ -915,7 +925,7 @@ class AssetsController extends base_controller_1.BaseController {
      * @param assetId - The CAIP-19 asset ID to unhide.
      */
     unhideAsset(assetId) {
-        const normalizedAssetId = (0, index_js_1.normalizeAssetId)(assetId);
+        const normalizedAssetId = (0, index_js_2.normalizeAssetId)(assetId);
         log('Unhiding asset', { assetId: normalizedAssetId });
         this.update((state) => {
             const prefs = state.assetPreferences[normalizedAssetId];
@@ -1221,7 +1231,7 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     queryApiClient.queryClient
         .fetchQuery({
         queryKey: NATIVE_ASSETS_QUERY_KEY,
-        queryFn: index_js_1.buildNativeAssetsFromApi,
+        queryFn: index_js_2.buildNativeAssetsFromApi,
         staleTime: Infinity,
         gcTime: Infinity,
     })
@@ -1234,7 +1244,7 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
     // #isNativeAsset, #resolveNativeAssetIds) have data available immediately.
     // When fetchQuery resolves (currently instant, future: API), it overwrites
     // this with potentially fresher data.
-    const initialNativeAssetMap = (0, index_js_1.buildNativeAssetsFromConstant)();
+    const initialNativeAssetMap = (0, index_js_2.buildNativeAssetsFromConstant)();
     queryApiClient.setCachedData(NATIVE_ASSETS_QUERY_KEY, initialNativeAssetMap);
 }, _AssetsController_initializeState = function _AssetsController_initializeState() {
     const { enabledNetworkMap } = this.messenger.call('NetworkEnablementController:getState');
@@ -1604,7 +1614,7 @@ async function _AssetsController_executeMiddlewares(params) {
     }
 }, _AssetsController_normalizeAssetIdOrThrow = function _AssetsController_normalizeAssetIdOrThrow(assetId, methodName) {
     try {
-        return (0, index_js_1.normalizeAssetId)(assetId);
+        return (0, index_js_2.normalizeAssetId)(assetId);
     }
     catch {
         throw new Error(`AssetsController.${methodName}: invalid CAIP-19 assetId "${assetId}"`);
@@ -1625,7 +1635,7 @@ async function _AssetsController_executeMiddlewares(params) {
             if (!chainFilter.has(assetId.split('/')[0])) {
                 continue;
             }
-            const normalizedAssetId = (0, index_js_1.normalizeAssetId)(assetId);
+            const normalizedAssetId = (0, index_js_2.normalizeAssetId)(assetId);
             if (prices[normalizedAssetId] ?? prices[assetId]) {
                 continue;
             }
@@ -1856,7 +1866,7 @@ async function _AssetsController_executeMiddlewares(params) {
                         // exponent form is rewritten) so balances arriving before
                         // their metadata aren't lossily truncated.
                         const assetDecimals = metadata[assetId]?.decimals;
-                        const newAmount = (0, index_js_1.normalizeAmountString)(balance.amount, assetDecimals);
+                        const newAmount = (0, index_js_2.normalizeAmountString)(balance.amount, assetDecimals);
                         effective[assetId] = { ...balance, amount: newAmount };
                         const oldAmount = previousBalance?.amount;
                         const isNewDefaultNativeZero = oldAmount === undefined &&