Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,8 @@ const config = createConfig([
'packages/accounts-controller/**',
'packages/address-book-controller/**',
'packages/approval-controller/**',
'packages/assets-controller/**',
'packages/assets-controllers/**',
'packages/authenticated-user-storage/**',
'packages/base-controller/**',
'packages/base-data-service/**',
Expand Down Expand Up @@ -411,6 +413,7 @@ const config = createConfig([
'packages/multichain-transactions-controller/**',
'packages/name-controller/**',
'packages/network-connection-banner-controller/**',
'packages/network-enablement-controller/**',
'packages/permission-controller/**',
'packages/permission-log-controller/**',
'packages/platform-api-docs/**',
Expand Down
4 changes: 2 additions & 2 deletions packages/assets-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"changelog:validate": "../../scripts/validate-changelog.sh @metamask/assets-controller",
"lint:tsconfigs": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts",
"lint:tsconfigs:fix": "tsx ../../scripts/lint-tsconfigs/lint-tsconfigs.mts --fix",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --generate",
"messenger-action-types:check": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "tsx ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Do not edit manually.
*/

import type { AssetsController } from './AssetsController';
import type { AssetsController } from './AssetsController.js';

export type AssetsControllerGetAssetsAction = {
type: `AssetsController:getAssets`;
Expand Down
26 changes: 15 additions & 11 deletions packages/assets-controller/src/AssetsController.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,32 @@ import type { NetworkState } from '@metamask/network-controller';
import {
AssetsController,
getDefaultAssetsControllerState,
} from './AssetsController';
} from './AssetsController.js';
import type {
AssetsControllerMessenger,
AssetsControllerState,
} from './AssetsController';
import type { AccountsApiDataSourceConfig } from './data-sources/AccountsApiDataSource';
import type { PriceDataSourceConfig } from './data-sources/PriceDataSource';
import { PriceDataSource } from './data-sources/PriceDataSource';
import { TokenDataSource } from './data-sources/TokenDataSource';
import { buildDefaultAssetsInfo } from './defaults';
import type { Assets3346MigrationState } from './migrations/healAssetsInfoMetadata';
} from './AssetsController.js';
import type { AccountsApiDataSourceConfig } from './data-sources/AccountsApiDataSource.js';
import type { PriceDataSourceConfig } from './data-sources/PriceDataSource.js';
import { PriceDataSource } from './data-sources/PriceDataSource.js';
import { TokenDataSource } from './data-sources/TokenDataSource.js';
import { buildDefaultAssetsInfo } from './defaults.js';
import type { Assets3346MigrationState } from './migrations/healAssetsInfoMetadata.js';
import type {
Caip19AssetId,
AccountId,
DataRequest,
DataResponse,
FungibleAssetMetadata,
} from './types';
import { formatExchangeRatesForBridge, normalizeAssetId } from './utils';
} from './types.js';
import {
formatExchangeRatesForBridge,
normalizeAssetId,
} from './utils/index.js';

jest.mock('./utils', () => {
const actual = jest.requireActual<typeof import('./utils')>('./utils');
const actual =
jest.requireActual<typeof import('./utils/index.js')>('./utils');
return {
...actual,
formatExchangeRatesForBridge: jest.fn(actual.formatExchangeRatesForBridge),
Expand Down
60 changes: 30 additions & 30 deletions packages/assets-controller/src/AssetsController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,45 +73,45 @@ import { Mutex } from 'async-mutex';
import BigNumberJS from 'bignumber.js';
import { isEqual } from 'lodash';

import type { AssetsControllerMethodActions } from './AssetsController-method-action-types';
import type { AssetsControllerMethodActions } from './AssetsController-method-action-types.js';
import type {
AbstractDataSource,
DataSourceState,
SubscriptionRequest,
} from './data-sources/AbstractDataSource';
import type { AccountsApiDataSourceConfig } from './data-sources/AccountsApiDataSource';
import { AccountsApiDataSource } from './data-sources/AccountsApiDataSource';
import { BackendWebsocketDataSource } from './data-sources/BackendWebsocketDataSource';
import { shouldSkipNativeForCaipChainId } from './data-sources/evm-rpc-services/utils/assets';
import type { PriceDataSourceConfig } from './data-sources/PriceDataSource';
import { PriceDataSource } from './data-sources/PriceDataSource';
import type { RpcDataSourceConfig } from './data-sources/RpcDataSource';
import { RpcDataSource } from './data-sources/RpcDataSource';
import type { AccountsControllerAccountBalancesUpdatedEvent } from './data-sources/SnapDataSource';
import { SnapDataSource } from './data-sources/SnapDataSource';
import type { StakedBalanceDataSourceConfig } from './data-sources/StakedBalanceDataSource';
import { StakedBalanceDataSource } from './data-sources/StakedBalanceDataSource';
} from './data-sources/AbstractDataSource.js';
import type { AccountsApiDataSourceConfig } from './data-sources/AccountsApiDataSource.js';
import { AccountsApiDataSource } from './data-sources/AccountsApiDataSource.js';
import { BackendWebsocketDataSource } from './data-sources/BackendWebsocketDataSource.js';
import { shouldSkipNativeForCaipChainId } from './data-sources/evm-rpc-services/utils/assets.js';
import type { PriceDataSourceConfig } from './data-sources/PriceDataSource.js';
import { PriceDataSource } from './data-sources/PriceDataSource.js';
import type { RpcDataSourceConfig } from './data-sources/RpcDataSource.js';
import { RpcDataSource } from './data-sources/RpcDataSource.js';
import type { AccountsControllerAccountBalancesUpdatedEvent } from './data-sources/SnapDataSource.js';
import { SnapDataSource } from './data-sources/SnapDataSource.js';
import type { StakedBalanceDataSourceConfig } from './data-sources/StakedBalanceDataSource.js';
import { StakedBalanceDataSource } from './data-sources/StakedBalanceDataSource.js';
import {
CaipAssetNamespace,
TokenDataSource,
} from './data-sources/TokenDataSource';
} from './data-sources/TokenDataSource.js';
import {
CHAINS_WITH_DEFAULT_TRACKED_ASSETS,
DEFAULT_TRACKED_ASSETS_BY_CHAIN,
buildDefaultAssetsInfo,
getDefaultAssetMetadata,
} from './defaults';
import { AssetsDataSourceError } from './errors';
import { projectLogger, createModuleLogger } from './logger';
import { CustomAssetGraduationMiddleware } from './middlewares/CustomAssetGraduationMiddleware';
import { DetectionMiddleware } from './middlewares/DetectionMiddleware';
} from './defaults.js';
import { AssetsDataSourceError } from './errors.js';
import { projectLogger, createModuleLogger } from './logger.js';
import { CustomAssetGraduationMiddleware } from './middlewares/CustomAssetGraduationMiddleware.js';
import { DetectionMiddleware } from './middlewares/DetectionMiddleware.js';
import {
createParallelBalanceMiddleware,
createParallelMiddleware,
} from './middlewares/ParallelMiddleware';
import { RpcFallbackMiddleware } from './middlewares/RpcFallbackMiddleware';
import type { Assets3346MigrationState } from './migrations/healAssetsInfoMetadata';
import { tempHealAssetsInfoMetadata } from './migrations/healAssetsInfoMetadata';
} from './middlewares/ParallelMiddleware.js';
import { RpcFallbackMiddleware } from './middlewares/RpcFallbackMiddleware.js';
import type { Assets3346MigrationState } from './migrations/healAssetsInfoMetadata.js';
import { tempHealAssetsInfoMetadata } from './migrations/healAssetsInfoMetadata.js';
import type {
AccountId,
AssetPreferences,
Expand All @@ -135,22 +135,22 @@ import type {
Middleware,
SubscriptionResponse,
Asset,
} from './types';
} from './types.js';
import { ZERO_ADDRESS } from './utils/constants.js';
import { pickRpcCustomAssetsSupplement } from './utils/customAssetsRpcSupplement.js';
import {
normalizeAmountString,
normalizeAssetId,
formatExchangeRatesForBridge,
formatStateForTransactionPay,
buildNativeAssetsFromConstant,
buildNativeAssetsFromApi,
} from './utils';
} from './utils/index.js';
import type {
BridgeExchangeRatesFormat,
TransactionPayLegacyFormat,
} from './utils';
import { ZERO_ADDRESS } from './utils/constants';
import { pickRpcCustomAssetsSupplement } from './utils/customAssetsRpcSupplement';
import { processAccountActivityBalanceUpdates } from './utils/processAccountActivityBalanceUpdates';
} from './utils/index.js';
import { processAccountActivityBalanceUpdates } from './utils/processAccountActivityBalanceUpdates.js';

