@metamask/assets-controllers 99.3.1 → 99.3.2

package/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [99.3.2]
+
+### Changed
+
+- Bump `@metamask/accounts-controller` from `^35.0.2` to `^36.0.0` ([#7897](https://github.com/MetaMask/core/pull/7897))
+- Bump `@metamask/keyring-api` from `^21.0.0` to `^21.5.0` ([#7857](https://github.com/MetaMask/core/pull/7857))
+- Bump `@metamask/account-tree-controller` from `^4.0.0` to `^4.1.1` ([#7869](https://github.com/MetaMask/core/pull/7869)), ([#7897](https://github.com/MetaMask/core/pull/7897))
+- Bump `@metamask/multichain-account-service` from `^5.1.0` to `^7.0.0` ([#7869](https://github.com/MetaMask/core/pull/7869)), ([#7897](https://github.com/MetaMask/core/pull/7897))
+- Bump `@metamask/transaction-controller` from `^62.15.0` to `^62.17.0` ([#7872](https://github.com/MetaMask/core/pull/7872)), ([#7897](https://github.com/MetaMask/core/pull/7897))
+- Bump `@metamask/phishing-controller` from `^16.1.0` to `^16.2.0` ([#7883](https://github.com/MetaMask/core/pull/7883))
+- Optimize Price API performance by deduplicating concurrent API calls ([#7811](https://github.com/MetaMask/core/pull/7811))
+  - Add in-flight promise caching for `fetchSupportedNetworks()` to prevent duplicate concurrent requests
+  - Update `fetchTokenPrices()` and `fetchExchangeRates()` to only refresh supported networks/currencies when no cached value exists
+
 ## [99.3.1]
 
 ### Fixed
@@ -26,6 +40,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix trending tokens showing incorrect market cap values by adding `usePriceApiData` parameter (defaults to `true`) to use price API data for accurate market data ([#7829](https://github.com/MetaMask/core/pull/7829))
 - Bump `@metamask/transaction-controller` from `^62.13.0` to `^62.15.0` ([#7832](https://github.com/MetaMask/core/pull/7832), [#7854](https://github.com/MetaMask/core/pull/7854))
 
+### Fixed
+
+- Ensure TokenBalancesController zeroes out ERC tokens that are not returned from Accounts API ([#7861](https://github.com/MetaMask/core/pull/7861))
+  - The Accounts API does not return tokens that are empty/have zero balance, but we need to make sure that the API service can return zero balance, so we can correctly update the TokenBalancesController state and prevent stale values (e.g. when a user swaps/sends all their balance for a given ERC-20 token - we need to update the state for that token to zero and not show the old value)
+
 ## [99.2.0]
 
 ### Added
@@ -2649,7 +2668,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@99.3.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@99.3.2...HEAD
+[99.3.2]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@99.3.1...@metamask/assets-controllers@99.3.2
 [99.3.1]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@99.3.0...@metamask/assets-controllers@99.3.1
 [99.3.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@99.2.0...@metamask/assets-controllers@99.3.0
 [99.2.0]: https://github.com/MetaMask/core/compare/@metamask/assets-controllers@99.1.0...@metamask/assets-controllers@99.2.0

package/dist/DeFiPositionsController/DeFiPositionsController.cjs

@@ -72,9 +72,8 @@ class DeFiPositionsController extends (0, polling_controller_1.StaticIntervalPol
         });
         this.messenger.subscribe('TransactionController:transactionConfirmed', async (transactionMeta) => {
             const selectedAddress = __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_getSelectedEvmAdress).call(this);
-            if (!selectedAddress ||
-                selectedAddress.toLowerCase() !==
-                    transactionMeta.txParams.from.toLowerCase()) {
+            if (selectedAddress?.toLowerCase() !==
+                transactionMeta.txParams.from.toLowerCase()) {
                 return;
             }
             await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, selectedAddress);

package/dist/DeFiPositionsController/DeFiPositionsController.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsController.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AASA,uDAAyD;AAIzD,qEAA+E;AAI/E,yEAAwE;AAExE,2DAAyD;AACzD,qEAA4D;AAG5D,MAAM,iBAAiB,GAAG,MAAO,CAAC;AAElC,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAuCjD,MAAM,kBAAkB,GAAgD;IACtE,gBAAgB,EAAE;QAChB,kBAAkB,EAAE,KAAK;QACzB,OAAO,EAAE,KAAK;QACd,sBAAsB,EAAE,KAAK;QAC7B,QAAQ,EAAE,IAAI;KACf;IACD,qBAAqB,EAAE;QACrB,kBAAkB,EAAE,KAAK;QACzB,OAAO,EAAE,KAAK;QACd,sBAAsB,EAAE,KAAK;QAC7B,QAAQ,EAAE,KAAK;KAChB;CACF,CAAC;AAEK,MAAM,sCAAsC,GACjD,GAAiC,EAAE;IACjC,OAAO;QACL,gBAAgB,EAAE,EAAE;QACpB,qBAAqB,EAAE,EAAE;KAC1B,CAAC;AACJ,CAAC,CAAC;AANS,QAAA,sCAAsC,0CAM/C;AA0CJ;;GAEG;AACH,MAAa,uBAAwB,SAAQ,IAAA,oDAA+B,GAI3E;IASC;;;;;;;OAOG;IACH,YAAY,EACV,SAAS,EACT,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,EACtB,UAAU,GAKX;QACC,KAAK,CAAC;YACJ,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,kBAAkB;YAC5B,SAAS;YACT,KAAK,EAAE,IAAA,8CAAsC,GAAE;SAChD,CAAC,CAAC;;QA9BI,0DAE4B;QAE5B,qDAA0B;QAE1B,sDAA6B;QA0BpC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAE1C,uBAAA,IAAI,2CAAmB,IAAA,sCAAoB,GAAE,MAAA,CAAC;QAC9C,uBAAA,IAAI,sCAAc,SAAS,MAAA,CAAC;QAE5B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,wBAAwB,EAAE,GAAG,EAAE;YACtD,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,SAAS,CACtB,4CAA4C,EAC5C,KAAK,EAAE,eAAe,EAAE,EAAE;YACxB,MAAM,eAAe,GAAG,uBAAA,IAAI,yFAAsB,MAA1B,IAAI,CAAwB,CAAC;YAErD,IACE,CAAC,eAAe;gBAChB,eAAe,CAAC,WAAW,EAAE;oBAC3B,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,EAC7C,CAAC;gBACD,OAAO;YACT,CAAC;YAED,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,eAAe,CAAC,CAAC;QACtD,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,SAAS,CACtB,kDAAkD,EAClD,KAAK,IAAI,EAAE;YACT,MAAM,eAAe,GAAG,uBAAA,IAAI,yFAAsB,MAA1B,IAAI,CAAwB,CAAC;YAErD,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,OAAO;YACT,CAAC;YAED,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,eAAe,CAAC,CAAC;QACtD,CAAC,CACF,CAAC;QAEF,uBAAA,IAAI,uCAAe,UAAU,MAAA,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,uBAAA,IAAI,0CAAW,MAAf,IAAI,CAAa,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,uBAAA,IAAI,yFAAsB,MAA1B,IAAI,CAAwB,CAAC;QAErD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,uBAAA,IAAI,0FAAuB,MAA3B,IAAI,EAAwB,eAAe,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACpB,KAAK,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,gBAAgB,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC;CAiEF;AAhKD,0DAgKC;wQA/DC,KAAK,0DAAyB,cAAsB;IAClD,IAAI,CAAC,uBAAA,IAAI,0CAAW,MAAf,IAAI,CAAa,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IAED,MAAM,wBAAwB,GAC5B,MAAM,uBAAA,IAAI,0FAAuB,MAA3B,IAAI,EAAwB,cAAc,CAAC,CAAC;IAEpD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpB,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,wBAAwB,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC,mDAED,KAAK,yDACH,cAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,qBAAqB,GAAG,MAAM,uBAAA,IAAI,+CAAgB,MAApB,IAAI,EAAiB,cAAc,CAAC,CAAC;QAEzE,MAAM,oBAAoB,GAAG,IAAA,yCAAkB,EAAC,qBAAqB,CAAC,CAAC;QAEvE,IAAI,CAAC;YACH,uBAAA,IAAI,gGAA6B,MAAjC,IAAI,EAA8B,oBAAoB,EAAE,cAAc,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,gDAAgD,cAAc,GAAG,EACjE,KAAK,CACN,CAAC;QACJ,CAAC;QAED,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,uHAGC,oBAAkD,EAClD,cAAsB;IAEtB,wDAAwD;IACxD,IAAI,CAAC,uBAAA,IAAI,2CAAY,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,qDAA4B,EAAC,oBAAoB,CAAC,CAAC;IACvE,MAAM,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC;IAElD,IAAI,cAAc,KAAK,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACpB,KAAK,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,uBAAA,IAAI,2CAAY,EAAE,KAAlB,IAAI,EAAe,WAAW,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;IAGC,OAAO,IAAI,CAAC,SAAS;SAClB,IAAI,CAAC,2DAA2D,CAAC;SACjE,IAAI,CAAC,CAAC,OAAwB,EAAE,EAAE,CAAC,IAAA,8BAAgB,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnE,EAAE,OAAO,CAAC;AACd,CAAC","sourcesContent":["import type {\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n} from '@metamask/account-tree-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport { isEvmAccountType } from '@metamask/keyring-api';\nimport type { KeyringControllerLockEvent } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { Messenger } from '@metamask/messenger';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { TransactionControllerTransactionConfirmedEvent } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport { calculateDeFiPositionMetrics } from './calculate-defi-metrics';\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupDeFiPositions } from './group-defi-positions';\nimport type { GroupedDeFiPositions } from './group-defi-positions';\n\nconst TEN_MINUTES_IN_MS = 600_000;\n\nconst controllerName = 'DeFiPositionsController';\n\nexport type GroupedDeFiPositionsPerChain = {\n  [chain: Hex]: GroupedDeFiPositions;\n};\n\nexport type TrackingEventPayload = {\n  event: string;\n  category: string;\n  properties: {\n    totalPositions: number;\n    totalMarketValueUSD: number;\n    breakdown?: {\n      protocolId: string;\n      marketValueUSD: number;\n      chainId: Hex;\n      count: number;\n    }[];\n  };\n};\n\ntype TrackEventHook = (event: TrackingEventPayload) => void;\n\nexport type DeFiPositionsControllerState = {\n  /**\n   * Object containing DeFi positions per account and network\n   */\n  allDeFiPositions: {\n    [accountAddress: string]: GroupedDeFiPositionsPerChain | null;\n  };\n\n  /**\n   * Object containing DeFi positions count per account\n   */\n  allDeFiPositionsCount: {\n    [accountAddress: string]: number;\n  };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n  allDeFiPositions: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n  allDeFiPositionsCount: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: false,\n  },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n  (): DeFiPositionsControllerState => {\n    return {\n      allDeFiPositions: {},\n      allDeFiPositionsCount: {},\n    };\n  };\n\nexport type DeFiPositionsControllerActions =\n  DeFiPositionsControllerGetStateAction;\n\nexport type DeFiPositionsControllerGetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerState\n>;\n\nexport type DeFiPositionsControllerEvents =\n  DeFiPositionsControllerStateChangeEvent;\n\nexport type DeFiPositionsControllerStateChangeEvent =\n  ControllerStateChangeEvent<\n    typeof controllerName,\n    DeFiPositionsControllerState\n  >;\n\n/**\n * The external actions available to the {@link DeFiPositionsController}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsController}.\n */\nexport type AllowedEvents =\n  | KeyringControllerLockEvent\n  | TransactionControllerTransactionConfirmedEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent;\n\n/**\n * The messenger of the {@link DeFiPositionsController}.\n */\nexport type DeFiPositionsControllerMessenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerActions | AllowedActions,\n  DeFiPositionsControllerEvents | AllowedEvents\n>;\n\n/**\n * Controller that stores assets and exposes convenience methods\n */\nexport class DeFiPositionsController extends StaticIntervalPollingController()<\n  typeof controllerName,\n  DeFiPositionsControllerState,\n  DeFiPositionsControllerMessenger\n> {\n  readonly #fetchPositions: (\n    accountAddress: string,\n  ) => Promise<DefiPositionResponse[]>;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #trackEvent?: TrackEventHook;\n\n  /**\n   * DeFiPositionsController constuctor\n   *\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)\n   * @param options.trackEvent - Function to track events. (default: undefined)\n   */\n  constructor({\n    messenger,\n    isEnabled = () => true,\n    trackEvent,\n  }: {\n    messenger: DeFiPositionsControllerMessenger;\n    isEnabled?: () => boolean;\n    trackEvent?: TrackEventHook;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: getDefaultDefiPositionsControllerState(),\n    });\n\n    this.setIntervalLength(TEN_MINUTES_IN_MS);\n\n    this.#fetchPositions = buildPositionFetcher();\n    this.#isEnabled = isEnabled;\n\n    this.messenger.subscribe('KeyringController:lock', () => {\n      this.stopAllPolling();\n    });\n\n    this.messenger.subscribe(\n      'TransactionController:transactionConfirmed',\n      async (transactionMeta) => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (\n          !selectedAddress ||\n          selectedAddress.toLowerCase() !==\n            transactionMeta.txParams.from.toLowerCase()\n        ) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      async () => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (!selectedAddress) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.#trackEvent = trackEvent;\n  }\n\n  async _executePoll(): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAddress = this.#getSelectedEvmAdress();\n\n    if (!selectedAddress) {\n      return;\n    }\n\n    const accountPositions = await this.#fetchAccountPositions(selectedAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[selectedAddress] = accountPositions;\n    });\n  }\n\n  async #updateAccountPositions(accountAddress: string): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const accountPositionsPerChain =\n      await this.#fetchAccountPositions(accountAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[accountAddress] = accountPositionsPerChain;\n    });\n  }\n\n  async #fetchAccountPositions(\n    accountAddress: string,\n  ): Promise<GroupedDeFiPositionsPerChain | null> {\n    try {\n      const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n      const groupedDeFiPositions = groupDeFiPositions(defiPositionsResponse);\n\n      try {\n        this.#updatePositionsCountMetrics(groupedDeFiPositions, accountAddress);\n      } catch (error) {\n        console.error(\n          `Failed to update positions count for account ${accountAddress}:`,\n          error,\n        );\n      }\n\n      return groupedDeFiPositions;\n    } catch {\n      return null;\n    }\n  }\n\n  #updatePositionsCountMetrics(\n    groupedDeFiPositions: GroupedDeFiPositionsPerChain,\n    accountAddress: string,\n  ) {\n    // If no track event passed then skip the metrics update\n    if (!this.#trackEvent) {\n      return;\n    }\n\n    const defiMetrics = calculateDeFiPositionMetrics(groupedDeFiPositions);\n    const { totalPositions } = defiMetrics.properties;\n\n    if (totalPositions !== this.state.allDeFiPositionsCount[accountAddress]) {\n      this.update((state) => {\n        state.allDeFiPositionsCount[accountAddress] = totalPositions;\n      });\n\n      this.#trackEvent?.(defiMetrics);\n    }\n  }\n\n  #getSelectedEvmAdress(): string | undefined {\n    return this.messenger\n      .call('AccountTreeController:getAccountsFromSelectedAccountGroup')\n      .find((account: InternalAccount) => isEvmAccountType(account.type))\n      ?.address;\n  }\n}\n"]}
+{"version":3,"file":"DeFiPositionsController.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n} from '@metamask/account-tree-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport { isEvmAccountType } from '@metamask/keyring-api';\nimport type { KeyringControllerLockEvent } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { Messenger } from '@metamask/messenger';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { TransactionControllerTransactionConfirmedEvent } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport { calculateDeFiPositionMetrics } from './calculate-defi-metrics';\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupDeFiPositions } from './group-defi-positions';\nimport type { GroupedDeFiPositions } from './group-defi-positions';\n\nconst TEN_MINUTES_IN_MS = 600_000;\n\nconst controllerName = 'DeFiPositionsController';\n\nexport type GroupedDeFiPositionsPerChain = {\n  [chain: Hex]: GroupedDeFiPositions;\n};\n\nexport type TrackingEventPayload = {\n  event: string;\n  category: string;\n  properties: {\n    totalPositions: number;\n    totalMarketValueUSD: number;\n    breakdown?: {\n      protocolId: string;\n      marketValueUSD: number;\n      chainId: Hex;\n      count: number;\n    }[];\n  };\n};\n\ntype TrackEventHook = (event: TrackingEventPayload) => void;\n\nexport type DeFiPositionsControllerState = {\n  /**\n   * Object containing DeFi positions per account and network\n   */\n  allDeFiPositions: {\n    [accountAddress: string]: GroupedDeFiPositionsPerChain | null;\n  };\n\n  /**\n   * Object containing DeFi positions count per account\n   */\n  allDeFiPositionsCount: {\n    [accountAddress: string]: number;\n  };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n  allDeFiPositions: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n  allDeFiPositionsCount: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: false,\n  },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n  (): DeFiPositionsControllerState => {\n    return {\n      allDeFiPositions: {},\n      allDeFiPositionsCount: {},\n    };\n  };\n\nexport type DeFiPositionsControllerActions =\n  DeFiPositionsControllerGetStateAction;\n\nexport type DeFiPositionsControllerGetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerState\n>;\n\nexport type DeFiPositionsControllerEvents =\n  DeFiPositionsControllerStateChangeEvent;\n\nexport type DeFiPositionsControllerStateChangeEvent =\n  ControllerStateChangeEvent<\n    typeof controllerName,\n    DeFiPositionsControllerState\n  >;\n\n/**\n * The external actions available to the {@link DeFiPositionsController}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsController}.\n */\nexport type AllowedEvents =\n  | KeyringControllerLockEvent\n  | TransactionControllerTransactionConfirmedEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent;\n\n/**\n * The messenger of the {@link DeFiPositionsController}.\n */\nexport type DeFiPositionsControllerMessenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerActions | AllowedActions,\n  DeFiPositionsControllerEvents | AllowedEvents\n>;\n\n/**\n * Controller that stores assets and exposes convenience methods\n */\nexport class DeFiPositionsController extends StaticIntervalPollingController()<\n  typeof controllerName,\n  DeFiPositionsControllerState,\n  DeFiPositionsControllerMessenger\n> {\n  readonly #fetchPositions: (\n    accountAddress: string,\n  ) => Promise<DefiPositionResponse[]>;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #trackEvent?: TrackEventHook;\n\n  /**\n   * DeFiPositionsController constuctor\n   *\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)\n   * @param options.trackEvent - Function to track events. (default: undefined)\n   */\n  constructor({\n    messenger,\n    isEnabled = () => true,\n    trackEvent,\n  }: {\n    messenger: DeFiPositionsControllerMessenger;\n    isEnabled?: () => boolean;\n    trackEvent?: TrackEventHook;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: getDefaultDefiPositionsControllerState(),\n    });\n\n    this.setIntervalLength(TEN_MINUTES_IN_MS);\n\n    this.#fetchPositions = buildPositionFetcher();\n    this.#isEnabled = isEnabled;\n\n    this.messenger.subscribe('KeyringController:lock', () => {\n      this.stopAllPolling();\n    });\n\n    this.messenger.subscribe(\n      'TransactionController:transactionConfirmed',\n      async (transactionMeta) => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (\n          selectedAddress?.toLowerCase() !==\n          transactionMeta.txParams.from.toLowerCase()\n        ) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      async () => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (!selectedAddress) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.#trackEvent = trackEvent;\n  }\n\n  async _executePoll(): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAddress = this.#getSelectedEvmAdress();\n\n    if (!selectedAddress) {\n      return;\n    }\n\n    const accountPositions = await this.#fetchAccountPositions(selectedAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[selectedAddress] = accountPositions;\n    });\n  }\n\n  async #updateAccountPositions(accountAddress: string): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const accountPositionsPerChain =\n      await this.#fetchAccountPositions(accountAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[accountAddress] = accountPositionsPerChain;\n    });\n  }\n\n  async #fetchAccountPositions(\n    accountAddress: string,\n  ): Promise<GroupedDeFiPositionsPerChain | null> {\n    try {\n      const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n      const groupedDeFiPositions = groupDeFiPositions(defiPositionsResponse);\n\n      try {\n        this.#updatePositionsCountMetrics(groupedDeFiPositions, accountAddress);\n      } catch (error) {\n        console.error(\n          `Failed to update positions count for account ${accountAddress}:`,\n          error,\n        );\n      }\n\n      return groupedDeFiPositions;\n    } catch {\n      return null;\n    }\n  }\n\n  #updatePositionsCountMetrics(\n    groupedDeFiPositions: GroupedDeFiPositionsPerChain,\n    accountAddress: string,\n  ) {\n    // If no track event passed then skip the metrics update\n    if (!this.#trackEvent) {\n      return;\n    }\n\n    const defiMetrics = calculateDeFiPositionMetrics(groupedDeFiPositions);\n    const { totalPositions } = defiMetrics.properties;\n\n    if (totalPositions !== this.state.allDeFiPositionsCount[accountAddress]) {\n      this.update((state) => {\n        state.allDeFiPositionsCount[accountAddress] = totalPositions;\n      });\n\n      this.#trackEvent?.(defiMetrics);\n    }\n  }\n\n  #getSelectedEvmAdress(): string | undefined {\n    return this.messenger\n      .call('AccountTreeController:getAccountsFromSelectedAccountGroup')\n      .find((account: InternalAccount) => isEvmAccountType(account.type))\n      ?.address;\n  }\n}\n"]}

package/dist/DeFiPositionsController/DeFiPositionsController.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsController.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,8DAA8D,EAC9D,oDAAoD,EACrD,0CAA0C;AAC3C,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAE3B,kCAAkC;AAEnC,OAAO,KAAK,EAAE,0BAA0B,EAAE,qCAAqC;AAE/E,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EAAE,8CAA8C,EAAE,yCAAyC;AACvG,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAM3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,mCAA+B;AAInE,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,MAAM,MAAM,4BAA4B,GAAG;IACzC,CAAC,KAAK,EAAE,GAAG,GAAG,oBAAoB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,SAAS,CAAC,EAAE;YACV,UAAU,EAAE,MAAM,CAAC;YACnB,cAAc,EAAE,MAAM,CAAC;YACvB,OAAO,EAAE,GAAG,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;SACf,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AAEF,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAE5D,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG,4BAA4B,GAAG,IAAI,CAAC;KAC/D,CAAC;IAEF;;OAEG;IACH,qBAAqB,EAAE;QACrB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;KAClC,CAAC;CACH,CAAC;AAiBF,eAAO,MAAM,sCAAsC,QAC7C,4BAKH,CAAC;AAEJ,MAAM,MAAM,8BAA8B,GACxC,qCAAqC,CAAC;AAExC,MAAM,MAAM,qCAAqC,GAAG,wBAAwB,CAC1E,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACvC,uCAAuC,CAAC;AAE1C,MAAM,MAAM,uCAAuC,GACjD,0BAA0B,CACxB,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB,0BAA0B,GAC1B,8CAA8C,GAC9C,oDAAoD,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,SAAS,CACtD,OAAO,cAAc,EACrB,8BAA8B,GAAG,cAAc,EAC/C,6BAA6B,GAAG,aAAa,CAC9C,CAAC;;;;;;;;;;;;;;;;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,6BAC3C,OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;IASC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAsB,EACtB,UAAU,GACX,EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;QAC1B,UAAU,CAAC,EAAE,cAAc,CAAC;KAC7B;IAkDK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAiFpC"}
+{"version":3,"file":"DeFiPositionsController.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,8DAA8D,EAC9D,oDAAoD,EACrD,0CAA0C;AAC3C,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAE3B,kCAAkC;AAEnC,OAAO,KAAK,EAAE,0BAA0B,EAAE,qCAAqC;AAE/E,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EAAE,8CAA8C,EAAE,yCAAyC;AACvG,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAM3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,mCAA+B;AAInE,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,MAAM,MAAM,4BAA4B,GAAG;IACzC,CAAC,KAAK,EAAE,GAAG,GAAG,oBAAoB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,SAAS,CAAC,EAAE;YACV,UAAU,EAAE,MAAM,CAAC;YACnB,cAAc,EAAE,MAAM,CAAC;YACvB,OAAO,EAAE,GAAG,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;SACf,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AAEF,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAE5D,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG,4BAA4B,GAAG,IAAI,CAAC;KAC/D,CAAC;IAEF;;OAEG;IACH,qBAAqB,EAAE;QACrB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;KAClC,CAAC;CACH,CAAC;AAiBF,eAAO,MAAM,sCAAsC,QAC7C,4BAKH,CAAC;AAEJ,MAAM,MAAM,8BAA8B,GACxC,qCAAqC,CAAC;AAExC,MAAM,MAAM,qCAAqC,GAAG,wBAAwB,CAC1E,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACvC,uCAAuC,CAAC;AAE1C,MAAM,MAAM,uCAAuC,GACjD,0BAA0B,CACxB,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB,0BAA0B,GAC1B,8CAA8C,GAC9C,oDAAoD,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,SAAS,CACtD,OAAO,cAAc,EACrB,8BAA8B,GAAG,cAAc,EAC/C,6BAA6B,GAAG,aAAa,CAC9C,CAAC;;;;;;;;;;;;;;;;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,6BAC3C,OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;IASC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAsB,EACtB,UAAU,GACX,EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;QAC1B,UAAU,CAAC,EAAE,cAAc,CAAC;KAC7B;IAiDK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAiFpC"}

package/dist/DeFiPositionsController/DeFiPositionsController.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsController.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,8DAA8D,EAC9D,oDAAoD,EACrD,0CAA0C;AAC3C,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAE3B,kCAAkC;AAEnC,OAAO,KAAK,EAAE,0BAA0B,EAAE,qCAAqC;AAE/E,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EAAE,8CAA8C,EAAE,yCAAyC;AACvG,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAM3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,mCAA+B;AAInE,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,MAAM,MAAM,4BAA4B,GAAG;IACzC,CAAC,KAAK,EAAE,GAAG,GAAG,oBAAoB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,SAAS,CAAC,EAAE;YACV,UAAU,EAAE,MAAM,CAAC;YACnB,cAAc,EAAE,MAAM,CAAC;YACvB,OAAO,EAAE,GAAG,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;SACf,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AAEF,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAE5D,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG,4BAA4B,GAAG,IAAI,CAAC;KAC/D,CAAC;IAEF;;OAEG;IACH,qBAAqB,EAAE;QACrB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;KAClC,CAAC;CACH,CAAC;AAiBF,eAAO,MAAM,sCAAsC,QAC7C,4BAKH,CAAC;AAEJ,MAAM,MAAM,8BAA8B,GACxC,qCAAqC,CAAC;AAExC,MAAM,MAAM,qCAAqC,GAAG,wBAAwB,CAC1E,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACvC,uCAAuC,CAAC;AAE1C,MAAM,MAAM,uCAAuC,GACjD,0BAA0B,CACxB,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB,0BAA0B,GAC1B,8CAA8C,GAC9C,oDAAoD,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,SAAS,CACtD,OAAO,cAAc,EACrB,8BAA8B,GAAG,cAAc,EAC/C,6BAA6B,GAAG,aAAa,CAC9C,CAAC;;;;;;;;;;;;;;;;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,6BAC3C,OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;IASC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAsB,EACtB,UAAU,GACX,EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;QAC1B,UAAU,CAAC,EAAE,cAAc,CAAC;KAC7B;IAkDK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAiFpC"}
+{"version":3,"file":"DeFiPositionsController.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,8DAA8D,EAC9D,oDAAoD,EACrD,0CAA0C;AAC3C,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAE3B,kCAAkC;AAEnC,OAAO,KAAK,EAAE,0BAA0B,EAAE,qCAAqC;AAE/E,OAAO,KAAK,EAAE,SAAS,EAAE,4BAA4B;AAErD,OAAO,KAAK,EAAE,8CAA8C,EAAE,yCAAyC;AACvG,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAM3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,mCAA+B;AAInE,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,MAAM,MAAM,4BAA4B,GAAG;IACzC,CAAC,KAAK,EAAE,GAAG,GAAG,oBAAoB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,SAAS,CAAC,EAAE;YACV,UAAU,EAAE,MAAM,CAAC;YACnB,cAAc,EAAE,MAAM,CAAC;YACvB,OAAO,EAAE,GAAG,CAAC;YACb,KAAK,EAAE,MAAM,CAAC;SACf,EAAE,CAAC;KACL,CAAC;CACH,CAAC;AAEF,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAE5D,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG,4BAA4B,GAAG,IAAI,CAAC;KAC/D,CAAC;IAEF;;OAEG;IACH,qBAAqB,EAAE;QACrB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAAC;KAClC,CAAC;CACH,CAAC;AAiBF,eAAO,MAAM,sCAAsC,QAC7C,4BAKH,CAAC;AAEJ,MAAM,MAAM,8BAA8B,GACxC,qCAAqC,CAAC;AAExC,MAAM,MAAM,qCAAqC,GAAG,wBAAwB,CAC1E,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEF,MAAM,MAAM,6BAA6B,GACvC,uCAAuC,CAAC;AAE1C,MAAM,MAAM,uCAAuC,GACjD,0BAA0B,CACxB,OAAO,cAAc,EACrB,4BAA4B,CAC7B,CAAC;AAEJ;;GAEG;AACH,MAAM,MAAM,cAAc,GACxB,8DAA8D,CAAC;AAEjE;;GAEG;AACH,MAAM,MAAM,aAAa,GACrB,0BAA0B,GAC1B,8CAA8C,GAC9C,oDAAoD,CAAC;AAEzD;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,SAAS,CACtD,OAAO,cAAc,EACrB,8BAA8B,GAAG,cAAc,EAC/C,6BAA6B,GAAG,aAAa,CAC9C,CAAC;;;;;;;;;;;;;;;;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,6BAC3C,OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;IASC;;;;;;;OAOG;gBACS,EACV,SAAS,EACT,SAAsB,EACtB,UAAU,GACX,EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;QAC1B,UAAU,CAAC,EAAE,cAAc,CAAC;KAC7B;IAiDK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAiFpC"}

package/dist/DeFiPositionsController/DeFiPositionsController.mjs

@@ -68,9 +68,8 @@ export class DeFiPositionsController extends StaticIntervalPollingController() {
         });
         this.messenger.subscribe('TransactionController:transactionConfirmed', async (transactionMeta) => {
             const selectedAddress = __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_getSelectedEvmAdress).call(this);
-            if (!selectedAddress ||
-                selectedAddress.toLowerCase() !==
-                    transactionMeta.txParams.from.toLowerCase()) {
+            if (selectedAddress?.toLowerCase() !==
+                transactionMeta.txParams.from.toLowerCase()) {
                 return;
             }
             await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, selectedAddress);

package/dist/DeFiPositionsController/DeFiPositionsController.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"DeFiPositionsController.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n} from '@metamask/account-tree-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport { isEvmAccountType } from '@metamask/keyring-api';\nimport type { KeyringControllerLockEvent } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { Messenger } from '@metamask/messenger';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { TransactionControllerTransactionConfirmedEvent } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport { calculateDeFiPositionMetrics } from './calculate-defi-metrics';\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupDeFiPositions } from './group-defi-positions';\nimport type { GroupedDeFiPositions } from './group-defi-positions';\n\nconst TEN_MINUTES_IN_MS = 600_000;\n\nconst controllerName = 'DeFiPositionsController';\n\nexport type GroupedDeFiPositionsPerChain = {\n  [chain: Hex]: GroupedDeFiPositions;\n};\n\nexport type TrackingEventPayload = {\n  event: string;\n  category: string;\n  properties: {\n    totalPositions: number;\n    totalMarketValueUSD: number;\n    breakdown?: {\n      protocolId: string;\n      marketValueUSD: number;\n      chainId: Hex;\n      count: number;\n    }[];\n  };\n};\n\ntype TrackEventHook = (event: TrackingEventPayload) => void;\n\nexport type DeFiPositionsControllerState = {\n  /**\n   * Object containing DeFi positions per account and network\n   */\n  allDeFiPositions: {\n    [accountAddress: string]: GroupedDeFiPositionsPerChain | null;\n  };\n\n  /**\n   * Object containing DeFi positions count per account\n   */\n  allDeFiPositionsCount: {\n    [accountAddress: string]: number;\n  };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n  allDeFiPositions: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n  allDeFiPositionsCount: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: false,\n  },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n  (): DeFiPositionsControllerState => {\n    return {\n      allDeFiPositions: {},\n      allDeFiPositionsCount: {},\n    };\n  };\n\nexport type DeFiPositionsControllerActions =\n  DeFiPositionsControllerGetStateAction;\n\nexport type DeFiPositionsControllerGetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerState\n>;\n\nexport type DeFiPositionsControllerEvents =\n  DeFiPositionsControllerStateChangeEvent;\n\nexport type DeFiPositionsControllerStateChangeEvent =\n  ControllerStateChangeEvent<\n    typeof controllerName,\n    DeFiPositionsControllerState\n  >;\n\n/**\n * The external actions available to the {@link DeFiPositionsController}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsController}.\n */\nexport type AllowedEvents =\n  | KeyringControllerLockEvent\n  | TransactionControllerTransactionConfirmedEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent;\n\n/**\n * The messenger of the {@link DeFiPositionsController}.\n */\nexport type DeFiPositionsControllerMessenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerActions | AllowedActions,\n  DeFiPositionsControllerEvents | AllowedEvents\n>;\n\n/**\n * Controller that stores assets and exposes convenience methods\n */\nexport class DeFiPositionsController extends StaticIntervalPollingController()<\n  typeof controllerName,\n  DeFiPositionsControllerState,\n  DeFiPositionsControllerMessenger\n> {\n  readonly #fetchPositions: (\n    accountAddress: string,\n  ) => Promise<DefiPositionResponse[]>;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #trackEvent?: TrackEventHook;\n\n  /**\n   * DeFiPositionsController constuctor\n   *\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)\n   * @param options.trackEvent - Function to track events. (default: undefined)\n   */\n  constructor({\n    messenger,\n    isEnabled = () => true,\n    trackEvent,\n  }: {\n    messenger: DeFiPositionsControllerMessenger;\n    isEnabled?: () => boolean;\n    trackEvent?: TrackEventHook;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: getDefaultDefiPositionsControllerState(),\n    });\n\n    this.setIntervalLength(TEN_MINUTES_IN_MS);\n\n    this.#fetchPositions = buildPositionFetcher();\n    this.#isEnabled = isEnabled;\n\n    this.messenger.subscribe('KeyringController:lock', () => {\n      this.stopAllPolling();\n    });\n\n    this.messenger.subscribe(\n      'TransactionController:transactionConfirmed',\n      async (transactionMeta) => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (\n          !selectedAddress ||\n          selectedAddress.toLowerCase() !==\n            transactionMeta.txParams.from.toLowerCase()\n        ) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      async () => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (!selectedAddress) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.#trackEvent = trackEvent;\n  }\n\n  async _executePoll(): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAddress = this.#getSelectedEvmAdress();\n\n    if (!selectedAddress) {\n      return;\n    }\n\n    const accountPositions = await this.#fetchAccountPositions(selectedAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[selectedAddress] = accountPositions;\n    });\n  }\n\n  async #updateAccountPositions(accountAddress: string): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const accountPositionsPerChain =\n      await this.#fetchAccountPositions(accountAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[accountAddress] = accountPositionsPerChain;\n    });\n  }\n\n  async #fetchAccountPositions(\n    accountAddress: string,\n  ): Promise<GroupedDeFiPositionsPerChain | null> {\n    try {\n      const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n      const groupedDeFiPositions = groupDeFiPositions(defiPositionsResponse);\n\n      try {\n        this.#updatePositionsCountMetrics(groupedDeFiPositions, accountAddress);\n      } catch (error) {\n        console.error(\n          `Failed to update positions count for account ${accountAddress}:`,\n          error,\n        );\n      }\n\n      return groupedDeFiPositions;\n    } catch {\n      return null;\n    }\n  }\n\n  #updatePositionsCountMetrics(\n    groupedDeFiPositions: GroupedDeFiPositionsPerChain,\n    accountAddress: string,\n  ) {\n    // If no track event passed then skip the metrics update\n    if (!this.#trackEvent) {\n      return;\n    }\n\n    const defiMetrics = calculateDeFiPositionMetrics(groupedDeFiPositions);\n    const { totalPositions } = defiMetrics.properties;\n\n    if (totalPositions !== this.state.allDeFiPositionsCount[accountAddress]) {\n      this.update((state) => {\n        state.allDeFiPositionsCount[accountAddress] = totalPositions;\n      });\n\n      this.#trackEvent?.(defiMetrics);\n    }\n  }\n\n  #getSelectedEvmAdress(): string | undefined {\n    return this.messenger\n      .call('AccountTreeController:getAccountsFromSelectedAccountGroup')\n      .find((account: InternalAccount) => isEvmAccountType(account.type))\n      ?.address;\n  }\n}\n"]}
+{"version":3,"file":"DeFiPositionsController.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";;;;;;;;;;;;AASA,OAAO,EAAE,gBAAgB,EAAE,8BAA8B;AAIzD,OAAO,EAAE,+BAA+B,EAAE,qCAAqC;AAI/E,OAAO,EAAE,4BAA4B,EAAE,qCAAiC;AAExE,OAAO,EAAE,oBAAoB,EAAE,8BAA0B;AACzD,OAAO,EAAE,kBAAkB,EAAE,mCAA+B;AAG5D,MAAM,iBAAiB,GAAG,MAAO,CAAC;AAElC,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAuCjD,MAAM,kBAAkB,GAAgD;IACtE,gBAAgB,EAAE;QAChB,kBAAkB,EAAE,KAAK;QACzB,OAAO,EAAE,KAAK;QACd,sBAAsB,EAAE,KAAK;QAC7B,QAAQ,EAAE,IAAI;KACf;IACD,qBAAqB,EAAE;QACrB,kBAAkB,EAAE,KAAK;QACzB,OAAO,EAAE,KAAK;QACd,sBAAsB,EAAE,KAAK;QAC7B,QAAQ,EAAE,KAAK;KAChB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GACjD,GAAiC,EAAE;IACjC,OAAO;QACL,gBAAgB,EAAE,EAAE;QACpB,qBAAqB,EAAE,EAAE;KAC1B,CAAC;AACJ,CAAC,CAAC;AA0CJ;;GAEG;AACH,MAAM,OAAO,uBAAwB,SAAQ,+BAA+B,EAI3E;IASC;;;;;;;OAOG;IACH,YAAY,EACV,SAAS,EACT,SAAS,GAAG,GAAG,EAAE,CAAC,IAAI,EACtB,UAAU,GAKX;QACC,KAAK,CAAC;YACJ,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,kBAAkB;YAC5B,SAAS;YACT,KAAK,EAAE,sCAAsC,EAAE;SAChD,CAAC,CAAC;;QA9BI,0DAE4B;QAE5B,qDAA0B;QAE1B,sDAA6B;QA0BpC,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;QAE1C,uBAAA,IAAI,2CAAmB,oBAAoB,EAAE,MAAA,CAAC;QAC9C,uBAAA,IAAI,sCAAc,SAAS,MAAA,CAAC;QAE5B,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,wBAAwB,EAAE,GAAG,EAAE;YACtD,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,CAAC,SAAS,CACtB,4CAA4C,EAC5C,KAAK,EAAE,eAAe,EAAE,EAAE;YACxB,MAAM,eAAe,GAAG,uBAAA,IAAI,yFAAsB,MAA1B,IAAI,CAAwB,CAAC;YAErD,IACE,eAAe,EAAE,WAAW,EAAE;gBAC9B,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,EAC3C,CAAC;gBACD,OAAO;YACT,CAAC;YAED,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,eAAe,CAAC,CAAC;QACtD,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,SAAS,CACtB,kDAAkD,EAClD,KAAK,IAAI,EAAE;YACT,MAAM,eAAe,GAAG,uBAAA,IAAI,yFAAsB,MAA1B,IAAI,CAAwB,CAAC;YAErD,IAAI,CAAC,eAAe,EAAE,CAAC;gBACrB,OAAO;YACT,CAAC;YAED,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,eAAe,CAAC,CAAC;QACtD,CAAC,CACF,CAAC;QAEF,uBAAA,IAAI,uCAAe,UAAU,MAAA,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,uBAAA,IAAI,0CAAW,MAAf,IAAI,CAAa,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,uBAAA,IAAI,yFAAsB,MAA1B,IAAI,CAAwB,CAAC;QAErD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,uBAAA,IAAI,0FAAuB,MAA3B,IAAI,EAAwB,eAAe,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACpB,KAAK,CAAC,gBAAgB,CAAC,eAAe,CAAC,GAAG,gBAAgB,CAAC;QAC7D,CAAC,CAAC,CAAC;IACL,CAAC;CAiEF;wQA/DC,KAAK,0DAAyB,cAAsB;IAClD,IAAI,CAAC,uBAAA,IAAI,0CAAW,MAAf,IAAI,CAAa,EAAE,CAAC;QACvB,OAAO;IACT,CAAC;IAED,MAAM,wBAAwB,GAC5B,MAAM,uBAAA,IAAI,0FAAuB,MAA3B,IAAI,EAAwB,cAAc,CAAC,CAAC;IAEpD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpB,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,wBAAwB,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC,mDAED,KAAK,yDACH,cAAsB;IAEtB,IAAI,CAAC;QACH,MAAM,qBAAqB,GAAG,MAAM,uBAAA,IAAI,+CAAgB,MAApB,IAAI,EAAiB,cAAc,CAAC,CAAC;QAEzE,MAAM,oBAAoB,GAAG,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;QAEvE,IAAI,CAAC;YACH,uBAAA,IAAI,gGAA6B,MAAjC,IAAI,EAA8B,oBAAoB,EAAE,cAAc,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CACX,gDAAgD,cAAc,GAAG,EACjE,KAAK,CACN,CAAC;QACJ,CAAC;QAED,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,uHAGC,oBAAkD,EAClD,cAAsB;IAEtB,wDAAwD;IACxD,IAAI,CAAC,uBAAA,IAAI,2CAAY,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACvE,MAAM,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,UAAU,CAAC;IAElD,IAAI,cAAc,KAAK,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,cAAc,CAAC,EAAE,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YACpB,KAAK,CAAC,qBAAqB,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,uBAAA,IAAI,2CAAY,EAAE,KAAlB,IAAI,EAAe,WAAW,CAAC,CAAC;IAClC,CAAC;AACH,CAAC;IAGC,OAAO,IAAI,CAAC,SAAS;SAClB,IAAI,CAAC,2DAA2D,CAAC;SACjE,IAAI,CAAC,CAAC,OAAwB,EAAE,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACnE,EAAE,OAAO,CAAC;AACd,CAAC","sourcesContent":["import type {\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction,\n  AccountTreeControllerSelectedAccountGroupChangeEvent,\n} from '@metamask/account-tree-controller';\nimport type {\n  ControllerGetStateAction,\n  ControllerStateChangeEvent,\n  StateMetadata,\n} from '@metamask/base-controller';\nimport { isEvmAccountType } from '@metamask/keyring-api';\nimport type { KeyringControllerLockEvent } from '@metamask/keyring-controller';\nimport type { InternalAccount } from '@metamask/keyring-internal-api';\nimport type { Messenger } from '@metamask/messenger';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { TransactionControllerTransactionConfirmedEvent } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport { calculateDeFiPositionMetrics } from './calculate-defi-metrics';\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupDeFiPositions } from './group-defi-positions';\nimport type { GroupedDeFiPositions } from './group-defi-positions';\n\nconst TEN_MINUTES_IN_MS = 600_000;\n\nconst controllerName = 'DeFiPositionsController';\n\nexport type GroupedDeFiPositionsPerChain = {\n  [chain: Hex]: GroupedDeFiPositions;\n};\n\nexport type TrackingEventPayload = {\n  event: string;\n  category: string;\n  properties: {\n    totalPositions: number;\n    totalMarketValueUSD: number;\n    breakdown?: {\n      protocolId: string;\n      marketValueUSD: number;\n      chainId: Hex;\n      count: number;\n    }[];\n  };\n};\n\ntype TrackEventHook = (event: TrackingEventPayload) => void;\n\nexport type DeFiPositionsControllerState = {\n  /**\n   * Object containing DeFi positions per account and network\n   */\n  allDeFiPositions: {\n    [accountAddress: string]: GroupedDeFiPositionsPerChain | null;\n  };\n\n  /**\n   * Object containing DeFi positions count per account\n   */\n  allDeFiPositionsCount: {\n    [accountAddress: string]: number;\n  };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n  allDeFiPositions: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: true,\n  },\n  allDeFiPositionsCount: {\n    includeInStateLogs: false,\n    persist: false,\n    includeInDebugSnapshot: false,\n    usedInUi: false,\n  },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n  (): DeFiPositionsControllerState => {\n    return {\n      allDeFiPositions: {},\n      allDeFiPositionsCount: {},\n    };\n  };\n\nexport type DeFiPositionsControllerActions =\n  DeFiPositionsControllerGetStateAction;\n\nexport type DeFiPositionsControllerGetStateAction = ControllerGetStateAction<\n  typeof controllerName,\n  DeFiPositionsControllerState\n>;\n\nexport type DeFiPositionsControllerEvents =\n  DeFiPositionsControllerStateChangeEvent;\n\nexport type DeFiPositionsControllerStateChangeEvent =\n  ControllerStateChangeEvent<\n    typeof controllerName,\n    DeFiPositionsControllerState\n  >;\n\n/**\n * The external actions available to the {@link DeFiPositionsController}.\n */\nexport type AllowedActions =\n  AccountTreeControllerGetAccountsFromSelectedAccountGroupAction;\n\n/**\n * The external events available to the {@link DeFiPositionsController}.\n */\nexport type AllowedEvents =\n  | KeyringControllerLockEvent\n  | TransactionControllerTransactionConfirmedEvent\n  | AccountTreeControllerSelectedAccountGroupChangeEvent;\n\n/**\n * The messenger of the {@link DeFiPositionsController}.\n */\nexport type DeFiPositionsControllerMessenger = Messenger<\n  typeof controllerName,\n  DeFiPositionsControllerActions | AllowedActions,\n  DeFiPositionsControllerEvents | AllowedEvents\n>;\n\n/**\n * Controller that stores assets and exposes convenience methods\n */\nexport class DeFiPositionsController extends StaticIntervalPollingController()<\n  typeof controllerName,\n  DeFiPositionsControllerState,\n  DeFiPositionsControllerMessenger\n> {\n  readonly #fetchPositions: (\n    accountAddress: string,\n  ) => Promise<DefiPositionResponse[]>;\n\n  readonly #isEnabled: () => boolean;\n\n  readonly #trackEvent?: TrackEventHook;\n\n  /**\n   * DeFiPositionsController constuctor\n   *\n   * @param options - Constructor options.\n   * @param options.messenger - The controller messenger.\n   * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)\n   * @param options.trackEvent - Function to track events. (default: undefined)\n   */\n  constructor({\n    messenger,\n    isEnabled = () => true,\n    trackEvent,\n  }: {\n    messenger: DeFiPositionsControllerMessenger;\n    isEnabled?: () => boolean;\n    trackEvent?: TrackEventHook;\n  }) {\n    super({\n      name: controllerName,\n      metadata: controllerMetadata,\n      messenger,\n      state: getDefaultDefiPositionsControllerState(),\n    });\n\n    this.setIntervalLength(TEN_MINUTES_IN_MS);\n\n    this.#fetchPositions = buildPositionFetcher();\n    this.#isEnabled = isEnabled;\n\n    this.messenger.subscribe('KeyringController:lock', () => {\n      this.stopAllPolling();\n    });\n\n    this.messenger.subscribe(\n      'TransactionController:transactionConfirmed',\n      async (transactionMeta) => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (\n          selectedAddress?.toLowerCase() !==\n          transactionMeta.txParams.from.toLowerCase()\n        ) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.messenger.subscribe(\n      'AccountTreeController:selectedAccountGroupChange',\n      async () => {\n        const selectedAddress = this.#getSelectedEvmAdress();\n\n        if (!selectedAddress) {\n          return;\n        }\n\n        await this.#updateAccountPositions(selectedAddress);\n      },\n    );\n\n    this.#trackEvent = trackEvent;\n  }\n\n  async _executePoll(): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const selectedAddress = this.#getSelectedEvmAdress();\n\n    if (!selectedAddress) {\n      return;\n    }\n\n    const accountPositions = await this.#fetchAccountPositions(selectedAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[selectedAddress] = accountPositions;\n    });\n  }\n\n  async #updateAccountPositions(accountAddress: string): Promise<void> {\n    if (!this.#isEnabled()) {\n      return;\n    }\n\n    const accountPositionsPerChain =\n      await this.#fetchAccountPositions(accountAddress);\n\n    this.update((state) => {\n      state.allDeFiPositions[accountAddress] = accountPositionsPerChain;\n    });\n  }\n\n  async #fetchAccountPositions(\n    accountAddress: string,\n  ): Promise<GroupedDeFiPositionsPerChain | null> {\n    try {\n      const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n      const groupedDeFiPositions = groupDeFiPositions(defiPositionsResponse);\n\n      try {\n        this.#updatePositionsCountMetrics(groupedDeFiPositions, accountAddress);\n      } catch (error) {\n        console.error(\n          `Failed to update positions count for account ${accountAddress}:`,\n          error,\n        );\n      }\n\n      return groupedDeFiPositions;\n    } catch {\n      return null;\n    }\n  }\n\n  #updatePositionsCountMetrics(\n    groupedDeFiPositions: GroupedDeFiPositionsPerChain,\n    accountAddress: string,\n  ) {\n    // If no track event passed then skip the metrics update\n    if (!this.#trackEvent) {\n      return;\n    }\n\n    const defiMetrics = calculateDeFiPositionMetrics(groupedDeFiPositions);\n    const { totalPositions } = defiMetrics.properties;\n\n    if (totalPositions !== this.state.allDeFiPositionsCount[accountAddress]) {\n      this.update((state) => {\n        state.allDeFiPositionsCount[accountAddress] = totalPositions;\n      });\n\n      this.#trackEvent?.(defiMetrics);\n    }\n  }\n\n  #getSelectedEvmAdress(): string | undefined {\n    return this.messenger\n      .call('AccountTreeController:getAccountsFromSelectedAccountGroup')\n      .find((account: InternalAccount) => isEvmAccountType(account.type))\n      ?.address;\n  }\n}\n"]}

package/dist/TokenBalancesController.cjs

@@ -123,7 +123,7 @@ class TokenBalancesController extends (0, polling_controller_1.StaticIntervalPol
             return this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
         });
         _TokenBalancesController_createAccountsApiFetcher.set(this, () => {
-            const originalFetcher = new api_balance_fetcher_1.AccountsApiBalanceFetcher(__classPrivateFieldGet(this, _TokenBalancesController_platform, "f"), __classPrivateFieldGet(this, _TokenBalancesController_getProvider, "f"));
+            const originalFetcher = new api_balance_fetcher_1.AccountsApiBalanceFetcher(__classPrivateFieldGet(this, _TokenBalancesController_platform, "f"), __classPrivateFieldGet(this, _TokenBalancesController_getProvider, "f"), () => this.state.tokenBalances);
             return {
                 // Dynamically check allowExternalServices() at call time, not just at construction time
                 supports: (chainId) => __classPrivateFieldGet(this, _TokenBalancesController_allowExternalServices, "f").call(this) &&
@@ -660,8 +660,7 @@ _TokenBalancesController_platform = new WeakMap(), _TokenBalancesController_quer
             return false;
         }
         const stakingContractAddress = AssetsContractController_1.STAKING_CONTRACT_ADDRESS_BY_CHAINID[balance.chainId];
-        return (stakingContractAddress &&
-            stakingContractAddress.toLowerCase() === balance.token.toLowerCase());
+        return (stakingContractAddress?.toLowerCase() === balance.token.toLowerCase());
     });
     if (!stakedBalances.length) {
         return [];