npm - @metamask-previews/assets-controllers - Versions diffs - 56.0.0-preview-9d7b1fa6 → 56.0.0-preview-20c091f4 - Mend

@metamask-previews/assets-controllers 56.0.0-preview-9d7b1fa6 → 56.0.0-preview-20c091f4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
+### Added
+- Add a new DeFiPositionsController that keeps an update list of DeFi positions for EVM accounts ([#5400](https://github.com/MetaMask/core/pull/5400))
 ## [56.0.0]
 ### Changed

package/README.md CHANGED Viewed

@@ -19,6 +19,7 @@ This package features the following controllers:
 - [**CollectibleDetectionController**](src/CollectibleDetectionController.ts) keeps a periodically updated list of ERC-721 tokens assigned to the currently selected address.
 - [**CollectiblesController**](src/CollectiblesController.ts) tracks ERC-721 and ERC-1155 tokens assigned to the currently selected address, using OpenSea to retrieve token information.
 - [**CurrencyRateController**](src/CurrencyRateController.ts) keeps a periodically updated value of the exchange rate from the currently selected "native" currency to another (handling testnet tokens specially).
+- [**DeFiPositionsController**](src/DeFiPositionsController/DeFiPositionsController.ts.ts) keeps a periodically updated value of the DeFi positions for the owner EVM addresses.
 - [**RatesController**](src/RatesController/RatesController.ts) keeps a periodically updated value for the exchange rates for different cryptocurrencies. The difference between the `RatesController` and `CurrencyRateController` is that the second one is coupled to the `NetworksController` and is EVM specific, whilst the first one can handle different blockchain currencies like BTC and SOL.
 - [**TokenBalancesController**](src/TokenBalancesController.ts) keeps a periodically updated set of balances for the current set of ERC-20 tokens.
 - [**TokenDetectionController**](src/TokenDetectionController.ts) keeps a periodically updated list of ERC-20 tokens assigned to the currently selected address.

package/dist/DeFiPositionsController/DeFiPositionsController.cjs CHANGED Viewed

@@ -10,12 +10,15 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _DeFiPositionsController_instances, _DeFiPositionsController_fetchPositions, _DeFiPositionsController_updateAccountPositions;
+var _DeFiPositionsController_instances, _DeFiPositionsController_fetchPositions, _DeFiPositionsController_isEnabled, _DeFiPositionsController_updateAccountPositions, _DeFiPositionsController_fetchAccountPositions;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeFiPositionsController = exports.getDefaultDefiPositionsControllerState = void 0;
-const base_controller_1 = require("@metamask/base-controller");
+const polling_controller_1 = require("@metamask/polling-controller");
 const fetch_positions_1 = require("./fetch-positions.cjs");
 const group_positions_1 = require("./group-positions.cjs");
+const assetsUtil_1 = require("../assetsUtil.cjs");
+const TEN_MINUTES_IN_MS = 60000;
+const FETCH_POSITIONS_BATCH_SIZE = 10;
 const controllerName = 'DeFiPositionsController';
 const controllerMetadata = {
     allDeFiPositions: {
@@ -32,48 +35,92 @@ exports.getDefaultDefiPositionsControllerState = getDefaultDefiPositionsControll
 /**
  * Controller that stores assets and exposes convenience methods
  */
-class DeFiPositionsController extends base_controller_1.BaseController {
+class DeFiPositionsController extends (0, polling_controller_1.StaticIntervalPollingController)() {
     /**
      * Tokens controller options
      *
      * @param options - Constructor options.
      * @param options.messenger - The controller messenger.
-     * @param options.state - Initial state to set on this controller.
-     * @param options.apiUrl - Override for theAPI URL to use for fetching DeFi positions.
+     * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)
      */
-    constructor({ messenger, state, apiUrl, }) {
+    constructor({ messenger, isEnabled = () => true, }) {
         super({
             name: controllerName,
             metadata: controllerMetadata,
             messenger,
-            state: {
-                ...(0, exports.getDefaultDefiPositionsControllerState)(),
-                ...state,
-            },
+            state: (0, exports.getDefaultDefiPositionsControllerState)(),
         });
         _DeFiPositionsController_instances.add(this);
         _DeFiPositionsController_fetchPositions.set(this, void 0);
-        __classPrivateFieldSet(this, _DeFiPositionsController_fetchPositions, (0, fetch_positions_1.buildPositionFetcher)(apiUrl), "f");
-        this.messagingSystem.subscribe('AccountsController:selectedAccountChange', async (selectedAccount) => {
-            await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, selectedAccount.address);
+        _DeFiPositionsController_isEnabled.set(this, void 0);
+        this.setIntervalLength(TEN_MINUTES_IN_MS);
+        __classPrivateFieldSet(this, _DeFiPositionsController_fetchPositions, (0, fetch_positions_1.buildPositionFetcher)(), "f");
+        __classPrivateFieldSet(this, _DeFiPositionsController_isEnabled, isEnabled, "f");
+        this.messagingSystem.subscribe('KeyringController:unlock', async () => {
+            this.startPolling(null);
+        });
+        this.messagingSystem.subscribe('KeyringController:lock', () => {
+            this.stopAllPolling();
+        });
+        this.messagingSystem.subscribe('TransactionController:transactionConfirmed', async (transactionMeta) => {
+            if (!__classPrivateFieldGet(this, _DeFiPositionsController_isEnabled, "f").call(this)) {
+                return;
+            }
+            await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, transactionMeta.txParams.from);
         });
-        this.messagingSystem.subscribe('NetworkController:stateChange', async () => {
-            const { address } = this.messagingSystem.call('AccountsController:getSelectedAccount');
-            if (address) {
-                await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, address);
+        this.messagingSystem.subscribe('AccountsController:accountAdded', async (account) => {
+            if (!__classPrivateFieldGet(this, _DeFiPositionsController_isEnabled, "f").call(this) || !account.type.startsWith('eip155:')) {
+                return;
             }
+            await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, account.address);
+        });
+    }
+    async _executePoll() {
+        if (!__classPrivateFieldGet(this, _DeFiPositionsController_isEnabled, "f").call(this)) {
+            return;
+        }
+        const accounts = this.messagingSystem.call('AccountsController:listAccounts');
+        const results = await (0, assetsUtil_1.reduceInBatchesSerially)({
+            initialResult: [],
+            values: accounts,
+            batchSize: FETCH_POSITIONS_BATCH_SIZE,
+            eachBatch: async (workingResult, batch) => {
+                const batchResults = (await Promise.all(batch.map(async ({ address: accountAddress, type }) => {
+                    if (type.startsWith('eip155:')) {
+                        const positions = await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_fetchAccountPositions).call(this, accountAddress);
+                        return {
+                            accountAddress,
+                            positions,
+                        };
+                    }
+                    return undefined;
+                }))).filter(Boolean);
+                return [...workingResult, ...batchResults];
+            },
+        });
+        const allDefiPositions = results.reduce((acc, { accountAddress, positions }) => {
+            acc[accountAddress] = positions;
+            return acc;
+        }, {});
+        this.update((state) => {
+            state.allDeFiPositions = allDefiPositions;
         });
     }
 }
 exports.DeFiPositionsController = DeFiPositionsController;
-_DeFiPositionsController_fetchPositions = new WeakMap(), _DeFiPositionsController_instances = new WeakSet(), _DeFiPositionsController_updateAccountPositions = async function _DeFiPositionsController_updateAccountPositions(accountAddress) {
-    this.update((state) => {
-        state.allDeFiPositions[accountAddress] = null;
-    });
-    const defiPositionsResponse = await __classPrivateFieldGet(this, _DeFiPositionsController_fetchPositions, "f").call(this, accountAddress);
-    const accountPositionsPerChain = (0, group_positions_1.groupPositions)(defiPositionsResponse);
+_DeFiPositionsController_fetchPositions = new WeakMap(), _DeFiPositionsController_isEnabled = new WeakMap(), _DeFiPositionsController_instances = new WeakSet(), _DeFiPositionsController_updateAccountPositions = async function _DeFiPositionsController_updateAccountPositions(accountAddress) {
+    const accountPositionsPerChain = await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_fetchAccountPositions).call(this, accountAddress);
     this.update((state) => {
         state.allDeFiPositions[accountAddress] = accountPositionsPerChain;
     });
+}, _DeFiPositionsController_fetchAccountPositions = async function _DeFiPositionsController_fetchAccountPositions(accountAddress) {
+    try {
+        const defiPositionsResponse = await __classPrivateFieldGet(this, _DeFiPositionsController_fetchPositions, "f").call(this, accountAddress);
+        return (0, group_positions_1.groupPositions)(defiPositionsResponse);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    }
+    catch (error) {
+        return null;
+    }
 };
 //# sourceMappingURL=DeFiPositionsController.cjs.map

package/dist/DeFiPositionsController/DeFiPositionsController.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeFiPositionsController.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAUA,+DAA2D;AAK3D,2DAAyD;AACzD,2DAA0E;AAE1E,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAWjD,MAAM,kBAAkB,GAAgD;IACtE,gBAAgB,EAAE;QAChB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;KACjB;CACF,CAAC;AAEK,MAAM,sCAAsC,GACjD,GAAiC,EAAE;IACjC,OAAO;QACL,gBAAgB,EAAE,EAAE;KACrB,CAAC;AACJ,CAAC,CAAC;AALS,QAAA,sCAAsC,0CAK/C;AA0CJ;;GAEG;AACH,MAAa,uBAAwB,SAAQ,gCAI5C;IAKC;;;;;;;OAOG;IACH,YAAY,EACV,SAAS,EACT,KAAK,EACL,MAAM,GAKP;QACC,KAAK,CAAC;YACJ,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,kBAAkB;YAC5B,SAAS;YACT,KAAK,EAAE;gBACL,GAAG,IAAA,8CAAsC,GAAE;gBAC3C,GAAG,KAAK;aACT;SACF,CAAC,CAAC;;QA7BI,0DAE4B;QA6BnC,uBAAA,IAAI,2CAAmB,IAAA,sCAAoB,EAAC,MAAM,CAAC,MAAA,CAAC;QAEpD,IAAI,CAAC,eAAe,CAAC,SAAS,CAC5B,0CAA0C,EAC1C,KAAK,EAAE,eAAe,EAAE,EAAE;YACxB,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,eAAe,CAAC,OAAO,CAAC,CAAC;QAC9D,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,SAAS,CAC5B,+BAA+B,EAC/B,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAC3C,uCAAuC,CACxC,CAAC;YAEF,IAAI,OAAO,EAAE;gBACX,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,OAAO,CAAC,CAAC;aAC7C;QACH,CAAC,CACF,CAAC;IACJ,CAAC;CAeF;AAxED,0DAwEC;+JAbC,KAAK,0DAAyB,cAAsB;IAClD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpB,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,MAAM,uBAAA,IAAI,+CAAgB,MAApB,IAAI,EAAiB,cAAc,CAAC,CAAC;IAEzE,MAAM,wBAAwB,GAAG,IAAA,gCAAc,EAAC,qBAAqB,CAAC,CAAC;IAEvE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpB,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,wBAAwB,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type {\n AccountsControllerGetSelectedAccountAction,\n AccountsControllerSelectedAccountChangeEvent,\n} from '@metamask/accounts-controller';\nimport type {\n ControllerGetStateAction,\n ControllerStateChangeEvent,\n RestrictedMessenger,\n StateMetadata,\n} from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type { NetworkControllerStateChangeEvent } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupPositions, type GroupedPositions } from './group-positions';\n\nconst controllerName = 'DeFiPositionsController';\n\nexport type DeFiPositionsControllerState = {\n /*\n Object containing DeFi positions per account and network\n /\n allDeFiPositions: {\n [accountAddress: string]: { [chain: Hex]: GroupedPositions } \| null;\n };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n allDeFiPositions: {\n persist: false,\n anonymous: false,\n },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n (): DeFiPositionsControllerState => {\n return {\n allDeFiPositions: {},\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 = AccountsControllerGetSelectedAccountAction;\n\n/\n The external events available to the {@link DeFiPositionsController}.\n /\nexport type AllowedEvents =\n \| NetworkControllerStateChangeEvent\n \| AccountsControllerSelectedAccountChangeEvent;\n\n/\n The messenger of the {@link DeFiPositionsController}.\n /\nexport type DeFiPositionsControllerMessenger = RestrictedMessenger<\n typeof controllerName,\n DeFiPositionsControllerActions \| AllowedActions,\n DeFiPositionsControllerEvents \| AllowedEvents,\n AllowedActions['type'],\n AllowedEvents['type']\n>;\n\n/\n Controller that stores assets and exposes convenience methods\n /\nexport class DeFiPositionsController extends BaseController<\n typeof controllerName,\n DeFiPositionsControllerState,\n DeFiPositionsControllerMessenger\n> {\n readonly #fetchPositions: (\n accountAddress: string,\n ) => Promise<DefiPositionResponse[]>;\n\n /\n Tokens controller options\n \n @param options - Constructor options.\n * @param options.messenger - The controller messenger.\n * @param options.state - Initial state to set on this controller.\n * @param options.apiUrl - Override for theAPI URL to use for fetching DeFi positions.\n */\n constructor({\n messenger,\n state,\n apiUrl,\n }: {\n messenger: DeFiPositionsControllerMessenger;\n state?: Partial<DeFiPositionsControllerState>;\n apiUrl?: string;\n }) {\n super({\n name: controllerName,\n metadata: controllerMetadata,\n messenger,\n state: {\n ...getDefaultDefiPositionsControllerState(),\n ...state,\n },\n });\n\n this.#fetchPositions = buildPositionFetcher(apiUrl);\n\n this.messagingSystem.subscribe(\n 'AccountsController:selectedAccountChange',\n async (selectedAccount) => {\n await this.#updateAccountPositions(selectedAccount.address);\n },\n );\n\n this.messagingSystem.subscribe(\n 'NetworkController:stateChange',\n async () => {\n const { address } = this.messagingSystem.call(\n 'AccountsController:getSelectedAccount',\n );\n\n if (address) {\n await this.#updateAccountPositions(address);\n }\n },\n );\n }\n\n async #updateAccountPositions(accountAddress: string) {\n this.update((state) => {\n state.allDeFiPositions[accountAddress] = null;\n });\n\n const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n const accountPositionsPerChain = groupPositions(defiPositionsResponse);\n\n this.update((state) => {\n state.allDeFiPositions[accountAddress] = accountPositionsPerChain;\n });\n }\n}\n"]}
1	+ {"version":3,"file":"DeFiPositionsController.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n AccountsControllerAccountAddedEvent,\n AccountsControllerListAccountsAction,\n} from '@metamask/accounts-controller';\nimport type {\n ControllerGetStateAction,\n ControllerStateChangeEvent,\n RestrictedMessenger,\n StateMetadata,\n} from '@metamask/base-controller';\nimport type { KeyringControllerUnlockEvent } from '@metamask/keyring-controller';\nimport type { KeyringControllerLockEvent } from '@metamask/keyring-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { TransactionControllerTransactionConfirmedEvent } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupPositions, type GroupedPositions } from './group-positions';\nimport { reduceInBatchesSerially } from '../assetsUtil';\n\nconst TEN_MINUTES_IN_MS = 60_000;\n\nconst FETCH_POSITIONS_BATCH_SIZE = 10;\n\nconst controllerName = 'DeFiPositionsController';\n\ntype GroupedPositionsPerChain = {\n [chain: Hex]: GroupedPositions;\n};\n\nexport type DeFiPositionsControllerState = {\n /*\n Object containing DeFi positions per account and network\n /\n allDeFiPositions: {\n [accountAddress: string]: GroupedPositionsPerChain \| null;\n };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n allDeFiPositions: {\n persist: false,\n anonymous: false,\n },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n (): DeFiPositionsControllerState => {\n return {\n allDeFiPositions: {},\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 DeFiPositionsControllerAllowedActions =\n AccountsControllerListAccountsAction;\n\n/\n The external events available to the {@link DeFiPositionsController}.\n /\nexport type DeFiPositionsControllerAllowedEvents =\n \| KeyringControllerUnlockEvent\n \| KeyringControllerLockEvent\n \| TransactionControllerTransactionConfirmedEvent\n \| AccountsControllerAccountAddedEvent;\n\n/\n The messenger of the {@link DeFiPositionsController}.\n /\nexport type DeFiPositionsControllerMessenger = RestrictedMessenger<\n typeof controllerName,\n DeFiPositionsControllerActions \| DeFiPositionsControllerAllowedActions,\n DeFiPositionsControllerEvents \| DeFiPositionsControllerAllowedEvents,\n DeFiPositionsControllerAllowedActions['type'],\n DeFiPositionsControllerAllowedEvents['type']\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 /\n Tokens controller options\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 */\n constructor({\n messenger,\n isEnabled = () => true,\n }: {\n messenger: DeFiPositionsControllerMessenger;\n isEnabled?: () => boolean;\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.messagingSystem.subscribe('KeyringController:unlock', async () => {\n this.startPolling(null);\n });\n\n this.messagingSystem.subscribe('KeyringController:lock', () => {\n this.stopAllPolling();\n });\n\n this.messagingSystem.subscribe(\n 'TransactionController:transactionConfirmed',\n async (transactionMeta) => {\n if (!this.#isEnabled()) {\n return;\n }\n\n await this.#updateAccountPositions(transactionMeta.txParams.from);\n },\n );\n\n this.messagingSystem.subscribe(\n 'AccountsController:accountAdded',\n async (account) => {\n if (!this.#isEnabled() \|\| !account.type.startsWith('eip155:')) {\n return;\n }\n\n await this.#updateAccountPositions(account.address);\n },\n );\n }\n\n async _executePoll(): Promise<void> {\n if (!this.#isEnabled()) {\n return;\n }\n\n const accounts = this.messagingSystem.call(\n 'AccountsController:listAccounts',\n );\n\n const results = await reduceInBatchesSerially({\n initialResult: [] as {\n accountAddress: string;\n positions: GroupedPositionsPerChain \| null;\n }[],\n values: accounts,\n batchSize: FETCH_POSITIONS_BATCH_SIZE,\n eachBatch: async (workingResult, batch) => {\n const batchResults = (\n await Promise.all(\n batch.map(async ({ address: accountAddress, type }) => {\n if (type.startsWith('eip155:')) {\n const positions =\n await this.#fetchAccountPositions(accountAddress);\n\n return {\n accountAddress,\n positions,\n };\n }\n\n return undefined;\n }),\n )\n ).filter(Boolean) as {\n accountAddress: string;\n positions: GroupedPositionsPerChain \| null;\n }[];\n\n return [...workingResult, ...batchResults];\n },\n });\n\n const allDefiPositions = results.reduce(\n (acc, { accountAddress, positions }) => {\n acc[accountAddress] = positions;\n return acc;\n },\n {} as DeFiPositionsControllerState['allDeFiPositions'],\n );\n\n this.update((state) => {\n state.allDeFiPositions = allDefiPositions;\n });\n }\n\n async #updateAccountPositions(accountAddress: string): Promise<void> {\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<GroupedPositionsPerChain \| null> {\n try {\n const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n return groupPositions(defiPositionsResponse);\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n } catch (error) {\n return null;\n }\n }\n}\n"]}

package/dist/DeFiPositionsController/DeFiPositionsController.d.cts CHANGED Viewed

@@ -1,18 +1,21 @@
-import type { AccountsControllerGetSelectedAccountAction, AccountsControllerSelectedAccountChangeEvent } from "@metamask/accounts-controller";
+/// <reference types="node" />
+import type { AccountsControllerAccountAddedEvent, AccountsControllerListAccountsAction } from "@metamask/accounts-controller";
 import type { ControllerGetStateAction, ControllerStateChangeEvent, RestrictedMessenger } from "@metamask/base-controller";
-import { BaseController } from "@metamask/base-controller";
-import type { NetworkControllerStateChangeEvent } from "@metamask/network-controller";
+import type { KeyringControllerUnlockEvent } from "@metamask/keyring-controller";
+import type { KeyringControllerLockEvent } from "@metamask/keyring-controller";
+import type { TransactionControllerTransactionConfirmedEvent } from "@metamask/transaction-controller";
 import type { Hex } from "@metamask/utils";
 import { type GroupedPositions } from "./group-positions.cjs";
 declare const controllerName = "DeFiPositionsController";
+type GroupedPositionsPerChain = {
+    [chain: Hex]: GroupedPositions;
+};
 export type DeFiPositionsControllerState = {
     /**
      * Object containing DeFi positions per account and network
      */
     allDeFiPositions: {
-        [accountAddress: string]: {
-            [chain: Hex]: GroupedPositions;
-        } | null;
+        [accountAddress: string]: GroupedPositionsPerChain | null;
     };
 };
 export declare const getDefaultDefiPositionsControllerState: () => DeFiPositionsControllerState;
@@ -23,33 +26,47 @@ export type DeFiPositionsControllerStateChangeEvent = ControllerStateChangeEvent
 /**
  * The external actions available to the {@link DeFiPositionsController}.
  */
-export type AllowedActions = AccountsControllerGetSelectedAccountAction;
+export type DeFiPositionsControllerAllowedActions = AccountsControllerListAccountsAction;
 /**
  * The external events available to the {@link DeFiPositionsController}.
  */
-export type AllowedEvents = NetworkControllerStateChangeEvent | AccountsControllerSelectedAccountChangeEvent;
+export type DeFiPositionsControllerAllowedEvents = KeyringControllerUnlockEvent | KeyringControllerLockEvent | TransactionControllerTransactionConfirmedEvent | AccountsControllerAccountAddedEvent;
 /**
  * The messenger of the {@link DeFiPositionsController}.
  */
-export type DeFiPositionsControllerMessenger = RestrictedMessenger<typeof controllerName, DeFiPositionsControllerActions | AllowedActions, DeFiPositionsControllerEvents | AllowedEvents, AllowedActions['type'], AllowedEvents['type']>;
+export type DeFiPositionsControllerMessenger = RestrictedMessenger<typeof controllerName, DeFiPositionsControllerActions | DeFiPositionsControllerAllowedActions, DeFiPositionsControllerEvents | DeFiPositionsControllerAllowedEvents, DeFiPositionsControllerAllowedActions['type'], DeFiPositionsControllerAllowedEvents['type']>;
+declare const DeFiPositionsController_base: (abstract new (...args: any[]) => {
+    readonly "__#14@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#14@#intervalLength": number | undefined;
+    setIntervalLength(intervalLength: number): void;
+    getIntervalLength(): number | undefined;
+    _startPolling(input: import("@metamask/utils").Json): void;
+    _stopPollingByPollingTokenSetId(key: string): void;
+    readonly "__#3@#pollingTokenSets": Map<string, Set<string>>;
+    "__#3@#callbacks": Map<string, Set<(input: import("@metamask/utils").Json) => void>>;
+    _executePoll(input: import("@metamask/utils").Json): Promise<void>;
+    startPolling(input: import("@metamask/utils").Json): string;
+    stopAllPolling(): void;
+    stopPollingByPollingToken(pollingToken: string): void;
+    onPollingComplete(input: import("@metamask/utils").Json, callback: (input: import("@metamask/utils").Json) => void): void;
+}) & typeof import("@metamask/base-controller").BaseController;
 /**
  * Controller that stores assets and exposes convenience methods
  */
-export declare class DeFiPositionsController extends BaseController<typeof controllerName, DeFiPositionsControllerState, DeFiPositionsControllerMessenger> {
+export declare class DeFiPositionsController extends DeFiPositionsController_base<typeof controllerName, DeFiPositionsControllerState, DeFiPositionsControllerMessenger> {
     #private;
     /**
      * Tokens controller options
      *
      * @param options - Constructor options.
      * @param options.messenger - The controller messenger.
-     * @param options.state - Initial state to set on this controller.
-     * @param options.apiUrl - Override for theAPI URL to use for fetching DeFi positions.
+     * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)
      */
-    constructor({ messenger, state, apiUrl, }: {
+    constructor({ messenger, isEnabled, }: {
         messenger: DeFiPositionsControllerMessenger;
-        state?: Partial<DeFiPositionsControllerState>;
-        apiUrl?: string;
+        isEnabled?: () => boolean;
     });
+    _executePoll(): Promise<void>;
 }
 export {};
 //# sourceMappingURL=DeFiPositionsController.d.cts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"DeFiPositionsController.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,~~0CAA0C~~,~~EAC1C~~,~~4CAA4C~~,~~EAC7C~~,sCAAsC;AACvC,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,mBAAmB,EAEpB,kCAAkC;AACnC,OAAO,EAAE,~~cAAc~~,EAAE,~~kCAAkC~~;~~AAC3D~~,OAAO,KAAK,EAAE,~~iCAAiC~~,EAAE,qCAAqC;~~AACtF~~,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,EAAkB,KAAK,gBAAgB,EAAE,8BAA0B;~~AAE1E~~,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG~~;YAAE~~,~~CAAC~~,~~KAAK,EAAE,~~GAAG,~~GAAG,gBAAgB,CAAA;SAAE,GAAG,~~IAAI,CAAC;~~KACrE~~,CAAC;CACH,CAAC;AASF,eAAO,MAAM,sCAAsC,QAC7C,4BAIH,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~~,~~GAAG~~,~~0CAA0C~~,CAAC;~~AAExE~~;;GAEG;AACH,MAAM,MAAM,~~aAAa~~,~~GACrB~~,~~iCAAiC~~,~~GACjC~~,~~4CAA4C~~,CAAC;~~AAEjD~~;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,mBAAmB,CAChE,OAAO,cAAc,EACrB,8BAA8B,GAAG,~~cAAc~~,~~EAC/C~~,6BAA6B,GAAG,~~aAAa~~,~~EAC7C~~,~~cAAc~~,CAAC,MAAM,CAAC,~~EACtB~~,~~aAAa~~,CAAC,MAAM,CAAC,~~CACtB~~,CAAC;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,~~cAAc~~,~~CACzD,~~OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;~~IAKC;;;;;;;OAOG~~;gBACS,EACV,SAAS,EACT,~~KAAK~~,~~EACL~~,~~MAAM,GACP,~~EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,~~KAAK~~,CAAC,EAAE,OAAO,CAAC,~~4BAA4B~~,~~CAAC~~,~~CAAC;QAC9C~~,~~MAAM,~~CAAC,~~EAAE~~,~~MAAM,~~CAAC;~~KACjB;CA+CF~~"}
1	+ {"version":3,"file":"DeFiPositionsController.d.cts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,mCAAmC,EACnC,oCAAoC,EACrC,sCAAsC;AACvC,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,mBAAmB,EAEpB,kCAAkC;AACnC,OAAO,KAAK,EAAE,4BAA4B,EAAE,qCAAqC;AACjF,OAAO,KAAK,EAAE,0BAA0B,EAAE,qCAAqC;AAE/E,OAAO,KAAK,EAAE,8CAA8C,EAAE,yCAAyC;AACvG,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,EAAkB,KAAK,gBAAgB,EAAE,8BAA0B;AAO1E,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,KAAK,wBAAwB,GAAG;IAC9B,CAAC,KAAK,EAAE,GAAG,GAAG,gBAAgB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG,wBAAwB,GAAG,IAAI,CAAC;KAC3D,CAAC;CACH,CAAC;AASF,eAAO,MAAM,sCAAsC,QAC7C,4BAIH,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,qCAAqC,GAC/C,oCAAoC,CAAC;AAEvC;;GAEG;AACH,MAAM,MAAM,oCAAoC,GAC5C,4BAA4B,GAC5B,0BAA0B,GAC1B,8CAA8C,GAC9C,mCAAmC,CAAC;AAExC;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,mBAAmB,CAChE,OAAO,cAAc,EACrB,8BAA8B,GAAG,qCAAqC,EACtE,6BAA6B,GAAG,oCAAoC,EACpE,qCAAqC,CAAC,MAAM,CAAC,EAC7C,oCAAoC,CAAC,MAAM,CAAC,CAC7C,CAAC;;;;;;;;;;;;;;;;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,6BAC3C,OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;IAOC;;;;;;OAMG;gBACS,EACV,SAAS,EACT,SAAsB,GACvB,EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;KAC3B;IA4CK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CA4EpC"}

package/dist/DeFiPositionsController/DeFiPositionsController.d.mts CHANGED Viewed

@@ -1,18 +1,21 @@
-import type { AccountsControllerGetSelectedAccountAction, AccountsControllerSelectedAccountChangeEvent } from "@metamask/accounts-controller";
+/// <reference types="node" />
+import type { AccountsControllerAccountAddedEvent, AccountsControllerListAccountsAction } from "@metamask/accounts-controller";
 import type { ControllerGetStateAction, ControllerStateChangeEvent, RestrictedMessenger } from "@metamask/base-controller";
-import { BaseController } from "@metamask/base-controller";
-import type { NetworkControllerStateChangeEvent } from "@metamask/network-controller";
+import type { KeyringControllerUnlockEvent } from "@metamask/keyring-controller";
+import type { KeyringControllerLockEvent } from "@metamask/keyring-controller";
+import type { TransactionControllerTransactionConfirmedEvent } from "@metamask/transaction-controller";
 import type { Hex } from "@metamask/utils";
 import { type GroupedPositions } from "./group-positions.mjs";
 declare const controllerName = "DeFiPositionsController";
+type GroupedPositionsPerChain = {
+    [chain: Hex]: GroupedPositions;
+};
 export type DeFiPositionsControllerState = {
     /**
      * Object containing DeFi positions per account and network
      */
     allDeFiPositions: {
-        [accountAddress: string]: {
-            [chain: Hex]: GroupedPositions;
-        } | null;
+        [accountAddress: string]: GroupedPositionsPerChain | null;
     };
 };
 export declare const getDefaultDefiPositionsControllerState: () => DeFiPositionsControllerState;
@@ -23,33 +26,47 @@ export type DeFiPositionsControllerStateChangeEvent = ControllerStateChangeEvent
 /**
  * The external actions available to the {@link DeFiPositionsController}.
  */
-export type AllowedActions = AccountsControllerGetSelectedAccountAction;
+export type DeFiPositionsControllerAllowedActions = AccountsControllerListAccountsAction;
 /**
  * The external events available to the {@link DeFiPositionsController}.
  */
-export type AllowedEvents = NetworkControllerStateChangeEvent | AccountsControllerSelectedAccountChangeEvent;
+export type DeFiPositionsControllerAllowedEvents = KeyringControllerUnlockEvent | KeyringControllerLockEvent | TransactionControllerTransactionConfirmedEvent | AccountsControllerAccountAddedEvent;
 /**
  * The messenger of the {@link DeFiPositionsController}.
  */
-export type DeFiPositionsControllerMessenger = RestrictedMessenger<typeof controllerName, DeFiPositionsControllerActions | AllowedActions, DeFiPositionsControllerEvents | AllowedEvents, AllowedActions['type'], AllowedEvents['type']>;
+export type DeFiPositionsControllerMessenger = RestrictedMessenger<typeof controllerName, DeFiPositionsControllerActions | DeFiPositionsControllerAllowedActions, DeFiPositionsControllerEvents | DeFiPositionsControllerAllowedEvents, DeFiPositionsControllerAllowedActions['type'], DeFiPositionsControllerAllowedEvents['type']>;
+declare const DeFiPositionsController_base: (abstract new (...args: any[]) => {
+    readonly "__#14@#intervalIds": Record<string, NodeJS.Timeout>;
+    "__#14@#intervalLength": number | undefined;
+    setIntervalLength(intervalLength: number): void;
+    getIntervalLength(): number | undefined;
+    _startPolling(input: import("@metamask/utils").Json): void;
+    _stopPollingByPollingTokenSetId(key: string): void;
+    readonly "__#3@#pollingTokenSets": Map<string, Set<string>>;
+    "__#3@#callbacks": Map<string, Set<(input: import("@metamask/utils").Json) => void>>;
+    _executePoll(input: import("@metamask/utils").Json): Promise<void>;
+    startPolling(input: import("@metamask/utils").Json): string;
+    stopAllPolling(): void;
+    stopPollingByPollingToken(pollingToken: string): void;
+    onPollingComplete(input: import("@metamask/utils").Json, callback: (input: import("@metamask/utils").Json) => void): void;
+}) & typeof import("@metamask/base-controller").BaseController;
 /**
  * Controller that stores assets and exposes convenience methods
  */
-export declare class DeFiPositionsController extends BaseController<typeof controllerName, DeFiPositionsControllerState, DeFiPositionsControllerMessenger> {
+export declare class DeFiPositionsController extends DeFiPositionsController_base<typeof controllerName, DeFiPositionsControllerState, DeFiPositionsControllerMessenger> {
     #private;
     /**
      * Tokens controller options
      *
      * @param options - Constructor options.
      * @param options.messenger - The controller messenger.
-     * @param options.state - Initial state to set on this controller.
-     * @param options.apiUrl - Override for theAPI URL to use for fetching DeFi positions.
+     * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)
      */
-    constructor({ messenger, state, apiUrl, }: {
+    constructor({ messenger, isEnabled, }: {
         messenger: DeFiPositionsControllerMessenger;
-        state?: Partial<DeFiPositionsControllerState>;
-        apiUrl?: string;
+        isEnabled?: () => boolean;
     });
+    _executePoll(): Promise<void>;
 }
 export {};
 //# sourceMappingURL=DeFiPositionsController.d.mts.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"DeFiPositionsController.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,~~0CAA0C~~,~~EAC1C~~,~~4CAA4C~~,~~EAC7C~~,sCAAsC;AACvC,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,mBAAmB,EAEpB,kCAAkC;AACnC,OAAO,EAAE,~~cAAc~~,EAAE,~~kCAAkC~~;~~AAC3D~~,OAAO,KAAK,EAAE,~~iCAAiC~~,EAAE,qCAAqC;~~AACtF~~,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,EAAkB,KAAK,gBAAgB,EAAE,8BAA0B;~~AAE1E~~,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG~~;YAAE~~,~~CAAC~~,~~KAAK,EAAE,~~GAAG,~~GAAG,gBAAgB,CAAA;SAAE,GAAG,~~IAAI,CAAC;~~KACrE~~,CAAC;CACH,CAAC;AASF,eAAO,MAAM,sCAAsC,QAC7C,4BAIH,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~~,~~GAAG~~,~~0CAA0C~~,CAAC;~~AAExE~~;;GAEG;AACH,MAAM,MAAM,~~aAAa~~,~~GACrB~~,~~iCAAiC~~,~~GACjC~~,~~4CAA4C~~,CAAC;~~AAEjD~~;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,mBAAmB,CAChE,OAAO,cAAc,EACrB,8BAA8B,GAAG,~~cAAc~~,~~EAC/C~~,6BAA6B,GAAG,~~aAAa~~,~~EAC7C~~,~~cAAc~~,CAAC,MAAM,CAAC,~~EACtB~~,~~aAAa~~,CAAC,MAAM,CAAC,~~CACtB~~,CAAC;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,~~cAAc~~,~~CACzD,~~OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;~~IAKC;;;;;;;OAOG~~;gBACS,EACV,SAAS,EACT,~~KAAK~~,~~EACL~~,~~MAAM,GACP,~~EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,~~KAAK~~,CAAC,EAAE,OAAO,CAAC,~~4BAA4B~~,~~CAAC~~,~~CAAC;QAC9C~~,~~MAAM,~~CAAC,~~EAAE~~,~~MAAM,~~CAAC;~~KACjB;CA+CF~~"}
1	+ {"version":3,"file":"DeFiPositionsController.d.mts","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EACV,mCAAmC,EACnC,oCAAoC,EACrC,sCAAsC;AACvC,OAAO,KAAK,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,mBAAmB,EAEpB,kCAAkC;AACnC,OAAO,KAAK,EAAE,4BAA4B,EAAE,qCAAqC;AACjF,OAAO,KAAK,EAAE,0BAA0B,EAAE,qCAAqC;AAE/E,OAAO,KAAK,EAAE,8CAA8C,EAAE,yCAAyC;AACvG,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,EAAkB,KAAK,gBAAgB,EAAE,8BAA0B;AAO1E,QAAA,MAAM,cAAc,4BAA4B,CAAC;AAEjD,KAAK,wBAAwB,GAAG;IAC9B,CAAC,KAAK,EAAE,GAAG,GAAG,gBAAgB,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,gBAAgB,EAAE;QAChB,CAAC,cAAc,EAAE,MAAM,GAAG,wBAAwB,GAAG,IAAI,CAAC;KAC3D,CAAC;CACH,CAAC;AASF,eAAO,MAAM,sCAAsC,QAC7C,4BAIH,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,qCAAqC,GAC/C,oCAAoC,CAAC;AAEvC;;GAEG;AACH,MAAM,MAAM,oCAAoC,GAC5C,4BAA4B,GAC5B,0BAA0B,GAC1B,8CAA8C,GAC9C,mCAAmC,CAAC;AAExC;;GAEG;AACH,MAAM,MAAM,gCAAgC,GAAG,mBAAmB,CAChE,OAAO,cAAc,EACrB,8BAA8B,GAAG,qCAAqC,EACtE,6BAA6B,GAAG,oCAAoC,EACpE,qCAAqC,CAAC,MAAM,CAAC,EAC7C,oCAAoC,CAAC,MAAM,CAAC,CAC7C,CAAC;;;;;;;;;;;;;;;;AAEF;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,6BAC3C,OAAO,cAAc,EACrB,4BAA4B,EAC5B,gCAAgC,CACjC;;IAOC;;;;;;OAMG;gBACS,EACV,SAAS,EACT,SAAsB,GACvB,EAAE;QACD,SAAS,EAAE,gCAAgC,CAAC;QAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;KAC3B;IA4CK,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CA4EpC"}

package/dist/DeFiPositionsController/DeFiPositionsController.mjs CHANGED Viewed

@@ -9,10 +9,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _DeFiPositionsController_instances, _DeFiPositionsController_fetchPositions, _DeFiPositionsController_updateAccountPositions;
-import { BaseController } from "@metamask/base-controller";
+var _DeFiPositionsController_instances, _DeFiPositionsController_fetchPositions, _DeFiPositionsController_isEnabled, _DeFiPositionsController_updateAccountPositions, _DeFiPositionsController_fetchAccountPositions;
+import { StaticIntervalPollingController } from "@metamask/polling-controller";
 import { buildPositionFetcher } from "./fetch-positions.mjs";
 import { groupPositions } from "./group-positions.mjs";
+import { reduceInBatchesSerially } from "../assetsUtil.mjs";
+const TEN_MINUTES_IN_MS = 60000;
+const FETCH_POSITIONS_BATCH_SIZE = 10;
 const controllerName = 'DeFiPositionsController';
 const controllerMetadata = {
     allDeFiPositions: {
@@ -28,47 +31,91 @@ export const getDefaultDefiPositionsControllerState = () => {
 /**
  * Controller that stores assets and exposes convenience methods
  */
-export class DeFiPositionsController extends BaseController {
+export class DeFiPositionsController extends StaticIntervalPollingController() {
     /**
      * Tokens controller options
      *
      * @param options - Constructor options.
      * @param options.messenger - The controller messenger.
-     * @param options.state - Initial state to set on this controller.
-     * @param options.apiUrl - Override for theAPI URL to use for fetching DeFi positions.
+     * @param options.isEnabled - Function that returns whether the controller is enabled. (default: () => true)
      */
-    constructor({ messenger, state, apiUrl, }) {
+    constructor({ messenger, isEnabled = () => true, }) {
         super({
             name: controllerName,
             metadata: controllerMetadata,
             messenger,
-            state: {
-                ...getDefaultDefiPositionsControllerState(),
-                ...state,
-            },
+            state: getDefaultDefiPositionsControllerState(),
         });
         _DeFiPositionsController_instances.add(this);
         _DeFiPositionsController_fetchPositions.set(this, void 0);
-        __classPrivateFieldSet(this, _DeFiPositionsController_fetchPositions, buildPositionFetcher(apiUrl), "f");
-        this.messagingSystem.subscribe('AccountsController:selectedAccountChange', async (selectedAccount) => {
-            await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, selectedAccount.address);
+        _DeFiPositionsController_isEnabled.set(this, void 0);
+        this.setIntervalLength(TEN_MINUTES_IN_MS);
+        __classPrivateFieldSet(this, _DeFiPositionsController_fetchPositions, buildPositionFetcher(), "f");
+        __classPrivateFieldSet(this, _DeFiPositionsController_isEnabled, isEnabled, "f");
+        this.messagingSystem.subscribe('KeyringController:unlock', async () => {
+            this.startPolling(null);
+        });
+        this.messagingSystem.subscribe('KeyringController:lock', () => {
+            this.stopAllPolling();
+        });
+        this.messagingSystem.subscribe('TransactionController:transactionConfirmed', async (transactionMeta) => {
+            if (!__classPrivateFieldGet(this, _DeFiPositionsController_isEnabled, "f").call(this)) {
+                return;
+            }
+            await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, transactionMeta.txParams.from);
         });
-        this.messagingSystem.subscribe('NetworkController:stateChange', async () => {
-            const { address } = this.messagingSystem.call('AccountsController:getSelectedAccount');
-            if (address) {
-                await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, address);
+        this.messagingSystem.subscribe('AccountsController:accountAdded', async (account) => {
+            if (!__classPrivateFieldGet(this, _DeFiPositionsController_isEnabled, "f").call(this) || !account.type.startsWith('eip155:')) {
+                return;
             }
+            await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_updateAccountPositions).call(this, account.address);
+        });
+    }
+    async _executePoll() {
+        if (!__classPrivateFieldGet(this, _DeFiPositionsController_isEnabled, "f").call(this)) {
+            return;
+        }
+        const accounts = this.messagingSystem.call('AccountsController:listAccounts');
+        const results = await reduceInBatchesSerially({
+            initialResult: [],
+            values: accounts,
+            batchSize: FETCH_POSITIONS_BATCH_SIZE,
+            eachBatch: async (workingResult, batch) => {
+                const batchResults = (await Promise.all(batch.map(async ({ address: accountAddress, type }) => {
+                    if (type.startsWith('eip155:')) {
+                        const positions = await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_fetchAccountPositions).call(this, accountAddress);
+                        return {
+                            accountAddress,
+                            positions,
+                        };
+                    }
+                    return undefined;
+                }))).filter(Boolean);
+                return [...workingResult, ...batchResults];
+            },
+        });
+        const allDefiPositions = results.reduce((acc, { accountAddress, positions }) => {
+            acc[accountAddress] = positions;
+            return acc;
+        }, {});
+        this.update((state) => {
+            state.allDeFiPositions = allDefiPositions;
         });
     }
 }
-_DeFiPositionsController_fetchPositions = new WeakMap(), _DeFiPositionsController_instances = new WeakSet(), _DeFiPositionsController_updateAccountPositions = async function _DeFiPositionsController_updateAccountPositions(accountAddress) {
-    this.update((state) => {
-        state.allDeFiPositions[accountAddress] = null;
-    });
-    const defiPositionsResponse = await __classPrivateFieldGet(this, _DeFiPositionsController_fetchPositions, "f").call(this, accountAddress);
-    const accountPositionsPerChain = groupPositions(defiPositionsResponse);
+_DeFiPositionsController_fetchPositions = new WeakMap(), _DeFiPositionsController_isEnabled = new WeakMap(), _DeFiPositionsController_instances = new WeakSet(), _DeFiPositionsController_updateAccountPositions = async function _DeFiPositionsController_updateAccountPositions(accountAddress) {
+    const accountPositionsPerChain = await __classPrivateFieldGet(this, _DeFiPositionsController_instances, "m", _DeFiPositionsController_fetchAccountPositions).call(this, accountAddress);
     this.update((state) => {
         state.allDeFiPositions[accountAddress] = accountPositionsPerChain;
     });
+}, _DeFiPositionsController_fetchAccountPositions = async function _DeFiPositionsController_fetchAccountPositions(accountAddress) {
+    try {
+        const defiPositionsResponse = await __classPrivateFieldGet(this, _DeFiPositionsController_fetchPositions, "f").call(this, accountAddress);
+        return groupPositions(defiPositionsResponse);
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    }
+    catch (error) {
+        return null;
+    }
 };
 //# sourceMappingURL=DeFiPositionsController.mjs.map

package/dist/DeFiPositionsController/DeFiPositionsController.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DeFiPositionsController.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":";;;;;;;;;;;;AAUA,OAAO,EAAE,cAAc,EAAE,kCAAkC;AAK3D,OAAO,EAAE,oBAAoB,EAAE,8BAA0B;AACzD,OAAO,EAAE,cAAc,EAAyB,8BAA0B;AAE1E,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAWjD,MAAM,kBAAkB,GAAgD;IACtE,gBAAgB,EAAE;QAChB,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,KAAK;KACjB;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,sCAAsC,GACjD,GAAiC,EAAE;IACjC,OAAO;QACL,gBAAgB,EAAE,EAAE;KACrB,CAAC;AACJ,CAAC,CAAC;AA0CJ;;GAEG;AACH,MAAM,OAAO,uBAAwB,SAAQ,cAI5C;IAKC;;;;;;;OAOG;IACH,YAAY,EACV,SAAS,EACT,KAAK,EACL,MAAM,GAKP;QACC,KAAK,CAAC;YACJ,IAAI,EAAE,cAAc;YACpB,QAAQ,EAAE,kBAAkB;YAC5B,SAAS;YACT,KAAK,EAAE;gBACL,GAAG,sCAAsC,EAAE;gBAC3C,GAAG,KAAK;aACT;SACF,CAAC,CAAC;;QA7BI,0DAE4B;QA6BnC,uBAAA,IAAI,2CAAmB,oBAAoB,CAAC,MAAM,CAAC,MAAA,CAAC;QAEpD,IAAI,CAAC,eAAe,CAAC,SAAS,CAC5B,0CAA0C,EAC1C,KAAK,EAAE,eAAe,EAAE,EAAE;YACxB,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,eAAe,CAAC,OAAO,CAAC,CAAC;QAC9D,CAAC,CACF,CAAC;QAEF,IAAI,CAAC,eAAe,CAAC,SAAS,CAC5B,+BAA+B,EAC/B,KAAK,IAAI,EAAE;YACT,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAC3C,uCAAuC,CACxC,CAAC;YAEF,IAAI,OAAO,EAAE;gBACX,MAAM,uBAAA,IAAI,2FAAwB,MAA5B,IAAI,EAAyB,OAAO,CAAC,CAAC;aAC7C;QACH,CAAC,CACF,CAAC;IACJ,CAAC;CAeF;+JAbC,KAAK,0DAAyB,cAAsB;IAClD,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpB,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,MAAM,uBAAA,IAAI,+CAAgB,MAApB,IAAI,EAAiB,cAAc,CAAC,CAAC;IAEzE,MAAM,wBAAwB,GAAG,cAAc,CAAC,qBAAqB,CAAC,CAAC;IAEvE,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACpB,KAAK,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,wBAAwB,CAAC;IACpE,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type {\n AccountsControllerGetSelectedAccountAction,\n AccountsControllerSelectedAccountChangeEvent,\n} from '@metamask/accounts-controller';\nimport type {\n ControllerGetStateAction,\n ControllerStateChangeEvent,\n RestrictedMessenger,\n StateMetadata,\n} from '@metamask/base-controller';\nimport { BaseController } from '@metamask/base-controller';\nimport type { NetworkControllerStateChangeEvent } from '@metamask/network-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupPositions, type GroupedPositions } from './group-positions';\n\nconst controllerName = 'DeFiPositionsController';\n\nexport type DeFiPositionsControllerState = {\n /*\n Object containing DeFi positions per account and network\n /\n allDeFiPositions: {\n [accountAddress: string]: { [chain: Hex]: GroupedPositions } \| null;\n };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n allDeFiPositions: {\n persist: false,\n anonymous: false,\n },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n (): DeFiPositionsControllerState => {\n return {\n allDeFiPositions: {},\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 = AccountsControllerGetSelectedAccountAction;\n\n/\n The external events available to the {@link DeFiPositionsController}.\n /\nexport type AllowedEvents =\n \| NetworkControllerStateChangeEvent\n \| AccountsControllerSelectedAccountChangeEvent;\n\n/\n The messenger of the {@link DeFiPositionsController}.\n /\nexport type DeFiPositionsControllerMessenger = RestrictedMessenger<\n typeof controllerName,\n DeFiPositionsControllerActions \| AllowedActions,\n DeFiPositionsControllerEvents \| AllowedEvents,\n AllowedActions['type'],\n AllowedEvents['type']\n>;\n\n/\n Controller that stores assets and exposes convenience methods\n /\nexport class DeFiPositionsController extends BaseController<\n typeof controllerName,\n DeFiPositionsControllerState,\n DeFiPositionsControllerMessenger\n> {\n readonly #fetchPositions: (\n accountAddress: string,\n ) => Promise<DefiPositionResponse[]>;\n\n /\n Tokens controller options\n \n @param options - Constructor options.\n * @param options.messenger - The controller messenger.\n * @param options.state - Initial state to set on this controller.\n * @param options.apiUrl - Override for theAPI URL to use for fetching DeFi positions.\n */\n constructor({\n messenger,\n state,\n apiUrl,\n }: {\n messenger: DeFiPositionsControllerMessenger;\n state?: Partial<DeFiPositionsControllerState>;\n apiUrl?: string;\n }) {\n super({\n name: controllerName,\n metadata: controllerMetadata,\n messenger,\n state: {\n ...getDefaultDefiPositionsControllerState(),\n ...state,\n },\n });\n\n this.#fetchPositions = buildPositionFetcher(apiUrl);\n\n this.messagingSystem.subscribe(\n 'AccountsController:selectedAccountChange',\n async (selectedAccount) => {\n await this.#updateAccountPositions(selectedAccount.address);\n },\n );\n\n this.messagingSystem.subscribe(\n 'NetworkController:stateChange',\n async () => {\n const { address } = this.messagingSystem.call(\n 'AccountsController:getSelectedAccount',\n );\n\n if (address) {\n await this.#updateAccountPositions(address);\n }\n },\n );\n }\n\n async #updateAccountPositions(accountAddress: string) {\n this.update((state) => {\n state.allDeFiPositions[accountAddress] = null;\n });\n\n const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n const accountPositionsPerChain = groupPositions(defiPositionsResponse);\n\n this.update((state) => {\n state.allDeFiPositions[accountAddress] = accountPositionsPerChain;\n });\n }\n}\n"]}
1	+ {"version":3,"file":"DeFiPositionsController.mjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/DeFiPositionsController.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n AccountsControllerAccountAddedEvent,\n AccountsControllerListAccountsAction,\n} from '@metamask/accounts-controller';\nimport type {\n ControllerGetStateAction,\n ControllerStateChangeEvent,\n RestrictedMessenger,\n StateMetadata,\n} from '@metamask/base-controller';\nimport type { KeyringControllerUnlockEvent } from '@metamask/keyring-controller';\nimport type { KeyringControllerLockEvent } from '@metamask/keyring-controller';\nimport { StaticIntervalPollingController } from '@metamask/polling-controller';\nimport type { TransactionControllerTransactionConfirmedEvent } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport type { DefiPositionResponse } from './fetch-positions';\nimport { buildPositionFetcher } from './fetch-positions';\nimport { groupPositions, type GroupedPositions } from './group-positions';\nimport { reduceInBatchesSerially } from '../assetsUtil';\n\nconst TEN_MINUTES_IN_MS = 60_000;\n\nconst FETCH_POSITIONS_BATCH_SIZE = 10;\n\nconst controllerName = 'DeFiPositionsController';\n\ntype GroupedPositionsPerChain = {\n [chain: Hex]: GroupedPositions;\n};\n\nexport type DeFiPositionsControllerState = {\n /*\n Object containing DeFi positions per account and network\n /\n allDeFiPositions: {\n [accountAddress: string]: GroupedPositionsPerChain \| null;\n };\n};\n\nconst controllerMetadata: StateMetadata<DeFiPositionsControllerState> = {\n allDeFiPositions: {\n persist: false,\n anonymous: false,\n },\n};\n\nexport const getDefaultDefiPositionsControllerState =\n (): DeFiPositionsControllerState => {\n return {\n allDeFiPositions: {},\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 DeFiPositionsControllerAllowedActions =\n AccountsControllerListAccountsAction;\n\n/\n The external events available to the {@link DeFiPositionsController}.\n /\nexport type DeFiPositionsControllerAllowedEvents =\n \| KeyringControllerUnlockEvent\n \| KeyringControllerLockEvent\n \| TransactionControllerTransactionConfirmedEvent\n \| AccountsControllerAccountAddedEvent;\n\n/\n The messenger of the {@link DeFiPositionsController}.\n /\nexport type DeFiPositionsControllerMessenger = RestrictedMessenger<\n typeof controllerName,\n DeFiPositionsControllerActions \| DeFiPositionsControllerAllowedActions,\n DeFiPositionsControllerEvents \| DeFiPositionsControllerAllowedEvents,\n DeFiPositionsControllerAllowedActions['type'],\n DeFiPositionsControllerAllowedEvents['type']\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 /\n Tokens controller options\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 */\n constructor({\n messenger,\n isEnabled = () => true,\n }: {\n messenger: DeFiPositionsControllerMessenger;\n isEnabled?: () => boolean;\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.messagingSystem.subscribe('KeyringController:unlock', async () => {\n this.startPolling(null);\n });\n\n this.messagingSystem.subscribe('KeyringController:lock', () => {\n this.stopAllPolling();\n });\n\n this.messagingSystem.subscribe(\n 'TransactionController:transactionConfirmed',\n async (transactionMeta) => {\n if (!this.#isEnabled()) {\n return;\n }\n\n await this.#updateAccountPositions(transactionMeta.txParams.from);\n },\n );\n\n this.messagingSystem.subscribe(\n 'AccountsController:accountAdded',\n async (account) => {\n if (!this.#isEnabled() \|\| !account.type.startsWith('eip155:')) {\n return;\n }\n\n await this.#updateAccountPositions(account.address);\n },\n );\n }\n\n async _executePoll(): Promise<void> {\n if (!this.#isEnabled()) {\n return;\n }\n\n const accounts = this.messagingSystem.call(\n 'AccountsController:listAccounts',\n );\n\n const results = await reduceInBatchesSerially({\n initialResult: [] as {\n accountAddress: string;\n positions: GroupedPositionsPerChain \| null;\n }[],\n values: accounts,\n batchSize: FETCH_POSITIONS_BATCH_SIZE,\n eachBatch: async (workingResult, batch) => {\n const batchResults = (\n await Promise.all(\n batch.map(async ({ address: accountAddress, type }) => {\n if (type.startsWith('eip155:')) {\n const positions =\n await this.#fetchAccountPositions(accountAddress);\n\n return {\n accountAddress,\n positions,\n };\n }\n\n return undefined;\n }),\n )\n ).filter(Boolean) as {\n accountAddress: string;\n positions: GroupedPositionsPerChain \| null;\n }[];\n\n return [...workingResult, ...batchResults];\n },\n });\n\n const allDefiPositions = results.reduce(\n (acc, { accountAddress, positions }) => {\n acc[accountAddress] = positions;\n return acc;\n },\n {} as DeFiPositionsControllerState['allDeFiPositions'],\n );\n\n this.update((state) => {\n state.allDeFiPositions = allDefiPositions;\n });\n }\n\n async #updateAccountPositions(accountAddress: string): Promise<void> {\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<GroupedPositionsPerChain \| null> {\n try {\n const defiPositionsResponse = await this.#fetchPositions(accountAddress);\n\n return groupPositions(defiPositionsResponse);\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n } catch (error) {\n return null;\n }\n }\n}\n"]}

package/dist/DeFiPositionsController/fetch-positions.cjs CHANGED Viewed

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildPositionFetcher = exports.DEFAULT_DEFI_POSITIONS_API_URL = void 0;
+exports.buildPositionFetcher = exports.DEFI_POSITIONS_API_URL = void 0;
 // TODO: Update with prod API URL when available
-exports.DEFAULT_DEFI_POSITIONS_API_URL = 'https://defiadapters.dev-api.cx.metamask.io';
+exports.DEFI_POSITIONS_API_URL = 'https://defiadapters.dev-api.cx.metamask.io';
 /**
  * Builds a function that fetches DeFi positions for a given account address
  *
- * @param apiUrl - The URL of the API to fetch the DeFi positions from
  * @returns A function that fetches DeFi positions for a given account address
  */
-function buildPositionFetcher(apiUrl = exports.DEFAULT_DEFI_POSITIONS_API_URL) {
+function buildPositionFetcher() {
     return async (accountAddress) => {
-        const defiPositionsResponse = await fetch(`${apiUrl}/positions/${accountAddress}`);
+        const defiPositionsResponse = await fetch(`${exports.DEFI_POSITIONS_API_URL}/positions/${accountAddress}`);
         if (defiPositionsResponse.status !== 200) {
             throw new Error(`Unable to fetch defi positions - HTTP ${defiPositionsResponse.status}`);
         }

package/dist/DeFiPositionsController/fetch-positions.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fetch-positions.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/fetch-positions.ts"],"names":[],"mappings":";;;AAwDA,gDAAgD;AACnC,QAAA,~~8BAA8B~~,~~GACzC~~,6CAA6C,CAAC;AAEhD~~;;;;;GAKG~~;AACH,SAAgB,oBAAoB~~,CAClC,SAAiB,sCAA8B~~;~~IAE/C~~,OAAO,KAAK,EAAE,cAAsB,EAAmC,EAAE;QACvE,MAAM,qBAAqB,GAAG,MAAM,KAAK,CACvC,GAAG,~~MAAM~~,cAAc,cAAc,EAAE,~~CACxC~~,CAAC;QAEF,IAAI,qBAAqB,CAAC,MAAM,KAAK,GAAG,EAAE;YACxC,MAAM,IAAI,KAAK,CACb,yCAAyC,qBAAqB,CAAC,MAAM,EAAE,CACxE,CAAC;SACH;QAED,OAAO,CAAC,MAAM,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;~~AAhBD~~,~~oDAgBC~~","sourcesContent":["export type DefiPositionResponse = AdapterResponse<{\n tokens: ProtocolToken[];\n}>;\n\ntype ProtocolDetails = {\n chainId: number;\n protocolId: string;\n productId: string;\n name: string;\n description: string;\n iconUrl: string;\n siteUrl: string;\n positionType: PositionType;\n metadata?: {\n groupPositions?: boolean;\n };\n};\n\ntype AdapterResponse<ProtocolResponse> =\n \| (ProtocolDetails & {\n chainName: string;\n } & (\n \| (ProtocolResponse & { success: true })\n \| (AdapterErrorResponse & { success: false })\n ))\n \| (AdapterErrorResponse & { success: false });\n\ntype AdapterErrorResponse = {\n error: {\n message: string;\n };\n};\n\nexport type PositionType = 'supply' \| 'borrow' \| 'stake' \| 'reward';\n\nexport type ProtocolToken = Balance & {\n type: 'protocol';\n tokenId?: string;\n};\n\nexport type Underlying = Balance & {\n type: 'underlying' \| 'underlying-claimable';\n iconUrl: string;\n};\n\nexport type Balance = {\n address: string;\n name: string;\n symbol: string;\n decimals: number;\n balanceRaw: string;\n balance: number;\n price?: number;\n tokens?: Underlying[];\n};\n\n// TODO: Update with prod API URL when available\nexport const ~~DEFAULT_DEFI_POSITIONS_API_URL~~ =\n 'https://defiadapters.dev-api.cx.metamask.io';\n\n/*\n Builds a function that fetches DeFi positions for a given account address\n \n @~~param apiUrl - The URL of the API to fetch the DeFi positions from\n * @~~returns A function that fetches DeFi positions for a given account address\n */\nexport function buildPositionFetcher(~~\n apiUrl: string = DEFAULT_DEFI_POSITIONS_API_URL,\n~~) {\n return async (accountAddress: string): Promise<DefiPositionResponse[]> => {\n const defiPositionsResponse = await fetch(\n `${~~apiUrl~~}/positions/${accountAddress}`,\n );\n\n if (defiPositionsResponse.status !== 200) {\n throw new Error(\n `Unable to fetch defi positions - HTTP ${defiPositionsResponse.status}`,\n );\n }\n\n return (await defiPositionsResponse.json()).data;\n };\n}\n"]}
1	+ {"version":3,"file":"fetch-positions.cjs","sourceRoot":"","sources":["../../src/DeFiPositionsController/fetch-positions.ts"],"names":[],"mappings":";;;AAwDA,gDAAgD;AACnC,QAAA,sBAAsB,GACjC,6CAA6C,CAAC;AAEhD;;;;GAIG;AACH,SAAgB,oBAAoB;IAClC,OAAO,KAAK,EAAE,cAAsB,EAAmC,EAAE;QACvE,MAAM,qBAAqB,GAAG,MAAM,KAAK,CACvC,GAAG,8BAAsB,cAAc,cAAc,EAAE,CACxD,CAAC;QAEF,IAAI,qBAAqB,CAAC,MAAM,KAAK,GAAG,EAAE;YACxC,MAAM,IAAI,KAAK,CACb,yCAAyC,qBAAqB,CAAC,MAAM,EAAE,CACxE,CAAC;SACH;QAED,OAAO,CAAC,MAAM,qBAAqB,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC,CAAC;AACJ,CAAC;AAdD,oDAcC","sourcesContent":["export type DefiPositionResponse = AdapterResponse<{\n tokens: ProtocolToken[];\n}>;\n\ntype ProtocolDetails = {\n chainId: number;\n protocolId: string;\n productId: string;\n name: string;\n description: string;\n iconUrl: string;\n siteUrl: string;\n positionType: PositionType;\n metadata?: {\n groupPositions?: boolean;\n };\n};\n\ntype AdapterResponse<ProtocolResponse> =\n \| (ProtocolDetails & {\n chainName: string;\n } & (\n \| (ProtocolResponse & { success: true })\n \| (AdapterErrorResponse & { success: false })\n ))\n \| (AdapterErrorResponse & { success: false });\n\ntype AdapterErrorResponse = {\n error: {\n message: string;\n };\n};\n\nexport type PositionType = 'supply' \| 'borrow' \| 'stake' \| 'reward';\n\nexport type ProtocolToken = Balance & {\n type: 'protocol';\n tokenId?: string;\n};\n\nexport type Underlying = Balance & {\n type: 'underlying' \| 'underlying-claimable';\n iconUrl: string;\n};\n\nexport type Balance = {\n address: string;\n name: string;\n symbol: string;\n decimals: number;\n balanceRaw: string;\n balance: number;\n price?: number;\n tokens?: Underlying[];\n};\n\n// TODO: Update with prod API URL when available\nexport const DEFI_POSITIONS_API_URL =\n 'https://defiadapters.dev-api.cx.metamask.io';\n\n/*\n Builds a function that fetches DeFi positions for a given account address\n \n @returns A function that fetches DeFi positions for a given account address\n */\nexport function buildPositionFetcher() {\n return async (accountAddress: string): Promise<DefiPositionResponse[]> => {\n const defiPositionsResponse = await fetch(\n `${DEFI_POSITIONS_API_URL}/positions/${accountAddress}`,\n );\n\n if (defiPositionsResponse.status !== 200) {\n throw new Error(\n `Unable to fetch defi positions - HTTP ${defiPositionsResponse.status}`,\n );\n }\n\n return (await defiPositionsResponse.json()).data;\n };\n}\n"]}