const NATIVE_ASSETS_QUERY_KEY = ['nativeAssets'];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import {
import {
AssetsControllerMessenger,
getDefaultAssetsControllerState,
} from '../AssetsController';
import { STAKING_INTERFACE } from '../data-sources/evm-rpc-services/services/StakedBalanceFetcher';
} from '../AssetsController.js';
import { STAKING_INTERFACE } from '../data-sources/evm-rpc-services/services/StakedBalanceFetcher.js';

// Test escape hatch for mocking areas that do not need explicit types
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import type { ChainId } from '../types';
import type { ChainId } from '../types.js';
import type {
ActiveSubscription,
DataSourceState,
SubscriptionRequest,
} from './AbstractDataSource';
import { AbstractDataSource } from './AbstractDataSource';
} from './AbstractDataSource.js';
import { AbstractDataSource } from './AbstractDataSource.js';

const CHAIN_MAINNET = 'eip155:1' as ChainId;
const CHAIN_POLYGON = 'eip155:137' as ChainId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {
DataRequest,
DataResponse,
AssetsControllerStateInternal,
} from '../types';
} from '../types.js';

// ============================================================================
// DATA SOURCE BASE TYPES
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ import type {
DataRequest,
Context,
AssetsControllerStateInternal,
} from '../types';
} from '../types.js';
import {
SNAPS_ASSETS_MIGRATION_FLAG_KEYS,
SnapsAssetsMigrationStage,
} from '../utils/snaps-assets-migration';
} from '../utils/snaps-assets-migration.js';
import type {
AccountsApiDataSourceOptions,
AccountsApiDataSourceAllowedActions,
AccountsApiDataSourceAllowedEvents,
} from './AccountsApiDataSource';
} from './AccountsApiDataSource.js';
import {
AccountsApiDataSource,
filterResponseToKnownAssets,
} from './AccountsApiDataSource';
} from './AccountsApiDataSource.js';

type AllActions = AccountsApiDataSourceAllowedActions;
type AllEvents = AccountsApiDataSourceAllowedEvents;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
toCaipChainId,
} from '@metamask/utils';

import type { AssetsControllerMessenger } from '../AssetsController';
import { projectLogger, createModuleLogger } from '../logger';
import type { AssetsControllerMessenger } from '../AssetsController.js';
import { projectLogger, createModuleLogger } from '../logger.js';
import type {
ChainId,
Caip19AssetId,
Expand All @@ -23,17 +23,17 @@ import type {
DataResponse,
Middleware,
AssetsControllerStateInternal,
} from '../types';
import { fetchWithTimeout, normalizeAssetId } from '../utils';
} from '../types.js';
import { fetchWithTimeout, normalizeAssetId } from '../utils/index.js';
import {
getMigrationStages,
shouldSupportChain,
} from '../utils/snaps-assets-migration';
} from '../utils/snaps-assets-migration.js';
import type {
DataSourceState,
SubscriptionRequest,
} from './AbstractDataSource';
import { AbstractDataSource } from './AbstractDataSource';
} from './AbstractDataSource.js';
import { AbstractDataSource } from './AbstractDataSource.js';

// ============================================================================
// CONSTANTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ import type { InternalAccount } from '@metamask/keyring-internal-api';
import { Messenger, MOCK_ANY_NAMESPACE } from '@metamask/messenger';
import type { MockAnyNamespace } from '@metamask/messenger';

import type { AssetsControllerMessenger } from '../AssetsController';
import type { Caip19AssetId, ChainId, DataRequest } from '../types';
import type { AssetsControllerMessenger } from '../AssetsController.js';
import type { Caip19AssetId, ChainId, DataRequest } from '../types.js';
import {
BackendWebsocketDataSource,
createBackendWebsocketDataSource,
} from './BackendWebsocketDataSource';
} from './BackendWebsocketDataSource.js';
import type {
BackendWebsocketDataSourceAllowedActions,
BackendWebsocketDataSourceAllowedEvents,
} from './BackendWebsocketDataSource';
} from './BackendWebsocketDataSource.js';

type AllActions = BackendWebsocketDataSourceAllowedActions;
type AllEvents = BackendWebsocketDataSourceAllowedEvents;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import {
toCaipChainId,
} from '@metamask/utils';

import type { AssetsControllerMessenger } from '../AssetsController';
import { projectLogger, createModuleLogger } from '../logger';
import type { ChainId, Caip19AssetId, DataResponse } from '../types';
import { processAccountActivityBalanceUpdates } from '../utils/processAccountActivityBalanceUpdates';
import { AbstractDataSource } from './AbstractDataSource';
import type { AssetsControllerMessenger } from '../AssetsController.js';
import { projectLogger, createModuleLogger } from '../logger.js';
import type { ChainId, Caip19AssetId, DataResponse } from '../types.js';
import { processAccountActivityBalanceUpdates } from '../utils/processAccountActivityBalanceUpdates.js';
import { AbstractDataSource } from './AbstractDataSource.js';
import type {
DataSourceState,
SubscriptionRequest,
} from './AbstractDataSource';
} from './AbstractDataSource.js';

// ============================================================================
// CONSTANTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import type {
Context,
Caip19AssetId,
AssetsControllerStateInternal,
} from '../types';
import { normalizeAssetId } from '../utils';
import type { PriceDataSourceOptions } from './PriceDataSource';
import { PriceDataSource } from './PriceDataSource';
} from '../types.js';
import { normalizeAssetId } from '../utils/index.js';
import type { PriceDataSourceOptions } from './PriceDataSource.js';
import { PriceDataSource } from './PriceDataSource.js';

jest.useFakeTimers();

Expand Down
14 changes: 7 additions & 7 deletions packages/assets-controller/src/data-sources/PriceDataSource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ import type {
import { ApiPlatformClient } from '@metamask/core-backend';
import { parseCaipAssetType } from '@metamask/utils';

import { projectLogger, createModuleLogger } from '../logger';
import { forDataTypes } from '../types';
import { projectLogger, createModuleLogger } from '../logger.js';
import { forDataTypes } from '../types.js';
import type {
Caip19AssetId,
DataRequest,
DataResponse,
FungibleAssetPrice,
Middleware,
AssetsControllerStateInternal,
} from '../types';
import { fetchWithTimeout, normalizeAssetId } from '../utils';
import { DedupingBatchFetcher } from '../utils/dedupingBatchFetcher';
import type { SubscriptionRequest } from './AbstractDataSource';
import { reduceInBatchesSerially } from './evm-rpc-services';
} from '../types.js';
import { DedupingBatchFetcher } from '../utils/dedupingBatchFetcher.js';
import { fetchWithTimeout, normalizeAssetId } from '../utils/index.js';
import type { SubscriptionRequest } from './AbstractDataSource.js';
import { reduceInBatchesSerially } from './evm-rpc-services/index.js';

// ============================================================================
// CONSTANTS
Expand Down
20 changes: 10 additions & 10 deletions packages/assets-controller/src/data-sources/RpcDataSource.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@ import {
createMockAssetControllerMessenger,
MockRootMessenger,
registerRpcDataSourceActions,
} from '../__fixtures__/MockAssetControllerMessenger';
import { getDefaultAssetsControllerState } from '../AssetsController';
import type { AssetsControllerMessenger } from '../AssetsController';
import type { Caip19AssetId, ChainId, DataRequest, Context } from '../types';
import { normalizeAssetId } from '../utils';
import { BalanceFetcher, TokenDetector } from './evm-rpc-services';
} from '../__fixtures__/MockAssetControllerMessenger.js';
import { getDefaultAssetsControllerState } from '../AssetsController.js';
import type { AssetsControllerMessenger } from '../AssetsController.js';
import type { Caip19AssetId, ChainId, DataRequest, Context } from '../types.js';
import { normalizeAssetId } from '../utils/index.js';
import { BalanceFetcher, TokenDetector } from './evm-rpc-services/index.js';
import type {
Address,
BalanceFetchResult,
TokenDetectionResult,
} from './evm-rpc-services';
import { shouldSkipNativeForCaipChainId } from './evm-rpc-services/utils/assets';
import type { RpcDataSourceOptions } from './RpcDataSource';
} from './evm-rpc-services/index.js';
import { shouldSkipNativeForCaipChainId } from './evm-rpc-services/utils/assets.js';
import type { RpcDataSourceOptions } from './RpcDataSource.js';
import {
RpcDataSource,
caipChainIdToHex,
createRpcDataSource,
} from './RpcDataSource';
} from './RpcDataSource.js';

const MOCK_CHAIN_ID_HEX = '0x1';
const MOCK_CHAIN_ID_CAIP = 'eip155:1' as ChainId;
Expand Down
Loading