From 95a566d12241ffac1181d5fe63ca930b6ddefa16 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:35:56 +0200 Subject: [PATCH 01/11] Add .js import extensions to address-book-controller --- eslint.config.mjs | 1 + packages/address-book-controller/package.json | 4 ++-- .../src/AddressBookController-method-action-types.ts | 2 +- .../src/AddressBookController.test.ts | 4 ++-- .../address-book-controller/src/AddressBookController.ts | 2 +- packages/address-book-controller/src/index.ts | 6 +++--- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index c9509beecb9..f81552d053c 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -381,6 +381,7 @@ const config = createConfig([ files: [ 'packages/account-tree-controller/**', 'packages/accounts-controller/**', + 'packages/address-book-controller/**', 'packages/authenticated-user-storage/**', 'packages/base-controller/**', 'packages/base-data-service/**', diff --git a/packages/address-book-controller/package.json b/packages/address-book-controller/package.json index 8904d912112..47befdfcc72 100644 --- a/packages/address-book-controller/package.json +++ b/packages/address-book-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/address-book-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", diff --git a/packages/address-book-controller/src/AddressBookController-method-action-types.ts b/packages/address-book-controller/src/AddressBookController-method-action-types.ts index 5dcfc6b1b22..0c62c5e1f44 100644 --- a/packages/address-book-controller/src/AddressBookController-method-action-types.ts +++ b/packages/address-book-controller/src/AddressBookController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { AddressBookController } from './AddressBookController'; +import type { AddressBookController } from './AddressBookController.js'; /** * Returns all address book entries as an array. diff --git a/packages/address-book-controller/src/AddressBookController.test.ts b/packages/address-book-controller/src/AddressBookController.test.ts index f3064c83750..5139c6be941 100644 --- a/packages/address-book-controller/src/AddressBookController.test.ts +++ b/packages/address-book-controller/src/AddressBookController.test.ts @@ -11,12 +11,12 @@ import type { Hex } from '@metamask/utils'; import type { AddressBookControllerContactDeletedEvent, AddressBookControllerMessenger, -} from './AddressBookController'; +} from './AddressBookController.js'; import { AddressBookController, AddressType, controllerName, -} from './AddressBookController'; +} from './AddressBookController.js'; type AllActions = MessengerActions; diff --git a/packages/address-book-controller/src/AddressBookController.ts b/packages/address-book-controller/src/AddressBookController.ts index 62ad4e66824..08e51b829a6 100644 --- a/packages/address-book-controller/src/AddressBookController.ts +++ b/packages/address-book-controller/src/AddressBookController.ts @@ -13,7 +13,7 @@ import { import type { Messenger } from '@metamask/messenger'; import type { Hex } from '@metamask/utils'; -import type { AddressBookControllerMethodActions } from './AddressBookController-method-action-types'; +import type { AddressBookControllerMethodActions } from './AddressBookController-method-action-types.js'; /** * ContactEntry representation diff --git a/packages/address-book-controller/src/index.ts b/packages/address-book-controller/src/index.ts index 3cf41024037..de2ef0e79ae 100644 --- a/packages/address-book-controller/src/index.ts +++ b/packages/address-book-controller/src/index.ts @@ -10,15 +10,15 @@ export type { AddressBookControllerEvents, AddressBookControllerMessenger, ContactEntry, -} from './AddressBookController'; +} from './AddressBookController.js'; export { getDefaultAddressBookControllerState, AddressBookController, -} from './AddressBookController'; +} from './AddressBookController.js'; export type { AddressBookControllerListAction, AddressBookControllerSetAction, AddressBookControllerDeleteAction, AddressBookControllerClearAction, -} from './AddressBookController-method-action-types'; +} from './AddressBookController-method-action-types.js'; From c2b459509719f62933b016bece75b5ecbd908615 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:36:44 +0200 Subject: [PATCH 02/11] Add .js import extensions to approval-controller --- eslint.config.mjs | 1 + packages/approval-controller/package.json | 4 ++-- .../src/ApprovalController-method-action-types.ts | 2 +- .../approval-controller/src/ApprovalController.test.ts | 8 ++++---- packages/approval-controller/src/ApprovalController.ts | 4 ++-- packages/approval-controller/src/index.ts | 6 +++--- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index f81552d053c..b45d8a17412 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -382,6 +382,7 @@ const config = createConfig([ 'packages/account-tree-controller/**', 'packages/accounts-controller/**', 'packages/address-book-controller/**', + 'packages/approval-controller/**', 'packages/authenticated-user-storage/**', 'packages/base-controller/**', 'packages/base-data-service/**', diff --git a/packages/approval-controller/package.json b/packages/approval-controller/package.json index 28886a3c5a1..22bead46135 100644 --- a/packages/approval-controller/package.json +++ b/packages/approval-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/approval-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", diff --git a/packages/approval-controller/src/ApprovalController-method-action-types.ts b/packages/approval-controller/src/ApprovalController-method-action-types.ts index eff304674ba..b95a2587231 100644 --- a/packages/approval-controller/src/ApprovalController-method-action-types.ts +++ b/packages/approval-controller/src/ApprovalController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { ApprovalController } from './ApprovalController'; +import type { ApprovalController } from './ApprovalController.js'; /** * Adds an approval request per the given arguments, optionally showing diff --git a/packages/approval-controller/src/ApprovalController.test.ts b/packages/approval-controller/src/ApprovalController.test.ts index 1853f6e7172..8d1133a50a9 100644 --- a/packages/approval-controller/src/ApprovalController.test.ts +++ b/packages/approval-controller/src/ApprovalController.test.ts @@ -10,7 +10,7 @@ import type { import { errorCodes, JsonRpcError } from '@metamask/rpc-errors'; import { nanoid } from 'nanoid'; -import { flushPromises } from '../../../tests/helpers'; +import { flushPromises } from '../../../tests/helpers.js'; import type { AddApprovalOptions, ApprovalControllerActions, @@ -19,19 +19,19 @@ import type { ErrorOptions, StartFlowOptions, SuccessOptions, -} from './ApprovalController'; +} from './ApprovalController.js'; import { APPROVAL_TYPE_RESULT_ERROR, APPROVAL_TYPE_RESULT_SUCCESS, ApprovalController, ORIGIN_METAMASK, -} from './ApprovalController'; +} from './ApprovalController.js'; import { ApprovalRequestNoResultSupportError, EndInvalidFlowError, MissingApprovalFlowError, NoApprovalFlowsError, -} from './errors'; +} from './errors.js'; jest.mock('nanoid'); diff --git a/packages/approval-controller/src/ApprovalController.ts b/packages/approval-controller/src/ApprovalController.ts index 0457c0aec89..73cf15154be 100644 --- a/packages/approval-controller/src/ApprovalController.ts +++ b/packages/approval-controller/src/ApprovalController.ts @@ -10,14 +10,14 @@ import { rpcErrors } from '@metamask/rpc-errors'; import type { Json, OptionalField } from '@metamask/utils'; import { nanoid } from 'nanoid'; -import type { ApprovalControllerMethodActions } from './ApprovalController-method-action-types'; +import type { ApprovalControllerMethodActions } from './ApprovalController-method-action-types.js'; import { ApprovalRequestNotFoundError, ApprovalRequestNoResultSupportError, EndInvalidFlowError, NoApprovalFlowsError, MissingApprovalFlowError, -} from './errors'; +} from './errors.js'; // Constants diff --git a/packages/approval-controller/src/index.ts b/packages/approval-controller/src/index.ts index 5a8f6173ff2..740667561c8 100644 --- a/packages/approval-controller/src/index.ts +++ b/packages/approval-controller/src/index.ts @@ -1,4 +1,4 @@ -export * from './ApprovalController'; +export * from './ApprovalController.js'; export type { ApprovalControllerAddRequestAction, ApprovalControllerAddAndShowApprovalRequestAction, @@ -16,5 +16,5 @@ export type { ApprovalControllerSetFlowLoadingTextAction, ApprovalControllerShowSuccessAction, ApprovalControllerShowErrorAction, -} from './ApprovalController-method-action-types'; -export * from './errors'; +} from './ApprovalController-method-action-types.js'; +export * from './errors.js'; From 9ca6939872d249832ffa5b9e25a9bb2090bec930 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:37:41 +0200 Subject: [PATCH 03/11] Add .js import extensions to ens-controller --- eslint.config.mjs | 1 + packages/ens-controller/package.json | 4 ++-- .../ens-controller/src/EnsController-method-action-types.ts | 2 +- packages/ens-controller/src/EnsController.test.ts | 6 +++--- packages/ens-controller/src/EnsController.ts | 2 +- packages/ens-controller/src/index.ts | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index b45d8a17412..a702d5a155f 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -394,6 +394,7 @@ const config = createConfig([ 'packages/controller-utils/**', 'packages/eip-5792-middleware/**', 'packages/eip1193-permission-middleware/**', + 'packages/ens-controller/**', 'packages/eth-block-tracker/**', 'packages/eth-json-rpc-middleware/**', 'packages/eth-json-rpc-provider/**', diff --git a/packages/ens-controller/package.json b/packages/ens-controller/package.json index 626a5b0832b..242110dff7d 100644 --- a/packages/ens-controller/package.json +++ b/packages/ens-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/ens-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", diff --git a/packages/ens-controller/src/EnsController-method-action-types.ts b/packages/ens-controller/src/EnsController-method-action-types.ts index 0cddc37e12d..5b355c8d8d6 100644 --- a/packages/ens-controller/src/EnsController-method-action-types.ts +++ b/packages/ens-controller/src/EnsController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { EnsController } from './EnsController'; +import type { EnsController } from './EnsController.js'; /** * Clears ensResolutionsByAddress state property. diff --git a/packages/ens-controller/src/EnsController.test.ts b/packages/ens-controller/src/EnsController.test.ts index e113c914061..7a93e4cf314 100644 --- a/packages/ens-controller/src/EnsController.test.ts +++ b/packages/ens-controller/src/EnsController.test.ts @@ -20,12 +20,12 @@ import type { import { buildMockGetNetworkClientById, buildCustomNetworkClientConfiguration, -} from '../../network-controller/tests/helpers'; -import { EnsController, DEFAULT_ENS_NETWORK_MAP } from './EnsController'; +} from '../../network-controller/tests/helpers.js'; +import { EnsController, DEFAULT_ENS_NETWORK_MAP } from './EnsController.js'; import type { EnsControllerState, EnsControllerMessenger, -} from './EnsController'; +} from './EnsController.js'; const defaultState: EnsControllerState = { ensEntries: {}, diff --git a/packages/ens-controller/src/EnsController.ts b/packages/ens-controller/src/EnsController.ts index 9d974bce5be..456178f4dad 100644 --- a/packages/ens-controller/src/EnsController.ts +++ b/packages/ens-controller/src/EnsController.ts @@ -25,7 +25,7 @@ import type { Hex } from '@metamask/utils'; import { createProjectLogger } from '@metamask/utils'; import { toASCII } from 'punycode/punycode.js'; -import type { EnsControllerMethodActions } from './EnsController-method-action-types'; +import type { EnsControllerMethodActions } from './EnsController-method-action-types.js'; const log = createProjectLogger('ens-controller'); diff --git a/packages/ens-controller/src/index.ts b/packages/ens-controller/src/index.ts index a2f476a1a05..9b6610d6d88 100644 --- a/packages/ens-controller/src/index.ts +++ b/packages/ens-controller/src/index.ts @@ -1,4 +1,4 @@ -export * from './EnsController'; +export * from './EnsController.js'; export type { EnsControllerResetStateAction, EnsControllerClearAction, @@ -6,4 +6,4 @@ export type { EnsControllerGetAction, EnsControllerSetAction, EnsControllerReverseResolveAddressAction, -} from './EnsController-method-action-types'; +} from './EnsController-method-action-types.js'; From 93fa32a5c5c3722868e86cb6b93b7b638369aa03 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:38:53 +0200 Subject: [PATCH 04/11] Add .js import extensions to gas-fee-controller --- eslint.config.mjs | 1 + packages/gas-fee-controller/package.json | 4 ++-- .../src/GasFeeController-method-action-types.ts | 2 +- .../gas-fee-controller/src/GasFeeController.test.ts | 12 ++++++------ packages/gas-fee-controller/src/GasFeeController.ts | 6 +++--- .../src/determineGasFeeCalculations.test.ts | 6 +++--- .../src/determineGasFeeCalculations.ts | 4 ++-- packages/gas-fee-controller/src/gas-util.test.ts | 4 ++-- packages/gas-fee-controller/src/gas-util.ts | 2 +- packages/gas-fee-controller/src/index.ts | 4 ++-- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index a702d5a155f..3b3e2c985f3 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -398,6 +398,7 @@ const config = createConfig([ 'packages/eth-block-tracker/**', 'packages/eth-json-rpc-middleware/**', 'packages/eth-json-rpc-provider/**', + 'packages/gas-fee-controller/**', 'packages/json-rpc-engine/**', 'packages/json-rpc-middleware-stream/**', 'packages/messenger/**', diff --git a/packages/gas-fee-controller/package.json b/packages/gas-fee-controller/package.json index e4a9c8389d5..a8a42552528 100644 --- a/packages/gas-fee-controller/package.json +++ b/packages/gas-fee-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/gas-fee-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", diff --git a/packages/gas-fee-controller/src/GasFeeController-method-action-types.ts b/packages/gas-fee-controller/src/GasFeeController-method-action-types.ts index 000c9b6a77e..4f50d3ce9a4 100644 --- a/packages/gas-fee-controller/src/GasFeeController-method-action-types.ts +++ b/packages/gas-fee-controller/src/GasFeeController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { GasFeeController } from './GasFeeController'; +import type { GasFeeController } from './GasFeeController.js'; /** * Resets the polling interval by stopping and restarting polling diff --git a/packages/gas-fee-controller/src/GasFeeController.test.ts b/packages/gas-fee-controller/src/GasFeeController.test.ts index 415a067f8f7..17fb08fac35 100644 --- a/packages/gas-fee-controller/src/GasFeeController.test.ts +++ b/packages/gas-fee-controller/src/GasFeeController.test.ts @@ -20,26 +20,26 @@ import type { import type { Hex } from '@metamask/utils'; import nock from 'nock'; -import { flushPromises } from '../../../tests/helpers'; +import { flushPromises } from '../../../tests/helpers.js'; import { buildCustomNetworkConfiguration, buildCustomRpcEndpoint, -} from '../../network-controller/tests/helpers'; -import determineGasFeeCalculations from './determineGasFeeCalculations'; +} from '../../network-controller/tests/helpers.js'; +import determineGasFeeCalculations from './determineGasFeeCalculations.js'; import { fetchGasEstimates, fetchLegacyGasPriceEstimates, fetchEthGasPriceEstimate, calculateTimeEstimate, -} from './gas-util'; -import { GAS_ESTIMATE_TYPES, GasFeeController } from './GasFeeController'; +} from './gas-util.js'; +import { GAS_ESTIMATE_TYPES, GasFeeController } from './GasFeeController.js'; import type { GasFeeMessenger, GasFeeState, GasFeeStateEthGasPrice, GasFeeStateFeeMarket, GasFeeStateLegacy, -} from './GasFeeController'; +} from './GasFeeController.js'; jest.mock('./determineGasFeeCalculations'); diff --git a/packages/gas-fee-controller/src/GasFeeController.ts b/packages/gas-fee-controller/src/GasFeeController.ts index 940dce00529..987430af0ee 100644 --- a/packages/gas-fee-controller/src/GasFeeController.ts +++ b/packages/gas-fee-controller/src/GasFeeController.ts @@ -23,14 +23,14 @@ import { StaticIntervalPollingController } from '@metamask/polling-controller'; import type { Hex } from '@metamask/utils'; import { v1 as random } from 'uuid'; -import determineGasFeeCalculations from './determineGasFeeCalculations'; +import determineGasFeeCalculations from './determineGasFeeCalculations.js'; import { fetchGasEstimates, fetchLegacyGasPriceEstimates, fetchEthGasPriceEstimate, calculateTimeEstimate, -} from './gas-util'; -import type { GasFeeControllerMethodActions } from './GasFeeController-method-action-types'; +} from './gas-util.js'; +import type { GasFeeControllerMethodActions } from './GasFeeController-method-action-types.js'; export const LEGACY_GAS_PRICES_API_URL = `https://api.metaswap.codefi.network/gasPrices`; diff --git a/packages/gas-fee-controller/src/determineGasFeeCalculations.test.ts b/packages/gas-fee-controller/src/determineGasFeeCalculations.test.ts index a8df42bc14c..deaf4f27aed 100644 --- a/packages/gas-fee-controller/src/determineGasFeeCalculations.test.ts +++ b/packages/gas-fee-controller/src/determineGasFeeCalculations.test.ts @@ -1,17 +1,17 @@ -import determineGasFeeCalculations from './determineGasFeeCalculations'; +import determineGasFeeCalculations from './determineGasFeeCalculations.js'; import { fetchGasEstimates, fetchLegacyGasPriceEstimates, fetchEthGasPriceEstimate, calculateTimeEstimate, -} from './gas-util'; +} from './gas-util.js'; import type { unknownString, GasFeeEstimates, LegacyGasPriceEstimate, EthGasPriceEstimate, EstimatedGasFeeTimeBounds, -} from './GasFeeController'; +} from './GasFeeController.js'; jest.mock('./gas-util'); diff --git a/packages/gas-fee-controller/src/determineGasFeeCalculations.ts b/packages/gas-fee-controller/src/determineGasFeeCalculations.ts index b93b86e9bb8..3d8382b451b 100644 --- a/packages/gas-fee-controller/src/determineGasFeeCalculations.ts +++ b/packages/gas-fee-controller/src/determineGasFeeCalculations.ts @@ -4,8 +4,8 @@ import type { GasFeeEstimates, GasFeeState as GasFeeCalculations, LegacyGasPriceEstimate, -} from './GasFeeController'; -import { GAS_ESTIMATE_TYPES } from './GasFeeController'; +} from './GasFeeController.js'; +import { GAS_ESTIMATE_TYPES } from './GasFeeController.js'; type DetermineGasFeeCalculationsRequest = { isEIP1559Compatible: boolean; diff --git a/packages/gas-fee-controller/src/gas-util.test.ts b/packages/gas-fee-controller/src/gas-util.test.ts index baea4369289..aaea5d2370b 100644 --- a/packages/gas-fee-controller/src/gas-util.test.ts +++ b/packages/gas-fee-controller/src/gas-util.test.ts @@ -5,8 +5,8 @@ import { normalizeGWEIDecimalNumbers, fetchGasEstimates, calculateTimeEstimate, -} from './gas-util'; -import type { GasFeeEstimates } from './GasFeeController'; +} from './gas-util.js'; +import type { GasFeeEstimates } from './GasFeeController.js'; const mockEIP1559ApiResponses: GasFeeEstimates[] = [ { diff --git a/packages/gas-fee-controller/src/gas-util.ts b/packages/gas-fee-controller/src/gas-util.ts index 17a242ac8be..adabe9fbf23 100644 --- a/packages/gas-fee-controller/src/gas-util.ts +++ b/packages/gas-fee-controller/src/gas-util.ts @@ -13,7 +13,7 @@ import type { EstimatedGasFeeTimeBounds, unknownString, LegacyGasPriceEstimate, -} from './GasFeeController'; +} from './GasFeeController.js'; const makeClientIdHeader = (clientId: string) => ({ 'X-Client-Id': clientId }); diff --git a/packages/gas-fee-controller/src/index.ts b/packages/gas-fee-controller/src/index.ts index 073a4b4b74a..20a4abf17e0 100644 --- a/packages/gas-fee-controller/src/index.ts +++ b/packages/gas-fee-controller/src/index.ts @@ -1,4 +1,4 @@ -export * from './GasFeeController'; +export * from './GasFeeController.js'; export type { GasFeeControllerResetPollingAction, GasFeeControllerFetchGasFeeEstimatesAction, @@ -8,4 +8,4 @@ export type { GasFeeControllerGetTimeEstimateAction, GasFeeControllerEnableNonRPCGasFeeApisAction, GasFeeControllerDisableNonRPCGasFeeApisAction, -} from './GasFeeController-method-action-types'; +} from './GasFeeController-method-action-types.js'; From f3a136b4ce2945762971cc10acfbed3738719b14 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:39:52 +0200 Subject: [PATCH 05/11] Add .js import extensions to logging-controller --- eslint.config.mjs | 1 + packages/logging-controller/package.json | 4 ++-- .../src/LoggingController-method-action-types.ts | 2 +- .../logging-controller/src/LoggingController.test.ts | 8 ++++---- packages/logging-controller/src/LoggingController.ts | 4 ++-- packages/logging-controller/src/index.ts | 6 +++--- packages/logging-controller/src/logTypes/EthSignLog.ts | 2 +- packages/logging-controller/src/logTypes/GenericLog.ts | 2 +- packages/logging-controller/src/logTypes/index.ts | 10 +++++----- 9 files changed, 20 insertions(+), 19 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 3b3e2c985f3..abb2de1193d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -401,6 +401,7 @@ const config = createConfig([ 'packages/gas-fee-controller/**', 'packages/json-rpc-engine/**', 'packages/json-rpc-middleware-stream/**', + 'packages/logging-controller/**', 'packages/messenger/**', 'packages/messenger-cli/**', 'packages/money-account-controller/**', diff --git a/packages/logging-controller/package.json b/packages/logging-controller/package.json index 9cc8a06be51..0e4a2893177 100644 --- a/packages/logging-controller/package.json +++ b/packages/logging-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/logging-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", diff --git a/packages/logging-controller/src/LoggingController-method-action-types.ts b/packages/logging-controller/src/LoggingController-method-action-types.ts index 74d41e3e6e7..3e2fd71b6aa 100644 --- a/packages/logging-controller/src/LoggingController-method-action-types.ts +++ b/packages/logging-controller/src/LoggingController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { LoggingController } from './LoggingController'; +import type { LoggingController } from './LoggingController.js'; /** * Add log to the state. diff --git a/packages/logging-controller/src/LoggingController.test.ts b/packages/logging-controller/src/LoggingController.test.ts index 43fd99d7a7c..8985c16f727 100644 --- a/packages/logging-controller/src/LoggingController.test.ts +++ b/packages/logging-controller/src/LoggingController.test.ts @@ -7,10 +7,10 @@ import type { } from '@metamask/messenger'; import * as uuid from 'uuid'; -import type { LoggingControllerMessenger } from './LoggingController'; -import { LoggingController } from './LoggingController'; -import { LogType } from './logTypes'; -import { SigningMethod, SigningStage } from './logTypes/EthSignLog'; +import type { LoggingControllerMessenger } from './LoggingController.js'; +import { LoggingController } from './LoggingController.js'; +import { SigningMethod, SigningStage } from './logTypes/EthSignLog.js'; +import { LogType } from './logTypes/index.js'; jest.mock('uuid', () => { return { diff --git a/packages/logging-controller/src/LoggingController.ts b/packages/logging-controller/src/LoggingController.ts index 55c4a7bbb3b..f950cba141a 100644 --- a/packages/logging-controller/src/LoggingController.ts +++ b/packages/logging-controller/src/LoggingController.ts @@ -7,8 +7,8 @@ import { BaseController } from '@metamask/base-controller'; import type { Messenger } from '@metamask/messenger'; import { v1 as random } from 'uuid'; -import type { LoggingControllerMethodActions } from './LoggingController-method-action-types'; -import type { Log } from './logTypes'; +import type { LoggingControllerMethodActions } from './LoggingController-method-action-types.js'; +import type { Log } from './logTypes/index.js'; /** * LogEntry is the entry that will be added to the logging controller state. diff --git a/packages/logging-controller/src/index.ts b/packages/logging-controller/src/index.ts index aaf85b45b3b..662d5365fd7 100644 --- a/packages/logging-controller/src/index.ts +++ b/packages/logging-controller/src/index.ts @@ -1,6 +1,6 @@ -export * from './LoggingController'; +export * from './LoggingController.js'; export type { LoggingControllerAddAction, LoggingControllerClearAction, -} from './LoggingController-method-action-types'; -export * from './logTypes'; +} from './LoggingController-method-action-types.js'; +export * from './logTypes/index.js'; diff --git a/packages/logging-controller/src/logTypes/EthSignLog.ts b/packages/logging-controller/src/logTypes/EthSignLog.ts index 4c90e49ce46..7c58744c12c 100644 --- a/packages/logging-controller/src/logTypes/EthSignLog.ts +++ b/packages/logging-controller/src/logTypes/EthSignLog.ts @@ -1,4 +1,4 @@ -import type { LogType } from './LogType'; +import type { LogType } from './LogType.js'; /** * An enum of the signing method types that we are interested in logging. diff --git a/packages/logging-controller/src/logTypes/GenericLog.ts b/packages/logging-controller/src/logTypes/GenericLog.ts index 9a6e7870cad..2f398143658 100644 --- a/packages/logging-controller/src/logTypes/GenericLog.ts +++ b/packages/logging-controller/src/logTypes/GenericLog.ts @@ -1,4 +1,4 @@ -import type { LogType } from './LogType'; +import type { LogType } from './LogType.js'; /* * The logging controller can handle any kind of log statement that may benefit diff --git a/packages/logging-controller/src/logTypes/index.ts b/packages/logging-controller/src/logTypes/index.ts index e34adbc63a8..c8dc8436593 100644 --- a/packages/logging-controller/src/logTypes/index.ts +++ b/packages/logging-controller/src/logTypes/index.ts @@ -1,5 +1,5 @@ -import type { EthSignLog } from './EthSignLog'; -import type { GenericLog } from './GenericLog'; +import type { EthSignLog } from './EthSignLog.js'; +import type { GenericLog } from './GenericLog.js'; /** * Union of all possible log data structures. @@ -9,6 +9,6 @@ export type Log = EthSignLog | GenericLog; /** * Export all other types from these files for usage by clients */ -export * from './EthSignLog'; -export type * from './GenericLog'; -export * from './LogType'; +export * from './EthSignLog.js'; +export type * from './GenericLog.js'; +export * from './LogType.js'; From 1c3549298bdefd480dd5be6bf1576fcab37fd713 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:40:30 +0200 Subject: [PATCH 06/11] Add .js import extensions to message-manager --- eslint.config.mjs | 1 + .../message-manager/src/AbstractMessageManager.test.ts | 4 ++-- .../message-manager/src/DecryptMessageManager.test.ts | 4 ++-- packages/message-manager/src/DecryptMessageManager.ts | 6 +++--- .../src/EncryptionPublicKeyManager.test.ts | 4 ++-- .../message-manager/src/EncryptionPublicKeyManager.ts | 6 +++--- packages/message-manager/src/index.ts | 8 ++++---- packages/message-manager/src/types.ts | 2 +- packages/message-manager/src/utils.test.ts | 2 +- packages/message-manager/src/utils.ts | 4 ++-- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index abb2de1193d..bf70918453b 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -402,6 +402,7 @@ const config = createConfig([ 'packages/json-rpc-engine/**', 'packages/json-rpc-middleware-stream/**', 'packages/logging-controller/**', + 'packages/message-manager/**', 'packages/messenger/**', 'packages/messenger-cli/**', 'packages/money-account-controller/**', diff --git a/packages/message-manager/src/AbstractMessageManager.test.ts b/packages/message-manager/src/AbstractMessageManager.test.ts index bd12258372f..5ecae7c2b86 100644 --- a/packages/message-manager/src/AbstractMessageManager.test.ts +++ b/packages/message-manager/src/AbstractMessageManager.test.ts @@ -6,14 +6,14 @@ import type { import { ApprovalType } from '@metamask/controller-utils'; import type { Messenger } from '@metamask/messenger'; -import { AbstractMessageManager } from './AbstractMessageManager'; +import { AbstractMessageManager } from './AbstractMessageManager.js'; import type { AbstractMessage, AbstractMessageParams, MessageManagerState, MessageRequest, SecurityProviderRequest, -} from './AbstractMessageManager'; +} from './AbstractMessageManager.js'; type ConcreteMessage = AbstractMessage & { messageParams: ConcreteMessageParams; diff --git a/packages/message-manager/src/DecryptMessageManager.test.ts b/packages/message-manager/src/DecryptMessageManager.test.ts index 1e59533ae5f..df9e5e47368 100644 --- a/packages/message-manager/src/DecryptMessageManager.test.ts +++ b/packages/message-manager/src/DecryptMessageManager.test.ts @@ -1,5 +1,5 @@ -import { DecryptMessageManager } from './DecryptMessageManager'; -import type { DecryptMessageManagerMessenger } from './DecryptMessageManager'; +import { DecryptMessageManager } from './DecryptMessageManager.js'; +import type { DecryptMessageManagerMessenger } from './DecryptMessageManager.js'; const mockMessenger = { registerActionHandler: jest.fn(), diff --git a/packages/message-manager/src/DecryptMessageManager.ts b/packages/message-manager/src/DecryptMessageManager.ts index 11c48f3941d..0292ba1726c 100644 --- a/packages/message-manager/src/DecryptMessageManager.ts +++ b/packages/message-manager/src/DecryptMessageManager.ts @@ -13,9 +13,9 @@ import type { MessageManagerState, MessageRequest, SecurityProviderRequest, -} from './AbstractMessageManager'; -import { AbstractMessageManager } from './AbstractMessageManager'; -import { normalizeMessageData, validateDecryptedMessageData } from './utils'; +} from './AbstractMessageManager.js'; +import { AbstractMessageManager } from './AbstractMessageManager.js'; +import { normalizeMessageData, validateDecryptedMessageData } from './utils.js'; const managerName = 'DecryptMessageManager'; diff --git a/packages/message-manager/src/EncryptionPublicKeyManager.test.ts b/packages/message-manager/src/EncryptionPublicKeyManager.test.ts index 81735a5fdaa..740a9093564 100644 --- a/packages/message-manager/src/EncryptionPublicKeyManager.test.ts +++ b/packages/message-manager/src/EncryptionPublicKeyManager.test.ts @@ -1,5 +1,5 @@ -import { EncryptionPublicKeyManager } from './EncryptionPublicKeyManager'; -import type { EncryptionPublicKeyManagerMessenger } from './EncryptionPublicKeyManager'; +import { EncryptionPublicKeyManager } from './EncryptionPublicKeyManager.js'; +import type { EncryptionPublicKeyManagerMessenger } from './EncryptionPublicKeyManager.js'; const mockMessenger = { registerActionHandler: jest.fn(), diff --git a/packages/message-manager/src/EncryptionPublicKeyManager.ts b/packages/message-manager/src/EncryptionPublicKeyManager.ts index 371747725f2..c3464096dfb 100644 --- a/packages/message-manager/src/EncryptionPublicKeyManager.ts +++ b/packages/message-manager/src/EncryptionPublicKeyManager.ts @@ -12,9 +12,9 @@ import type { MessageManagerState, MessageRequest, SecurityProviderRequest, -} from './AbstractMessageManager'; -import { AbstractMessageManager } from './AbstractMessageManager'; -import { validateEncryptionPublicKeyMessageData } from './utils'; +} from './AbstractMessageManager.js'; +import { AbstractMessageManager } from './AbstractMessageManager.js'; +import { validateEncryptionPublicKeyMessageData } from './utils.js'; const managerName = 'EncryptionPublicKeyManager'; diff --git a/packages/message-manager/src/index.ts b/packages/message-manager/src/index.ts index bdcd9e46a88..0ab01d5a3a0 100644 --- a/packages/message-manager/src/index.ts +++ b/packages/message-manager/src/index.ts @@ -1,4 +1,4 @@ -export * from './AbstractMessageManager'; -export * from './EncryptionPublicKeyManager'; -export * from './DecryptMessageManager'; -export type * from './types'; +export * from './AbstractMessageManager.js'; +export * from './EncryptionPublicKeyManager.js'; +export * from './DecryptMessageManager.js'; +export type * from './types.js'; diff --git a/packages/message-manager/src/types.ts b/packages/message-manager/src/types.ts index dc580bd61d5..81726bbcf7f 100644 --- a/packages/message-manager/src/types.ts +++ b/packages/message-manager/src/types.ts @@ -1,6 +1,6 @@ import type { SIWEMessage } from '@metamask/controller-utils'; -import type { AbstractMessageParams } from './AbstractMessageManager'; +import type { AbstractMessageParams } from './AbstractMessageManager.js'; // Below types are have been moved into KeyringController, but are still exported here for backwards compatibility. diff --git a/packages/message-manager/src/utils.test.ts b/packages/message-manager/src/utils.test.ts index 01ac1327e08..936dab2c751 100644 --- a/packages/message-manager/src/utils.test.ts +++ b/packages/message-manager/src/utils.test.ts @@ -1,4 +1,4 @@ -import * as util from './utils'; +import * as util from './utils.js'; describe('utils', () => { it('normalizeMessageData', () => { diff --git a/packages/message-manager/src/utils.ts b/packages/message-manager/src/utils.ts index caa3aed7459..3fafade1e81 100644 --- a/packages/message-manager/src/utils.ts +++ b/packages/message-manager/src/utils.ts @@ -1,8 +1,8 @@ import { isValidHexAddress } from '@metamask/controller-utils'; import { add0x, bytesToHex, remove0x } from '@metamask/utils'; -import type { DecryptMessageParams } from './DecryptMessageManager'; -import type { EncryptionPublicKeyParams } from './EncryptionPublicKeyManager'; +import type { DecryptMessageParams } from './DecryptMessageManager.js'; +import type { EncryptionPublicKeyParams } from './EncryptionPublicKeyManager.js'; const hexRe = /^[0-9A-Fa-f]+$/gu; /** From 732be8cb4fdf173a3a87e86e216d1c7db5b3ad65 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:41:26 +0200 Subject: [PATCH 07/11] Add .js import extensions to name-controller --- eslint.config.mjs | 1 + packages/name-controller/package.json | 4 ++-- .../src/NameController-method-action-types.ts | 2 +- .../name-controller/src/NameController.test.ts | 8 ++++---- packages/name-controller/src/NameController.ts | 6 +++--- packages/name-controller/src/index.ts | 14 +++++++------- packages/name-controller/src/providers/ens.test.ts | 4 ++-- packages/name-controller/src/providers/ens.ts | 6 +++--- .../src/providers/etherscan.test.ts | 8 ++++---- .../name-controller/src/providers/etherscan.ts | 10 +++++----- .../name-controller/src/providers/lens.test.ts | 6 +++--- packages/name-controller/src/providers/lens.ts | 8 ++++---- .../name-controller/src/providers/token.test.ts | 6 +++--- packages/name-controller/src/providers/token.ts | 8 ++++---- packages/name-controller/src/utils.test.ts | 2 +- 15 files changed, 47 insertions(+), 46 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index bf70918453b..7cdb82f4e46 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -409,6 +409,7 @@ const config = createConfig([ 'packages/multichain-account-service/**', 'packages/multichain-api-middleware/**', 'packages/multichain-transactions-controller/**', + 'packages/name-controller/**', 'packages/network-connection-banner-controller/**', 'packages/permission-controller/**', 'packages/permission-log-controller/**', diff --git a/packages/name-controller/package.json b/packages/name-controller/package.json index c113ab626e8..6e21b5bbc27 100644 --- a/packages/name-controller/package.json +++ b/packages/name-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/name-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", "prepare-manifest:preview": "../../scripts/prepare-preview-manifest.sh", "since-latest-release": "../../scripts/since-latest-release.sh", "test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter", diff --git a/packages/name-controller/src/NameController-method-action-types.ts b/packages/name-controller/src/NameController-method-action-types.ts index d7a91815569..13f91e9c04d 100644 --- a/packages/name-controller/src/NameController-method-action-types.ts +++ b/packages/name-controller/src/NameController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { NameController } from './NameController'; +import type { NameController } from './NameController.js'; /** * Set the user specified name for a value. diff --git a/packages/name-controller/src/NameController.test.ts b/packages/name-controller/src/NameController.test.ts index 403688fd249..496557dd6ce 100644 --- a/packages/name-controller/src/NameController.test.ts +++ b/packages/name-controller/src/NameController.test.ts @@ -4,15 +4,15 @@ import type { SetNameRequest, UpdateProposedNamesRequest, NameControllerState, -} from './NameController'; +} from './NameController.js'; import { FALLBACK_VARIATION, NameController, NameOrigin, PROPOSED_NAME_EXPIRE_DURATION, -} from './NameController'; -import type { NameProvider } from './types'; -import { NameType } from './types'; +} from './NameController.js'; +import type { NameProvider } from './types.js'; +import { NameType } from './types.js'; const NAME_MOCK = 'TestName'; const PROPOSED_NAME_MOCK = 'TestProposedName'; diff --git a/packages/name-controller/src/NameController.ts b/packages/name-controller/src/NameController.ts index 1d9cb25c087..e0389fb534d 100644 --- a/packages/name-controller/src/NameController.ts +++ b/packages/name-controller/src/NameController.ts @@ -6,14 +6,14 @@ import { BaseController } from '@metamask/base-controller'; import { isSafeDynamicKey } from '@metamask/controller-utils'; import type { Messenger } from '@metamask/messenger'; -import type { NameControllerMethodActions } from './NameController-method-action-types'; +import type { NameControllerMethodActions } from './NameController-method-action-types.js'; import type { NameProvider, NameProviderRequest, NameProviderResult, NameProviderSourceResult, -} from './types'; -import { NameType } from './types'; +} from './types.js'; +import { NameType } from './types.js'; export const FALLBACK_VARIATION = '*'; export const PROPOSED_NAME_EXPIRE_DURATION = 60 * 60 * 24; // 24 hours diff --git a/packages/name-controller/src/index.ts b/packages/name-controller/src/index.ts index 7a9bdceff5e..918c77eeb28 100644 --- a/packages/name-controller/src/index.ts +++ b/packages/name-controller/src/index.ts @@ -1,10 +1,10 @@ -export * from './NameController'; +export * from './NameController.js'; export type { NameControllerSetNameAction, NameControllerUpdateProposedNamesAction, -} from './NameController-method-action-types'; -export * from './types'; -export * from './providers/ens'; -export * from './providers/etherscan'; -export * from './providers/token'; -export * from './providers/lens'; +} from './NameController-method-action-types.js'; +export * from './types.js'; +export * from './providers/ens.js'; +export * from './providers/etherscan.js'; +export * from './providers/token.js'; +export * from './providers/lens.js'; diff --git a/packages/name-controller/src/providers/ens.test.ts b/packages/name-controller/src/providers/ens.test.ts index 126fb0cdcd7..147044a0d72 100644 --- a/packages/name-controller/src/providers/ens.test.ts +++ b/packages/name-controller/src/providers/ens.test.ts @@ -1,5 +1,5 @@ -import { NameType } from '../types'; -import { ENSNameProvider } from './ens'; +import { NameType } from '../types.js'; +import { ENSNameProvider } from './ens.js'; jest.mock('../util'); diff --git a/packages/name-controller/src/providers/ens.ts b/packages/name-controller/src/providers/ens.ts index 84f7df329df..7f96fc7bb33 100644 --- a/packages/name-controller/src/providers/ens.ts +++ b/packages/name-controller/src/providers/ens.ts @@ -1,11 +1,11 @@ -import { projectLogger, createModuleLogger } from '../logger'; +import { projectLogger, createModuleLogger } from '../logger.js'; import type { NameProvider, NameProviderMetadata, NameProviderRequest, NameProviderResult, -} from '../types'; -import { NameType } from '../types'; +} from '../types.js'; +import { NameType } from '../types.js'; export type ReverseLookupCallback = ( address: string, diff --git a/packages/name-controller/src/providers/etherscan.test.ts b/packages/name-controller/src/providers/etherscan.test.ts index 78ae2d42e41..44e0d394cab 100644 --- a/packages/name-controller/src/providers/etherscan.test.ts +++ b/packages/name-controller/src/providers/etherscan.test.ts @@ -1,7 +1,7 @@ -import { CHAIN_IDS } from '../constants'; -import { NameType } from '../types'; -import { handleFetch } from '../util'; -import { EtherscanNameProvider } from './etherscan'; +import { CHAIN_IDS } from '../constants.js'; +import { NameType } from '../types.js'; +import { handleFetch } from '../util.js'; +import { EtherscanNameProvider } from './etherscan.js'; jest.mock('../util'); diff --git a/packages/name-controller/src/providers/etherscan.ts b/packages/name-controller/src/providers/etherscan.ts index 9d26e5db03b..bb0a81134e2 100644 --- a/packages/name-controller/src/providers/etherscan.ts +++ b/packages/name-controller/src/providers/etherscan.ts @@ -1,15 +1,15 @@ import { Mutex } from 'async-mutex'; -import { ETHERSCAN_SUPPORTED_NETWORKS } from '../constants'; -import { createModuleLogger, projectLogger } from '../logger'; +import { ETHERSCAN_SUPPORTED_NETWORKS } from '../constants.js'; +import { createModuleLogger, projectLogger } from '../logger.js'; import type { NameProvider, NameProviderMetadata, NameProviderRequest, NameProviderResult, -} from '../types'; -import { NameType } from '../types'; -import { handleFetch, assertIsError } from '../util'; +} from '../types.js'; +import { NameType } from '../types.js'; +import { handleFetch, assertIsError } from '../util.js'; const ID = 'etherscan'; const LABEL = 'Etherscan (Verified Contract Name)'; diff --git a/packages/name-controller/src/providers/lens.test.ts b/packages/name-controller/src/providers/lens.test.ts index dc22770dbf3..8540260fc3a 100644 --- a/packages/name-controller/src/providers/lens.test.ts +++ b/packages/name-controller/src/providers/lens.test.ts @@ -1,6 +1,6 @@ -import { NameType } from '../types'; -import { graphQL } from '../util'; -import { LensNameProvider } from './lens'; +import { NameType } from '../types.js'; +import { graphQL } from '../util.js'; +import { LensNameProvider } from './lens.js'; jest.mock('../util'); diff --git a/packages/name-controller/src/providers/lens.ts b/packages/name-controller/src/providers/lens.ts index b3560c1e7f5..483d1c23705 100644 --- a/packages/name-controller/src/providers/lens.ts +++ b/packages/name-controller/src/providers/lens.ts @@ -1,12 +1,12 @@ -import { createModuleLogger, projectLogger } from '../logger'; +import { createModuleLogger, projectLogger } from '../logger.js'; import type { NameProvider, NameProviderMetadata, NameProviderRequest, NameProviderResult, -} from '../types'; -import { NameType } from '../types'; -import { graphQL } from '../util'; +} from '../types.js'; +import { NameType } from '../types.js'; +import { graphQL } from '../util.js'; const ID = 'lens'; const LABEL = 'Lens Protocol'; diff --git a/packages/name-controller/src/providers/token.test.ts b/packages/name-controller/src/providers/token.test.ts index 4215e2dfe51..a43eb46f747 100644 --- a/packages/name-controller/src/providers/token.test.ts +++ b/packages/name-controller/src/providers/token.test.ts @@ -1,6 +1,6 @@ -import { NameType } from '../types'; -import { handleFetch } from '../util'; -import { TokenNameProvider } from './token'; +import { NameType } from '../types.js'; +import { handleFetch } from '../util.js'; +import { TokenNameProvider } from './token.js'; jest.mock('../util'); diff --git a/packages/name-controller/src/providers/token.ts b/packages/name-controller/src/providers/token.ts index b082439caba..9ca9760acc4 100644 --- a/packages/name-controller/src/providers/token.ts +++ b/packages/name-controller/src/providers/token.ts @@ -1,12 +1,12 @@ -import { createModuleLogger, projectLogger } from '../logger'; +import { createModuleLogger, projectLogger } from '../logger.js'; import type { NameProvider, NameProviderMetadata, NameProviderRequest, NameProviderResult, -} from '../types'; -import { NameType } from '../types'; -import { handleFetch } from '../util'; +} from '../types.js'; +import { NameType } from '../types.js'; +import { handleFetch } from '../util.js'; const ID = 'token'; const LABEL = 'Blockchain (Token Name)'; diff --git a/packages/name-controller/src/utils.test.ts b/packages/name-controller/src/utils.test.ts index 44b498c6c7b..d7a7fa472ca 100644 --- a/packages/name-controller/src/utils.test.ts +++ b/packages/name-controller/src/utils.test.ts @@ -1,4 +1,4 @@ -import { assertIsError, graphQL } from './util'; +import { assertIsError, graphQL } from './util.js'; describe('Utils', () => { describe('graphQL', () => { From e1d90fd79fb85068c7e36364bdf8510fc940461a Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:42:22 +0200 Subject: [PATCH 08/11] Add .js import extensions to signature-controller --- eslint.config.mjs | 1 + packages/signature-controller/package.json | 4 ++-- .../SignatureController-method-action-types.ts | 2 +- .../src/SignatureController.test.ts | 16 ++++++++-------- .../src/SignatureController.ts | 16 ++++++++-------- packages/signature-controller/src/index.ts | 6 +++--- .../src/utils/decoding-api.test.ts | 6 +++--- .../src/utils/decoding-api.ts | 6 +++--- .../src/utils/delegations.test.ts | 6 +++--- .../src/utils/delegations.ts | 4 ++-- .../src/utils/normalize.test.ts | 4 ++-- .../signature-controller/src/utils/normalize.ts | 2 +- .../src/utils/validation.test.ts | 4 ++-- .../signature-controller/src/utils/validation.ts | 4 ++-- 14 files changed, 41 insertions(+), 40 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 7cdb82f4e46..71f58f47049 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -422,6 +422,7 @@ const config = createConfig([ 'packages/react-data-query/**', 'packages/sample-controllers/**', 'packages/selected-network-controller/**', + 'packages/signature-controller/**', 'packages/smart-transactions-controller/**', 'packages/snap-account-service/**', 'packages/wallet/**', diff --git a/packages/signature-controller/package.json b/packages/signature-controller/package.json index 6aaacd361da..9f735a01e55 100644 --- a/packages/signature-controller/package.json +++ b/packages/signature-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/signature-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", diff --git a/packages/signature-controller/src/SignatureController-method-action-types.ts b/packages/signature-controller/src/SignatureController-method-action-types.ts index ca6aedcc146..3da10884974 100644 --- a/packages/signature-controller/src/SignatureController-method-action-types.ts +++ b/packages/signature-controller/src/SignatureController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { SignatureController } from './SignatureController'; +import type { SignatureController } from './SignatureController.js'; /** * Reset the controller state to the initial state. diff --git a/packages/signature-controller/src/SignatureController.test.ts b/packages/signature-controller/src/SignatureController.test.ts index 4f9d1d5349c..60d57b29b9f 100644 --- a/packages/signature-controller/src/SignatureController.test.ts +++ b/packages/signature-controller/src/SignatureController.test.ts @@ -5,26 +5,26 @@ import { SignTypedDataVersion } from '@metamask/keyring-controller'; import { LogType, SigningStage } from '@metamask/logging-controller'; import { v1 } from 'uuid'; -import { flushPromises } from '../../../tests/helpers'; +import { flushPromises } from '../../../tests/helpers.js'; import type { SignatureControllerMessenger, SignatureControllerOptions, SignatureControllerState, -} from './SignatureController'; -import { SignatureController } from './SignatureController'; +} from './SignatureController.js'; +import { SignatureController } from './SignatureController.js'; import type { MessageParamsPersonal, MessageParamsTyped, OriginalRequest, SignatureRequest, -} from './types'; -import { SignatureRequestStatus, SignatureRequestType } from './types'; -import * as DecodingDataUtils from './utils/decoding-api'; +} from './types.js'; +import { SignatureRequestStatus, SignatureRequestType } from './types.js'; +import * as DecodingDataUtils from './utils/decoding-api.js'; import { normalizePersonalMessageParams, normalizeTypedMessageParams, -} from './utils/normalize'; -import { validateTypedSignatureRequest } from './utils/validation'; +} from './utils/normalize.js'; +import { validateTypedSignatureRequest } from './utils/validation.js'; jest.mock('uuid'); jest.mock('./utils/validation'); diff --git a/packages/signature-controller/src/SignatureController.ts b/packages/signature-controller/src/SignatureController.ts index c24b6bebe33..d5f2de6961e 100644 --- a/packages/signature-controller/src/SignatureController.ts +++ b/packages/signature-controller/src/SignatureController.ts @@ -39,9 +39,9 @@ import type { Hex, Json } from '@metamask/utils'; import EventEmitter from 'events'; import { v1 as random } from 'uuid'; -import { projectLogger as log } from './logger'; -import type { SignatureControllerMethodActions } from './SignatureController-method-action-types'; -import { SignatureRequestStatus, SignatureRequestType } from './types'; +import { projectLogger as log } from './logger.js'; +import type { SignatureControllerMethodActions } from './SignatureController-method-action-types.js'; +import { SignatureRequestStatus, SignatureRequestType } from './types.js'; import type { MessageParamsPersonal, MessageParamsTyped, @@ -52,21 +52,21 @@ import type { LegacyStateMessage, StateSIWEMessage, MessageParamsTypedData, -} from './types'; -import { DECODING_API_ERRORS, decodeSignature } from './utils/decoding-api'; +} from './types.js'; +import { DECODING_API_ERRORS, decodeSignature } from './utils/decoding-api.js'; import { decodePermissionFromRequest, isDelegationRequest, validateExecutionPermissionMetadata, -} from './utils/delegations'; +} from './utils/delegations.js'; import { normalizePersonalMessageParams, normalizeTypedMessageParams, -} from './utils/normalize'; +} from './utils/normalize.js'; import { validatePersonalSignatureRequest, validateTypedSignatureRequest, -} from './utils/validation'; +} from './utils/validation.js'; const controllerName = 'SignatureController'; diff --git a/packages/signature-controller/src/index.ts b/packages/signature-controller/src/index.ts index 82447289f46..46754d16adb 100644 --- a/packages/signature-controller/src/index.ts +++ b/packages/signature-controller/src/index.ts @@ -1,4 +1,4 @@ -export * from './SignatureController'; +export * from './SignatureController.js'; export type { SignatureControllerResetStateAction, SignatureControllerRejectUnapprovedAction, @@ -10,5 +10,5 @@ export type { SignatureControllerSetDeferredSignErrorAction, SignatureControllerSetTypedMessageInProgressAction, SignatureControllerSetPersonalMessageInProgressAction, -} from './SignatureController-method-action-types'; -export * from './types'; +} from './SignatureController-method-action-types.js'; +export * from './types.js'; diff --git a/packages/signature-controller/src/utils/decoding-api.test.ts b/packages/signature-controller/src/utils/decoding-api.test.ts index f9dbfa2a52d..c07cfafaef5 100644 --- a/packages/signature-controller/src/utils/decoding-api.test.ts +++ b/packages/signature-controller/src/utils/decoding-api.test.ts @@ -1,6 +1,6 @@ -import { EthMethod } from '../types'; -import type { OriginalRequest } from '../types'; -import { decodeSignature } from './decoding-api'; +import { EthMethod } from '../types.js'; +import type { OriginalRequest } from '../types.js'; +import { decodeSignature } from './decoding-api.js'; const PERMIT_REQUEST_MOCK = { method: EthMethod.SignTypedDataV4, diff --git a/packages/signature-controller/src/utils/decoding-api.ts b/packages/signature-controller/src/utils/decoding-api.ts index b8ed5bc1a81..fde49e5562e 100644 --- a/packages/signature-controller/src/utils/decoding-api.ts +++ b/packages/signature-controller/src/utils/decoding-api.ts @@ -1,6 +1,6 @@ -import { EthMethod } from '../types'; -import type { OriginalRequest } from '../types'; -import { normalizeParam } from './normalize'; +import { EthMethod } from '../types.js'; +import type { OriginalRequest } from '../types.js'; +import { normalizeParam } from './normalize.js'; export const DECODING_API_ERRORS = { UNSUPPORTED_SIGNATURE: 'UNSUPPORTED_SIGNATURE', diff --git a/packages/signature-controller/src/utils/delegations.test.ts b/packages/signature-controller/src/utils/delegations.test.ts index 4816956af4d..a8d2c2c8e88 100644 --- a/packages/signature-controller/src/utils/delegations.test.ts +++ b/packages/signature-controller/src/utils/delegations.test.ts @@ -1,13 +1,13 @@ import type { DecodedPermission } from '@metamask/gator-permissions-controller'; import type { Json } from '@metamask/utils'; -import type { SignatureControllerMessenger } from '../SignatureController'; -import type { MessageParamsTyped, MessageParamsTypedData } from '../types'; +import type { SignatureControllerMessenger } from '../SignatureController.js'; +import type { MessageParamsTyped, MessageParamsTypedData } from '../types.js'; import { decodePermissionFromRequest, isDelegationRequest, validateExecutionPermissionMetadata, -} from './delegations'; +} from './delegations.js'; describe('delegations utils', () => { describe('isDelegationRequest', () => { diff --git a/packages/signature-controller/src/utils/delegations.ts b/packages/signature-controller/src/utils/delegations.ts index cf1b12c7179..28a36633fb1 100644 --- a/packages/signature-controller/src/utils/delegations.ts +++ b/packages/signature-controller/src/utils/delegations.ts @@ -4,11 +4,11 @@ import type { } from '@metamask/gator-permissions-controller'; import { isHexAddress, isStrictHexString } from '@metamask/utils'; -import type { SignatureControllerMessenger } from '../SignatureController'; +import type { SignatureControllerMessenger } from '../SignatureController.js'; import type { MessageParamsTypedData, MessageParamsTypedDataWithMetadata, -} from '../types'; +} from '../types.js'; const DELEGATION_PRIMARY_TYPE = 'Delegation'; diff --git a/packages/signature-controller/src/utils/normalize.test.ts b/packages/signature-controller/src/utils/normalize.test.ts index 26b930f2d29..812cad765de 100644 --- a/packages/signature-controller/src/utils/normalize.test.ts +++ b/packages/signature-controller/src/utils/normalize.test.ts @@ -1,11 +1,11 @@ import { SignTypedDataVersion } from '@metamask/keyring-controller'; -import type { MessageParamsPersonal, MessageParamsTyped } from '../types'; +import type { MessageParamsPersonal, MessageParamsTyped } from '../types.js'; import { normalizeParam, normalizePersonalMessageParams, normalizeTypedMessageParams, -} from './normalize'; +} from './normalize.js'; describe('Normalize Utils', () => { describe('normalizePersonalMessageParams', () => { diff --git a/packages/signature-controller/src/utils/normalize.ts b/packages/signature-controller/src/utils/normalize.ts index 4c06c439acb..9ff8c4ee6f5 100644 --- a/packages/signature-controller/src/utils/normalize.ts +++ b/packages/signature-controller/src/utils/normalize.ts @@ -2,7 +2,7 @@ import { SignTypedDataVersion } from '@metamask/keyring-controller'; import { add0x, bytesToHex, remove0x } from '@metamask/utils'; import type { Json } from '@metamask/utils'; -import type { MessageParamsPersonal, MessageParamsTyped } from '../types'; +import type { MessageParamsPersonal, MessageParamsTyped } from '../types.js'; /** * Normalize personal message params. diff --git a/packages/signature-controller/src/utils/validation.test.ts b/packages/signature-controller/src/utils/validation.test.ts index 26f5b5ff1b7..fa1ccf7eadf 100644 --- a/packages/signature-controller/src/utils/validation.test.ts +++ b/packages/signature-controller/src/utils/validation.test.ts @@ -8,12 +8,12 @@ import type { MessageParamsPersonal, MessageParamsTyped, OriginalRequest, -} from '../types'; +} from '../types.js'; import { PRIMARY_TYPE_DELEGATION, validatePersonalSignatureRequest, validateTypedSignatureRequest, -} from './validation'; +} from './validation.js'; const CHAIN_ID_MOCK = '0x1'; const ORIGIN_MOCK = 'test.com'; diff --git a/packages/signature-controller/src/utils/validation.ts b/packages/signature-controller/src/utils/validation.ts index 024d1d9c8af..f4a711bfa80 100644 --- a/packages/signature-controller/src/utils/validation.ts +++ b/packages/signature-controller/src/utils/validation.ts @@ -15,8 +15,8 @@ import type { MessageParamsTyped, MessageParamsTypedData, OriginalRequest, -} from '../types'; -import { isDelegationRequest } from './delegations'; +} from '../types.js'; +import { isDelegationRequest } from './delegations.js'; export const PRIMARY_TYPE_DELEGATION = 'Delegation'; export const DELEGATOR_FIELD = 'delegator'; From 942aa5b49644c5f2adb2c4a2cf58dfca4e9afbfe Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:43:31 +0200 Subject: [PATCH 09/11] Add .js import extensions to transaction-controller --- eslint.config.mjs | 1 + packages/transaction-controller/package.json | 4 +- ...ansactionController-method-action-types.ts | 2 +- .../src/TransactionController.test.ts | 66 +++++++------- .../src/TransactionController.ts | 86 ++++++++++--------- .../TransactionControllerIntegration.test.ts | 18 ++-- .../src/api/accounts-api.test.ts | 6 +- .../src/api/accounts-api.ts | 4 +- .../src/api/simulation-api.test.ts | 9 +- .../src/api/simulation-api.ts | 11 ++- packages/transaction-controller/src/errors.ts | 2 +- .../src/gas-flows/DefaultGasFeeFlow.test.ts | 8 +- .../src/gas-flows/DefaultGasFeeFlow.ts | 8 +- .../src/gas-flows/LineaGasFeeFlow.test.ts | 14 +-- .../src/gas-flows/LineaGasFeeFlow.ts | 12 +-- .../gas-flows/MantleLayer1GasFeeFlow.test.ts | 14 +-- .../src/gas-flows/MantleLayer1GasFeeFlow.ts | 12 +-- .../OptimismLayer1GasFeeFlow.test.ts | 10 +-- .../src/gas-flows/OptimismLayer1GasFeeFlow.ts | 8 +- .../gas-flows/OracleLayer1GasFeeFlow.test.ts | 14 +-- .../src/gas-flows/OracleLayer1GasFeeFlow.ts | 12 +-- .../RandomisedEstimationsGasFeeFlow.test.ts | 12 +-- .../RandomisedEstimationsGasFeeFlow.ts | 14 +-- .../gas-flows/ScrollLayer1GasFeeFlow.test.ts | 10 +-- .../src/gas-flows/ScrollLayer1GasFeeFlow.ts | 8 +- .../src/gas-flows/TestGasFeeFlow.test.ts | 6 +- .../src/gas-flows/TestGasFeeFlow.ts | 4 +- .../src/helpers/GasFeePoller.test.ts | 16 ++-- .../src/helpers/GasFeePoller.ts | 16 ++-- .../src/helpers/MethodDataHelper.test.ts | 6 +- .../src/helpers/MethodDataHelper.ts | 6 +- .../helpers/MultichainTrackingHelper.test.ts | 6 +- .../src/helpers/MultichainTrackingHelper.ts | 4 +- .../helpers/PendingTransactionTracker.test.ts | 12 +-- .../src/helpers/PendingTransactionTracker.ts | 16 ++-- .../src/helpers/ResimulateHelper.test.ts | 12 +-- .../src/helpers/ResimulateHelper.ts | 8 +- .../src/helpers/TransactionPoller.test.ts | 8 +- .../src/helpers/TransactionPoller.ts | 8 +- .../src/hooks/CollectPublishHook.test.ts | 6 +- .../src/hooks/CollectPublishHook.ts | 8 +- .../ExtraTransactionsPublishHook.test.ts | 8 +- .../src/hooks/ExtraTransactionsPublishHook.ts | 6 +- .../hooks/SequentialPublishBatchHook.test.ts | 8 +- .../src/hooks/SequentialPublishBatchHook.ts | 6 +- packages/transaction-controller/src/index.ts | 28 +++--- packages/transaction-controller/src/types.ts | 2 +- .../src/utils/balance-changes.test.ts | 20 ++--- .../src/utils/balance-changes.ts | 20 ++--- .../src/utils/balance.test.ts | 11 ++- .../src/utils/balance.ts | 6 +- .../src/utils/batch.test.ts | 24 +++--- .../transaction-controller/src/utils/batch.ts | 34 ++++---- .../src/utils/eip7702.test.ts | 16 ++-- .../src/utils/eip7702.ts | 12 +-- .../src/utils/external-transactions.test.ts | 6 +- .../src/utils/external-transactions.ts | 4 +- .../src/utils/feature-flags.test.ts | 8 +- .../src/utils/feature-flags.ts | 8 +- .../src/utils/first-time-interaction.test.ts | 12 +-- .../src/utils/first-time-interaction.ts | 14 +-- .../src/utils/gas-fee-tokens.test.ts | 14 +-- .../src/utils/gas-fee-tokens.ts | 26 +++--- .../src/utils/gas-fees.test.ts | 12 +-- .../src/utils/gas-fees.ts | 12 +-- .../src/utils/gas-flow.test.ts | 8 +- .../src/utils/gas-flow.ts | 8 +- .../src/utils/gas.test.ts | 28 +++--- .../transaction-controller/src/utils/gas.ts | 21 +++-- .../src/utils/layer1-gas-fee-flow.test.ts | 8 +- .../src/utils/layer1-gas-fee-flow.ts | 6 +- .../src/utils/nonce.test.ts | 9 +- .../transaction-controller/src/utils/nonce.ts | 4 +- .../src/utils/prepare.test.ts | 6 +- .../src/utils/prepare.ts | 2 +- .../src/utils/provider.test.ts | 4 +- .../src/utils/provider.ts | 4 +- .../src/utils/retry.test.ts | 4 +- .../transaction-controller/src/utils/retry.ts | 2 +- .../src/utils/revert-reason.test.ts | 8 +- .../src/utils/revert-reason.ts | 8 +- .../src/utils/signature.test.ts | 2 +- .../src/utils/swaps.test.ts | 14 +-- .../transaction-controller/src/utils/swaps.ts | 14 +-- .../src/utils/transaction-type.test.ts | 12 +-- .../src/utils/transaction-type.ts | 10 +-- .../src/utils/utils.test.ts | 6 +- .../transaction-controller/src/utils/utils.ts | 4 +- .../src/utils/validation.test.ts | 6 +- .../src/utils/validation.ts | 6 +- .../tests/JsonRpcRequestMocks.ts | 2 +- 91 files changed, 530 insertions(+), 500 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 71f58f47049..bb8739120a5 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -425,6 +425,7 @@ const config = createConfig([ 'packages/signature-controller/**', 'packages/smart-transactions-controller/**', 'packages/snap-account-service/**', + 'packages/transaction-controller/**', 'packages/wallet/**', 'packages/wallet-cli/**', 'packages/wallet-framework-docs/**', diff --git a/packages/transaction-controller/package.json b/packages/transaction-controller/package.json index 1cfc46ac49e..d41a88d229b 100644 --- a/packages/transaction-controller/package.json +++ b/packages/transaction-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/transaction-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", diff --git a/packages/transaction-controller/src/TransactionController-method-action-types.ts b/packages/transaction-controller/src/TransactionController-method-action-types.ts index ab865d28b14..194d8a98d4e 100644 --- a/packages/transaction-controller/src/TransactionController-method-action-types.ts +++ b/packages/transaction-controller/src/TransactionController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { TransactionController } from './TransactionController'; +import type { TransactionController } from './TransactionController.js'; /** * Handle new method data request. diff --git a/packages/transaction-controller/src/TransactionController.test.ts b/packages/transaction-controller/src/TransactionController.test.ts index a1c1d072381..4a0bb2b2107 100644 --- a/packages/transaction-controller/src/TransactionController.test.ts +++ b/packages/transaction-controller/src/TransactionController.test.ts @@ -42,34 +42,34 @@ import assert from 'assert'; // eslint-disable-next-line import-x/namespace import * as uuidModule from 'uuid'; -import { FakeBlockTracker } from '../../../tests/fake-block-tracker'; -import { FakeProvider } from '../../../tests/fake-provider'; -import { flushPromises } from '../../../tests/helpers'; +import { FakeBlockTracker } from '../../../tests/fake-block-tracker.js'; +import { FakeProvider } from '../../../tests/fake-provider.js'; +import { flushPromises } from '../../../tests/helpers.js'; import { buildCustomNetworkClientConfiguration, buildMockFindNetworkClientIdByChainId, buildMockGetNetworkClientById, -} from '../../network-controller/tests/helpers'; -import { CHAIN_IDS } from './constants'; -import { DefaultGasFeeFlow } from './gas-flows/DefaultGasFeeFlow'; -import { LineaGasFeeFlow } from './gas-flows/LineaGasFeeFlow'; -import { RandomisedEstimationsGasFeeFlow } from './gas-flows/RandomisedEstimationsGasFeeFlow'; -import { TestGasFeeFlow } from './gas-flows/TestGasFeeFlow'; +} from '../../network-controller/tests/helpers.js'; +import { CHAIN_IDS } from './constants.js'; +import { DefaultGasFeeFlow } from './gas-flows/DefaultGasFeeFlow.js'; +import { LineaGasFeeFlow } from './gas-flows/LineaGasFeeFlow.js'; +import { RandomisedEstimationsGasFeeFlow } from './gas-flows/RandomisedEstimationsGasFeeFlow.js'; +import { TestGasFeeFlow } from './gas-flows/TestGasFeeFlow.js'; import { updateTransactionGasEstimates, GasFeePoller, -} from './helpers/GasFeePoller'; -import { MethodDataHelper } from './helpers/MethodDataHelper'; -import { MultichainTrackingHelper } from './helpers/MultichainTrackingHelper'; -import { PendingTransactionTracker } from './helpers/PendingTransactionTracker'; -import { shouldResimulate } from './helpers/ResimulateHelper'; -import { ExtraTransactionsPublishHook } from './hooks/ExtraTransactionsPublishHook'; +} from './helpers/GasFeePoller.js'; +import { MethodDataHelper } from './helpers/MethodDataHelper.js'; +import { MultichainTrackingHelper } from './helpers/MultichainTrackingHelper.js'; +import { PendingTransactionTracker } from './helpers/PendingTransactionTracker.js'; +import { shouldResimulate } from './helpers/ResimulateHelper.js'; +import { ExtraTransactionsPublishHook } from './hooks/ExtraTransactionsPublishHook.js'; import type { MethodData, TransactionControllerMessenger, TransactionControllerOptions, -} from './TransactionController'; -import { TransactionController } from './TransactionController'; +} from './TransactionController.js'; +import { TransactionController } from './TransactionController.js'; import type { TransactionMeta, DappSuggestedGasFees, @@ -84,7 +84,7 @@ import type { GasFeeEstimates, SimulationData, GetSimulationConfig, -} from './types'; +} from './types.js'; import { GasFeeEstimateLevel, GasFeeEstimateType, @@ -95,35 +95,35 @@ import { TransactionStatus, TransactionType, WalletDevice, -} from './types'; -import { getBalanceChanges } from './utils/balance-changes'; -import { addTransactionBatch } from './utils/batch'; -import { getDelegationAddress } from './utils/eip7702'; +} from './types.js'; +import { getBalanceChanges } from './utils/balance-changes.js'; +import { addTransactionBatch } from './utils/batch.js'; +import { getDelegationAddress } from './utils/eip7702.js'; import { getSubmitHistoryLimit, getTransactionHistoryLimit, -} from './utils/feature-flags'; -import { updateFirstTimeInteraction } from './utils/first-time-interaction'; +} from './utils/feature-flags.js'; +import { updateFirstTimeInteraction } from './utils/first-time-interaction.js'; +import { getGasFeeTokens } from './utils/gas-fee-tokens.js'; +import { updateGasFees } from './utils/gas-fees.js'; +import { getGasFeeFlow } from './utils/gas-flow.js'; import { addGasBuffer, estimateGas, estimateGasBatch, updateGas, -} from './utils/gas'; -import { getGasFeeTokens } from './utils/gas-fee-tokens'; -import { updateGasFees } from './utils/gas-fees'; -import { getGasFeeFlow } from './utils/gas-flow'; +} from './utils/gas.js'; import { getTransactionLayer1GasFee, updateTransactionLayer1GasFee, -} from './utils/layer1-gas-fee-flow'; -import { rpcRequest } from './utils/provider'; +} from './utils/layer1-gas-fee-flow.js'; +import { rpcRequest } from './utils/provider.js'; import { updatePostTransactionBalance, updateSwapsTransaction, -} from './utils/swaps'; -import * as transactionTypeUtils from './utils/transaction-type'; -import { ErrorCode } from './utils/validation'; +} from './utils/swaps.js'; +import * as transactionTypeUtils from './utils/transaction-type.js'; +import { ErrorCode } from './utils/validation.js'; type AllTransactionControllerActions = MessengerActions; diff --git a/packages/transaction-controller/src/TransactionController.ts b/packages/transaction-controller/src/TransactionController.ts index b0ff4cd3533..ea765290515 100644 --- a/packages/transaction-controller/src/TransactionController.ts +++ b/packages/transaction-controller/src/TransactionController.ts @@ -71,30 +71,30 @@ import { EventEmitter } from 'events'; import { cloneDeep, mapValues, merge, noop, pickBy, sortBy } from 'lodash'; import { v1 as random } from 'uuid'; -import { DefaultGasFeeFlow } from './gas-flows/DefaultGasFeeFlow'; -import { LineaGasFeeFlow } from './gas-flows/LineaGasFeeFlow'; -import { MantleLayer1GasFeeFlow } from './gas-flows/MantleLayer1GasFeeFlow'; -import { OptimismLayer1GasFeeFlow } from './gas-flows/OptimismLayer1GasFeeFlow'; -import { RandomisedEstimationsGasFeeFlow } from './gas-flows/RandomisedEstimationsGasFeeFlow'; -import { ScrollLayer1GasFeeFlow } from './gas-flows/ScrollLayer1GasFeeFlow'; -import { TestGasFeeFlow } from './gas-flows/TestGasFeeFlow'; +import { DefaultGasFeeFlow } from './gas-flows/DefaultGasFeeFlow.js'; +import { LineaGasFeeFlow } from './gas-flows/LineaGasFeeFlow.js'; +import { MantleLayer1GasFeeFlow } from './gas-flows/MantleLayer1GasFeeFlow.js'; +import { OptimismLayer1GasFeeFlow } from './gas-flows/OptimismLayer1GasFeeFlow.js'; +import { RandomisedEstimationsGasFeeFlow } from './gas-flows/RandomisedEstimationsGasFeeFlow.js'; +import { ScrollLayer1GasFeeFlow } from './gas-flows/ScrollLayer1GasFeeFlow.js'; +import { TestGasFeeFlow } from './gas-flows/TestGasFeeFlow.js'; import { GasFeePoller, updateTransactionGasProperties, updateTransactionGasEstimates, -} from './helpers/GasFeePoller'; -import { MethodDataHelper } from './helpers/MethodDataHelper'; -import { MultichainTrackingHelper } from './helpers/MultichainTrackingHelper'; -import { PendingTransactionTracker } from './helpers/PendingTransactionTracker'; -import type { ResimulateResponse } from './helpers/ResimulateHelper'; +} from './helpers/GasFeePoller.js'; +import { MethodDataHelper } from './helpers/MethodDataHelper.js'; +import { MultichainTrackingHelper } from './helpers/MultichainTrackingHelper.js'; +import { PendingTransactionTracker } from './helpers/PendingTransactionTracker.js'; +import type { ResimulateResponse } from './helpers/ResimulateHelper.js'; import { ResimulateHelper, hasSimulationDataChanged, shouldResimulate, -} from './helpers/ResimulateHelper'; -import { ExtraTransactionsPublishHook } from './hooks/ExtraTransactionsPublishHook'; -import { projectLogger as log } from './logger'; -import type { TransactionControllerMethodActions } from './TransactionController-method-action-types'; +} from './helpers/ResimulateHelper.js'; +import { ExtraTransactionsPublishHook } from './hooks/ExtraTransactionsPublishHook.js'; +import { projectLogger as log } from './logger.js'; +import type { TransactionControllerMethodActions } from './TransactionController-method-action-types.js'; import type { DappSuggestedGasFees, Layer1GasFeeFlow, @@ -129,7 +129,7 @@ import type { AddTransactionOptions, PublishHookResult, GetGasFeeTokensRequest, -} from './types'; +} from './types.js'; import { GasFeeEstimateLevel, TransactionContainerType, @@ -137,49 +137,53 @@ import { TransactionType, TransactionStatus, SimulationErrorCode, -} from './types'; -import { getBalanceChanges } from './utils/balance-changes'; -import { addTransactionBatch, isAtomicBatchSupported } from './utils/batch'; +} from './types.js'; +import { getBalanceChanges } from './utils/balance-changes.js'; +import { addTransactionBatch, isAtomicBatchSupported } from './utils/batch.js'; import { generateEIP7702BatchTransaction, getDelegationAddress, signAuthorizationList, -} from './utils/eip7702'; -import { validateConfirmedExternalTransaction } from './utils/external-transactions'; +} from './utils/eip7702.js'; +import { validateConfirmedExternalTransaction } from './utils/external-transactions.js'; import { getSubmitHistoryLimit, getTransactionHistoryLimit, -} from './utils/feature-flags'; -import { updateFirstTimeInteraction } from './utils/first-time-interaction'; -import type { EstimateGasBatchResult } from './utils/gas'; +} from './utils/feature-flags.js'; +import { updateFirstTimeInteraction } from './utils/first-time-interaction.js'; +import { + checkGasFeeTokenBeforePublish, + getGasFeeTokens, +} from './utils/gas-fee-tokens.js'; +import { updateGasFees } from './utils/gas-fees.js'; +import { getGasFeeFlow } from './utils/gas-flow.js'; +import type { EstimateGasBatchResult } from './utils/gas.js'; import { addGasBuffer, estimateGas, estimateGasBatch, updateGas, -} from './utils/gas'; -import { - checkGasFeeTokenBeforePublish, - getGasFeeTokens, -} from './utils/gas-fee-tokens'; -import { updateGasFees } from './utils/gas-fees'; -import { getGasFeeFlow } from './utils/gas-flow'; +} from './utils/gas.js'; import { getTransactionLayer1GasFee, updateTransactionLayer1GasFee, -} from './utils/layer1-gas-fee-flow'; +} from './utils/layer1-gas-fee-flow.js'; import { getAndFormatTransactionsForNonceTracker, getNextNonce, -} from './utils/nonce'; -import { prepareTransaction, serializeTransaction } from './utils/prepare'; -import { getChainId, getNetworkClientId, rpcRequest } from './utils/provider'; -import { getTransactionParamsWithIncreasedGasFee } from './utils/retry'; +} from './utils/nonce.js'; +import { prepareTransaction, serializeTransaction } from './utils/prepare.js'; +import { + getChainId, + getNetworkClientId, + rpcRequest, +} from './utils/provider.js'; +import { getTransactionParamsWithIncreasedGasFee } from './utils/retry.js'; import { updatePostTransactionBalance, updateSwapsTransaction, -} from './utils/swaps'; -import { determineTransactionType } from './utils/transaction-type'; +} from './utils/swaps.js'; +import { determineTransactionType } from './utils/transaction-type.js'; import { normalizeTransactionParams, isEIP1559Transaction, @@ -189,12 +193,12 @@ import { normalizeTxError, normalizeGasFeeValues, setEnvelopeType, -} from './utils/utils'; +} from './utils/utils.js'; import { ErrorCode, validateTransactionOrigin, validateTxParams, -} from './utils/validation'; +} from './utils/validation.js'; /** * Metadata for the TransactionController state, describing how to "anonymize" diff --git a/packages/transaction-controller/src/TransactionControllerIntegration.test.ts b/packages/transaction-controller/src/TransactionControllerIntegration.test.ts index 6a577a314c4..c815c116a6e 100644 --- a/packages/transaction-controller/src/TransactionControllerIntegration.test.ts +++ b/packages/transaction-controller/src/TransactionControllerIntegration.test.ts @@ -35,14 +35,14 @@ import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote import assert from 'assert'; import { v4 as uuidV4 } from 'uuid'; -import { jestAdvanceTime } from '../../../tests/helpers'; -import { mockNetwork } from '../../../tests/mock-network'; +import { jestAdvanceTime } from '../../../tests/helpers.js'; +import { mockNetwork } from '../../../tests/mock-network.js'; import { buildAddNetworkFields, buildCustomNetworkClientConfiguration, buildUpdateNetworkCustomRpcEndpointFields, -} from '../../network-controller/tests/helpers'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../remote-feature-flag-controller/src/remote-feature-flag-controller'; +} from '../../network-controller/tests/helpers.js'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; import { buildEthGasPriceRequestMock, buildEthBlockNumberRequestMock, @@ -53,14 +53,14 @@ import { buildEthGetBlockByHashRequestMock, buildEthSendRawTransactionRequestMock, buildEthGetTransactionReceiptRequestMock, -} from '../tests/JsonRpcRequestMocks'; +} from '../tests/JsonRpcRequestMocks.js'; import type { TransactionControllerMessenger, TransactionControllerOptions, -} from './TransactionController'; -import { TransactionController } from './TransactionController'; -import type { InternalAccount } from './types'; -import { TransactionStatus, TransactionType } from './types'; +} from './TransactionController.js'; +import { TransactionController } from './TransactionController.js'; +import type { InternalAccount } from './types.js'; +import { TransactionStatus, TransactionType } from './types.js'; jest.mock('uuid', () => { const actual = jest.requireActual('uuid'); diff --git a/packages/transaction-controller/src/api/accounts-api.test.ts b/packages/transaction-controller/src/api/accounts-api.test.ts index fbcc6fc196a..59d718df33a 100644 --- a/packages/transaction-controller/src/api/accounts-api.test.ts +++ b/packages/transaction-controller/src/api/accounts-api.test.ts @@ -1,8 +1,8 @@ import { successfulFetch } from '@metamask/controller-utils'; -import { FirstTimeInteractionError } from '../errors'; -import type { GetAccountAddressRelationshipRequest } from './accounts-api'; -import { getAccountAddressRelationship } from './accounts-api'; +import { FirstTimeInteractionError } from '../errors.js'; +import type { GetAccountAddressRelationshipRequest } from './accounts-api.js'; +import { getAccountAddressRelationship } from './accounts-api.js'; jest.mock('@metamask/controller-utils', () => ({ ...jest.requireActual('@metamask/controller-utils'), diff --git a/packages/transaction-controller/src/api/accounts-api.ts b/packages/transaction-controller/src/api/accounts-api.ts index 69fd3235112..4684955ece8 100644 --- a/packages/transaction-controller/src/api/accounts-api.ts +++ b/packages/transaction-controller/src/api/accounts-api.ts @@ -1,8 +1,8 @@ import { successfulFetch } from '@metamask/controller-utils'; import { createModuleLogger } from '@metamask/utils'; -import { FirstTimeInteractionError } from '../errors'; -import { projectLogger } from '../logger'; +import { FirstTimeInteractionError } from '../errors.js'; +import { projectLogger } from '../logger.js'; export type AccountAddressRelationshipResponse = { chainId?: number; diff --git a/packages/transaction-controller/src/api/simulation-api.test.ts b/packages/transaction-controller/src/api/simulation-api.test.ts index c70e5f2d527..74191d0668b 100644 --- a/packages/transaction-controller/src/api/simulation-api.test.ts +++ b/packages/transaction-controller/src/api/simulation-api.test.ts @@ -2,9 +2,12 @@ import type { Hex } from '@metamask/utils'; import { cloneDeep } from 'lodash'; import type { GetSimulationConfig } from 'src'; -import { CHAIN_IDS, DELEGATION_MANAGER_ADDRESSES } from '../constants'; -import type { SimulationRequest, SimulationResponse } from './simulation-api'; -import { simulateTransactions } from './simulation-api'; +import { CHAIN_IDS, DELEGATION_MANAGER_ADDRESSES } from '../constants.js'; +import type { + SimulationRequest, + SimulationResponse, +} from './simulation-api.js'; +import { simulateTransactions } from './simulation-api.js'; const CHAIN_ID_MOCK = '0x1'; const CHAIN_ID_MOCK_DECIMAL = 1; diff --git a/packages/transaction-controller/src/api/simulation-api.ts b/packages/transaction-controller/src/api/simulation-api.ts index 4cdd3bfa795..4d080a3055e 100644 --- a/packages/transaction-controller/src/api/simulation-api.ts +++ b/packages/transaction-controller/src/api/simulation-api.ts @@ -6,10 +6,13 @@ import { cloneDeep } from 'lodash'; import { CODE_DELEGATION_MANAGER_NO_SIGNATURE_ERRORS, DELEGATION_MANAGER_ADDRESSES, -} from '../constants'; -import { SimulationChainNotSupportedError, SimulationError } from '../errors'; -import { projectLogger } from '../logger'; -import type { GetSimulationConfig } from '../types'; +} from '../constants.js'; +import { + SimulationChainNotSupportedError, + SimulationError, +} from '../errors.js'; +import { projectLogger } from '../logger.js'; +import type { GetSimulationConfig } from '../types.js'; const log = createModuleLogger(projectLogger, 'simulation-api'); diff --git a/packages/transaction-controller/src/errors.ts b/packages/transaction-controller/src/errors.ts index 53f79810aa5..d4e83a8888c 100644 --- a/packages/transaction-controller/src/errors.ts +++ b/packages/transaction-controller/src/errors.ts @@ -1,6 +1,6 @@ import type { Hex } from '@metamask/utils'; -import { SimulationErrorCode } from './types'; +import { SimulationErrorCode } from './types.js'; export class SimulationError extends Error { code?: string | number; diff --git a/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.test.ts index 97bdcf42f48..b253d1438e1 100644 --- a/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.test.ts @@ -6,15 +6,15 @@ import type { } from '@metamask/gas-fee-controller'; import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { FeeMarketGasFeeEstimates, GasPriceGasFeeEstimates, LegacyGasFeeEstimates, TransactionMeta, -} from '../types'; -import { GasFeeEstimateType, TransactionStatus } from '../types'; -import { DefaultGasFeeFlow } from './DefaultGasFeeFlow'; +} from '../types.js'; +import { GasFeeEstimateType, TransactionStatus } from '../types.js'; +import { DefaultGasFeeFlow } from './DefaultGasFeeFlow.js'; const TRANSACTION_META_MOCK: TransactionMeta = { id: '1', diff --git a/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.ts index 1810023ec5a..715bc4e5cb2 100644 --- a/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.ts @@ -7,7 +7,7 @@ import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../logger'; +import { projectLogger } from '../logger.js'; import type { FeeMarketGasFeeEstimateForLevel, FeeMarketGasFeeEstimates, @@ -17,9 +17,9 @@ import type { GasFeeFlowResponse, GasPriceGasFeeEstimates, LegacyGasFeeEstimates, -} from '../types'; -import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types'; -import { gweiDecimalToWeiHex } from '../utils/gas-fees'; +} from '../types.js'; +import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types.js'; +import { gweiDecimalToWeiHex } from '../utils/gas-fees.js'; const log = createModuleLogger(projectLogger, 'default-gas-fee-flow'); diff --git a/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.test.ts index 2988ce3f262..7e35e21412a 100644 --- a/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.test.ts @@ -1,22 +1,22 @@ import type { GasFeeState } from '@metamask/gas-fee-controller'; import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { FeeMarketGasFeeEstimates, GasFeeFlowRequest, GasFeeFlowResponse, TransactionMeta, -} from '../types'; +} from '../types.js'; import { GasFeeEstimateLevel, GasFeeEstimateType, TransactionStatus, -} from '../types'; -import { rpcRequest } from '../utils/provider'; -import { DefaultGasFeeFlow } from './DefaultGasFeeFlow'; -import { LineaGasFeeFlow } from './LineaGasFeeFlow'; +} from '../types.js'; +import { rpcRequest } from '../utils/provider.js'; +import { DefaultGasFeeFlow } from './DefaultGasFeeFlow.js'; +import { LineaGasFeeFlow } from './LineaGasFeeFlow.js'; jest.mock('../utils/provider', () => ({ rpcRequest: jest.fn(), diff --git a/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.ts index fcdadaf94f5..f43e0eb8e77 100644 --- a/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.ts @@ -4,18 +4,18 @@ import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import type BN from 'bn.js'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { GasFeeEstimates, GasFeeFlow, GasFeeFlowRequest, GasFeeFlowResponse, TransactionMeta, -} from '../types'; -import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types'; -import { rpcRequest } from '../utils/provider'; -import { DefaultGasFeeFlow } from './DefaultGasFeeFlow'; +} from '../types.js'; +import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types.js'; +import { rpcRequest } from '../utils/provider.js'; +import { DefaultGasFeeFlow } from './DefaultGasFeeFlow.js'; type LineaEstimateGasResponse = { baseFeePerGas: Hex; diff --git a/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.test.ts index 97597ee07d6..36f26814e10 100644 --- a/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.test.ts @@ -6,13 +6,13 @@ import { add0x } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import BN from 'bn.js'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { TransactionStatus } from '../types'; -import type { Layer1GasFeeFlowRequest, TransactionMeta } from '../types'; -import { rpcRequest } from '../utils/provider'; -import { bnFromHex, padHexToEvenLength } from '../utils/utils'; -import { MantleLayer1GasFeeFlow } from './MantleLayer1GasFeeFlow'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { TransactionStatus } from '../types.js'; +import type { Layer1GasFeeFlowRequest, TransactionMeta } from '../types.js'; +import { rpcRequest } from '../utils/provider.js'; +import { bnFromHex, padHexToEvenLength } from '../utils/utils.js'; +import { MantleLayer1GasFeeFlow } from './MantleLayer1GasFeeFlow.js'; jest.mock('../utils/provider'); diff --git a/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.ts index 17ebaeb2301..9cae5e6b52d 100644 --- a/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/MantleLayer1GasFeeFlow.ts @@ -2,12 +2,12 @@ import { Interface } from '@ethersproject/abi'; import type { Hex } from '@metamask/utils'; import type BN from 'bn.js'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { Layer1GasFeeFlowRequest, TransactionMeta } from '../types'; -import { rpcRequest } from '../utils/provider'; -import { toBN } from '../utils/utils'; -import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { Layer1GasFeeFlowRequest, TransactionMeta } from '../types.js'; +import { rpcRequest } from '../utils/provider.js'; +import { toBN } from '../utils/utils.js'; +import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow.js'; const MANTLE_CHAIN_IDS: Hex[] = [CHAIN_IDS.MANTLE, CHAIN_IDS.MANTLE_SEPOLIA]; diff --git a/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.test.ts index b8b078e1e9a..2f8c0d84459 100644 --- a/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.test.ts @@ -2,11 +2,11 @@ import * as ControllerUtils from '@metamask/controller-utils'; import { hexToNumber } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { TransactionStatus } from '../types'; -import { OptimismLayer1GasFeeFlow } from './OptimismLayer1GasFeeFlow'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionStatus } from '../types.js'; +import { OptimismLayer1GasFeeFlow } from './OptimismLayer1GasFeeFlow.js'; jest.mock('@metamask/controller-utils', () => { const actual = jest.requireActual('@metamask/controller-utils'); diff --git a/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.ts index 5c5e6cd0151..8378bfcdf4b 100644 --- a/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.ts @@ -2,10 +2,10 @@ import { handleFetch } from '@metamask/controller-utils'; import { hexToNumber } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow.js'; const FALLBACK_OPTIMISM_STACK_CHAIN_IDS: Hex[] = [ CHAIN_IDS.OPTIMISM, diff --git a/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.test.ts index 62f3f31951b..fd73bf17630 100644 --- a/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.test.ts @@ -6,13 +6,13 @@ import { add0x } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import BN from 'bn.js'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { TransactionStatus } from '../types'; -import type { Layer1GasFeeFlowRequest, TransactionMeta } from '../types'; -import { rpcRequest } from '../utils/provider'; -import { bnFromHex, padHexToEvenLength } from '../utils/utils'; -import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { TransactionStatus } from '../types.js'; +import type { Layer1GasFeeFlowRequest, TransactionMeta } from '../types.js'; +import { rpcRequest } from '../utils/provider.js'; +import { bnFromHex, padHexToEvenLength } from '../utils/utils.js'; +import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow.js'; jest.mock('../utils/provider'); diff --git a/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.ts index 318b3f3e4a4..034fb69473d 100644 --- a/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.ts @@ -3,17 +3,17 @@ import type { Hex } from '@metamask/utils'; import { add0x, createModuleLogger } from '@metamask/utils'; import BN from 'bn.js'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { Layer1GasFeeFlow, Layer1GasFeeFlowRequest, Layer1GasFeeFlowResponse, TransactionMeta, -} from '../types'; -import { prepareTransaction } from '../utils/prepare'; -import { rpcRequest } from '../utils/provider'; -import { padHexToEvenLength, toBN } from '../utils/utils'; +} from '../types.js'; +import { prepareTransaction } from '../utils/prepare.js'; +import { rpcRequest } from '../utils/provider.js'; +import { padHexToEvenLength, toBN } from '../utils/utils.js'; const log = createModuleLogger(projectLogger, 'oracle-layer1-gas-fee-flow'); diff --git a/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.test.ts index 184528d5d70..9c8ae5ec0a3 100644 --- a/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.test.ts @@ -2,24 +2,24 @@ import { toHex } from '@metamask/controller-utils'; import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller'; import type { GasFeeState } from '@metamask/gas-fee-controller'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { FeeMarketGasFeeEstimates, GasPriceGasFeeEstimates, LegacyGasFeeEstimates, TransactionMeta, -} from '../types'; +} from '../types.js'; import { GasFeeEstimateLevel, GasFeeEstimateType, TransactionStatus, -} from '../types'; -import { getGasFeeRandomisation } from '../utils/feature-flags'; -import { DefaultGasFeeFlow } from './DefaultGasFeeFlow'; +} from '../types.js'; +import { getGasFeeRandomisation } from '../utils/feature-flags.js'; +import { DefaultGasFeeFlow } from './DefaultGasFeeFlow.js'; import { RandomisedEstimationsGasFeeFlow, randomiseDecimalGWEIAndConvertToHex, -} from './RandomisedEstimationsGasFeeFlow'; +} from './RandomisedEstimationsGasFeeFlow.js'; jest.mock('./DefaultGasFeeFlow'); jest.mock('../utils/feature-flags'); diff --git a/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.ts index 0b19594e78b..ef3cefef391 100644 --- a/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/RandomisedEstimationsGasFeeFlow.ts @@ -3,8 +3,8 @@ import { GAS_ESTIMATE_TYPES } from '@metamask/gas-fee-controller'; import { add0x, createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { FeeMarketGasFeeEstimateForLevel, FeeMarketGasFeeEstimates, @@ -12,14 +12,14 @@ import type { GasFeeFlowRequest, GasFeeFlowResponse, TransactionMeta, -} from '../types'; -import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types'; -import { getGasFeeRandomisation } from '../utils/feature-flags'; +} from '../types.js'; +import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types.js'; +import { getGasFeeRandomisation } from '../utils/feature-flags.js'; import { gweiDecimalToWeiDecimal, gweiDecimalToWeiHex, -} from '../utils/gas-fees'; -import { DefaultGasFeeFlow } from './DefaultGasFeeFlow'; +} from '../utils/gas-fees.js'; +import { DefaultGasFeeFlow } from './DefaultGasFeeFlow.js'; const log = createModuleLogger( projectLogger, diff --git a/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.test.ts index afe58af2b74..c46ae5245f0 100644 --- a/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.test.ts @@ -1,10 +1,10 @@ import type { Hex } from '@metamask/utils'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { TransactionStatus } from '../types'; -import { ScrollLayer1GasFeeFlow } from './ScrollLayer1GasFeeFlow'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionStatus } from '../types.js'; +import { ScrollLayer1GasFeeFlow } from './ScrollLayer1GasFeeFlow.js'; const TRANSACTION_META_MOCK: TransactionMeta = { id: '1', diff --git a/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.ts index 6f1f3127406..25f98109121 100644 --- a/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.ts @@ -1,9 +1,9 @@ import type { Hex } from '@metamask/utils'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { OracleLayer1GasFeeFlow } from './OracleLayer1GasFeeFlow.js'; const SCROLL_CHAIN_IDS: Hex[] = [CHAIN_IDS.SCROLL, CHAIN_IDS.SCROLL_SEPOLIA]; diff --git a/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.test.ts b/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.test.ts index be03eda14b5..6267a52d1e4 100644 --- a/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.test.ts +++ b/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.test.ts @@ -1,6 +1,6 @@ -import { GasFeeEstimateType } from '../types'; -import type { GasFeeFlowRequest } from '../types'; -import { TestGasFeeFlow } from './TestGasFeeFlow'; +import { GasFeeEstimateType } from '../types.js'; +import type { GasFeeFlowRequest } from '../types.js'; +import { TestGasFeeFlow } from './TestGasFeeFlow.js'; describe('TestGasFeeFlow', () => { describe('matchesTransaction', () => { diff --git a/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.ts b/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.ts index 95bfb1212de..0659f76e95b 100644 --- a/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.ts +++ b/packages/transaction-controller/src/gas-flows/TestGasFeeFlow.ts @@ -1,12 +1,12 @@ import { toHex } from '@metamask/controller-utils'; import type { Hex } from '@metamask/utils'; -import { GasFeeEstimateType } from '../types'; +import { GasFeeEstimateType } from '../types.js'; import type { GasFeeFlow, GasFeeFlowRequest, GasFeeFlowResponse, -} from '../types'; +} from '../types.js'; const INCREMENT = 1e15; // 0.001 ETH const LEVEL_DIFFERENCE = 0.5; diff --git a/packages/transaction-controller/src/helpers/GasFeePoller.test.ts b/packages/transaction-controller/src/helpers/GasFeePoller.test.ts index eb9971571bc..29f2195a4d4 100644 --- a/packages/transaction-controller/src/helpers/GasFeePoller.test.ts +++ b/packages/transaction-controller/src/helpers/GasFeePoller.test.ts @@ -1,28 +1,28 @@ /* eslint-disable no-new */ import type { Hex } from '@metamask/utils'; -import { flushPromises } from '../../../../tests/helpers'; -import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { flushPromises } from '../../../../tests/helpers.js'; +import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import { GasFeeEstimateLevel, GasFeeEstimateType, TransactionEnvelopeType, TransactionStatus, UserFeeLevel, -} from '../types'; +} from '../types.js'; import type { GasFeeFlowResponse, Layer1GasFeeFlow, TransactionBatchMeta, -} from '../types'; -import type { GasFeeFlow, GasFeeEstimates, TransactionMeta } from '../types'; -import { getTransactionLayer1GasFee } from '../utils/layer1-gas-fee-flow'; +} from '../types.js'; +import type { GasFeeFlow, GasFeeEstimates, TransactionMeta } from '../types.js'; +import { getTransactionLayer1GasFee } from '../utils/layer1-gas-fee-flow.js'; import { GasFeePoller, updateTransactionGasProperties, updateTransactionGasEstimates, -} from './GasFeePoller'; +} from './GasFeePoller.js'; jest.mock('../utils/feature-flags'); jest.mock('../utils/layer1-gas-fee-flow', () => ({ diff --git a/packages/transaction-controller/src/helpers/GasFeePoller.ts b/packages/transaction-controller/src/helpers/GasFeePoller.ts index 06ff0c1fd3a..38218478a16 100644 --- a/packages/transaction-controller/src/helpers/GasFeePoller.ts +++ b/packages/transaction-controller/src/helpers/GasFeePoller.ts @@ -9,9 +9,9 @@ import { createModuleLogger } from '@metamask/utils'; // eslint-disable-next-line import-x/no-nodejs-modules import EventEmitter from 'events'; -import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow.js'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { GasFeeEstimates, GasFeeFlow, @@ -20,16 +20,16 @@ import type { TransactionMeta, TransactionParams, TransactionBatchMeta, -} from '../types'; +} from '../types.js'; import { GasFeeEstimateLevel, GasFeeEstimateType, TransactionStatus, TransactionEnvelopeType, -} from '../types'; -import { getGasFeeFlow } from '../utils/gas-flow'; -import { getTransactionLayer1GasFee } from '../utils/layer1-gas-fee-flow'; -import { getNetworkClientId } from '../utils/provider'; +} from '../types.js'; +import { getGasFeeFlow } from '../utils/gas-flow.js'; +import { getTransactionLayer1GasFee } from '../utils/layer1-gas-fee-flow.js'; +import { getNetworkClientId } from '../utils/provider.js'; const log = createModuleLogger(projectLogger, 'gas-fee-poller'); diff --git a/packages/transaction-controller/src/helpers/MethodDataHelper.test.ts b/packages/transaction-controller/src/helpers/MethodDataHelper.test.ts index 728bb4e9c75..3989d36cf1a 100644 --- a/packages/transaction-controller/src/helpers/MethodDataHelper.test.ts +++ b/packages/transaction-controller/src/helpers/MethodDataHelper.test.ts @@ -3,9 +3,9 @@ import { MethodRegistry } from 'eth-method-registry'; import type { MethodData, TransactionControllerMessenger, -} from '../TransactionController'; -import { getProvider } from '../utils/provider'; -import { MethodDataHelper } from './MethodDataHelper'; +} from '../TransactionController.js'; +import { getProvider } from '../utils/provider.js'; +import { MethodDataHelper } from './MethodDataHelper.js'; jest.mock('eth-method-registry'); diff --git a/packages/transaction-controller/src/helpers/MethodDataHelper.ts b/packages/transaction-controller/src/helpers/MethodDataHelper.ts index 15608fcc9ad..ef352dee207 100644 --- a/packages/transaction-controller/src/helpers/MethodDataHelper.ts +++ b/packages/transaction-controller/src/helpers/MethodDataHelper.ts @@ -6,12 +6,12 @@ import { MethodRegistry } from 'eth-method-registry'; // eslint-disable-next-line import-x/no-nodejs-modules import EventEmitter from 'events'; -import { projectLogger } from '../logger'; +import { projectLogger } from '../logger.js'; import type { MethodData, TransactionControllerMessenger, -} from '../TransactionController'; -import { getProvider } from '../utils/provider'; +} from '../TransactionController.js'; +import { getProvider } from '../utils/provider.js'; const log = createModuleLogger(projectLogger, 'method-data'); diff --git a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts index 95d42992e9e..127f68f5e8c 100644 --- a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts +++ b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts @@ -7,12 +7,12 @@ import type { import type { NonceTracker } from '@metamask/nonce-tracker'; import type { Hex } from '@metamask/utils'; -import { jestAdvanceTime } from '../../../../tests/helpers'; +import { jestAdvanceTime } from '../../../../tests/helpers.js'; import { MultichainTrackingHelper, MultichainTrackingHelperOptions, -} from './MultichainTrackingHelper'; -import type { PendingTransactionTracker } from './PendingTransactionTracker'; +} from './MultichainTrackingHelper.js'; +import type { PendingTransactionTracker } from './PendingTransactionTracker.js'; jest.mock( '@metamask/eth-query', diff --git a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts index 5b884376c19..8c432ad4bb1 100644 --- a/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts +++ b/packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts @@ -10,8 +10,8 @@ import type { NonceLock, NonceTracker } from '@metamask/nonce-tracker'; import type { Hex } from '@metamask/utils'; import { Mutex } from 'async-mutex'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { PendingTransactionTracker } from './PendingTransactionTracker'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { PendingTransactionTracker } from './PendingTransactionTracker.js'; /** * Registry of network clients provided by the NetworkController diff --git a/packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts b/packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts index 4744e5e0032..105ab87dfa0 100644 --- a/packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts +++ b/packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts @@ -2,12 +2,12 @@ import type { BlockTracker } from '@metamask/network-controller'; import { Json } from '@metamask/utils'; import { freeze } from 'immer'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { TransactionStatus } from '../types'; -import { rpcRequest } from '../utils/provider'; -import { PendingTransactionTracker } from './PendingTransactionTracker'; -import { TransactionPoller } from './TransactionPoller'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionStatus } from '../types.js'; +import { rpcRequest } from '../utils/provider.js'; +import { PendingTransactionTracker } from './PendingTransactionTracker.js'; +import { TransactionPoller } from './TransactionPoller.js'; const ID_MOCK = 'testId'; const CHAIN_ID_MOCK = '0x1'; diff --git a/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts b/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts index 691f2290332..a510d828ca2 100644 --- a/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts +++ b/packages/transaction-controller/src/helpers/PendingTransactionTracker.ts @@ -8,17 +8,17 @@ import type { Json } from '@metamask/utils'; import EventEmitter from 'events'; import { cloneDeep } from 'lodash'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta, TransactionReceipt } from '../types'; -import { TransactionStatus, TransactionType } from '../types'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta, TransactionReceipt } from '../types.js'; +import { TransactionStatus, TransactionType } from '../types.js'; import { getAcceleratedPollingParams, getTimeoutAttempts, -} from '../utils/feature-flags'; -import { getChainId, rpcRequest } from '../utils/provider'; -import { extractRevert, OnChainFailureError } from '../utils/revert-reason'; -import { TransactionPoller } from './TransactionPoller'; +} from '../utils/feature-flags.js'; +import { getChainId, rpcRequest } from '../utils/provider.js'; +import { extractRevert, OnChainFailureError } from '../utils/revert-reason.js'; +import { TransactionPoller } from './TransactionPoller.js'; /** * We wait this many blocks before emitting a 'transaction-dropped' event diff --git a/packages/transaction-controller/src/helpers/ResimulateHelper.test.ts b/packages/transaction-controller/src/helpers/ResimulateHelper.test.ts index 8884491ebab..01cd3a9c155 100644 --- a/packages/transaction-controller/src/helpers/ResimulateHelper.test.ts +++ b/packages/transaction-controller/src/helpers/ResimulateHelper.test.ts @@ -2,15 +2,15 @@ import { NetworkType } from '@metamask/controller-utils'; import type { NetworkClientId } from '@metamask/network-controller'; import { BN } from 'bn.js'; -import { CHAIN_IDS } from '../constants'; +import { CHAIN_IDS } from '../constants.js'; import type { TransactionMeta, SecurityAlertResponse, SimulationData, SimulationTokenBalanceChange, -} from '../types'; -import { TransactionStatus, SimulationTokenStandard } from '../types'; -import { getPercentageChange } from '../utils/utils'; +} from '../types.js'; +import { TransactionStatus, SimulationTokenStandard } from '../types.js'; +import { getPercentageChange } from '../utils/utils.js'; import { ResimulateHelper, BLOCK_TIME_ADDITIONAL_SECONDS, @@ -20,8 +20,8 @@ import { shouldResimulate, VALUE_COMPARISON_PERCENT_THRESHOLD, RESIMULATE_INTERVAL_MS, -} from './ResimulateHelper'; -import type { ResimulateHelperOptions } from './ResimulateHelper'; +} from './ResimulateHelper.js'; +import type { ResimulateHelperOptions } from './ResimulateHelper.js'; const CURRENT_TIME_MOCK = 1234567890; const CURRENT_TIME_SECONDS_MOCK = 1234567; diff --git a/packages/transaction-controller/src/helpers/ResimulateHelper.ts b/packages/transaction-controller/src/helpers/ResimulateHelper.ts index debff05c48d..b82bd57aecf 100644 --- a/packages/transaction-controller/src/helpers/ResimulateHelper.ts +++ b/packages/transaction-controller/src/helpers/ResimulateHelper.ts @@ -3,15 +3,15 @@ import { remove0x } from '@metamask/utils'; import { BN } from 'bn.js'; import { isEqual } from 'lodash'; -import { createModuleLogger, projectLogger } from '../logger'; -import { TransactionStatus } from '../types'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import { TransactionStatus } from '../types.js'; import type { SimulationBalanceChange, SimulationData, TransactionMeta, TransactionParams, -} from '../types'; -import { getPercentageChange } from '../utils/utils'; +} from '../types.js'; +import { getPercentageChange } from '../utils/utils.js'; const log = createModuleLogger(projectLogger, 'resimulate-helper'); diff --git a/packages/transaction-controller/src/helpers/TransactionPoller.test.ts b/packages/transaction-controller/src/helpers/TransactionPoller.test.ts index 6f9131de50a..8826eb7209f 100644 --- a/packages/transaction-controller/src/helpers/TransactionPoller.test.ts +++ b/packages/transaction-controller/src/helpers/TransactionPoller.test.ts @@ -1,10 +1,10 @@ import type { Transaction } from '@metamask/core-backend'; import type { BlockTracker } from '@metamask/network-controller'; -import { flushPromises } from '../../../../tests/helpers'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { TransactionPoller } from './TransactionPoller'; +import { flushPromises } from '../../../../tests/helpers.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionPoller } from './TransactionPoller.js'; jest.useFakeTimers(); diff --git a/packages/transaction-controller/src/helpers/TransactionPoller.ts b/packages/transaction-controller/src/helpers/TransactionPoller.ts index b5f10bc3431..406400e2a3d 100644 --- a/packages/transaction-controller/src/helpers/TransactionPoller.ts +++ b/packages/transaction-controller/src/helpers/TransactionPoller.ts @@ -4,10 +4,10 @@ import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import { isEqual } from 'lodash'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { getAcceleratedPollingParams } from '../utils/feature-flags'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { getAcceleratedPollingParams } from '../utils/feature-flags.js'; const log = createModuleLogger(projectLogger, 'transaction-poller'); diff --git a/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts b/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts index 75a27c4ba6f..ce853bf9a22 100644 --- a/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts +++ b/packages/transaction-controller/src/hooks/CollectPublishHook.test.ts @@ -1,8 +1,8 @@ import { noop } from 'lodash'; -import type { TransactionMeta } from '..'; -import { flushPromises } from '../../../../tests/helpers'; -import { CollectPublishHook } from './CollectPublishHook'; +import { flushPromises } from '../../../../tests/helpers.js'; +import type { TransactionMeta } from '../index.js'; +import { CollectPublishHook } from './CollectPublishHook.js'; const SIGNED_TX_MOCK = '0x123'; const SIGNED_TX_2_MOCK = '0x456'; diff --git a/packages/transaction-controller/src/hooks/CollectPublishHook.ts b/packages/transaction-controller/src/hooks/CollectPublishHook.ts index 4fcd31602a7..978608f61e8 100644 --- a/packages/transaction-controller/src/hooks/CollectPublishHook.ts +++ b/packages/transaction-controller/src/hooks/CollectPublishHook.ts @@ -2,8 +2,12 @@ import type { DeferredPromise, Hex } from '@metamask/utils'; import { createDeferredPromise, createModuleLogger } from '@metamask/utils'; import { sortBy } from 'lodash'; -import { projectLogger } from '../logger'; -import type { PublishHook, PublishHookResult, TransactionMeta } from '../types'; +import { projectLogger } from '../logger.js'; +import type { + PublishHook, + PublishHookResult, + TransactionMeta, +} from '../types.js'; const log = createModuleLogger(projectLogger, 'collect-publish-hook'); diff --git a/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.test.ts b/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.test.ts index e950de03df5..6ab008acffd 100644 --- a/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.test.ts +++ b/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.test.ts @@ -4,10 +4,10 @@ import type { BatchTransactionParams, TransactionController, TransactionMeta, -} from '..'; -import type { BatchTransaction } from '../types'; -import { TransactionType } from '../types'; -import { ExtraTransactionsPublishHook } from './ExtraTransactionsPublishHook'; +} from '../index.js'; +import type { BatchTransaction } from '../types.js'; +import { TransactionType } from '../types.js'; +import { ExtraTransactionsPublishHook } from './ExtraTransactionsPublishHook.js'; const SIGNED_TRANSACTION_MOCK = '0xffe'; const SIGNED_TRANSACTION_2_MOCK = '0xfff' as Hex; diff --git a/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.ts b/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.ts index 3c1e240634c..79d21a48206 100644 --- a/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.ts +++ b/packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.ts @@ -1,15 +1,15 @@ import { createDeferredPromise, createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import type { TransactionController } from '..'; -import { projectLogger } from '../logger'; +import type { TransactionController } from '../index.js'; +import { projectLogger } from '../logger.js'; import type { BatchTransactionParams, PublishHook, PublishHookResult, TransactionBatchSingleRequest, TransactionMeta, -} from '../types'; +} from '../types.js'; const log = createModuleLogger( projectLogger, diff --git a/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.test.ts b/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.test.ts index e43d4fd4ef8..06bf99c9e5c 100644 --- a/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.test.ts +++ b/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.test.ts @@ -1,9 +1,9 @@ import type { Hex } from '@metamask/utils'; -import { flushPromises } from '../../../../tests/helpers'; -import type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker'; -import type { PublishBatchHookTransaction, TransactionMeta } from '../types'; -import { SequentialPublishBatchHook } from './SequentialPublishBatchHook'; +import { flushPromises } from '../../../../tests/helpers.js'; +import type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker.js'; +import type { PublishBatchHookTransaction, TransactionMeta } from '../types.js'; +import { SequentialPublishBatchHook } from './SequentialPublishBatchHook.js'; const TRANSACTION_HASH_MOCK = '0x123'; const TRANSACTION_HASH_2_MOCK = '0x456'; diff --git a/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.ts b/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.ts index ee703029558..761b9172e86 100644 --- a/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.ts +++ b/packages/transaction-controller/src/hooks/SequentialPublishBatchHook.ts @@ -2,14 +2,14 @@ import { rpcErrors } from '@metamask/rpc-errors'; import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker'; -import { projectLogger } from '../logger'; +import type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker.js'; +import { projectLogger } from '../logger.js'; import type { PublishBatchHook, PublishBatchHookRequest, PublishBatchHookResult, TransactionMeta, -} from '../types'; +} from '../types.js'; const log = createModuleLogger(projectLogger, 'sequential-publish-batch-hook'); diff --git a/packages/transaction-controller/src/index.ts b/packages/transaction-controller/src/index.ts index 67493bc3dce..cb5f7c4fd01 100644 --- a/packages/transaction-controller/src/index.ts +++ b/packages/transaction-controller/src/index.ts @@ -22,7 +22,7 @@ export type { TransactionControllerUnapprovedTransactionAddedEvent, TransactionControllerMessenger, TransactionControllerOptions, -} from './TransactionController'; +} from './TransactionController.js'; export type { TransactionControllerAddTransactionAction, TransactionControllerAddTransactionBatchAction, @@ -56,12 +56,12 @@ export type { TransactionControllerUpdatePreviousGasParamsAction, TransactionControllerUpdateSelectedGasFeeTokenAction, TransactionControllerUpdateRequiredTransactionIdsAction, -} from './TransactionController-method-action-types'; +} from './TransactionController-method-action-types.js'; export { CANCEL_RATE, SPEED_UP_RATE, TransactionController, -} from './TransactionController'; +} from './TransactionController.js'; export type { AddTransactionOptions, AfterAddHook, @@ -115,7 +115,7 @@ export type { TransactionParams, TransactionReceipt, ValidateSecurityRequest, -} from './types'; +} from './types.js'; export { GasFeeEstimateLevel, GasFeeEstimateType, @@ -127,22 +127,22 @@ export { TransactionType, UserFeeLevel, WalletDevice, -} from './types'; -export { mergeGasFeeEstimates } from './utils/gas-flow'; +} from './types.js'; +export { mergeGasFeeEstimates } from './utils/gas-flow.js'; export { decodeAuthorizationSignature, generateEIP7702BatchTransaction, -} from './utils/eip7702'; +} from './utils/eip7702.js'; export { isEIP1559Transaction, normalizeTransactionParams, -} from './utils/utils'; -export { hasTransactionType } from './utils/transaction-type'; -export { CHAIN_IDS } from './constants'; -export { HARDFORK } from './utils/prepare'; -export { getAccountAddressRelationship } from './api/accounts-api'; +} from './utils/utils.js'; +export { hasTransactionType } from './utils/transaction-type.js'; +export { CHAIN_IDS } from './constants.js'; +export { HARDFORK } from './utils/prepare.js'; +export { getAccountAddressRelationship } from './api/accounts-api.js'; export type { GetAccountAddressRelationshipRequest, AccountAddressRelationshipResult, -} from './api/accounts-api'; -export { generateBatchId } from './utils/batch'; +} from './api/accounts-api.js'; +export { generateBatchId } from './utils/batch.js'; diff --git a/packages/transaction-controller/src/types.ts b/packages/transaction-controller/src/types.ts index 35aac199021..68c01373204 100644 --- a/packages/transaction-controller/src/types.ts +++ b/packages/transaction-controller/src/types.ts @@ -7,7 +7,7 @@ import type { NetworkClientId } from '@metamask/network-controller'; import type { Hex, Json } from '@metamask/utils'; import type { Operation } from 'fast-json-patch'; -import type { TransactionControllerMessenger } from './TransactionController'; +import type { TransactionControllerMessenger } from './TransactionController.js'; /** * Given a record, ensures that each property matches the `Json` type. diff --git a/packages/transaction-controller/src/utils/balance-changes.test.ts b/packages/transaction-controller/src/utils/balance-changes.test.ts index 5013029f065..91948e6eadf 100644 --- a/packages/transaction-controller/src/utils/balance-changes.test.ts +++ b/packages/transaction-controller/src/utils/balance-changes.test.ts @@ -3,22 +3,22 @@ import { Interface } from '@ethersproject/abi'; import type { NetworkClientId } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; -import { simulateTransactions } from '../api/simulation-api'; +import { simulateTransactions } from '../api/simulation-api.js'; import type { SimulationResponseLog, SimulationResponseTransaction, -} from '../api/simulation-api'; -import type { SimulationResponse } from '../api/simulation-api'; +} from '../api/simulation-api.js'; +import type { SimulationResponse } from '../api/simulation-api.js'; import { SimulationInvalidResponseError, SimulationRevertedError, -} from '../errors'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { GetSimulationConfig } from '../types'; -import { SimulationErrorCode, SimulationTokenStandard } from '../types'; -import type { GetBalanceChangesRequest } from './balance-changes'; -import { getBalanceChanges, SupportedToken } from './balance-changes'; -import { rpcRequest } from './provider'; +} from '../errors.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { GetSimulationConfig } from '../types.js'; +import { SimulationErrorCode, SimulationTokenStandard } from '../types.js'; +import type { GetBalanceChangesRequest } from './balance-changes.js'; +import { getBalanceChanges, SupportedToken } from './balance-changes.js'; +import { rpcRequest } from './provider.js'; jest.mock('../api/simulation-api'); diff --git a/packages/transaction-controller/src/utils/balance-changes.ts b/packages/transaction-controller/src/utils/balance-changes.ts index ba3ed0fe1e4..b366a75ba53 100644 --- a/packages/transaction-controller/src/utils/balance-changes.ts +++ b/packages/transaction-controller/src/utils/balance-changes.ts @@ -7,7 +7,7 @@ import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import BN from 'bn.js'; -import { simulateTransactions } from '../api/simulation-api'; +import { simulateTransactions } from '../api/simulation-api.js'; import type { SimulationResponseLog, SimulationRequestTransaction, @@ -15,18 +15,18 @@ import type { SimulationResponseCallTrace, SimulationResponseTransaction, SimulationRequest, -} from '../api/simulation-api'; +} from '../api/simulation-api.js'; import { ABI_SIMULATION_ERC20_WRAPPED, ABI_SIMULATION_ERC721_LEGACY, -} from '../constants'; +} from '../constants.js'; import { SimulationError, SimulationInvalidResponseError, SimulationRevertedError, -} from '../errors'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +} from '../errors.js'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { Revert, SimulationBalanceChange, @@ -36,10 +36,10 @@ import type { TransactionParams, NestedTransactionMetadata, GetSimulationConfig, -} from '../types'; -import { SimulationTokenStandard } from '../types'; -import { getNativeBalance } from './balance'; -import { decodeRevert } from './revert-reason'; +} from '../types.js'; +import { SimulationTokenStandard } from '../types.js'; +import { getNativeBalance } from './balance.js'; +import { decodeRevert } from './revert-reason.js'; export enum SupportedToken { ERC20 = 'erc20', diff --git a/packages/transaction-controller/src/utils/balance.test.ts b/packages/transaction-controller/src/utils/balance.test.ts index cbe32171f6a..a230667a78b 100644 --- a/packages/transaction-controller/src/utils/balance.test.ts +++ b/packages/transaction-controller/src/utils/balance.test.ts @@ -1,10 +1,13 @@ import { toHex } from '@metamask/controller-utils'; import type { NetworkClientId } from '@metamask/network-controller'; -import type { TransactionMeta } from '..'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { getNativeBalance, isNativeBalanceSufficientForGas } from './balance'; -import { rpcRequest } from './provider'; +import type { TransactionMeta } from '../index.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { + getNativeBalance, + isNativeBalanceSufficientForGas, +} from './balance.js'; +import { rpcRequest } from './provider.js'; jest.mock('./provider', () => ({ rpcRequest: jest.fn(), diff --git a/packages/transaction-controller/src/utils/balance.ts b/packages/transaction-controller/src/utils/balance.ts index 1f44f37ba7a..ae1a8cd10a1 100644 --- a/packages/transaction-controller/src/utils/balance.ts +++ b/packages/transaction-controller/src/utils/balance.ts @@ -2,9 +2,9 @@ import type { NetworkClientId } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import type { TransactionMeta } from '..'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { rpcRequest } from './provider'; +import type { TransactionMeta } from '../index.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { rpcRequest } from './provider.js'; /** * Get the native balance for an address. diff --git a/packages/transaction-controller/src/utils/batch.test.ts b/packages/transaction-controller/src/utils/batch.test.ts index d0bdf8c06eb..a642704bc7d 100644 --- a/packages/transaction-controller/src/utils/batch.test.ts +++ b/packages/transaction-controller/src/utils/batch.test.ts @@ -4,46 +4,46 @@ import { ApprovalType } from '@metamask/controller-utils'; import { rpcErrors, errorCodes } from '@metamask/rpc-errors'; import { cloneDeep } from 'lodash'; +import { flushPromises } from '../../../../tests/helpers.js'; +import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow.js'; +import { SequentialPublishBatchHook } from '../hooks/SequentialPublishBatchHook.js'; import { TransactionEnvelopeType, TransactionType, GasFeeEstimateLevel, GasFeeEstimateType, TransactionStatus, -} from '..'; +} from '../index.js'; import type { TransactionControllerMessenger, TransactionControllerState, TransactionMeta, -} from '..'; -import { flushPromises } from '../../../../tests/helpers'; -import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow'; -import { SequentialPublishBatchHook } from '../hooks/SequentialPublishBatchHook'; +} from '../index.js'; import type { GasFeeFlow, PublishBatchHook, RequiredAsset, TransactionBatchSingleRequest, -} from '../types'; +} from '../types.js'; import { ERROR_MESSAGE_NO_UPGRADE_CONTRACT, addTransactionBatch, isAtomicBatchSupported, -} from './batch'; +} from './batch.js'; import { ERROR_MESSGE_PUBLIC_KEY, doesAccountSupportEIP7702, doesChainSupportEIP7702, generateEIP7702BatchTransaction, isAccountUpgradedToEIP7702, -} from './eip7702'; +} from './eip7702.js'; import { getEIP7702SupportedChains, getEIP7702UpgradeContractAddress, -} from './feature-flags'; -import { simulateGasBatch } from './gas'; -import { determineTransactionType } from './transaction-type'; -import { validateBatchRequest } from './validation'; +} from './feature-flags.js'; +import { simulateGasBatch } from './gas.js'; +import { determineTransactionType } from './transaction-type.js'; +import { validateBatchRequest } from './validation.js'; jest.mock('./eip7702'); jest.mock('./feature-flags'); diff --git a/packages/transaction-controller/src/utils/batch.ts b/packages/transaction-controller/src/utils/batch.ts index 26592ff0572..268f1885b9d 100644 --- a/packages/transaction-controller/src/utils/batch.ts +++ b/packages/transaction-controller/src/utils/batch.ts @@ -18,7 +18,12 @@ import { bytesToHex, createModuleLogger } from '@metamask/utils'; import type { WritableDraft } from 'immer/dist/internal.js'; import { parse, v4 } from 'uuid'; -import { GasFeeEstimateLevel, TransactionStatus } from '..'; +import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow.js'; +import { updateTransactionGasEstimates } from '../helpers/GasFeePoller.js'; +import type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker.js'; +import { CollectPublishHook } from '../hooks/CollectPublishHook.js'; +import { SequentialPublishBatchHook } from '../hooks/SequentialPublishBatchHook.js'; +import { GasFeeEstimateLevel, TransactionStatus } from '../index.js'; import type { BatchTransactionParams, GetSimulationConfig, @@ -27,14 +32,9 @@ import type { TransactionControllerMessenger, TransactionControllerState, TransactionMeta, -} from '..'; -import { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow'; -import { updateTransactionGasEstimates } from '../helpers/GasFeePoller'; -import type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker'; -import { CollectPublishHook } from '../hooks/CollectPublishHook'; -import { SequentialPublishBatchHook } from '../hooks/SequentialPublishBatchHook'; -import { projectLogger } from '../logger'; -import { TransactionEnvelopeType, TransactionType } from '../types'; +} from '../index.js'; +import { projectLogger } from '../logger.js'; +import { TransactionEnvelopeType, TransactionType } from '../types.js'; import type { NestedTransactionMetadata, SecurityAlertResponse, @@ -47,24 +47,24 @@ import type { IsAtomicBatchSupportedResult, IsAtomicBatchSupportedResultEntry, TransactionBatchMeta, -} from '../types'; -import type { TransactionBatchResult, TransactionParams } from '../types'; +} from '../types.js'; +import type { TransactionBatchResult, TransactionParams } from '../types.js'; import { ERROR_MESSGE_PUBLIC_KEY, doesAccountSupportEIP7702, doesChainSupportEIP7702, generateEIP7702BatchTransaction, isAccountUpgradedToEIP7702, -} from './eip7702'; +} from './eip7702.js'; import { getBatchSizeLimit, getEIP7702SupportedChains, getEIP7702UpgradeContractAddress, -} from './feature-flags'; -import { simulateGasBatch } from './gas'; -import { getChainId } from './provider'; -import { determineTransactionType } from './transaction-type'; -import { validateBatchRequest } from './validation'; +} from './feature-flags.js'; +import { simulateGasBatch } from './gas.js'; +import { getChainId } from './provider.js'; +import { determineTransactionType } from './transaction-type.js'; +import { validateBatchRequest } from './validation.js'; type UpdateStateCallback = ( callback: ( diff --git a/packages/transaction-controller/src/utils/eip7702.test.ts b/packages/transaction-controller/src/utils/eip7702.test.ts index 155eb007ee1..2d28c16e94d 100644 --- a/packages/transaction-controller/src/utils/eip7702.test.ts +++ b/packages/transaction-controller/src/utils/eip7702.test.ts @@ -11,11 +11,11 @@ import { remove0x } from '@metamask/utils'; import type { KeyringControllerGetStateAction, KeyringControllerSignEip7702AuthorizationAction, -} from '../../../keyring-controller/src'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { TransactionStatus } from '../types'; -import type { AuthorizationList } from '../types'; -import type { TransactionMeta } from '../types'; +} from '../../../keyring-controller/src/index.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { TransactionStatus } from '../types.js'; +import type { AuthorizationList } from '../types.js'; +import type { TransactionMeta } from '../types.js'; import { DELEGATION_PREFIX, decodeAuthorizationSignature, @@ -25,12 +25,12 @@ import { getDelegationAddress, isAccountUpgradedToEIP7702, signAuthorizationList, -} from './eip7702'; +} from './eip7702.js'; import { getEIP7702ContractAddresses, getEIP7702SupportedChains, -} from './feature-flags'; -import { rpcRequest } from './provider'; +} from './feature-flags.js'; +import { rpcRequest } from './provider.js'; jest.mock('../utils/feature-flags'); diff --git a/packages/transaction-controller/src/utils/eip7702.ts b/packages/transaction-controller/src/utils/eip7702.ts index 91b39c390de..ea7f03792ac 100644 --- a/packages/transaction-controller/src/utils/eip7702.ts +++ b/packages/transaction-controller/src/utils/eip7702.ts @@ -5,20 +5,20 @@ import type { NetworkClientId } from '@metamask/network-controller'; import { createModuleLogger, add0x } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { ABI_IERC7821 } from '../constants'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { ABI_IERC7821 } from '../constants.js'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { BatchTransactionParams, Authorization, AuthorizationList, TransactionMeta, -} from '../types'; +} from '../types.js'; import { getEIP7702ContractAddresses, getEIP7702SupportedChains, -} from './feature-flags'; -import { rpcRequest } from './provider'; +} from './feature-flags.js'; +import { rpcRequest } from './provider.js'; export const DELEGATION_PREFIX = '0xef0100'; export const BATCH_FUNCTION_NAME = 'execute'; diff --git a/packages/transaction-controller/src/utils/external-transactions.test.ts b/packages/transaction-controller/src/utils/external-transactions.test.ts index 7fe874e62ef..6093f6b62ed 100644 --- a/packages/transaction-controller/src/utils/external-transactions.test.ts +++ b/packages/transaction-controller/src/utils/external-transactions.test.ts @@ -1,8 +1,8 @@ import { rpcErrors } from '@metamask/rpc-errors'; -import type { TransactionMeta } from '../types'; -import { TransactionStatus } from '../types'; -import { validateConfirmedExternalTransaction } from './external-transactions'; +import type { TransactionMeta } from '../types.js'; +import { TransactionStatus } from '../types.js'; +import { validateConfirmedExternalTransaction } from './external-transactions.js'; describe('validateConfirmedExternalTransaction', () => { const mockTransactionMeta = ( diff --git a/packages/transaction-controller/src/utils/external-transactions.ts b/packages/transaction-controller/src/utils/external-transactions.ts index c7174764e21..cf4f5d2b666 100644 --- a/packages/transaction-controller/src/utils/external-transactions.ts +++ b/packages/transaction-controller/src/utils/external-transactions.ts @@ -1,8 +1,8 @@ // These utility functions are exclusively used by `confirmExternalTransaction` method in controller import { rpcErrors } from '@metamask/rpc-errors'; -import { TransactionStatus } from '../types'; -import type { TransactionMeta } from '../types'; +import { TransactionStatus } from '../types.js'; +import type { TransactionMeta } from '../types.js'; /** * Validates the external provided transaction meta. diff --git a/packages/transaction-controller/src/utils/feature-flags.test.ts b/packages/transaction-controller/src/utils/feature-flags.test.ts index 405008c10b6..74437d7f93a 100644 --- a/packages/transaction-controller/src/utils/feature-flags.test.ts +++ b/packages/transaction-controller/src/utils/feature-flags.test.ts @@ -7,8 +7,8 @@ import type { import type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller'; import type { Hex } from '@metamask/utils'; -import type { TransactionControllerMessenger } from '..'; -import type { TransactionControllerFeatureFlags } from './feature-flags'; +import type { TransactionControllerMessenger } from '../index.js'; +import type { TransactionControllerFeatureFlags } from './feature-flags.js'; import { getAcceleratedPollingParams, getBatchSizeLimit, @@ -22,8 +22,8 @@ import { getTransactionHistoryLimit, FeatureFlag, getTimeoutAttempts, -} from './feature-flags'; -import { isValidSignature } from './signature'; +} from './feature-flags.js'; +import { isValidSignature } from './signature.js'; jest.mock('./signature'); diff --git a/packages/transaction-controller/src/utils/feature-flags.ts b/packages/transaction-controller/src/utils/feature-flags.ts index 128e5844cf0..d7bf191c5e0 100644 --- a/packages/transaction-controller/src/utils/feature-flags.ts +++ b/packages/transaction-controller/src/utils/feature-flags.ts @@ -1,10 +1,10 @@ import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { isValidSignature } from './signature'; -import { padHexToEvenLength } from './utils'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { isValidSignature } from './signature.js'; +import { padHexToEvenLength } from './utils.js'; const DEFAULT_BATCH_SIZE_LIMIT = 10; const DEFAULT_ACCELERATED_POLLING_COUNT_MAX = 10; diff --git a/packages/transaction-controller/src/utils/first-time-interaction.test.ts b/packages/transaction-controller/src/utils/first-time-interaction.test.ts index 208141f6ee7..5cf7329e3f3 100644 --- a/packages/transaction-controller/src/utils/first-time-interaction.test.ts +++ b/packages/transaction-controller/src/utils/first-time-interaction.test.ts @@ -1,11 +1,11 @@ import type { TraceContext } from '@metamask/controller-utils'; -import { getAccountAddressRelationship } from '../api/accounts-api'; -import type { TransactionMeta } from '../types'; -import { TransactionStatus, TransactionType } from '../types'; -import { updateFirstTimeInteraction } from './first-time-interaction'; -import { decodeTransactionData } from './transaction-type'; -import { validateParamTo } from './validation'; +import { getAccountAddressRelationship } from '../api/accounts-api.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionStatus, TransactionType } from '../types.js'; +import { updateFirstTimeInteraction } from './first-time-interaction.js'; +import { decodeTransactionData } from './transaction-type.js'; +import { validateParamTo } from './validation.js'; jest.mock('./transaction-type'); jest.mock('./validation'); diff --git a/packages/transaction-controller/src/utils/first-time-interaction.ts b/packages/transaction-controller/src/utils/first-time-interaction.ts index 85ba6cfbcf0..f6d20c95393 100644 --- a/packages/transaction-controller/src/utils/first-time-interaction.ts +++ b/packages/transaction-controller/src/utils/first-time-interaction.ts @@ -2,13 +2,13 @@ import type { TransactionDescription } from '@ethersproject/abi'; import type { TraceContext, TraceCallback } from '@metamask/controller-utils'; import { hexToNumber } from '@metamask/utils'; -import { getAccountAddressRelationship } from '../api/accounts-api'; -import type { GetAccountAddressRelationshipRequest } from '../api/accounts-api'; -import { projectLogger as log } from '../logger'; -import { TransactionType } from '../types'; -import type { TransactionMeta } from '../types'; -import { decodeTransactionData } from './transaction-type'; -import { validateParamTo } from './validation'; +import { getAccountAddressRelationship } from '../api/accounts-api.js'; +import type { GetAccountAddressRelationshipRequest } from '../api/accounts-api.js'; +import { projectLogger as log } from '../logger.js'; +import { TransactionType } from '../types.js'; +import type { TransactionMeta } from '../types.js'; +import { decodeTransactionData } from './transaction-type.js'; +import { validateParamTo } from './validation.js'; const TOKEN_TRANSFER_TYPES = [ TransactionType.tokenMethodTransfer, diff --git a/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts b/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts index 8a6418375d4..6cad84fc4ec 100644 --- a/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts +++ b/packages/transaction-controller/src/utils/gas-fee-tokens.test.ts @@ -1,21 +1,21 @@ import type { Hex } from '@metamask/utils'; import { cloneDeep } from 'lodash'; +import { simulateTransactions } from '../api/simulation-api.js'; import type { GasFeeToken, GetSimulationConfig, TransactionControllerMessenger, TransactionMeta, -} from '..'; -import { simulateTransactions } from '../api/simulation-api'; -import { isNativeBalanceSufficientForGas } from './balance'; -import { doesChainSupportEIP7702 } from './eip7702'; -import { getEIP7702UpgradeContractAddress } from './feature-flags'; -import type { GetGasFeeTokensRequest } from './gas-fee-tokens'; +} from '../index.js'; +import { isNativeBalanceSufficientForGas } from './balance.js'; +import { doesChainSupportEIP7702 } from './eip7702.js'; +import { getEIP7702UpgradeContractAddress } from './feature-flags.js'; +import type { GetGasFeeTokensRequest } from './gas-fee-tokens.js'; import { checkGasFeeTokenBeforePublish, getGasFeeTokens, -} from './gas-fee-tokens'; +} from './gas-fee-tokens.js'; jest.mock('../api/simulation-api'); jest.mock('./eip7702'); diff --git a/packages/transaction-controller/src/utils/gas-fee-tokens.ts b/packages/transaction-controller/src/utils/gas-fee-tokens.ts index ce4205aa188..c51dcb37ac0 100644 --- a/packages/transaction-controller/src/utils/gas-fee-tokens.ts +++ b/packages/transaction-controller/src/utils/gas-fee-tokens.ts @@ -3,23 +3,23 @@ import { rpcErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; +import { simulateTransactions } from '../api/simulation-api.js'; +import type { SimulationRequestTransaction } from '../api/simulation-api.js'; +import type { + SimulationResponse, + SimulationResponseTransaction, +} from '../api/simulation-api.js'; import type { GasFeeToken, TransactionControllerMessenger, TransactionMeta, -} from '..'; -import { simulateTransactions } from '../api/simulation-api'; -import type { SimulationRequestTransaction } from '../api/simulation-api'; -import type { - SimulationResponse, - SimulationResponseTransaction, -} from '../api/simulation-api'; -import { projectLogger } from '../logger'; -import type { GetSimulationConfig } from '../types'; -import { isNativeBalanceSufficientForGas } from './balance'; -import { ERROR_MESSAGE_NO_UPGRADE_CONTRACT } from './batch'; -import { ERROR_MESSGE_PUBLIC_KEY, doesChainSupportEIP7702 } from './eip7702'; -import { getEIP7702UpgradeContractAddress } from './feature-flags'; +} from '../index.js'; +import { projectLogger } from '../logger.js'; +import type { GetSimulationConfig } from '../types.js'; +import { isNativeBalanceSufficientForGas } from './balance.js'; +import { ERROR_MESSAGE_NO_UPGRADE_CONTRACT } from './batch.js'; +import { ERROR_MESSGE_PUBLIC_KEY, doesChainSupportEIP7702 } from './eip7702.js'; +import { getEIP7702UpgradeContractAddress } from './feature-flags.js'; const log = createModuleLogger(projectLogger, 'gas-fee-tokens'); diff --git a/packages/transaction-controller/src/utils/gas-fees.test.ts b/packages/transaction-controller/src/utils/gas-fees.test.ts index 0885e3dad40..55deb04f5fb 100644 --- a/packages/transaction-controller/src/utils/gas-fees.test.ts +++ b/packages/transaction-controller/src/utils/gas-fees.test.ts @@ -1,16 +1,16 @@ import type { NetworkClientId } from '@metamask/network-controller'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { GasFeeFlow, GasFeeFlowResponse } from '../types'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { GasFeeFlow, GasFeeFlowResponse } from '../types.js'; import { GasFeeEstimateLevel, GasFeeEstimateType, TransactionType, UserFeeLevel, -} from '../types'; -import type { UpdateGasFeesRequest } from './gas-fees'; -import { gweiDecimalToWeiDecimal, updateGasFees } from './gas-fees'; -import { rpcRequest } from './provider'; +} from '../types.js'; +import type { UpdateGasFeesRequest } from './gas-fees.js'; +import { gweiDecimalToWeiDecimal, updateGasFees } from './gas-fees.js'; +import { rpcRequest } from './provider.js'; jest.mock('./provider', () => ({ rpcRequest: jest.fn(), diff --git a/packages/transaction-controller/src/utils/gas-fees.ts b/packages/transaction-controller/src/utils/gas-fees.ts index 33f12cf9878..0c4adab24ff 100644 --- a/packages/transaction-controller/src/utils/gas-fees.ts +++ b/packages/transaction-controller/src/utils/gas-fees.ts @@ -6,21 +6,21 @@ import type { import type { Hex } from '@metamask/utils'; import { add0x, createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { SavedGasFees, TransactionParams, TransactionMeta, GasFeeFlow, -} from '../types'; +} from '../types.js'; import { GasFeeEstimateLevel, GasFeeEstimateType, UserFeeLevel, -} from '../types'; -import { getGasFeeFlow } from './gas-flow'; -import { rpcRequest } from './provider'; +} from '../types.js'; +import { getGasFeeFlow } from './gas-flow.js'; +import { rpcRequest } from './provider.js'; export type UpdateGasFeesRequest = { eip1559: boolean; diff --git a/packages/transaction-controller/src/utils/gas-flow.test.ts b/packages/transaction-controller/src/utils/gas-flow.test.ts index 7e80fa5f8f2..cb6405ff87e 100644 --- a/packages/transaction-controller/src/utils/gas-flow.test.ts +++ b/packages/transaction-controller/src/utils/gas-flow.test.ts @@ -1,15 +1,15 @@ import type { GasFeeEstimates as GasFeeControllerEstimates } from '@metamask/gas-fee-controller'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { FeeMarketGasFeeEstimates, GasFeeFlow, GasPriceGasFeeEstimates, LegacyGasFeeEstimates, TransactionMeta, -} from '../types'; -import { GasFeeEstimateType, TransactionStatus } from '../types'; -import { getGasFeeFlow, mergeGasFeeEstimates } from './gas-flow'; +} from '../types.js'; +import { GasFeeEstimateType, TransactionStatus } from '../types.js'; +import { getGasFeeFlow, mergeGasFeeEstimates } from './gas-flow.js'; const TRANSACTION_META_MOCK: TransactionMeta = { id: '1', diff --git a/packages/transaction-controller/src/utils/gas-flow.ts b/packages/transaction-controller/src/utils/gas-flow.ts index 94e21e5e579..1bf68eb9768 100644 --- a/packages/transaction-controller/src/utils/gas-flow.ts +++ b/packages/transaction-controller/src/utils/gas-flow.ts @@ -7,18 +7,18 @@ import type { } from '@metamask/gas-fee-controller'; import type { GasFeeState } from '@metamask/gas-fee-controller'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { GasFeeEstimateLevel, GasFeeEstimateType } from '../types.js'; import type { FeeMarketGasFeeEstimates, GasPriceGasFeeEstimates, LegacyGasFeeEstimates, -} from '../types'; +} from '../types.js'; import type { GasFeeFlow, TransactionMeta, FeeMarketGasFeeEstimateForLevel, -} from '../types'; +} from '../types.js'; type MergeGasFeeEstimatesRequest = { gasFeeControllerEstimates: diff --git a/packages/transaction-controller/src/utils/gas.test.ts b/packages/transaction-controller/src/utils/gas.test.ts index a54716235e5..a8cd9eb2a7a 100644 --- a/packages/transaction-controller/src/utils/gas.test.ts +++ b/packages/transaction-controller/src/utils/gas.test.ts @@ -6,19 +6,25 @@ import { cloneDeep } from 'lodash'; import type { SimulationResponse, SimulationResponseTransaction, -} from '../api/simulation-api'; -import { simulateTransactions } from '../api/simulation-api'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { TransactionEnvelopeType } from '../types'; -import type { TransactionMeta } from '../types'; +} from '../api/simulation-api.js'; +import { simulateTransactions } from '../api/simulation-api.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { TransactionEnvelopeType } from '../types.js'; +import type { TransactionMeta } from '../types.js'; import type { AuthorizationList, BatchTransactionParams, TransactionBatchSingleRequest, -} from '../types'; -import { DELEGATION_PREFIX, generateEIP7702BatchTransaction } from './eip7702'; -import { getGasEstimateBuffer, getGasEstimateFallback } from './feature-flags'; -import type { UpdateGasRequest } from './gas'; +} from '../types.js'; +import { + DELEGATION_PREFIX, + generateEIP7702BatchTransaction, +} from './eip7702.js'; +import { + getGasEstimateBuffer, + getGasEstimateFallback, +} from './feature-flags.js'; +import type { UpdateGasRequest } from './gas.js'; import { addGasBuffer, estimateGas, @@ -31,8 +37,8 @@ import { INTRINSIC_GAS, DUMMY_AUTHORIZATION_SIGNATURE, simulateGasBatch, -} from './gas'; -import { rpcRequest } from './provider'; +} from './gas.js'; +import { rpcRequest } from './provider.js'; jest.mock('./provider', () => ({ ...jest.requireActual('./provider'), diff --git a/packages/transaction-controller/src/utils/gas.ts b/packages/transaction-controller/src/utils/gas.ts index f04568a6a91..bc2fd95d260 100644 --- a/packages/transaction-controller/src/utils/gas.ts +++ b/packages/transaction-controller/src/utils/gas.ts @@ -9,10 +9,10 @@ import type { Hex, Json } from '@metamask/utils'; import { add0x, createModuleLogger, remove0x } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { simulateTransactions } from '../api/simulation-api'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { TransactionEnvelopeType } from '../types'; +import { simulateTransactions } from '../api/simulation-api.js'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { TransactionEnvelopeType } from '../types.js'; import type { AuthorizationList, BatchTransactionParams, @@ -23,15 +23,18 @@ import type { TransactionBatchSingleRequest, TransactionMeta, TransactionParams, -} from '../types'; +} from '../types.js'; import { DELEGATION_PREFIX, doesAccountSupportEIP7702, generateEIP7702BatchTransaction, -} from './eip7702'; -import { getGasEstimateBuffer, getGasEstimateFallback } from './feature-flags'; -import { getChainId, rpcRequest } from './provider'; -import { decodeRevert } from './revert-reason'; +} from './eip7702.js'; +import { + getGasEstimateBuffer, + getGasEstimateFallback, +} from './feature-flags.js'; +import { getChainId, rpcRequest } from './provider.js'; +import { decodeRevert } from './revert-reason.js'; export type UpdateGasRequest = { isCustomNetwork: boolean; diff --git a/packages/transaction-controller/src/utils/layer1-gas-fee-flow.test.ts b/packages/transaction-controller/src/utils/layer1-gas-fee-flow.test.ts index 34135610164..69fed9cc58b 100644 --- a/packages/transaction-controller/src/utils/layer1-gas-fee-flow.test.ts +++ b/packages/transaction-controller/src/utils/layer1-gas-fee-flow.test.ts @@ -1,9 +1,9 @@ import type { Hex } from '@metamask/utils'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { TransactionStatus } from '../types'; -import type { Layer1GasFeeFlow, TransactionMeta } from '../types'; -import { updateTransactionLayer1GasFee } from './layer1-gas-fee-flow'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { TransactionStatus } from '../types.js'; +import type { Layer1GasFeeFlow, TransactionMeta } from '../types.js'; +import { updateTransactionLayer1GasFee } from './layer1-gas-fee-flow.js'; jest.mock('@metamask/controller-utils', () => ({ ...jest.requireActual('@metamask/controller-utils'), diff --git a/packages/transaction-controller/src/utils/layer1-gas-fee-flow.ts b/packages/transaction-controller/src/utils/layer1-gas-fee-flow.ts index 91814854e4d..43295fda433 100644 --- a/packages/transaction-controller/src/utils/layer1-gas-fee-flow.ts +++ b/packages/transaction-controller/src/utils/layer1-gas-fee-flow.ts @@ -1,9 +1,9 @@ import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import { projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { Layer1GasFeeFlow, TransactionMeta } from '../types'; +import { projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { Layer1GasFeeFlow, TransactionMeta } from '../types.js'; const log = createModuleLogger(projectLogger, 'layer-1-gas-fee-flow'); diff --git a/packages/transaction-controller/src/utils/nonce.test.ts b/packages/transaction-controller/src/utils/nonce.test.ts index a9563c8cad4..f1355aaa51e 100644 --- a/packages/transaction-controller/src/utils/nonce.test.ts +++ b/packages/transaction-controller/src/utils/nonce.test.ts @@ -3,9 +3,12 @@ import type { Transaction as NonceTrackerTransaction, } from '@metamask/nonce-tracker'; -import type { TransactionMeta } from '../types'; -import { TransactionStatus } from '../types'; -import { getAndFormatTransactionsForNonceTracker, getNextNonce } from './nonce'; +import type { TransactionMeta } from '../types.js'; +import { TransactionStatus } from '../types.js'; +import { + getAndFormatTransactionsForNonceTracker, + getNextNonce, +} from './nonce.js'; const TRANSACTION_META_MOCK: TransactionMeta = { chainId: '0x1', diff --git a/packages/transaction-controller/src/utils/nonce.ts b/packages/transaction-controller/src/utils/nonce.ts index 8c17ee5c12a..49c65bf336f 100644 --- a/packages/transaction-controller/src/utils/nonce.ts +++ b/packages/transaction-controller/src/utils/nonce.ts @@ -4,8 +4,8 @@ import type { Transaction as NonceTrackerTransaction, } from '@metamask/nonce-tracker'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { TransactionMeta, TransactionStatus } from '../types'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { TransactionMeta, TransactionStatus } from '../types.js'; const log = createModuleLogger(projectLogger, 'nonce'); diff --git a/packages/transaction-controller/src/utils/prepare.test.ts b/packages/transaction-controller/src/utils/prepare.test.ts index c714afb0f47..a109bc13897 100644 --- a/packages/transaction-controller/src/utils/prepare.test.ts +++ b/packages/transaction-controller/src/utils/prepare.test.ts @@ -4,9 +4,9 @@ import { EOACodeEIP7702Transaction, } from '@ethereumjs/tx'; -import { TransactionEnvelopeType } from '../types'; -import type { Authorization, TransactionParams } from '../types'; -import { prepareTransaction, serializeTransaction } from './prepare'; +import { TransactionEnvelopeType } from '../types.js'; +import type { Authorization, TransactionParams } from '../types.js'; +import { prepareTransaction, serializeTransaction } from './prepare.js'; const CHAIN_ID_MOCK = '0x123'; diff --git a/packages/transaction-controller/src/utils/prepare.ts b/packages/transaction-controller/src/utils/prepare.ts index 2ec62c1b645..96bd589b672 100644 --- a/packages/transaction-controller/src/utils/prepare.ts +++ b/packages/transaction-controller/src/utils/prepare.ts @@ -6,7 +6,7 @@ import { bytesToHex } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; import { cloneDeep } from 'lodash'; -import type { AuthorizationList, TransactionParams } from '../types'; +import type { AuthorizationList, TransactionParams } from '../types.js'; export const HARDFORK = Hardfork.Prague; diff --git a/packages/transaction-controller/src/utils/provider.test.ts b/packages/transaction-controller/src/utils/provider.test.ts index 248124da355..4c9df1cf674 100644 --- a/packages/transaction-controller/src/utils/provider.test.ts +++ b/packages/transaction-controller/src/utils/provider.test.ts @@ -3,8 +3,8 @@ import { NetworkClientType } from '@metamask/network-controller'; import { RpcEndpointType } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import { getProvider, rpcRequest } from './provider'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import { getProvider, rpcRequest } from './provider.js'; describe('provider utils', () => { const requestMock = jest.fn(); diff --git a/packages/transaction-controller/src/utils/provider.ts b/packages/transaction-controller/src/utils/provider.ts index 0187a158524..ffa95c133b2 100644 --- a/packages/transaction-controller/src/utils/provider.ts +++ b/packages/transaction-controller/src/utils/provider.ts @@ -6,8 +6,8 @@ import type { import { NetworkClientType } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; const log = createModuleLogger(projectLogger, 'provider'); diff --git a/packages/transaction-controller/src/utils/retry.test.ts b/packages/transaction-controller/src/utils/retry.test.ts index 48a04bc13f4..5897730741a 100644 --- a/packages/transaction-controller/src/utils/retry.test.ts +++ b/packages/transaction-controller/src/utils/retry.test.ts @@ -1,5 +1,5 @@ -import type { TransactionParams } from '../types'; -import { getTransactionParamsWithIncreasedGasFee } from './retry'; +import type { TransactionParams } from '../types.js'; +import { getTransactionParamsWithIncreasedGasFee } from './retry.js'; const RATE_MOCK = 16; const VALUE_MOCK = '0x111'; diff --git a/packages/transaction-controller/src/utils/retry.ts b/packages/transaction-controller/src/utils/retry.ts index 9ab1e28aed3..61f37280986 100644 --- a/packages/transaction-controller/src/utils/retry.ts +++ b/packages/transaction-controller/src/utils/retry.ts @@ -6,7 +6,7 @@ import type { FeeMarketEIP1559Values, GasPriceValue, TransactionParams, -} from '../types'; +} from '../types.js'; /** * Returns new transaction parameters with increased gas fees. diff --git a/packages/transaction-controller/src/utils/revert-reason.test.ts b/packages/transaction-controller/src/utils/revert-reason.test.ts index 4133c8902e2..14aee347388 100644 --- a/packages/transaction-controller/src/utils/revert-reason.test.ts +++ b/packages/transaction-controller/src/utils/revert-reason.test.ts @@ -1,11 +1,11 @@ -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { rpcRequest } from './provider'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { rpcRequest } from './provider.js'; import { decodeRevert, extractRevert, OnChainFailureError, -} from './revert-reason'; +} from './revert-reason.js'; jest.mock('./provider', () => ({ ...jest.requireActual('./provider'), diff --git a/packages/transaction-controller/src/utils/revert-reason.ts b/packages/transaction-controller/src/utils/revert-reason.ts index 9079b4badeb..6c04c74b9ec 100644 --- a/packages/transaction-controller/src/utils/revert-reason.ts +++ b/packages/transaction-controller/src/utils/revert-reason.ts @@ -2,10 +2,10 @@ import { defaultAbiCoder } from '@ethersproject/abi'; import type { NetworkClientId } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { Revert, TransactionParams } from '../types'; -import { rpcRequest } from './provider'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { Revert, TransactionParams } from '../types.js'; +import { rpcRequest } from './provider.js'; const log = createModuleLogger(projectLogger, 'revert-reason'); diff --git a/packages/transaction-controller/src/utils/signature.test.ts b/packages/transaction-controller/src/utils/signature.test.ts index c07e25fce5c..346c1ae45a8 100644 --- a/packages/transaction-controller/src/utils/signature.test.ts +++ b/packages/transaction-controller/src/utils/signature.test.ts @@ -1,4 +1,4 @@ -import { isValidSignature } from './signature'; +import { isValidSignature } from './signature.js'; const VALUE_1_MOCK = '0x12345678'; const VALUE_2_MOCK = '0xabcabcabcabcabcabcabcabc'; diff --git a/packages/transaction-controller/src/utils/swaps.test.ts b/packages/transaction-controller/src/utils/swaps.test.ts index 39d34351008..dc10956a7cc 100644 --- a/packages/transaction-controller/src/utils/swaps.test.ts +++ b/packages/transaction-controller/src/utils/swaps.test.ts @@ -6,18 +6,18 @@ import type { } from '@metamask/messenger'; import type { NetworkClientId } from '@metamask/network-controller'; -import { flushPromises } from '../../../../tests/helpers'; -import { CHAIN_IDS } from '../constants'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { TransactionType, TransactionStatus } from '../types'; -import { rpcRequest } from './provider'; +import { flushPromises } from '../../../../tests/helpers.js'; +import { CHAIN_IDS } from '../constants.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionType, TransactionStatus } from '../types.js'; +import { rpcRequest } from './provider.js'; import { updateSwapsTransaction, updatePostTransactionBalance, UPDATE_POST_TX_BALANCE_ATTEMPTS, SWAPS_CHAINID_DEFAULT_TOKEN_MAP, -} from './swaps'; +} from './swaps.js'; jest.mock('./provider', () => ({ rpcRequest: jest.fn(), diff --git a/packages/transaction-controller/src/utils/swaps.ts b/packages/transaction-controller/src/utils/swaps.ts index d6c8755b97a..685cf00cc35 100644 --- a/packages/transaction-controller/src/utils/swaps.ts +++ b/packages/transaction-controller/src/utils/swaps.ts @@ -1,13 +1,13 @@ import type { NetworkClientId } from '@metamask/network-controller'; import { merge, pickBy } from 'lodash'; -import { CHAIN_IDS } from '../constants'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { TransactionType } from '../types'; -import { rpcRequest } from './provider'; -import { validateIfTransactionUnapproved } from './utils'; +import { CHAIN_IDS } from '../constants.js'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionType } from '../types.js'; +import { rpcRequest } from './provider.js'; +import { validateIfTransactionUnapproved } from './utils.js'; const log = createModuleLogger(projectLogger, 'swaps'); diff --git a/packages/transaction-controller/src/utils/transaction-type.test.ts b/packages/transaction-controller/src/utils/transaction-type.test.ts index 7e4284e76ab..6a2a776b4db 100644 --- a/packages/transaction-controller/src/utils/transaction-type.test.ts +++ b/packages/transaction-controller/src/utils/transaction-type.test.ts @@ -8,16 +8,16 @@ import { } from '@metamask/metamask-eth-abis'; import type { NetworkClientId } from '@metamask/network-controller'; -import type { TransactionControllerMessenger } from '../TransactionController'; -import type { TransactionMeta } from '../types'; -import { TransactionType } from '../types'; -import { DELEGATION_PREFIX } from './eip7702'; -import { rpcRequest } from './provider'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; +import type { TransactionMeta } from '../types.js'; +import { TransactionType } from '../types.js'; +import { DELEGATION_PREFIX } from './eip7702.js'; +import { rpcRequest } from './provider.js'; import { decodeTransactionData, determineTransactionType, hasTransactionType, -} from './transaction-type'; +} from './transaction-type.js'; jest.mock('./provider', () => ({ rpcRequest: jest.fn(), diff --git a/packages/transaction-controller/src/utils/transaction-type.ts b/packages/transaction-controller/src/utils/transaction-type.ts index abb2d0d0fe1..e2700a31ea5 100644 --- a/packages/transaction-controller/src/utils/transaction-type.ts +++ b/packages/transaction-controller/src/utils/transaction-type.ts @@ -8,15 +8,15 @@ import { } from '@metamask/metamask-eth-abis'; import type { NetworkClientId } from '@metamask/network-controller'; -import type { TransactionControllerMessenger } from '../TransactionController'; +import type { TransactionControllerMessenger } from '../TransactionController.js'; import type { InferTransactionTypeResult, TransactionMeta, TransactionParams, -} from '../types'; -import { TransactionType } from '../types'; -import { DELEGATION_PREFIX } from './eip7702'; -import { rpcRequest } from './provider'; +} from '../types.js'; +import { TransactionType } from '../types.js'; +import { DELEGATION_PREFIX } from './eip7702.js'; +import { rpcRequest } from './provider.js'; export const ESTIMATE_GAS_ERROR = 'eth_estimateGas rpc method error'; diff --git a/packages/transaction-controller/src/utils/utils.test.ts b/packages/transaction-controller/src/utils/utils.test.ts index 64ddcc7d005..c0a9d2a6f2e 100644 --- a/packages/transaction-controller/src/utils/utils.test.ts +++ b/packages/transaction-controller/src/utils/utils.test.ts @@ -5,9 +5,9 @@ import type { FeeMarketEIP1559Values, GasPriceValue, TransactionParams, -} from '../types'; -import { TransactionStatus } from '../types'; -import * as util from './utils'; +} from '../types.js'; +import { TransactionStatus } from '../types.js'; +import * as util from './utils.js'; const MAX_FEE_PER_GAS = 'maxFeePerGas'; const MAX_PRIORITY_FEE_PER_GAS = 'maxPriorityFeePerGas'; diff --git a/packages/transaction-controller/src/utils/utils.ts b/packages/transaction-controller/src/utils/utils.ts index 553bd2cec22..d5bb4c4e10f 100644 --- a/packages/transaction-controller/src/utils/utils.ts +++ b/packages/transaction-controller/src/utils/utils.ts @@ -16,8 +16,8 @@ import type { TransactionError, TransactionMeta, TransactionParams, -} from '../types'; -import { TransactionEnvelopeType, TransactionStatus } from '../types'; +} from '../types.js'; +import { TransactionEnvelopeType, TransactionStatus } from '../types.js'; export const ESTIMATE_GAS_ERROR = 'eth_estimateGas rpc method error'; diff --git a/packages/transaction-controller/src/utils/validation.test.ts b/packages/transaction-controller/src/utils/validation.test.ts index f9bc98e7644..ab2c78cc6f1 100644 --- a/packages/transaction-controller/src/utils/validation.test.ts +++ b/packages/transaction-controller/src/utils/validation.test.ts @@ -1,14 +1,14 @@ import { rpcErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; -import { TransactionEnvelopeType, TransactionType } from '../types'; -import type { TransactionParams } from '../types'; +import { TransactionEnvelopeType, TransactionType } from '../types.js'; +import type { TransactionParams } from '../types.js'; import { validateBatchRequest, validateParamTo, validateTransactionOrigin, validateTxParams, -} from './validation'; +} from './validation.js'; const DATA_MOCK = '0x12345678'; const FROM_MOCK: Hex = '0x1678a085c290ebd122dc42cba69373b5953b831d'; diff --git a/packages/transaction-controller/src/utils/validation.ts b/packages/transaction-controller/src/utils/validation.ts index c3421bf2028..5617a377b23 100644 --- a/packages/transaction-controller/src/utils/validation.ts +++ b/packages/transaction-controller/src/utils/validation.ts @@ -5,13 +5,13 @@ import { JsonRpcError, providerErrors, rpcErrors } from '@metamask/rpc-errors'; import type { Hex } from '@metamask/utils'; import { isStrictHexString, remove0x } from '@metamask/utils'; -import { TransactionEnvelopeType, TransactionType } from '../types'; +import { TransactionEnvelopeType, TransactionType } from '../types.js'; import type { Authorization, TransactionBatchRequest, TransactionParams, -} from '../types'; -import { isEIP1559Transaction } from './utils'; +} from '../types.js'; +import { isEIP1559Transaction } from './utils.js'; export enum ErrorCode { DuplicateBundleId = 5720, diff --git a/packages/transaction-controller/tests/JsonRpcRequestMocks.ts b/packages/transaction-controller/tests/JsonRpcRequestMocks.ts index 6d211e1af58..64d0b8116fe 100644 --- a/packages/transaction-controller/tests/JsonRpcRequestMocks.ts +++ b/packages/transaction-controller/tests/JsonRpcRequestMocks.ts @@ -1,6 +1,6 @@ import type { Hex } from '@metamask/utils'; -import type { JsonRpcRequestMock } from '../../../tests/mock-network'; +import type { JsonRpcRequestMock } from '../../../tests/mock-network.js'; /** * Builds mock eth_gasPrice request. From ba4d8df5c677b475828545ab6a6711eb6b641e55 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:44:35 +0200 Subject: [PATCH 10/11] Add .js import extensions to transaction-pay-controller --- eslint.config.mjs | 1 + .../transaction-pay-controller/package.json | 4 +- ...actionPayController-method-action-types.ts | 2 +- .../src/TransactionPayController.test.ts | 22 +++++------ .../src/TransactionPayController.ts | 18 ++++----- .../src/actions/update-fiat-payment.test.ts | 6 +-- .../src/actions/update-fiat-payment.ts | 8 ++-- .../src/actions/update-payment-token.test.ts | 12 +++--- .../src/actions/update-payment-token.ts | 10 ++--- .../src/constants.test.ts | 2 +- .../src/helpers/QuoteRefresher.test.ts | 12 +++--- .../src/helpers/QuoteRefresher.ts | 10 ++--- .../helpers/TransactionPayPublishHook.test.ts | 10 ++--- .../src/helpers/TransactionPayPublishHook.ts | 14 +++---- .../transaction-pay-controller/src/index.ts | 10 ++--- .../strategy/across/AcrossStrategy.test.ts | 14 +++---- .../src/strategy/across/AcrossStrategy.ts | 18 ++++----- .../strategy/across/across-actions.test.ts | 4 +- .../src/strategy/across/across-actions.ts | 6 +-- .../src/strategy/across/across-quotes.test.ts | 24 ++++++------ .../src/strategy/across/across-quotes.ts | 37 ++++++++++--------- .../src/strategy/across/across-submit.test.ts | 14 +++---- .../src/strategy/across/across-submit.ts | 18 ++++----- .../src/strategy/across/authorization-list.ts | 2 +- .../src/strategy/across/perps.ts | 4 +- .../src/strategy/across/requests.ts | 2 +- .../src/strategy/across/transactions.test.ts | 4 +- .../src/strategy/across/transactions.ts | 2 +- .../src/strategy/fiat/FiatStrategy.test.ts | 12 +++--- .../src/strategy/fiat/FiatStrategy.ts | 10 ++--- .../src/strategy/fiat/constants.ts | 2 +- .../strategy/fiat/fiat-direct-musd.test.ts | 12 +++--- .../src/strategy/fiat/fiat-direct-musd.ts | 20 +++++----- .../src/strategy/fiat/fiat-quotes.test.ts | 21 ++++++----- .../src/strategy/fiat/fiat-quotes.ts | 25 +++++++------ .../strategy/fiat/fiat-submit-simple.test.ts | 16 ++++---- .../src/strategy/fiat/fiat-submit-simple.ts | 14 +++---- .../fiat-submit-with-transaction-data.test.ts | 18 ++++----- .../fiat/fiat-submit-with-transaction-data.ts | 18 ++++----- .../src/strategy/fiat/fiat-submit.test.ts | 29 ++++++++------- .../src/strategy/fiat/fiat-submit.ts | 22 +++++------ .../strategy/fiat/fiat-test-funding.test.ts | 19 ++++++---- .../src/strategy/fiat/fiat-test-funding.ts | 20 +++++----- .../src/strategy/fiat/types.ts | 2 +- .../src/strategy/fiat/utils.test.ts | 15 +++++--- .../src/strategy/fiat/utils.ts | 16 ++++---- .../src/strategy/relay/RelayBridge.test.ts | 12 +++--- .../src/strategy/relay/RelayStrategy.test.ts | 12 +++--- .../src/strategy/relay/RelayStrategy.ts | 10 ++--- .../src/strategy/relay/constants.ts | 4 +- .../relay/hyperliquid-activation.test.ts | 10 ++--- .../strategy/relay/hyperliquid-activation.ts | 10 ++--- .../relay/hyperliquid-withdraw.test.ts | 10 ++--- .../strategy/relay/hyperliquid-withdraw.ts | 10 ++--- .../relay/polymarket/withdraw.test.ts | 14 +++---- .../src/strategy/relay/polymarket/withdraw.ts | 14 +++---- .../src/strategy/relay/relay-api.test.ts | 10 ++--- .../src/strategy/relay/relay-api.ts | 8 ++-- .../relay/relay-max-gas-station.test.ts | 16 ++++---- .../strategy/relay/relay-max-gas-station.ts | 10 ++--- .../relay/relay-post-ma-vault.test.ts | 14 +++---- .../src/strategy/relay/relay-post-ma-vault.ts | 14 +++---- .../src/strategy/relay/relay-quotes.test.ts | 25 +++++++------ .../src/strategy/relay/relay-quotes.ts | 34 ++++++++--------- .../relay/relay-submit-execute.test.ts | 12 +++--- .../strategy/relay/relay-submit-execute.ts | 14 +++---- .../src/strategy/relay/relay-submit.test.ts | 25 +++++++------ .../src/strategy/relay/relay-submit.ts | 26 ++++++------- .../strategy/server/ServerStrategy.test.ts | 14 +++---- .../src/strategy/server/ServerStrategy.ts | 10 ++--- .../src/strategy/server/perps.test.ts | 6 +-- .../src/strategy/server/perps.ts | 4 +- .../src/strategy/server/server-api.test.ts | 10 ++--- .../src/strategy/server/server-api.ts | 8 ++-- .../src/strategy/server/server-quotes.test.ts | 22 +++++------ .../src/strategy/server/server-quotes.ts | 28 +++++++------- .../src/strategy/server/server-submit.test.ts | 20 +++++----- .../src/strategy/server/server-submit.ts | 20 +++++----- .../src/tests/messenger-mock.ts | 6 +-- .../transaction-pay-controller/src/types.ts | 4 +- .../src/utils/7702.ts | 4 +- .../src/utils/amounts.test.ts | 2 +- .../src/utils/amounts.ts | 2 +- .../src/utils/chomp.test.ts | 8 ++-- .../src/utils/chomp.ts | 8 ++-- .../src/utils/error-prefix.test.ts | 2 +- .../src/utils/feature-flags.test.ts | 14 +++---- .../src/utils/feature-flags.ts | 14 +++---- .../src/utils/gas-station.test.ts | 8 ++-- .../src/utils/gas-station.ts | 8 ++-- .../src/utils/gas.test.ts | 12 +++--- .../src/utils/gas.ts | 12 +++--- .../src/utils/ma-vault-deposit.test.ts | 10 ++--- .../src/utils/ma-vault-deposit.ts | 14 +++---- .../src/utils/no-op-quote.test.ts | 6 +-- .../src/utils/no-op-quote.ts | 4 +- .../src/utils/provider.test.ts | 4 +- .../src/utils/provider.ts | 4 +- .../src/utils/quote-gas.test.ts | 8 ++-- .../src/utils/quote-gas.ts | 8 ++-- .../src/utils/quotes.test.ts | 23 ++++++------ .../src/utils/quotes.ts | 18 ++++----- .../src/utils/required-tokens.test.ts | 8 ++-- .../src/utils/required-tokens.ts | 6 +-- .../src/utils/source-amounts.test.ts | 16 ++++---- .../src/utils/source-amounts.ts | 20 +++++----- .../src/utils/strategy.test.ts | 14 +++---- .../src/utils/strategy.ts | 12 +++--- .../src/utils/token.test.ts | 8 ++-- .../src/utils/token.ts | 8 ++-- .../src/utils/totals.test.ts | 10 ++--- .../src/utils/totals.ts | 8 ++-- .../src/utils/transaction.test.ts | 10 ++--- .../src/utils/transaction.ts | 10 ++--- 114 files changed, 697 insertions(+), 673 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index bb8739120a5..8884621626d 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -426,6 +426,7 @@ const config = createConfig([ 'packages/smart-transactions-controller/**', 'packages/snap-account-service/**', 'packages/transaction-controller/**', + 'packages/transaction-pay-controller/**', 'packages/wallet/**', 'packages/wallet-cli/**', 'packages/wallet-framework-docs/**', diff --git a/packages/transaction-pay-controller/package.json b/packages/transaction-pay-controller/package.json index df68fad7b5b..cf7fed64cc0 100644 --- a/packages/transaction-pay-controller/package.json +++ b/packages/transaction-pay-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/transaction-pay-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", "prepare-manifest:preview": "../../scripts/prepare-preview-manifest.sh", "since-latest-release": "../../scripts/since-latest-release.sh", "test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter", diff --git a/packages/transaction-pay-controller/src/TransactionPayController-method-action-types.ts b/packages/transaction-pay-controller/src/TransactionPayController-method-action-types.ts index ff753bb1792..14a91436fa2 100644 --- a/packages/transaction-pay-controller/src/TransactionPayController-method-action-types.ts +++ b/packages/transaction-pay-controller/src/TransactionPayController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { TransactionPayController } from './TransactionPayController'; +import type { TransactionPayController } from './TransactionPayController.js'; /** * Sets the transaction configuration. diff --git a/packages/transaction-pay-controller/src/TransactionPayController.test.ts b/packages/transaction-pay-controller/src/TransactionPayController.test.ts index fcb6c4e840e..47ebeb8d12f 100644 --- a/packages/transaction-pay-controller/src/TransactionPayController.test.ts +++ b/packages/transaction-pay-controller/src/TransactionPayController.test.ts @@ -3,26 +3,26 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { TransactionPayController } from '.'; -import { updateFiatPayment } from './actions/update-fiat-payment'; -import { updatePaymentToken } from './actions/update-payment-token'; -import { PaymentOverride, TransactionPayStrategy } from './constants'; -import { deriveFiatAssetForFiatPayment } from './strategy/fiat/utils'; -import { getMessengerMock } from './tests/messenger-mock'; +import { updateFiatPayment } from './actions/update-fiat-payment.js'; +import { updatePaymentToken } from './actions/update-payment-token.js'; +import { PaymentOverride, TransactionPayStrategy } from './constants.js'; +import { TransactionPayController } from './index.js'; +import { deriveFiatAssetForFiatPayment } from './strategy/fiat/utils.js'; +import { getMessengerMock } from './tests/messenger-mock.js'; import type { TransactionPayControllerMessenger, TransactionPayControllerOptions, TransactionPaySourceAmount, UpdateTransactionDataCallback, -} from './types'; -import { getStrategyOrder } from './utils/feature-flags'; -import { updateQuotes } from './utils/quotes'; -import { updateSourceAmounts } from './utils/source-amounts'; +} from './types.js'; +import { getStrategyOrder } from './utils/feature-flags.js'; +import { updateQuotes } from './utils/quotes.js'; +import { updateSourceAmounts } from './utils/source-amounts.js'; import { getTransaction, subscribeAssetChanges, subscribeTransactionChanges, -} from './utils/transaction'; +} from './utils/transaction.js'; jest.mock('./actions/update-fiat-payment'); jest.mock('./actions/update-payment-token'); diff --git a/packages/transaction-pay-controller/src/TransactionPayController.ts b/packages/transaction-pay-controller/src/TransactionPayController.ts index c9e31d480d1..43794db9f30 100644 --- a/packages/transaction-pay-controller/src/TransactionPayController.ts +++ b/packages/transaction-pay-controller/src/TransactionPayController.ts @@ -4,14 +4,14 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Draft } from 'immer'; import { noop } from 'lodash'; -import { updateFiatPayment } from './actions/update-fiat-payment'; -import { updatePaymentToken } from './actions/update-payment-token'; +import { updateFiatPayment } from './actions/update-fiat-payment.js'; +import { updatePaymentToken } from './actions/update-payment-token.js'; import { CONTROLLER_NAME, isTransactionPayStrategy, TransactionPayStrategy, -} from './constants'; -import { QuoteRefresher } from './helpers/QuoteRefresher'; +} from './constants.js'; +import { QuoteRefresher } from './helpers/QuoteRefresher.js'; import type { GetAmountDataCallback, GetDelegationTransactionCallback, @@ -25,14 +25,14 @@ import type { TransactionPayControllerState, UpdateFiatPaymentRequest, UpdatePaymentTokenRequest, -} from './types'; -import { getStrategyOrder } from './utils/feature-flags'; -import { updateQuotes } from './utils/quotes'; -import { updateSourceAmounts } from './utils/source-amounts'; +} from './types.js'; +import { getStrategyOrder } from './utils/feature-flags.js'; +import { updateQuotes } from './utils/quotes.js'; +import { updateSourceAmounts } from './utils/source-amounts.js'; import { subscribeAssetChanges, subscribeTransactionChanges, -} from './utils/transaction'; +} from './utils/transaction.js'; const MESSENGER_EXPOSED_METHODS = [ 'getAmountData', diff --git a/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts b/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts index fd04bddee41..58baa2427b5 100644 --- a/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts +++ b/packages/transaction-pay-controller/src/actions/update-fiat-payment.test.ts @@ -1,9 +1,9 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { noop } from 'lodash'; -import type { TransactionData, TransactionFiatPayment } from '../types'; -import { getTransaction } from '../utils/transaction'; -import { updateFiatPayment } from './update-fiat-payment'; +import type { TransactionData, TransactionFiatPayment } from '../types.js'; +import { getTransaction } from '../utils/transaction.js'; +import { updateFiatPayment } from './update-fiat-payment.js'; jest.mock('../utils/transaction'); diff --git a/packages/transaction-pay-controller/src/actions/update-fiat-payment.ts b/packages/transaction-pay-controller/src/actions/update-fiat-payment.ts index 124ba9c5520..c3474abc166 100644 --- a/packages/transaction-pay-controller/src/actions/update-fiat-payment.ts +++ b/packages/transaction-pay-controller/src/actions/update-fiat-payment.ts @@ -1,12 +1,12 @@ import { createModuleLogger } from '@metamask/utils'; -import type { TransactionPayControllerMessenger } from '..'; -import { projectLogger } from '../logger'; +import type { TransactionPayControllerMessenger } from '../index.js'; +import { projectLogger } from '../logger.js'; import type { UpdateFiatPaymentRequest, UpdateTransactionDataCallback, -} from '../types'; -import { getTransaction } from '../utils/transaction'; +} from '../types.js'; +import { getTransaction } from '../utils/transaction.js'; const log = createModuleLogger(projectLogger, 'update-fiat-payment'); diff --git a/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts b/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts index 52aebf29725..d637f586166 100644 --- a/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts +++ b/packages/transaction-pay-controller/src/actions/update-payment-token.test.ts @@ -1,21 +1,21 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { noop } from 'lodash'; -import type { TransactionData, TransactionPaymentToken } from '../types'; +import type { TransactionData, TransactionPaymentToken } from '../types.js'; import { getTokenBalance, getTokenFiatRate, getTokenInfo, -} from '../utils/token'; -import { getTransaction } from '../utils/transaction'; -import { updatePaymentToken } from './update-payment-token'; +} from '../utils/token.js'; +import { getTransaction } from '../utils/transaction.js'; +import { updatePaymentToken } from './update-payment-token.js'; jest.mock('../utils/token', () => ({ - ...jest.createMockFromModule( + ...jest.createMockFromModule( '../utils/token', ), computeTokenAmounts: - jest.requireActual('../utils/token') + jest.requireActual('../utils/token') .computeTokenAmounts, })); jest.mock('../utils/transaction'); diff --git a/packages/transaction-pay-controller/src/actions/update-payment-token.ts b/packages/transaction-pay-controller/src/actions/update-payment-token.ts index 986738ef4fa..31e95a1465f 100644 --- a/packages/transaction-pay-controller/src/actions/update-payment-token.ts +++ b/packages/transaction-pay-controller/src/actions/update-payment-token.ts @@ -1,20 +1,20 @@ import { createModuleLogger } from '@metamask/utils'; import type { Hex } from '@metamask/utils'; -import type { TransactionPayControllerMessenger } from '..'; -import { projectLogger } from '../logger'; +import type { TransactionPayControllerMessenger } from '../index.js'; +import { projectLogger } from '../logger.js'; import type { TransactionPaymentToken, UpdatePaymentTokenRequest, UpdateTransactionDataCallback, -} from '../types'; +} from '../types.js'; import { computeTokenAmounts, getTokenBalance, getTokenFiatRate, getTokenInfo, -} from '../utils/token'; -import { getTransaction } from '../utils/transaction'; +} from '../utils/token.js'; +import { getTransaction } from '../utils/transaction.js'; const log = createModuleLogger(projectLogger, 'update-payment-token'); diff --git a/packages/transaction-pay-controller/src/constants.test.ts b/packages/transaction-pay-controller/src/constants.test.ts index 5bb589f50c4..b9e2faabce2 100644 --- a/packages/transaction-pay-controller/src/constants.test.ts +++ b/packages/transaction-pay-controller/src/constants.test.ts @@ -3,7 +3,7 @@ import { POLYGON_PUSD_ADDRESS, POLYGON_USDCE_ADDRESS, STABLECOINS, -} from './constants'; +} from './constants.js'; describe('STABLECOINS', () => { it('includes both Polygon USDC.e and Polymarket pUSD as Polygon stablecoins', () => { diff --git a/packages/transaction-pay-controller/src/helpers/QuoteRefresher.test.ts b/packages/transaction-pay-controller/src/helpers/QuoteRefresher.test.ts index a6f44a5df9a..cd95a2995f2 100644 --- a/packages/transaction-pay-controller/src/helpers/QuoteRefresher.test.ts +++ b/packages/transaction-pay-controller/src/helpers/QuoteRefresher.test.ts @@ -2,15 +2,15 @@ import { createDeferredPromise } from '@metamask/utils'; -import { flushPromises } from '../../../../tests/helpers'; -import { TransactionPayStrategy } from '../constants'; -import { getMessengerMock } from '../tests/messenger-mock'; +import { flushPromises } from '../../../../tests/helpers.js'; +import { TransactionPayStrategy } from '../constants.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; import type { TransactionData, TransactionPayControllerMessenger, -} from '../types'; -import { refreshQuotes } from '../utils/quotes'; -import { QuoteRefresher } from './QuoteRefresher'; +} from '../types.js'; +import { refreshQuotes } from '../utils/quotes.js'; +import { QuoteRefresher } from './QuoteRefresher.js'; jest.mock('../utils/quotes'); diff --git a/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts b/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts index eb0a1f9cdb0..f90e2e58c3e 100644 --- a/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts +++ b/packages/transaction-pay-controller/src/helpers/QuoteRefresher.ts @@ -2,14 +2,14 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { createModuleLogger } from '@metamask/utils'; import { noop } from 'lodash'; +import { TransactionPayStrategy } from '../constants.js'; import type { TransactionPayControllerMessenger, TransactionPayControllerState, -} from '..'; -import { TransactionPayStrategy } from '../constants'; -import { projectLogger } from '../logger'; -import type { UpdateTransactionDataCallback } from '../types'; -import { refreshQuotes } from '../utils/quotes'; +} from '../index.js'; +import { projectLogger } from '../logger.js'; +import type { UpdateTransactionDataCallback } from '../types.js'; +import { refreshQuotes } from '../utils/quotes.js'; const CHECK_INTERVAL = 1000; // 1 Second diff --git a/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.test.ts b/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.test.ts index 6b268dc80d2..31b3bea72e3 100644 --- a/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.test.ts +++ b/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.test.ts @@ -3,14 +3,14 @@ import type { TransactionMeta, } from '@metamask/transaction-controller'; -import { TransactionPayStrategy } from '..'; -import { getMessengerMock } from '../tests/messenger-mock'; +import { TransactionPayStrategy } from '../index.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; import type { TransactionPayControllerState, TransactionPayQuote, -} from '../types'; -import { getStrategyByName } from '../utils/strategy'; -import { TransactionPayPublishHook } from './TransactionPayPublishHook'; +} from '../types.js'; +import { getStrategyByName } from '../utils/strategy.js'; +import { TransactionPayPublishHook } from './TransactionPayPublishHook.js'; jest.mock('../utils/strategy'); diff --git a/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.ts b/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.ts index 1b1cce0d216..cf57a00494e 100644 --- a/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.ts +++ b/packages/transaction-pay-controller/src/helpers/TransactionPayPublishHook.ts @@ -4,16 +4,16 @@ import type { PublishHookResult } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { TransactionPayStrategy } from '../constants'; -import { projectLogger } from '../logger'; +import { TransactionPayStrategy } from '../constants.js'; +import { projectLogger } from '../logger.js'; import type { TransactionPayControllerMessenger, TransactionPayQuote, -} from '../types'; -import { accountSupports7702 } from '../utils/7702'; -import { prefixError } from '../utils/error-prefix'; -import { getStrategyByName } from '../utils/strategy'; -import { updateTransaction } from '../utils/transaction'; +} from '../types.js'; +import { accountSupports7702 } from '../utils/7702.js'; +import { prefixError } from '../utils/error-prefix.js'; +import { getStrategyByName } from '../utils/strategy.js'; +import { updateTransaction } from '../utils/transaction.js'; const log = createModuleLogger(projectLogger, 'pay-publish-hook'); const ERROR_PREFIX = 'MetaMask Pay: '; diff --git a/packages/transaction-pay-controller/src/index.ts b/packages/transaction-pay-controller/src/index.ts index dbab894b8ac..6417727cdab 100644 --- a/packages/transaction-pay-controller/src/index.ts +++ b/packages/transaction-pay-controller/src/index.ts @@ -25,7 +25,7 @@ export type { TransactionPayTotals, UpdateFiatPaymentRequest, UpdatePaymentTokenRequest, -} from './types'; +} from './types.js'; export type { TransactionPayControllerGetAmountDataAction, TransactionPayControllerGetDelegationTransactionAction, @@ -36,7 +36,7 @@ export type { TransactionPayControllerSetTransactionConfigAction, TransactionPayControllerUpdatePaymentTokenAction, TransactionPayControllerUpdateFiatPaymentAction, -} from './TransactionPayController-method-action-types'; -export { PaymentOverride, TransactionPayStrategy } from './constants'; -export { TransactionPayController } from './TransactionPayController'; -export { TransactionPayPublishHook } from './helpers/TransactionPayPublishHook'; +} from './TransactionPayController-method-action-types.js'; +export { PaymentOverride, TransactionPayStrategy } from './constants.js'; +export { TransactionPayController } from './TransactionPayController.js'; +export { TransactionPayPublishHook } from './helpers/TransactionPayPublishHook.js'; diff --git a/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.test.ts b/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.test.ts index c63d7ba7a86..972c485672d 100644 --- a/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.test.ts +++ b/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.test.ts @@ -5,18 +5,18 @@ import { } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM } from '../../constants'; +import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM } from '../../constants.js'; import type { PayStrategyCheckQuoteSupportRequest, PayStrategyExecuteRequest, PayStrategyGetQuotesRequest, TransactionPayQuote, -} from '../../types'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; -import { getAcrossQuotes } from './across-quotes'; -import { submitAcrossQuotes } from './across-submit'; -import { AcrossStrategy } from './AcrossStrategy'; -import type { AcrossQuote } from './types'; +} from '../../types.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getAcrossQuotes } from './across-quotes.js'; +import { submitAcrossQuotes } from './across-submit.js'; +import { AcrossStrategy } from './AcrossStrategy.js'; +import type { AcrossQuote } from './types.js'; jest.mock('./across-quotes'); jest.mock('./across-submit'); diff --git a/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.ts b/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.ts index 18a821f8544..213eaf73383 100644 --- a/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.ts +++ b/packages/transaction-pay-controller/src/strategy/across/AcrossStrategy.ts @@ -9,15 +9,15 @@ import type { PayStrategyExecuteRequest, PayStrategyGetQuotesRequest, TransactionPayQuote, -} from '../../types'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; -import { getAcrossDestination } from './across-actions'; -import { getAcrossQuotes } from './across-quotes'; -import { submitAcrossQuotes } from './across-submit'; -import { hasUnsupportedTransactionAuthorizationList } from './authorization-list'; -import { isSupportedAcrossPerpsDepositRequest } from './perps'; -import { isAcrossQuoteRequest } from './requests'; -import type { AcrossQuote } from './types'; +} from '../../types.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getAcrossDestination } from './across-actions.js'; +import { getAcrossQuotes } from './across-quotes.js'; +import { submitAcrossQuotes } from './across-submit.js'; +import { hasUnsupportedTransactionAuthorizationList } from './authorization-list.js'; +import { isSupportedAcrossPerpsDepositRequest } from './perps.js'; +import { isAcrossQuoteRequest } from './requests.js'; +import type { AcrossQuote } from './types.js'; export class AcrossStrategy implements PayStrategy { supports(request: PayStrategyGetQuotesRequest): boolean { diff --git a/packages/transaction-pay-controller/src/strategy/across/across-actions.test.ts b/packages/transaction-pay-controller/src/strategy/across/across-actions.test.ts index b6e6f917537..890ddc892e9 100644 --- a/packages/transaction-pay-controller/src/strategy/across/across-actions.test.ts +++ b/packages/transaction-pay-controller/src/strategy/across/across-actions.test.ts @@ -2,7 +2,7 @@ import { Interface } from '@ethersproject/abi'; import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import type { QuoteRequest } from '../../types'; +import type { QuoteRequest } from '../../types.js'; import { buildAcrossActionFromCall, CREATE_PROXY_SIGNATURE, @@ -11,7 +11,7 @@ import { isExtractableOutputTokenTransferCall, SAFE_EXEC_TRANSACTION_SIGNATURE, TOKEN_TRANSFER_SIGNATURE, -} from './across-actions'; +} from './across-actions.js'; const TOKEN_TRANSFER_INTERFACE = new Interface([TOKEN_TRANSFER_SIGNATURE]); const CREATE_PROXY_INTERFACE = new Interface([CREATE_PROXY_SIGNATURE]); diff --git a/packages/transaction-pay-controller/src/strategy/across/across-actions.ts b/packages/transaction-pay-controller/src/strategy/across/across-actions.ts index d733d3080cf..24219ae84cd 100644 --- a/packages/transaction-pay-controller/src/strategy/across/across-actions.ts +++ b/packages/transaction-pay-controller/src/strategy/across/across-actions.ts @@ -3,9 +3,9 @@ import type { TransactionDescription } from '@ethersproject/abi'; import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import type { QuoteRequest } from '../../types'; -import { isSupportedAcrossPerpsDepositRequest } from './perps'; -import type { AcrossAction, AcrossActionArg } from './types'; +import type { QuoteRequest } from '../../types.js'; +import { isSupportedAcrossPerpsDepositRequest } from './perps.js'; +import type { AcrossAction, AcrossActionArg } from './types.js'; export const TOKEN_TRANSFER_SIGNATURE = 'function transfer(address to, uint256 value)'; diff --git a/packages/transaction-pay-controller/src/strategy/across/across-quotes.test.ts b/packages/transaction-pay-controller/src/strategy/across/across-quotes.test.ts index a21ae52c493..4af8a0553c8 100644 --- a/packages/transaction-pay-controller/src/strategy/across/across-quotes.test.ts +++ b/packages/transaction-pay-controller/src/strategy/across/across-quotes.test.ts @@ -7,27 +7,27 @@ import type { } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM, CHAIN_ID_HYPERCORE, TransactionPayStrategy, -} from '../../constants'; -import { getMessengerMock } from '../../tests/messenger-mock'; -import type { QuoteRequest } from '../../types'; +} from '../../constants.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; +import type { QuoteRequest } from '../../types.js'; import { getGasBuffer, getSlippage, isEIP7702Chain, -} from '../../utils/feature-flags'; -import { calculateGasCost, calculateGasFeeTokenCost } from '../../utils/gas'; -import * as quoteGasUtils from '../../utils/quote-gas'; -import { getTokenBalance, getTokenFiatRate } from '../../utils/token'; -import { getAcrossQuotes } from './across-quotes'; -import { ACROSS_HYPERCORE_USDC_PERPS_ADDRESS } from './perps'; -import * as acrossTransactions from './transactions'; -import type { AcrossSwapApprovalResponse } from './types'; +} from '../../utils/feature-flags.js'; +import { calculateGasCost, calculateGasFeeTokenCost } from '../../utils/gas.js'; +import * as quoteGasUtils from '../../utils/quote-gas.js'; +import { getTokenBalance, getTokenFiatRate } from '../../utils/token.js'; +import { getAcrossQuotes } from './across-quotes.js'; +import { ACROSS_HYPERCORE_USDC_PERPS_ADDRESS } from './perps.js'; +import * as acrossTransactions from './transactions.js'; +import type { AcrossSwapApprovalResponse } from './types.js'; jest.mock('../../utils/token'); jest.mock('../../utils/gas', () => ({ diff --git a/packages/transaction-pay-controller/src/strategy/across/across-quotes.ts b/packages/transaction-pay-controller/src/strategy/across/across-quotes.ts index 8bee323d22f..edb775d9913 100644 --- a/packages/transaction-pay-controller/src/strategy/across/across-quotes.ts +++ b/packages/transaction-pay-controller/src/strategy/across/across-quotes.ts @@ -8,8 +8,8 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { TransactionPayStrategy } from '../../constants'; -import { projectLogger } from '../../logger'; +import { TransactionPayStrategy } from '../../constants.js'; +import { projectLogger } from '../../logger.js'; import type { Amount, FiatRates, @@ -17,37 +17,40 @@ import type { QuoteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { getFiatValueFromUsd, sumAmounts } from '../../utils/amounts'; -import { getPayStrategiesConfig, getSlippage } from '../../utils/feature-flags'; -import { calculateGasCost } from '../../utils/gas'; +} from '../../types.js'; +import { getFiatValueFromUsd, sumAmounts } from '../../utils/amounts.js'; +import { + getPayStrategiesConfig, + getSlippage, +} from '../../utils/feature-flags.js'; import { getGasStationCostInSourceTokenRaw, getGasStationEligibility, -} from '../../utils/gas-station'; -import { estimateQuoteGasLimits } from '../../utils/quote-gas'; -import type { QuoteGasTransaction } from '../../utils/quote-gas'; +} from '../../utils/gas-station.js'; +import { calculateGasCost } from '../../utils/gas.js'; +import { estimateQuoteGasLimits } from '../../utils/quote-gas.js'; +import type { QuoteGasTransaction } from '../../utils/quote-gas.js'; import { getNativeToken, getTokenBalance, getTokenFiatRate, -} from '../../utils/token'; -import type { AcrossDestination } from './across-actions'; -import { getAcrossDestination } from './across-actions'; -import { hasUnsupportedTransactionAuthorizationList } from './authorization-list'; -import { normalizeAcrossRequest } from './perps'; -import { isAcrossQuoteRequest } from './requests'; +} from '../../utils/token.js'; +import type { AcrossDestination } from './across-actions.js'; +import { getAcrossDestination } from './across-actions.js'; +import { hasUnsupportedTransactionAuthorizationList } from './authorization-list.js'; +import { normalizeAcrossRequest } from './perps.js'; +import { isAcrossQuoteRequest } from './requests.js'; import { getAcrossOrderedTransactions, getOriginalTransactionGas, -} from './transactions'; +} from './transactions.js'; import type { AcrossAction, AcrossActionRequestBody, AcrossGasLimits, AcrossQuote, AcrossSwapApprovalResponse, -} from './types'; +} from './types.js'; const log = createModuleLogger(projectLogger, 'across-strategy'); diff --git a/packages/transaction-pay-controller/src/strategy/across/across-submit.test.ts b/packages/transaction-pay-controller/src/strategy/across/across-submit.test.ts index dd453928c1d..f750b809abd 100644 --- a/packages/transaction-pay-controller/src/strategy/across/across-submit.test.ts +++ b/packages/transaction-pay-controller/src/strategy/across/across-submit.test.ts @@ -9,13 +9,13 @@ import type { } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; -import { TransactionPayStrategy } from '../../constants'; -import { getMessengerMock } from '../../tests/messenger-mock'; -import type { TransactionPayQuote } from '../../types'; -import { submitAcrossQuotes } from './across-submit'; -import * as acrossTransactions from './transactions'; -import type { AcrossQuote } from './types'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; +import { TransactionPayStrategy } from '../../constants.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; +import type { TransactionPayQuote } from '../../types.js'; +import { submitAcrossQuotes } from './across-submit.js'; +import * as acrossTransactions from './transactions.js'; +import type { AcrossQuote } from './types.js'; jest.mock('@metamask/controller-utils', () => ({ ...jest.requireActual('@metamask/controller-utils'), diff --git a/packages/transaction-pay-controller/src/strategy/across/across-submit.ts b/packages/transaction-pay-controller/src/strategy/across/across-submit.ts index c4e24e94733..38fbd751b46 100644 --- a/packages/transaction-pay-controller/src/strategy/across/across-submit.ts +++ b/packages/transaction-pay-controller/src/strategy/across/across-submit.ts @@ -15,27 +15,27 @@ import type { import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../../logger'; +import { projectLogger } from '../../logger.js'; import type { PayStrategyExecuteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { accountSupports7702 } from '../../utils/7702'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; -import { getGasBuffer } from '../../utils/feature-flags'; -import { getNetworkClientId } from '../../utils/provider'; +} from '../../types.js'; +import { accountSupports7702 } from '../../utils/7702.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getGasBuffer } from '../../utils/feature-flags.js'; +import { getNetworkClientId } from '../../utils/provider.js'; import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed, -} from '../../utils/transaction'; +} from '../../utils/transaction.js'; import { getAcrossOrderedTransactions, getOriginalTransactionGas, -} from './transactions'; -import type { AcrossQuote } from './types'; +} from './transactions.js'; +import type { AcrossQuote } from './types.js'; const log = createModuleLogger(projectLogger, 'across-strategy'); const ACROSS_STATUS_POLL_INTERVAL = 1000; diff --git a/packages/transaction-pay-controller/src/strategy/across/authorization-list.ts b/packages/transaction-pay-controller/src/strategy/across/authorization-list.ts index 6432448b6aa..3ce7e40fd3a 100644 --- a/packages/transaction-pay-controller/src/strategy/across/authorization-list.ts +++ b/packages/transaction-pay-controller/src/strategy/across/authorization-list.ts @@ -4,7 +4,7 @@ import { } from '@metamask/transaction-controller'; import type { TransactionMeta } from '@metamask/transaction-controller'; -import type { QuoteRequest } from '../../types'; +import type { QuoteRequest } from '../../types.js'; /** * Check whether an authorization list on the original transaction is unsupported by Across. diff --git a/packages/transaction-pay-controller/src/strategy/across/perps.ts b/packages/transaction-pay-controller/src/strategy/across/perps.ts index 0a24e7617f8..89a2b1242e4 100644 --- a/packages/transaction-pay-controller/src/strategy/across/perps.ts +++ b/packages/transaction-pay-controller/src/strategy/across/perps.ts @@ -8,8 +8,8 @@ import { CHAIN_ID_HYPERCORE, HYPERCORE_USDC_DECIMALS, USDC_DECIMALS, -} from '../../constants'; -import type { QuoteRequest } from '../../types'; +} from '../../constants.js'; +import type { QuoteRequest } from '../../types.js'; export const ACROSS_HYPERCORE_USDC_PERPS_ADDRESS = '0x2100000000000000000000000000000000000000' as Hex; diff --git a/packages/transaction-pay-controller/src/strategy/across/requests.ts b/packages/transaction-pay-controller/src/strategy/across/requests.ts index f662dc7ae60..bd76b694d09 100644 --- a/packages/transaction-pay-controller/src/strategy/across/requests.ts +++ b/packages/transaction-pay-controller/src/strategy/across/requests.ts @@ -1,4 +1,4 @@ -import type { QuoteRequest } from '../../types'; +import type { QuoteRequest } from '../../types.js'; export function isAcrossQuoteRequest(request: QuoteRequest): boolean { return ( diff --git a/packages/transaction-pay-controller/src/strategy/across/transactions.test.ts b/packages/transaction-pay-controller/src/strategy/across/transactions.test.ts index 9647e5f48ee..28235b4c34b 100644 --- a/packages/transaction-pay-controller/src/strategy/across/transactions.test.ts +++ b/packages/transaction-pay-controller/src/strategy/across/transactions.test.ts @@ -1,8 +1,8 @@ import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { getAcrossOrderedTransactions } from './transactions'; -import type { AcrossSwapApprovalResponse } from './types'; +import { getAcrossOrderedTransactions } from './transactions.js'; +import type { AcrossSwapApprovalResponse } from './types.js'; const QUOTE_MOCK: AcrossSwapApprovalResponse = { approvalTxns: [ diff --git a/packages/transaction-pay-controller/src/strategy/across/transactions.ts b/packages/transaction-pay-controller/src/strategy/across/transactions.ts index 38d04fff10b..3fe5d2260af 100644 --- a/packages/transaction-pay-controller/src/strategy/across/transactions.ts +++ b/packages/transaction-pay-controller/src/strategy/across/transactions.ts @@ -2,7 +2,7 @@ import { TransactionType } from '@metamask/transaction-controller'; import type { TransactionMeta } from '@metamask/transaction-controller'; import { BigNumber } from 'bignumber.js'; -import type { AcrossSwapApprovalResponse } from './types'; +import type { AcrossSwapApprovalResponse } from './types.js'; export type AcrossOrderedTransaction = { chainId: number; diff --git a/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.test.ts index b342021aebd..9bf58a51114 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.test.ts @@ -1,11 +1,11 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; -import type { TransactionPayControllerMessenger } from '../..'; -import type { TransactionPayQuote } from '../../types'; -import { getFiatQuotes } from './fiat-quotes'; -import { submitFiatQuotes } from './fiat-submit'; -import { FiatStrategy } from './FiatStrategy'; -import type { FiatQuote } from './types'; +import type { TransactionPayControllerMessenger } from '../../index.js'; +import type { TransactionPayQuote } from '../../types.js'; +import { getFiatQuotes } from './fiat-quotes.js'; +import { submitFiatQuotes } from './fiat-submit.js'; +import { FiatStrategy } from './FiatStrategy.js'; +import type { FiatQuote } from './types.js'; jest.mock('./fiat-quotes'); jest.mock('./fiat-submit'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.ts b/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.ts index fca14901409..b6444f3c286 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/FiatStrategy.ts @@ -3,11 +3,11 @@ import type { PayStrategyExecuteRequest, PayStrategyGetQuotesRequest, TransactionPayQuote, -} from '../../types'; -import { prefixError } from '../../utils/error-prefix'; -import { getFiatQuotes } from './fiat-quotes'; -import { submitFiatQuotes } from './fiat-submit'; -import type { FiatQuote } from './types'; +} from '../../types.js'; +import { prefixError } from '../../utils/error-prefix.js'; +import { getFiatQuotes } from './fiat-quotes.js'; +import { submitFiatQuotes } from './fiat-submit.js'; +import type { FiatQuote } from './types.js'; const ERROR_PREFIX = 'Fiat: '; diff --git a/packages/transaction-pay-controller/src/strategy/fiat/constants.ts b/packages/transaction-pay-controller/src/strategy/fiat/constants.ts index 367c799ea22..fea887b8ec6 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/constants.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/constants.ts @@ -8,7 +8,7 @@ import { CHAIN_ID_POLYGON, MUSD_MONAD_ADDRESS, NATIVE_TOKEN_ADDRESS, -} from '../../constants'; +} from '../../constants.js'; export const DEFAULT_FIAT_CURRENCY = 'USD'; diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.test.ts index 2832aced2aa..785b82cf095 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.test.ts @@ -3,20 +3,20 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { TransactionPayStrategy } from '../../constants'; +import { TransactionPayStrategy } from '../../constants.js'; import type { PayStrategyGetQuotesRequest, TransactionFiatPayment, TransactionPayRequiredToken, TransactionPayQuote, -} from '../../types'; -import { buildCaipAssetType, getTokenInfo } from '../../utils/token'; -import { getTransaction } from '../../utils/transaction'; -import { DEFAULT_FIAT_CURRENCY, MUSD_MONAD_FIAT_ASSET } from './constants'; +} from '../../types.js'; +import { buildCaipAssetType, getTokenInfo } from '../../utils/token.js'; +import { getTransaction } from '../../utils/transaction.js'; +import { DEFAULT_FIAT_CURRENCY, MUSD_MONAD_FIAT_ASSET } from './constants.js'; import { getDirectMusdFiatQuote, isDirectMusdMoneyAccountQuote, -} from './fiat-direct-musd'; +} from './fiat-direct-musd.js'; jest.mock('../../utils/token'); jest.mock('../../utils/transaction'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.ts index 976bffcd9d2..e1efce2806e 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-direct-musd.ts @@ -6,27 +6,27 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { TransactionPayStrategy } from '../../constants'; -import { projectLogger } from '../../logger'; +import { TransactionPayStrategy } from '../../constants.js'; +import { projectLogger } from '../../logger.js'; import type { PayStrategyExecuteRequest, PayStrategyGetQuotesRequest, TransactionFiatPayment, TransactionPayRequiredToken, TransactionPayQuote, -} from '../../types'; -import { prefixError } from '../../utils/error-prefix'; -import { getFiatVaultDisabled } from '../../utils/feature-flags'; -import { submitMoneyAccountVaultDeposit } from '../../utils/ma-vault-deposit'; -import { buildCaipAssetType, getTokenInfo } from '../../utils/token'; -import { MUSD_MONAD_FIAT_ASSET } from './constants'; -import type { FiatQuote } from './types'; +} from '../../types.js'; +import { prefixError } from '../../utils/error-prefix.js'; +import { getFiatVaultDisabled } from '../../utils/feature-flags.js'; +import { submitMoneyAccountVaultDeposit } from '../../utils/ma-vault-deposit.js'; +import { buildCaipAssetType, getTokenInfo } from '../../utils/token.js'; +import { MUSD_MONAD_FIAT_ASSET } from './constants.js'; +import type { FiatQuote } from './types.js'; import { getRampsQuote, getRawSourceAmountFromOrderCryptoAmount, resolveSourceAmountRaw, validateOrderAsset, -} from './utils'; +} from './utils.js'; const log = createModuleLogger(projectLogger, 'fiat-direct-musd'); const DIRECT_MUSD_ERROR_PREFIX = 'Direct mUSD: '; diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.test.ts index 580b868bc62..7a541090888 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.test.ts @@ -6,29 +6,32 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { NATIVE_TOKEN_ADDRESS, TransactionPayStrategy } from '../../constants'; +import { + NATIVE_TOKEN_ADDRESS, + TransactionPayStrategy, +} from '../../constants.js'; import type { PayStrategyGetQuotesRequest, TransactionFiatPayment, TransactionPayQuote, TransactionPayRequiredToken, -} from '../../types'; +} from '../../types.js'; import { buildCaipAssetType, computeRawFromFiatAmount, getTokenFiatRate, getTokenInfo, -} from '../../utils/token'; -import { getRelayQuotes } from '../relay/relay-quotes'; -import type { RelayQuote } from '../relay/types'; -import type { TransactionPayFiatAsset } from './constants'; -import { DEFAULT_FIAT_CURRENCY, MUSD_MONAD_FIAT_ASSET } from './constants'; -import { getFiatQuotes } from './fiat-quotes'; +} from '../../utils/token.js'; +import { getRelayQuotes } from '../relay/relay-quotes.js'; +import type { RelayQuote } from '../relay/types.js'; +import type { TransactionPayFiatAsset } from './constants.js'; +import { DEFAULT_FIAT_CURRENCY, MUSD_MONAD_FIAT_ASSET } from './constants.js'; +import { getFiatQuotes } from './fiat-quotes.js'; import { deriveFiatAssetForFiatPayment, getRawSourceAmountFromOrderCryptoAmount, isMoneyAccountDepositTransaction, -} from './utils'; +} from './utils.js'; jest.mock('../relay/relay-quotes'); jest.mock('../../utils/token'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.ts index 5359bf83e50..88e52c2b253 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-quotes.ts @@ -3,32 +3,35 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { NATIVE_TOKEN_ADDRESS, TransactionPayStrategy } from '../../constants'; -import { projectLogger } from '../../logger'; +import { + NATIVE_TOKEN_ADDRESS, + TransactionPayStrategy, +} from '../../constants.js'; +import { projectLogger } from '../../logger.js'; import type { PayStrategyGetQuotesRequest, QuoteRequest, TransactionFiatPayment, TransactionPayRequiredToken, TransactionPayQuote, -} from '../../types'; -import { getDirectMoneyMusdEnabled } from '../../utils/feature-flags'; +} from '../../types.js'; +import { getDirectMoneyMusdEnabled } from '../../utils/feature-flags.js'; import { buildCaipAssetType, computeRawFromFiatAmount, getTokenFiatRate, getTokenInfo, -} from '../../utils/token'; -import { getRelayQuotes } from '../relay/relay-quotes'; -import type { RelayQuote } from '../relay/types'; -import type { TransactionPayFiatAsset } from './constants'; -import { getDirectMusdFiatQuote } from './fiat-direct-musd'; -import type { FiatQuote } from './types'; +} from '../../utils/token.js'; +import { getRelayQuotes } from '../relay/relay-quotes.js'; +import type { RelayQuote } from '../relay/types.js'; +import type { TransactionPayFiatAsset } from './constants.js'; +import { getDirectMusdFiatQuote } from './fiat-direct-musd.js'; +import type { FiatQuote } from './types.js'; import { deriveFiatAssetForFiatPayment, getRampsQuote, isMoneyAccountDepositTransaction, -} from './utils'; +} from './utils.js'; const log = createModuleLogger(projectLogger, 'fiat-strategy'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.test.ts index 6168dd9e875..502b3537238 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.test.ts @@ -2,18 +2,18 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { TransactionPayStrategy } from '../../constants'; +import { TransactionPayStrategy } from '../../constants.js'; import type { PayStrategyExecuteRequest, QuoteRequest, TransactionPayQuote, -} from '../../types'; -import { getFiatMaxRateDriftPercent } from '../../utils/feature-flags'; -import { getRelayQuotes } from '../relay/relay-quotes'; -import { submitRelayQuotes } from '../relay/relay-submit'; -import type { RelayQuote } from '../relay/types'; -import { submitSimpleRelay } from './fiat-submit-simple'; -import type { FiatQuote } from './types'; +} from '../../types.js'; +import { getFiatMaxRateDriftPercent } from '../../utils/feature-flags.js'; +import { getRelayQuotes } from '../relay/relay-quotes.js'; +import { submitRelayQuotes } from '../relay/relay-submit.js'; +import type { RelayQuote } from '../relay/types.js'; +import { submitSimpleRelay } from './fiat-submit-simple.js'; +import type { FiatQuote } from './types.js'; jest.mock('../../utils/feature-flags'); jest.mock('../relay/relay-quotes'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.ts index be1aca5e7f5..12f3d6a3b09 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-simple.ts @@ -1,13 +1,13 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../../logger'; -import type { PayStrategyExecuteRequest, QuoteRequest } from '../../types'; -import { getFiatMaxRateDriftPercent } from '../../utils/feature-flags'; -import { getRelayQuotes } from '../relay/relay-quotes'; -import { submitRelayQuotes } from '../relay/relay-submit'; -import type { FiatQuote } from './types'; -import { validateRelayRateDrift } from './utils'; +import { projectLogger } from '../../logger.js'; +import type { PayStrategyExecuteRequest, QuoteRequest } from '../../types.js'; +import { getFiatMaxRateDriftPercent } from '../../utils/feature-flags.js'; +import { getRelayQuotes } from '../relay/relay-quotes.js'; +import { submitRelayQuotes } from '../relay/relay-submit.js'; +import type { FiatQuote } from './types.js'; +import { validateRelayRateDrift } from './utils.js'; const log = createModuleLogger(projectLogger, 'fiat-submit-simple'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.test.ts index 99a744eff5b..5631f65e927 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.test.ts @@ -2,22 +2,22 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { TransactionPayStrategy } from '../../constants'; +import { TransactionPayStrategy } from '../../constants.js'; import type { PayStrategyExecuteRequest, QuoteRequest, TransactionPayQuote, -} from '../../types'; +} from '../../types.js'; import { getFiatFeeReserveMultiplier, getFiatMaxRateDriftPercent, -} from '../../utils/feature-flags'; -import { getTransaction, updateTransaction } from '../../utils/transaction'; -import { getRelayQuotes } from '../relay/relay-quotes'; -import { submitRelayQuotes } from '../relay/relay-submit'; -import type { RelayQuote } from '../relay/types'; -import { submitWithTransactionData } from './fiat-submit-with-transaction-data'; -import type { FiatQuote } from './types'; +} from '../../utils/feature-flags.js'; +import { getTransaction, updateTransaction } from '../../utils/transaction.js'; +import { getRelayQuotes } from '../relay/relay-quotes.js'; +import { submitRelayQuotes } from '../relay/relay-submit.js'; +import type { RelayQuote } from '../relay/types.js'; +import { submitWithTransactionData } from './fiat-submit-with-transaction-data.js'; +import type { FiatQuote } from './types.js'; jest.mock('../../utils/feature-flags'); jest.mock('../../utils/transaction'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.ts index 03f975e1168..6d6d5944458 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit-with-transaction-data.ts @@ -2,18 +2,18 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { projectLogger } from '../../logger'; -import type { PayStrategyExecuteRequest, QuoteRequest } from '../../types'; +import { projectLogger } from '../../logger.js'; +import type { PayStrategyExecuteRequest, QuoteRequest } from '../../types.js'; import { getFiatFeeReserveMultiplier, getFiatMaxRateDriftPercent, -} from '../../utils/feature-flags'; -import { getTransaction, updateTransaction } from '../../utils/transaction'; -import { getRelayQuotes } from '../relay/relay-quotes'; -import { submitRelayQuotes } from '../relay/relay-submit'; -import type { RelayQuote } from '../relay/types'; -import type { FiatQuote } from './types'; -import { validateRelayRateDrift } from './utils'; +} from '../../utils/feature-flags.js'; +import { getTransaction, updateTransaction } from '../../utils/transaction.js'; +import { getRelayQuotes } from '../relay/relay-quotes.js'; +import { submitRelayQuotes } from '../relay/relay-submit.js'; +import type { RelayQuote } from '../relay/types.js'; +import type { FiatQuote } from './types.js'; +import { validateRelayRateDrift } from './utils.js'; const log = createModuleLogger(projectLogger, 'fiat-submit-calldata'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.test.ts index 1dee9b8a253..2c8310931c0 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.test.ts @@ -8,29 +8,32 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { TransactionPayStrategy } from '../../constants'; +import { TransactionPayStrategy } from '../../constants.js'; import type { PayStrategyExecuteRequest, QuoteRequest, TransactionPayFiatOptions, TransactionPayQuote, -} from '../../types'; -import { buildCaipAssetType } from '../../utils/token'; +} from '../../types.js'; +import { buildCaipAssetType } from '../../utils/token.js'; import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed, -} from '../../utils/transaction'; -import { getRelayQuotes } from '../relay/relay-quotes'; -import { submitRelayQuotes } from '../relay/relay-submit'; -import type { RelayQuote } from '../relay/types'; -import type { TransactionPayFiatAsset } from './constants'; -import { MUSD_MONAD_FIAT_ASSET } from './constants'; -import { submitFiatQuotes } from './fiat-submit'; -import { fundFiatOrderFromTestSource } from './fiat-test-funding'; -import type { FiatQuote } from './types'; -import { deriveFiatAssetForFiatPayment, resolveSourceAmountRaw } from './utils'; +} from '../../utils/transaction.js'; +import { getRelayQuotes } from '../relay/relay-quotes.js'; +import { submitRelayQuotes } from '../relay/relay-submit.js'; +import type { RelayQuote } from '../relay/types.js'; +import type { TransactionPayFiatAsset } from './constants.js'; +import { MUSD_MONAD_FIAT_ASSET } from './constants.js'; +import { submitFiatQuotes } from './fiat-submit.js'; +import { fundFiatOrderFromTestSource } from './fiat-test-funding.js'; +import type { FiatQuote } from './types.js'; +import { + deriveFiatAssetForFiatPayment, + resolveSourceAmountRaw, +} from './utils.js'; jest.mock('./utils', () => ({ ...jest.requireActual('./utils'), diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.ts index 949170a4fea..19042c2a3ee 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-submit.ts @@ -3,33 +3,33 @@ import { RampsOrderStatus } from '@metamask/ramps-controller'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../../logger'; +import { projectLogger } from '../../logger.js'; import type { PayStrategy, PayStrategyExecuteRequest, TransactionPayFiatOptions, TransactionPayControllerMessenger, -} from '../../types'; -import { prefixError } from '../../utils/error-prefix'; +} from '../../types.js'; +import { prefixError } from '../../utils/error-prefix.js'; import { getFiatOrderPollIntervalMs, getFiatOrderPollTimeoutMs, -} from '../../utils/feature-flags'; -import { updateTransaction } from '../../utils/transaction'; +} from '../../utils/feature-flags.js'; +import { updateTransaction } from '../../utils/transaction.js'; import { isDirectMusdMoneyAccountQuote, submitDirectMusdAfterFiatCompletion, -} from './fiat-direct-musd'; -import { submitSimpleRelay } from './fiat-submit-simple'; -import { submitWithTransactionData } from './fiat-submit-with-transaction-data'; -import { fundFiatOrderFromTestSource } from './fiat-test-funding'; -import type { FiatQuote } from './types'; +} from './fiat-direct-musd.js'; +import { submitSimpleRelay } from './fiat-submit-simple.js'; +import { submitWithTransactionData } from './fiat-submit-with-transaction-data.js'; +import { fundFiatOrderFromTestSource } from './fiat-test-funding.js'; +import type { FiatQuote } from './types.js'; import { deriveFiatAssetForFiatPayment, extractProviderCode, resolveSourceAmountRaw, validateOrderAsset, -} from './utils'; +} from './utils.js'; const log = createModuleLogger(projectLogger, 'fiat-submit'); const POST_RAMP_ERROR_PREFIX = 'Post-Ramp: '; diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.test.ts index b80a1bc7740..f104e467043 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.test.ts @@ -3,19 +3,22 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { NATIVE_TOKEN_ADDRESS, TransactionPayStrategy } from '../../constants'; -import type { TransactionPayQuote } from '../../types'; -import { getNetworkClientId } from '../../utils/provider'; +import { + NATIVE_TOKEN_ADDRESS, + TransactionPayStrategy, +} from '../../constants.js'; +import type { TransactionPayQuote } from '../../types.js'; +import { getNetworkClientId } from '../../utils/provider.js'; import { buildCaipAssetType, getLiveTokenBalance, getNativeToken, getTokenInfo, -} from '../../utils/token'; -import { waitForTransactionConfirmed } from '../../utils/transaction'; -import { fundFiatOrderFromTestSource } from './fiat-test-funding'; -import type { FiatQuote } from './types'; -import { deriveFiatAssetForFiatPayment } from './utils'; +} from '../../utils/token.js'; +import { waitForTransactionConfirmed } from '../../utils/transaction.js'; +import { fundFiatOrderFromTestSource } from './fiat-test-funding.js'; +import type { FiatQuote } from './types.js'; +import { deriveFiatAssetForFiatPayment } from './utils.js'; jest.mock('../../utils/provider'); jest.mock('../../utils/token'); diff --git a/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.ts b/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.ts index 8a4f72e6fa9..00136c1e900 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/fiat-test-funding.ts @@ -11,25 +11,25 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { NATIVE_TOKEN_ADDRESS } from '../../constants'; -import { projectLogger } from '../../logger'; +import { NATIVE_TOKEN_ADDRESS } from '../../constants.js'; +import { projectLogger } from '../../logger.js'; import type { TransactionPayControllerMessenger, TransactionPayFiatOptions, TransactionPayQuote, -} from '../../types'; -import { getNetworkClientId } from '../../utils/provider'; +} from '../../types.js'; +import { getNetworkClientId } from '../../utils/provider.js'; import { buildCaipAssetType, getLiveTokenBalance, getNativeToken, getTokenInfo, -} from '../../utils/token'; -import { waitForTransactionConfirmed } from '../../utils/transaction'; -import { isDirectMusdMoneyAccountQuote } from './fiat-direct-musd'; -import type { FiatQuote } from './types'; -import { deriveFiatAssetForFiatPayment } from './utils'; -import { getRawSourceAmountFromOrderCryptoAmount } from './utils'; +} from '../../utils/token.js'; +import { waitForTransactionConfirmed } from '../../utils/transaction.js'; +import { isDirectMusdMoneyAccountQuote } from './fiat-direct-musd.js'; +import type { FiatQuote } from './types.js'; +import { deriveFiatAssetForFiatPayment } from './utils.js'; +import { getRawSourceAmountFromOrderCryptoAmount } from './utils.js'; const log = createModuleLogger(projectLogger, 'fiat-test-funding'); const TOKEN_TRANSFER_INTERFACE = new Interface([ diff --git a/packages/transaction-pay-controller/src/strategy/fiat/types.ts b/packages/transaction-pay-controller/src/strategy/fiat/types.ts index a64c5aefea0..d40041b6748 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/types.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/types.ts @@ -1,6 +1,6 @@ import type { Quote } from '@metamask/ramps-controller'; -import type { RelayQuote } from '../relay/types'; +import type { RelayQuote } from '../relay/types.js'; export type FiatQuote = { rampsQuote: Quote; diff --git a/packages/transaction-pay-controller/src/strategy/fiat/utils.test.ts b/packages/transaction-pay-controller/src/strategy/fiat/utils.test.ts index f0fa144883d..9dc98c8c49b 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/utils.test.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/utils.test.ts @@ -3,17 +3,20 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; -import { NATIVE_TOKEN_ADDRESS } from '../../constants'; -import { getMessengerMock } from '../../tests/messenger-mock'; -import { ETH_MAINNET_FIAT_ASSET, FIAT_ASSET_ID_BY_TX_TYPE } from './constants'; -import type { TransactionPayFiatAsset } from './constants'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; +import { NATIVE_TOKEN_ADDRESS } from '../../constants.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; +import { + ETH_MAINNET_FIAT_ASSET, + FIAT_ASSET_ID_BY_TX_TYPE, +} from './constants.js'; +import type { TransactionPayFiatAsset } from './constants.js'; import { deriveFiatAssetForFiatPayment, getRawSourceAmountFromOrderCryptoAmount, isMoneyAccountDepositTransaction, resolveSourceAmountRaw, -} from './utils'; +} from './utils.js'; const TX_HASH_MOCK = '0xabc123'; const WALLET_ADDRESS_MOCK = '0x1111111111111111111111111111111111111111' as Hex; diff --git a/packages/transaction-pay-controller/src/strategy/fiat/utils.ts b/packages/transaction-pay-controller/src/strategy/fiat/utils.ts index 3a94efc7956..e53e557a98a 100644 --- a/packages/transaction-pay-controller/src/strategy/fiat/utils.ts +++ b/packages/transaction-pay-controller/src/strategy/fiat/utils.ts @@ -9,17 +9,17 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { projectLogger } from '../../logger'; -import type { TransactionPayControllerMessenger } from '../../types'; +import { projectLogger } from '../../logger.js'; +import type { TransactionPayControllerMessenger } from '../../types.js'; import { getFiatAssetPerTransactionType, getFiatEnabledTypes, -} from '../../utils/feature-flags'; -import { buildCaipAssetType, getTokenInfo } from '../../utils/token'; -import { getTransferredAmountFromTxHash } from '../../utils/transaction'; -import type { RelayQuote } from '../relay/types'; -import type { TransactionPayFiatAsset } from './constants'; -import { DEFAULT_FIAT_CURRENCY, FIAT_ENABLED_TYPES } from './constants'; +} from '../../utils/feature-flags.js'; +import { buildCaipAssetType, getTokenInfo } from '../../utils/token.js'; +import { getTransferredAmountFromTxHash } from '../../utils/transaction.js'; +import type { RelayQuote } from '../relay/types.js'; +import type { TransactionPayFiatAsset } from './constants.js'; +import { DEFAULT_FIAT_CURRENCY, FIAT_ENABLED_TYPES } from './constants.js'; const log = createModuleLogger(projectLogger, 'fiat-utils'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/RelayBridge.test.ts b/packages/transaction-pay-controller/src/strategy/relay/RelayBridge.test.ts index 0f90f518930..fe10b2123a7 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/RelayBridge.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/RelayBridge.test.ts @@ -1,11 +1,11 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; -import type { TransactionPayControllerMessenger } from '../..'; -import type { TransactionPayQuote } from '../../types'; -import { getRelayQuotes } from './relay-quotes'; -import { submitRelayQuotes } from './relay-submit'; -import { RelayStrategy } from './RelayStrategy'; -import type { RelayQuote } from './types'; +import type { TransactionPayControllerMessenger } from '../../index.js'; +import type { TransactionPayQuote } from '../../types.js'; +import { getRelayQuotes } from './relay-quotes.js'; +import { submitRelayQuotes } from './relay-submit.js'; +import { RelayStrategy } from './RelayStrategy.js'; +import type { RelayQuote } from './types.js'; jest.mock('./relay-quotes'); jest.mock('./relay-submit'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.test.ts b/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.test.ts index 947a0553fe1..368d04c9dc6 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.test.ts @@ -4,12 +4,12 @@ import type { PayStrategyExecuteRequest, PayStrategyGetQuotesRequest, TransactionPayQuote, -} from '../../types'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; -import { getRelayQuotes } from './relay-quotes'; -import { submitRelayQuotes } from './relay-submit'; -import { RelayStrategy } from './RelayStrategy'; -import type { RelayQuote } from './types'; +} from '../../types.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getRelayQuotes } from './relay-quotes.js'; +import { submitRelayQuotes } from './relay-submit.js'; +import { RelayStrategy } from './RelayStrategy.js'; +import type { RelayQuote } from './types.js'; jest.mock('./relay-quotes'); jest.mock('./relay-submit'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.ts b/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.ts index 22f6d9c31fd..af645056e7a 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/RelayStrategy.ts @@ -3,11 +3,11 @@ import type { PayStrategyExecuteRequest, PayStrategyGetQuotesRequest, TransactionPayQuote, -} from '../../types'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; -import { getRelayQuotes } from './relay-quotes'; -import { submitRelayQuotes } from './relay-submit'; -import type { RelayQuote } from './types'; +} from '../../types.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getRelayQuotes } from './relay-quotes.js'; +import { submitRelayQuotes } from './relay-submit.js'; +import type { RelayQuote } from './types.js'; export class RelayStrategy implements PayStrategy { supports(request: PayStrategyGetQuotesRequest): boolean { diff --git a/packages/transaction-pay-controller/src/strategy/relay/constants.ts b/packages/transaction-pay-controller/src/strategy/relay/constants.ts index 9d01da69fff..ab47df2db18 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/constants.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/constants.ts @@ -1,8 +1,8 @@ import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { PERPS_DEPOSIT_TYPES } from '../../constants'; -import type { RelayStatus } from './types'; +import { PERPS_DEPOSIT_TYPES } from '../../constants.js'; +import type { RelayStatus } from './types.js'; export const FALLBACK_HASH = '0x0' as Hex; diff --git a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.test.ts b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.test.ts index 40adcdd015a..a3587ea1495 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.test.ts @@ -3,14 +3,14 @@ import type { Hex } from '@metamask/utils'; import type { QuoteRequest, TransactionPayControllerMessenger, -} from '../../types'; -import { getHyperliquidActivationFeeConfig } from '../../utils/feature-flags'; -import { HYPERLIQUID_INFO_URL } from './constants'; -import type { HyperLiquidLedgerUpdate } from './hyperliquid-activation'; +} from '../../types.js'; +import { getHyperliquidActivationFeeConfig } from '../../utils/feature-flags.js'; +import { HYPERLIQUID_INFO_URL } from './constants.js'; +import type { HyperLiquidLedgerUpdate } from './hyperliquid-activation.js'; import { applyHyperliquidActivationFee, isHyperLiquidAccountActivated, -} from './hyperliquid-activation'; +} from './hyperliquid-activation.js'; jest.mock('../../utils/feature-flags', () => ({ getHyperliquidActivationFeeConfig: jest.fn(), diff --git a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.ts b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.ts index 60b7a6bb953..84a5afe9300 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-activation.ts @@ -2,14 +2,14 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { HYPERCORE_USDC_DECIMALS } from '../../constants'; -import { projectLogger } from '../../logger'; +import { HYPERCORE_USDC_DECIMALS } from '../../constants.js'; +import { projectLogger } from '../../logger.js'; import type { QuoteRequest, TransactionPayControllerMessenger, -} from '../../types'; -import { getHyperliquidActivationFeeConfig } from '../../utils/feature-flags'; -import { HYPERLIQUID_INFO_URL } from './constants'; +} from '../../types.js'; +import { getHyperliquidActivationFeeConfig } from '../../utils/feature-flags.js'; +import { HYPERLIQUID_INFO_URL } from './constants.js'; const log = createModuleLogger(projectLogger, 'hyperliquid-activation'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.test.ts b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.test.ts index 6fef5c4116b..f55ed99b6cc 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.test.ts @@ -2,11 +2,11 @@ import { successfulFetch } from '@metamask/controller-utils'; import { SignTypedDataVersion } from '@metamask/keyring-controller'; import type { Hex } from '@metamask/utils'; -import { getMessengerMock } from '../../tests/messenger-mock'; -import type { TransactionPayQuote } from '../../types'; -import { RELAY_AUTHORIZE_URL, HYPERLIQUID_EXCHANGE_URL } from './constants'; -import { submitHyperliquidWithdraw } from './hyperliquid-withdraw'; -import type { RelayQuote, RelaySignatureStep } from './types'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; +import type { TransactionPayQuote } from '../../types.js'; +import { RELAY_AUTHORIZE_URL, HYPERLIQUID_EXCHANGE_URL } from './constants.js'; +import { submitHyperliquidWithdraw } from './hyperliquid-withdraw.js'; +import type { RelayQuote, RelaySignatureStep } from './types.js'; jest.mock('@metamask/controller-utils', () => ({ ...jest.requireActual('@metamask/controller-utils'), diff --git a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.ts b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.ts index 69362a65794..cc453db0c1b 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/hyperliquid-withdraw.ts @@ -3,14 +3,14 @@ import { SignTypedDataVersion } from '@metamask/keyring-controller'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { CHAIN_ID_ARBITRUM } from '../../constants'; -import { projectLogger } from '../../logger'; +import { CHAIN_ID_ARBITRUM } from '../../constants.js'; +import { projectLogger } from '../../logger.js'; import type { TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { RELAY_AUTHORIZE_URL, HYPERLIQUID_EXCHANGE_URL } from './constants'; -import type { RelayQuote, RelaySignatureStep } from './types'; +} from '../../types.js'; +import { RELAY_AUTHORIZE_URL, HYPERLIQUID_EXCHANGE_URL } from './constants.js'; +import type { RelayQuote, RelaySignatureStep } from './types.js'; const log = createModuleLogger(projectLogger, 'hyperliquid-withdraw'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.test.ts b/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.test.ts index 61c116f4ede..951714bf7e0 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.test.ts @@ -3,20 +3,20 @@ import type { Hex } from '@metamask/utils'; import { POLYGON_PUSD_ADDRESS, POLYGON_USDCE_ADDRESS, -} from '../../../constants'; -import { getMessengerMock } from '../../../tests/messenger-mock'; -import type { QuoteRequest, TransactionPayQuote } from '../../../types'; -import { getLiveTokenBalance } from '../../../utils/token'; -import type { RelayQuote, RelayQuoteRequest } from '../types'; +} from '../../../constants.js'; +import { getMessengerMock } from '../../../tests/messenger-mock.js'; +import type { QuoteRequest, TransactionPayQuote } from '../../../types.js'; +import { getLiveTokenBalance } from '../../../utils/token.js'; +import type { RelayQuote, RelayQuoteRequest } from '../types.js'; import { POLYMARKET_COLLATERAL_OFFRAMP_POLYGON, POLYMARKET_COLLATERAL_ONRAMP_POLYGON, -} from './constants'; +} from './constants.js'; import { applyPolymarketDepositWalletOverrides, submitPolymarketWithdraw, sweepPolymarketDepositWallet, -} from './withdraw'; +} from './withdraw.js'; jest.mock('../../../utils/token'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.ts b/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.ts index 30a14183a4e..a234c1c4ac7 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/polymarket/withdraw.ts @@ -5,33 +5,33 @@ import { CHAIN_ID_POLYGON, POLYGON_PUSD_ADDRESS, POLYGON_USDCE_ADDRESS, -} from '../../../constants'; -import { projectLogger } from '../../../logger'; +} from '../../../constants.js'; +import { projectLogger } from '../../../logger.js'; import type { QuoteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../../types'; -import { getLiveTokenBalance } from '../../../utils/token'; +} from '../../../types.js'; +import { getLiveTokenBalance } from '../../../utils/token.js'; import type { RelayQuote, RelayQuoteRequest, RelayStatus, RelayTransactionStep, -} from '../types'; +} from '../types.js'; import { encodeApprove, encodeUnwrap, encodeWrap, extractErc20TransferRecipient, -} from './calldata'; +} from './calldata.js'; import { POLYMARKET_COLLATERAL_OFFRAMP_POLYGON, POLYMARKET_COLLATERAL_ONRAMP_POLYGON, SWEEP_BALANCE_RETRY_ATTEMPTS, SWEEP_BALANCE_RETRY_DELAY_MS, SWEEP_RELAYER_SETTLE_DELAY_MS, -} from './constants'; +} from './constants.js'; const log = createModuleLogger(projectLogger, 'polymarket-withdraw'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-api.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-api.test.ts index 40ded0e790c..ad7d4a5bc38 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-api.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-api.test.ts @@ -1,12 +1,12 @@ -import type { FeatureFlags } from '../../utils/feature-flags'; -import { getFeatureFlags } from '../../utils/feature-flags'; -import { RELAY_STATUS_URL } from './constants'; +import type { FeatureFlags } from '../../utils/feature-flags.js'; +import { getFeatureFlags } from '../../utils/feature-flags.js'; +import { RELAY_STATUS_URL } from './constants.js'; import { fetchRelayQuote, getRelayStatus, submitRelayExecute, -} from './relay-api'; -import type { RelayQuoteRequest } from './types'; +} from './relay-api.js'; +import type { RelayQuoteRequest } from './types.js'; jest.mock('../../utils/feature-flags'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-api.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-api.ts index 8f42d3715ee..836ba83159b 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-api.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-api.ts @@ -1,13 +1,13 @@ -import type { TransactionPayControllerMessenger } from '../../types'; -import { getFeatureFlags } from '../../utils/feature-flags'; -import { RELAY_STATUS_URL } from './constants'; +import type { TransactionPayControllerMessenger } from '../../types.js'; +import { getFeatureFlags } from '../../utils/feature-flags.js'; +import { RELAY_STATUS_URL } from './constants.js'; import type { RelayExecuteRequest, RelayExecuteResponse, RelayQuote, RelayQuoteRequest, RelayStatusResponse, -} from './types'; +} from './types.js'; /** * Fetch a quote from the Relay API. diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.test.ts index 918d1d09cb1..346d95c4e37 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.test.ts @@ -4,24 +4,24 @@ import type { } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { TransactionPayStrategy } from '../..'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; -import { getMessengerMock } from '../../tests/messenger-mock'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; +import { TransactionPayStrategy } from '../../index.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; import type { Amount, FiatValue, PayStrategyGetQuotesRequest, QuoteRequest, TransactionPayQuote, -} from '../../types'; -import { calculateGasFeeTokenCost } from '../../utils/gas'; +} from '../../types.js'; +import { calculateGasFeeTokenCost } from '../../utils/gas.js'; import { getNativeToken, getTokenBalance, getTokenInfo, -} from '../../utils/token'; -import { getRelayMaxGasStationQuote } from './relay-max-gas-station'; -import type { RelayQuote } from './types'; +} from '../../utils/token.js'; +import { getRelayMaxGasStationQuote } from './relay-max-gas-station.js'; +import type { RelayQuote } from './types.js'; jest.mock('../../utils/token'); jest.mock('../../utils/gas'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.ts index 39063b63aea..f66f9c5c28a 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-max-gas-station.ts @@ -1,23 +1,23 @@ import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { projectLogger } from '../../logger'; +import { projectLogger } from '../../logger.js'; import type { PayStrategyGetQuotesRequest, QuoteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; +} from '../../types.js'; import { getGasStationEligibility, getGasStationCostInSourceTokenRaw, -} from '../../utils/gas-station'; +} from '../../utils/gas-station.js'; import { getNativeToken, getTokenBalance, getTokenInfo, -} from '../../utils/token'; -import type { RelayQuote, RelayTransactionStep } from './types'; +} from '../../utils/token.js'; +import type { RelayQuote, RelayTransactionStep } from './types.js'; const log = createModuleLogger(projectLogger, 'relay-max-gas-station'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.test.ts index 445183f585c..04c19b3ac12 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.test.ts @@ -4,13 +4,13 @@ import type { Hex } from '@metamask/utils'; import type { TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { submitMoneyAccountVaultDeposit } from '../../utils/ma-vault-deposit'; -import { getTransferredAmountFromTxHash } from '../../utils/transaction'; -import { MUSD_MONAD_FIAT_ASSET } from '../fiat/constants'; -import { FALLBACK_HASH } from './constants'; -import { submitPostRelayVaultDeposit } from './relay-post-ma-vault'; -import type { RelayCompletionOutcome, RelayQuote } from './types'; +} from '../../types.js'; +import { submitMoneyAccountVaultDeposit } from '../../utils/ma-vault-deposit.js'; +import { getTransferredAmountFromTxHash } from '../../utils/transaction.js'; +import { MUSD_MONAD_FIAT_ASSET } from '../fiat/constants.js'; +import { FALLBACK_HASH } from './constants.js'; +import { submitPostRelayVaultDeposit } from './relay-post-ma-vault.js'; +import type { RelayCompletionOutcome, RelayQuote } from './types.js'; jest.mock('../../utils/transaction'); jest.mock('../../utils/ma-vault-deposit'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.ts index 8c2cd7768c2..82b5f53d742 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-post-ma-vault.ts @@ -2,16 +2,16 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../../logger'; +import { projectLogger } from '../../logger.js'; import type { TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { submitMoneyAccountVaultDeposit } from '../../utils/ma-vault-deposit'; -import { getTransferredAmountFromTxHash } from '../../utils/transaction'; -import { MUSD_MONAD_FIAT_ASSET } from '../fiat/constants'; -import { FALLBACK_HASH } from './constants'; -import type { RelayCompletionOutcome, RelayQuote } from './types'; +} from '../../types.js'; +import { submitMoneyAccountVaultDeposit } from '../../utils/ma-vault-deposit.js'; +import { getTransferredAmountFromTxHash } from '../../utils/transaction.js'; +import { MUSD_MONAD_FIAT_ASSET } from '../fiat/constants.js'; +import { FALLBACK_HASH } from './constants.js'; +import type { RelayCompletionOutcome, RelayQuote } from './types.js'; const log = createModuleLogger(projectLogger, 'relay-post-ma-vault'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts index cd6ffa21974..e517e6b5717 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.test.ts @@ -7,7 +7,7 @@ import type { import type { Hex } from '@metamask/utils'; import { cloneDeep } from 'lodash'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM, @@ -16,12 +16,12 @@ import { NATIVE_TOKEN_ADDRESS, PaymentOverride, POLYGON_USDCE_ADDRESS, -} from '../../constants'; -import { getMessengerMock } from '../../tests/messenger-mock'; +} from '../../constants.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; import type { GetDelegationTransactionCallback, QuoteRequest, -} from '../../types'; +} from '../../types.js'; import { DEFAULT_RELAY_ORIGIN_GAS_OVERHEAD, DEFAULT_RELAY_QUOTE_URL, @@ -30,23 +30,24 @@ import { isRelayExecuteEnabled, getGasBuffer, getSlippage, -} from '../../utils/feature-flags'; -import { calculateGasCost, calculateGasFeeTokenCost } from '../../utils/gas'; +} from '../../utils/feature-flags.js'; +import { calculateGasCost, calculateGasFeeTokenCost } from '../../utils/gas.js'; import { getNativeToken, getTokenBalance, getTokenFiatRate, -} from '../../utils/token'; -import { getRelayQuotes } from './relay-quotes'; -import type { RelayQuote, RelayTransactionStep } from './types'; +} from '../../utils/token.js'; +import { getRelayQuotes } from './relay-quotes.js'; +import type { RelayQuote, RelayTransactionStep } from './types.js'; jest.mock('../../utils/token', () => ({ - ...jest.createMockFromModule( + ...jest.createMockFromModule( '../../utils/token', ), normalizeTokenAddress: - jest.requireActual('../../utils/token') - .normalizeTokenAddress, + jest.requireActual( + '../../utils/token', + ).normalizeTokenAddress, })); jest.mock('../../utils/gas', () => ({ ...jest.requireActual('../../utils/gas'), diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.ts index 969ba352c3c..a42c3e954ca 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-quotes.ts @@ -14,7 +14,6 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { TransactionPayStrategy } from '../..'; import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM, @@ -26,8 +25,9 @@ import { PERPS_DEPOSIT_TYPES, USDC_DECIMALS, PaymentOverride, -} from '../../constants'; -import { projectLogger } from '../../logger'; +} from '../../constants.js'; +import { TransactionPayStrategy } from '../../index.js'; +import { projectLogger } from '../../logger.js'; import type { Amount, FiatRates, @@ -35,8 +35,8 @@ import type { QuoteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { getFiatValueFromUsd } from '../../utils/amounts'; +} from '../../types.js'; +import { getFiatValueFromUsd } from '../../utils/amounts.js'; import { getFeatureFlags, getRelayOriginGasOverhead, @@ -44,32 +44,32 @@ import { getStablecoins, isEIP7702Chain, isRelayExecuteEnabled, -} from '../../utils/feature-flags'; -import { calculateGasCost } from '../../utils/gas'; +} from '../../utils/feature-flags.js'; import { getGasStationCostInSourceTokenRaw, getGasStationEligibility, -} from '../../utils/gas-station'; -import { estimateQuoteGasLimits } from '../../utils/quote-gas'; -import type { QuoteGasTransaction } from '../../utils/quote-gas'; +} from '../../utils/gas-station.js'; +import { calculateGasCost } from '../../utils/gas.js'; +import { estimateQuoteGasLimits } from '../../utils/quote-gas.js'; +import type { QuoteGasTransaction } from '../../utils/quote-gas.js'; import { getNativeToken, getTokenBalance, getTokenFiatRate, normalizeTokenAddress, TokenAddressTarget, -} from '../../utils/token'; -import { TOKEN_TRANSFER_FOUR_BYTE } from './constants'; -import { applyHyperliquidActivationFee } from './hyperliquid-activation'; -import { applyPolymarketDepositWalletOverrides } from './polymarket/withdraw'; -import { fetchRelayQuote } from './relay-api'; -import { getRelayMaxGasStationQuote } from './relay-max-gas-station'; +} from '../../utils/token.js'; +import { TOKEN_TRANSFER_FOUR_BYTE } from './constants.js'; +import { applyHyperliquidActivationFee } from './hyperliquid-activation.js'; +import { applyPolymarketDepositWalletOverrides } from './polymarket/withdraw.js'; +import { fetchRelayQuote } from './relay-api.js'; +import { getRelayMaxGasStationQuote } from './relay-max-gas-station.js'; import type { RelayQuote, RelayQuoteMetamask, RelayQuoteRequest, RelayTransactionStep, -} from './types'; +} from './types.js'; const log = createModuleLogger(projectLogger, 'relay-strategy'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts index e36509046db..8eb4de9c368 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.test.ts @@ -3,16 +3,16 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { cloneDeep } from 'lodash'; -import { getMessengerMock } from '../../tests/messenger-mock'; -import type { TransactionPayQuote } from '../../types'; -import type { FeatureFlags } from '../../utils/feature-flags'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; +import type { TransactionPayQuote } from '../../types.js'; +import type { FeatureFlags } from '../../utils/feature-flags.js'; import { getFeatureFlags, getRelayPollingInterval, getRelayPollingTimeout, -} from '../../utils/feature-flags'; -import { submitViaRelayExecute } from './relay-submit-execute'; -import type { RelayQuote } from './types'; +} from '../../utils/feature-flags.js'; +import { submitViaRelayExecute } from './relay-submit-execute.js'; +import type { RelayQuote } from './types.js'; jest.mock('../../utils/feature-flags'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.ts index e2f2144a151..a18329f30fa 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-submit-execute.ts @@ -8,16 +8,16 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { projectLogger } from '../../logger'; +import { projectLogger } from '../../logger.js'; import type { TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { prefixError } from '../../utils/error-prefix'; -import { getNetworkClientId } from '../../utils/provider'; -import { FALLBACK_HASH } from './constants'; -import { submitRelayExecute } from './relay-api'; -import type { RelayExecuteRequest, RelayQuote } from './types'; +} from '../../types.js'; +import { prefixError } from '../../utils/error-prefix.js'; +import { getNetworkClientId } from '../../utils/provider.js'; +import { FALLBACK_HASH } from './constants.js'; +import { submitRelayExecute } from './relay-api.js'; +import type { RelayExecuteRequest, RelayQuote } from './types.js'; const log = createModuleLogger(projectLogger, 'relay-strategy'); const RELAY_EXECUTE_ERROR_PREFIX = 'Execute: '; diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts index 395c4a75bb1..16caf5f3f59 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-submit.test.ts @@ -7,30 +7,33 @@ import type { import type { Hex } from '@metamask/utils'; import { cloneDeep } from 'lodash'; -import { PaymentOverride } from '../../constants'; -import { getMessengerMock } from '../../tests/messenger-mock'; +import { PaymentOverride } from '../../constants.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; import type { PayStrategyExecuteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import type { FeatureFlags } from '../../utils/feature-flags'; +} from '../../types.js'; +import type { FeatureFlags } from '../../utils/feature-flags.js'; import { getFeatureFlags, getRelayPollingInterval, getRelayPollingTimeout, -} from '../../utils/feature-flags'; -import { getLiveTokenBalance, normalizeTokenAddress } from '../../utils/token'; +} from '../../utils/feature-flags.js'; +import { + getLiveTokenBalance, + normalizeTokenAddress, +} from '../../utils/token.js'; import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed, -} from '../../utils/transaction'; -import { RELAY_STATUS_URL } from './constants'; -import { submitRelayQuotes } from './relay-submit'; -import { submitViaRelayExecute } from './relay-submit-execute'; -import type { RelayQuote } from './types'; +} from '../../utils/transaction.js'; +import { RELAY_STATUS_URL } from './constants.js'; +import { submitViaRelayExecute } from './relay-submit-execute.js'; +import { submitRelayQuotes } from './relay-submit.js'; +import type { RelayQuote } from './types.js'; jest.mock('../../utils/token'); jest.mock('../../utils/transaction'); diff --git a/packages/transaction-pay-controller/src/strategy/relay/relay-submit.ts b/packages/transaction-pay-controller/src/strategy/relay/relay-submit.ts index 5f7da9bbec5..e51b6d9bc90 100644 --- a/packages/transaction-pay-controller/src/strategy/relay/relay-submit.ts +++ b/packages/transaction-pay-controller/src/strategy/relay/relay-submit.ts @@ -9,50 +9,50 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { projectLogger } from '../../logger'; +import { projectLogger } from '../../logger.js'; import type { PayStrategyExecuteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; -import { prefixError } from '../../utils/error-prefix'; +} from '../../types.js'; +import { prefixError } from '../../utils/error-prefix.js'; import { getFeatureFlags, getRelayPollingInterval, getRelayPollingTimeout, -} from '../../utils/feature-flags'; -import { getNetworkClientId } from '../../utils/provider'; +} from '../../utils/feature-flags.js'; +import { getNetworkClientId } from '../../utils/provider.js'; import { getLiveTokenBalance, normalizeTokenAddress, TokenAddressTarget, -} from '../../utils/token'; +} from '../../utils/token.js'; import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed, -} from '../../utils/transaction'; +} from '../../utils/transaction.js'; import { FALLBACK_HASH, RELAY_DEPOSIT_TYPES, RELAY_FAILURE_STATUSES, RELAY_PENDING_STATUSES, -} from './constants'; -import { submitHyperliquidWithdraw } from './hyperliquid-withdraw'; +} from './constants.js'; +import { submitHyperliquidWithdraw } from './hyperliquid-withdraw.js'; import { sweepPolymarketDepositWallet, submitPolymarketWithdraw, -} from './polymarket/withdraw'; -import { getRelayStatus } from './relay-api'; -import { submitViaRelayExecute } from './relay-submit-execute'; +} from './polymarket/withdraw.js'; +import { getRelayStatus } from './relay-api.js'; +import { submitViaRelayExecute } from './relay-submit-execute.js'; import type { RelayCompletionOutcome, RelayQuote, RelayStatus, RelayStatusResponse, RelayTransactionStep, -} from './types'; +} from './types.js'; const log = createModuleLogger(projectLogger, 'relay-strategy'); const RELAY_ERROR_PREFIX = 'Relay: '; diff --git a/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.test.ts b/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.test.ts index 5d2396a283d..ea705d35182 100644 --- a/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.test.ts +++ b/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.test.ts @@ -1,12 +1,12 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; -import type { TransactionPayControllerMessenger } from '../..'; -import type { TransactionPayQuote } from '../../types'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; -import { getServerQuotes } from './server-quotes'; -import { submitServerQuotes } from './server-submit'; -import { ServerStrategy } from './ServerStrategy'; -import type { ServerQuote } from './types'; +import type { TransactionPayControllerMessenger } from '../../index.js'; +import type { TransactionPayQuote } from '../../types.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getServerQuotes } from './server-quotes.js'; +import { submitServerQuotes } from './server-submit.js'; +import { ServerStrategy } from './ServerStrategy.js'; +import type { ServerQuote } from './types.js'; jest.mock('./server-quotes'); jest.mock('./server-submit'); diff --git a/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.ts b/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.ts index 2cb4e08f1ab..398ed12fc91 100644 --- a/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.ts +++ b/packages/transaction-pay-controller/src/strategy/server/ServerStrategy.ts @@ -3,11 +3,11 @@ import type { PayStrategyExecuteRequest, PayStrategyGetQuotesRequest, TransactionPayQuote, -} from '../../types'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; -import { getServerQuotes } from './server-quotes'; -import { submitServerQuotes } from './server-submit'; -import type { ServerQuote } from './types'; +} from '../../types.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getServerQuotes } from './server-quotes.js'; +import { submitServerQuotes } from './server-submit.js'; +import type { ServerQuote } from './types.js'; /** * Pay strategy that routes quote, submit, and status requests through the diff --git a/packages/transaction-pay-controller/src/strategy/server/perps.test.ts b/packages/transaction-pay-controller/src/strategy/server/perps.test.ts index facb01c49e7..f77244bf139 100644 --- a/packages/transaction-pay-controller/src/strategy/server/perps.test.ts +++ b/packages/transaction-pay-controller/src/strategy/server/perps.test.ts @@ -4,13 +4,13 @@ import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM, CHAIN_ID_HYPERCORE, -} from '../../constants'; -import type { QuoteRequest } from '../../types'; +} from '../../constants.js'; +import type { QuoteRequest } from '../../types.js'; import { SERVER_HYPERCORE_USDC_PERPS_ADDRESS, isServerPerpsDepositRequest, normalizeServerPerpsRequest, -} from './perps'; +} from './perps.js'; const BRIDGE_ADDRESS_LOWER = '0x2df1c51e09aecf9cacb7bc98cb1742757f163df7'; diff --git a/packages/transaction-pay-controller/src/strategy/server/perps.ts b/packages/transaction-pay-controller/src/strategy/server/perps.ts index d4f71fe7308..ec6121c97e0 100644 --- a/packages/transaction-pay-controller/src/strategy/server/perps.ts +++ b/packages/transaction-pay-controller/src/strategy/server/perps.ts @@ -8,8 +8,8 @@ import { CHAIN_ID_HYPERCORE, HYPERCORE_USDC_DECIMALS, USDC_DECIMALS, -} from '../../constants'; -import type { QuoteRequest } from '../../types'; +} from '../../constants.js'; +import type { QuoteRequest } from '../../types.js'; /** * Shared 20-byte sentinel address emitted by the server strategy to flag a diff --git a/packages/transaction-pay-controller/src/strategy/server/server-api.test.ts b/packages/transaction-pay-controller/src/strategy/server/server-api.test.ts index 7016301e4c1..869440beba7 100644 --- a/packages/transaction-pay-controller/src/strategy/server/server-api.test.ts +++ b/packages/transaction-pay-controller/src/strategy/server/server-api.test.ts @@ -1,12 +1,12 @@ -import type { PayStrategiesConfig } from '../../utils/feature-flags'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; +import type { PayStrategiesConfig } from '../../utils/feature-flags.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; import { fetchServerQuote, getServerStatus, submitServerIntent, -} from './server-api'; -import { ServerProviderName, ServerStatus, ServerTradeType } from './types'; -import type { ServerQuoteRequest, ServerSubmitRequest } from './types'; +} from './server-api.js'; +import { ServerProviderName, ServerStatus, ServerTradeType } from './types.js'; +import type { ServerQuoteRequest, ServerSubmitRequest } from './types.js'; jest.mock('../../utils/feature-flags'); diff --git a/packages/transaction-pay-controller/src/strategy/server/server-api.ts b/packages/transaction-pay-controller/src/strategy/server/server-api.ts index e866202eab7..56e45874d5c 100644 --- a/packages/transaction-pay-controller/src/strategy/server/server-api.ts +++ b/packages/transaction-pay-controller/src/strategy/server/server-api.ts @@ -1,8 +1,8 @@ import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../../logger'; -import type { TransactionPayControllerMessenger } from '../../types'; -import { getPayStrategiesConfig } from '../../utils/feature-flags'; +import { projectLogger } from '../../logger.js'; +import type { TransactionPayControllerMessenger } from '../../types.js'; +import { getPayStrategiesConfig } from '../../utils/feature-flags.js'; import type { ServerProviderName, ServerQuoteRequest, @@ -10,7 +10,7 @@ import type { ServerStatusResponse, ServerSubmitRequest, ServerSubmitResponse, -} from './types'; +} from './types.js'; const log = createModuleLogger(projectLogger, 'server-api'); diff --git a/packages/transaction-pay-controller/src/strategy/server/server-quotes.test.ts b/packages/transaction-pay-controller/src/strategy/server/server-quotes.test.ts index 26ce8dc7f6e..bd28a89abd5 100644 --- a/packages/transaction-pay-controller/src/strategy/server/server-quotes.test.ts +++ b/packages/transaction-pay-controller/src/strategy/server/server-quotes.test.ts @@ -5,31 +5,31 @@ import { CHAIN_ID_HYPERCORE, PaymentOverride, TransactionPayStrategy, -} from '../../constants'; -import { getMessengerMock } from '../../tests/messenger-mock'; +} from '../../constants.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; import type { GetDelegationTransactionCallback, QuoteRequest, -} from '../../types'; +} from '../../types.js'; import { getFeatureFlags, getSlippage, isEIP7702Chain, -} from '../../utils/feature-flags'; -import { calculateGasCost, getGasFee } from '../../utils/gas'; +} from '../../utils/feature-flags.js'; import { getGasStationCostInSourceTokenRaw, getGasStationEligibility, -} from '../../utils/gas-station'; -import { estimateQuoteGasLimits } from '../../utils/quote-gas'; +} from '../../utils/gas-station.js'; +import { calculateGasCost, getGasFee } from '../../utils/gas.js'; +import { estimateQuoteGasLimits } from '../../utils/quote-gas.js'; import { getNativeToken, getTokenBalance, getTokenFiatRate, -} from '../../utils/token'; -import { fetchServerQuote } from './server-api'; -import { getServerQuotes } from './server-quotes'; -import { ServerProviderName, ServerTradeType } from './types'; +} from '../../utils/token.js'; +import { fetchServerQuote } from './server-api.js'; +import { getServerQuotes } from './server-quotes.js'; +import { ServerProviderName, ServerTradeType } from './types.js'; jest.mock('../../utils/feature-flags', () => ({ ...jest.requireActual('../../utils/feature-flags'), diff --git a/packages/transaction-pay-controller/src/strategy/server/server-quotes.ts b/packages/transaction-pay-controller/src/strategy/server/server-quotes.ts index 3b71e75d6d8..12a4fc649ab 100644 --- a/packages/transaction-pay-controller/src/strategy/server/server-quotes.ts +++ b/packages/transaction-pay-controller/src/strategy/server/server-quotes.ts @@ -12,42 +12,42 @@ import { CHAIN_ID_HYPERCORE, PaymentOverride, TransactionPayStrategy, -} from '../../constants'; -import { projectLogger } from '../../logger'; +} from '../../constants.js'; +import { projectLogger } from '../../logger.js'; import type { PayStrategyGetQuotesRequest, QuoteRequest, TransactionPayControllerMessenger, TransactionPayFees, TransactionPayQuote, -} from '../../types'; -import { getFiatValueFromUsd } from '../../utils/amounts'; +} from '../../types.js'; +import { getFiatValueFromUsd } from '../../utils/amounts.js'; import { getFeatureFlags, getSlippage, isEIP7702Chain, -} from '../../utils/feature-flags'; -import { calculateGasCost, getGasFee } from '../../utils/gas'; +} from '../../utils/feature-flags.js'; import { getGasStationCostInSourceTokenRaw, getGasStationEligibility, -} from '../../utils/gas-station'; -import { estimateQuoteGasLimits } from '../../utils/quote-gas'; -import type { QuoteGasTransaction } from '../../utils/quote-gas'; +} from '../../utils/gas-station.js'; +import { calculateGasCost, getGasFee } from '../../utils/gas.js'; +import { estimateQuoteGasLimits } from '../../utils/quote-gas.js'; +import type { QuoteGasTransaction } from '../../utils/quote-gas.js'; import { getNativeToken, getTokenBalance, getTokenFiatRate, -} from '../../utils/token'; -import { normalizeServerPerpsRequest } from './perps'; -import { fetchServerQuote } from './server-api'; +} from '../../utils/token.js'; +import { normalizeServerPerpsRequest } from './perps.js'; +import { fetchServerQuote } from './server-api.js'; import type { ServerQuote, ServerQuoteRequest, ServerQuoteResult, ServerTransactionStep, -} from './types'; -import { ServerTradeType } from './types'; +} from './types.js'; +import { ServerTradeType } from './types.js'; const log = createModuleLogger(projectLogger, 'server-quotes'); const TOKEN_TRANSFER_FOUR_BYTE = '0xa9059cbb'; diff --git a/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts b/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts index e179b314ae8..0d0230b6081 100644 --- a/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts +++ b/packages/transaction-pay-controller/src/strategy/server/server-submit.test.ts @@ -4,26 +4,26 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { cloneDeep } from 'lodash'; -import { PaymentOverride } from '../../constants'; -import { getMessengerMock } from '../../tests/messenger-mock'; +import { PaymentOverride } from '../../constants.js'; +import { getMessengerMock } from '../../tests/messenger-mock.js'; import type { PayStrategyExecuteRequest, TransactionPayQuote, -} from '../../types'; +} from '../../types.js'; import { getServerPollingInterval, getServerPollingTimeout, -} from '../../utils/feature-flags'; -import { getLiveTokenBalance } from '../../utils/token'; +} from '../../utils/feature-flags.js'; +import { getLiveTokenBalance } from '../../utils/token.js'; import { collectTransactionIds, getTransaction, waitForTransactionConfirmed, -} from '../../utils/transaction'; -import { getServerStatus, submitServerIntent } from './server-api'; -import { submitServerQuotes } from './server-submit'; -import { ServerProviderName, ServerStatus } from './types'; -import type { ServerQuote, ServerSignatureStep } from './types'; +} from '../../utils/transaction.js'; +import { getServerStatus, submitServerIntent } from './server-api.js'; +import { submitServerQuotes } from './server-submit.js'; +import { ServerProviderName, ServerStatus } from './types.js'; +import type { ServerQuote, ServerSignatureStep } from './types.js'; jest.mock('@metamask/controller-utils', () => ({ ...jest.requireActual('@metamask/controller-utils'), diff --git a/packages/transaction-pay-controller/src/strategy/server/server-submit.ts b/packages/transaction-pay-controller/src/strategy/server/server-submit.ts index 973e63facfe..8d6a21c6802 100644 --- a/packages/transaction-pay-controller/src/strategy/server/server-submit.ts +++ b/packages/transaction-pay-controller/src/strategy/server/server-submit.ts @@ -13,38 +13,38 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { projectLogger } from '../../logger'; +import { projectLogger } from '../../logger.js'; import type { PayStrategyExecuteRequest, TransactionPayControllerMessenger, TransactionPayQuote, -} from '../../types'; +} from '../../types.js'; import { getServerPollingInterval, getServerPollingTimeout, -} from '../../utils/feature-flags'; -import { getNetworkClientId } from '../../utils/provider'; +} from '../../utils/feature-flags.js'; +import { getNetworkClientId } from '../../utils/provider.js'; import { getLiveTokenBalance, normalizeTokenAddress, TokenAddressTarget, -} from '../../utils/token'; +} from '../../utils/token.js'; import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed, -} from '../../utils/transaction'; -import { RELAY_DEPOSIT_TYPES } from '../relay/constants'; -import { getServerStatus, submitServerIntent } from './server-api'; +} from '../../utils/transaction.js'; +import { RELAY_DEPOSIT_TYPES } from '../relay/constants.js'; +import { getServerStatus, submitServerIntent } from './server-api.js'; import type { ServerQuote, ServerSignatureStep, ServerTransactionStep, ServerStatusResponse, ServerSubmitRequest, -} from './types'; -import { ServerStatus } from './types'; +} from './types.js'; +import { ServerStatus } from './types.js'; const log = createModuleLogger(projectLogger, 'server-strategy'); diff --git a/packages/transaction-pay-controller/src/tests/messenger-mock.ts b/packages/transaction-pay-controller/src/tests/messenger-mock.ts index 4e3b1897c45..36c204a2fc3 100644 --- a/packages/transaction-pay-controller/src/tests/messenger-mock.ts +++ b/packages/transaction-pay-controller/src/tests/messenger-mock.ts @@ -23,7 +23,7 @@ import type { } from '@metamask/transaction-controller'; import type { TransactionControllerUpdateTransactionAction } from '@metamask/transaction-controller'; -import type { TransactionPayControllerMessenger } from '..'; +import type { TransactionPayControllerMessenger } from '../index.js'; import type { TransactionPayControllerGetDelegationTransactionAction, TransactionPayControllerGetFiatOptionsAction, @@ -31,8 +31,8 @@ import type { TransactionPayControllerGetStrategyAction, TransactionPayControllerPolymarketGetDepositWalletAddressAction, TransactionPayControllerPolymarketSubmitDepositWalletBatchAction, -} from '../TransactionPayController-method-action-types'; -import type { TransactionPayControllerGetStateAction } from '../types'; +} from '../TransactionPayController-method-action-types.js'; +import type { TransactionPayControllerGetStateAction } from '../types.js'; type AllActions = MessengerActions; type AllEvents = MessengerEvents; diff --git a/packages/transaction-pay-controller/src/types.ts b/packages/transaction-pay-controller/src/types.ts index c1904e38f0d..d930c1a214a 100644 --- a/packages/transaction-pay-controller/src/types.ts +++ b/packages/transaction-pay-controller/src/types.ts @@ -57,8 +57,8 @@ import type { CONTROLLER_NAME, PaymentOverride, TransactionPayStrategy, -} from './constants'; -import type { TransactionPayControllerMethodActions } from './TransactionPayController-method-action-types'; +} from './constants.js'; +import type { TransactionPayControllerMethodActions } from './TransactionPayController-method-action-types.js'; export type AllowedActions = | AccountTrackerControllerGetStateAction diff --git a/packages/transaction-pay-controller/src/utils/7702.ts b/packages/transaction-pay-controller/src/utils/7702.ts index 00354371d23..4d8c1e082c0 100644 --- a/packages/transaction-pay-controller/src/utils/7702.ts +++ b/packages/transaction-pay-controller/src/utils/7702.ts @@ -1,5 +1,5 @@ -import type { TransactionPayControllerMessenger } from '../types'; -import { KEYRING_TYPES_SUPPORTING_7702 } from '../types'; +import type { TransactionPayControllerMessenger } from '../types.js'; +import { KEYRING_TYPES_SUPPORTING_7702 } from '../types.js'; /** * Check whether a given account supports EIP-7702 authorization signing. diff --git a/packages/transaction-pay-controller/src/utils/amounts.test.ts b/packages/transaction-pay-controller/src/utils/amounts.test.ts index c690b035759..e90a5ff6be5 100644 --- a/packages/transaction-pay-controller/src/utils/amounts.test.ts +++ b/packages/transaction-pay-controller/src/utils/amounts.test.ts @@ -1,6 +1,6 @@ import { BigNumber } from 'bignumber.js'; -import { getFiatValueFromUsd, sumAmounts } from './amounts'; +import { getFiatValueFromUsd, sumAmounts } from './amounts.js'; describe('Amounts utils', () => { describe('sumAmounts', () => { diff --git a/packages/transaction-pay-controller/src/utils/amounts.ts b/packages/transaction-pay-controller/src/utils/amounts.ts index c09a2cd2b6e..c21dad95861 100644 --- a/packages/transaction-pay-controller/src/utils/amounts.ts +++ b/packages/transaction-pay-controller/src/utils/amounts.ts @@ -1,6 +1,6 @@ import { BigNumber } from 'bignumber.js'; -import type { Amount, FiatValue } from '../types'; +import type { Amount, FiatValue } from '../types.js'; /** * Sum a list of amounts. diff --git a/packages/transaction-pay-controller/src/utils/chomp.test.ts b/packages/transaction-pay-controller/src/utils/chomp.test.ts index 370d72dd447..acbffb5e2f8 100644 --- a/packages/transaction-pay-controller/src/utils/chomp.test.ts +++ b/packages/transaction-pay-controller/src/utils/chomp.test.ts @@ -1,9 +1,9 @@ import type { Hex } from '@metamask/utils'; -import { CHAIN_ID_MONAD, MUSD_MONAD_ADDRESS } from '../constants'; -import type { TransactionPayControllerMessenger } from '../types'; -import { findRecentChompVaultDeposit } from './chomp'; -import { rpcRequest } from './provider'; +import { CHAIN_ID_MONAD, MUSD_MONAD_ADDRESS } from '../constants.js'; +import type { TransactionPayControllerMessenger } from '../types.js'; +import { findRecentChompVaultDeposit } from './chomp.js'; +import { rpcRequest } from './provider.js'; jest.mock('./provider'); diff --git a/packages/transaction-pay-controller/src/utils/chomp.ts b/packages/transaction-pay-controller/src/utils/chomp.ts index 79f440f4bfa..2c2cc466276 100644 --- a/packages/transaction-pay-controller/src/utils/chomp.ts +++ b/packages/transaction-pay-controller/src/utils/chomp.ts @@ -1,10 +1,10 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { CHAIN_ID_MONAD, MUSD_MONAD_ADDRESS } from '../constants'; -import { projectLogger } from '../logger'; -import type { TransactionPayControllerMessenger } from '../types'; -import { rpcRequest } from './provider'; +import { CHAIN_ID_MONAD, MUSD_MONAD_ADDRESS } from '../constants.js'; +import { projectLogger } from '../logger.js'; +import type { TransactionPayControllerMessenger } from '../types.js'; +import { rpcRequest } from './provider.js'; const log = createModuleLogger(projectLogger, 'chomp'); diff --git a/packages/transaction-pay-controller/src/utils/error-prefix.test.ts b/packages/transaction-pay-controller/src/utils/error-prefix.test.ts index 1488a7af95f..99ec914da92 100644 --- a/packages/transaction-pay-controller/src/utils/error-prefix.test.ts +++ b/packages/transaction-pay-controller/src/utils/error-prefix.test.ts @@ -1,4 +1,4 @@ -import { prefixError } from './error-prefix'; +import { prefixError } from './error-prefix.js'; describe('prefixError', () => { it('prefixes Error messages without replacing the Error object', () => { diff --git a/packages/transaction-pay-controller/src/utils/feature-flags.test.ts b/packages/transaction-pay-controller/src/utils/feature-flags.test.ts index e52b3e70d47..308bd19ecb9 100644 --- a/packages/transaction-pay-controller/src/utils/feature-flags.test.ts +++ b/packages/transaction-pay-controller/src/utils/feature-flags.test.ts @@ -1,11 +1,11 @@ import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; -import { TransactionPayStrategy } from '../constants'; -import type { TransactionPayFiatAsset } from '../strategy/fiat/constants'; -import { FIAT_ENABLED_TYPES } from '../strategy/fiat/constants'; -import { getMessengerMock } from '../tests/messenger-mock'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; +import { TransactionPayStrategy } from '../constants.js'; +import type { TransactionPayFiatAsset } from '../strategy/fiat/constants.js'; +import { FIAT_ENABLED_TYPES } from '../strategy/fiat/constants.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; import { DEFAULT_ACROSS_API_BASE, DEFAULT_FALLBACK_GAS_ESTIMATE, @@ -43,8 +43,8 @@ import { getSlippage, getStrategy, getStrategyOrder, -} from './feature-flags'; -import * as featureFlagsModule from './feature-flags'; +} from './feature-flags.js'; +import * as featureFlagsModule from './feature-flags.js'; const GAS_FALLBACK_ESTIMATE_MOCK = 123; const GAS_FALLBACK_MAX_MOCK = 456; diff --git a/packages/transaction-pay-controller/src/utils/feature-flags.ts b/packages/transaction-pay-controller/src/utils/feature-flags.ts index 978714a8fcf..708a7db2f3c 100644 --- a/packages/transaction-pay-controller/src/utils/feature-flags.ts +++ b/packages/transaction-pay-controller/src/utils/feature-flags.ts @@ -8,24 +8,24 @@ import { isTransactionPayStrategy, STABLECOINS, TransactionPayStrategy, -} from '../constants'; -import { projectLogger } from '../logger'; -import type { TransactionPayFiatAsset } from '../strategy/fiat/constants'; +} from '../constants.js'; +import { projectLogger } from '../logger.js'; +import type { TransactionPayFiatAsset } from '../strategy/fiat/constants.js'; import { ETH_MAINNET_FIAT_ASSET, FIAT_ASSET_ID_BY_TX_TYPE, FIAT_ENABLED_TYPES, -} from '../strategy/fiat/constants'; +} from '../strategy/fiat/constants.js'; import { RELAY_EXECUTE_URL, RELAY_POLLING_INTERVAL, RELAY_QUOTE_URL, -} from '../strategy/relay/constants'; +} from '../strategy/relay/constants.js'; import { SERVER_POLLING_INTERVAL, SERVER_URL_BASE, -} from '../strategy/server/constants'; -import type { TransactionPayControllerMessenger } from '../types'; +} from '../strategy/server/constants.js'; +import type { TransactionPayControllerMessenger } from '../types.js'; const log = createModuleLogger(projectLogger, 'feature-flags'); diff --git a/packages/transaction-pay-controller/src/utils/gas-station.test.ts b/packages/transaction-pay-controller/src/utils/gas-station.test.ts index 135a1447eab..ffea301fac8 100644 --- a/packages/transaction-pay-controller/src/utils/gas-station.test.ts +++ b/packages/transaction-pay-controller/src/utils/gas-station.test.ts @@ -1,13 +1,13 @@ import type { GasFeeToken } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; -import { getMessengerMock } from '../tests/messenger-mock'; -import { calculateGasFeeTokenCost } from './gas'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; import { getGasStationEligibility, getGasStationCostInSourceTokenRaw, -} from './gas-station'; +} from './gas-station.js'; +import { calculateGasFeeTokenCost } from './gas.js'; jest.mock('./gas'); diff --git a/packages/transaction-pay-controller/src/utils/gas-station.ts b/packages/transaction-pay-controller/src/utils/gas-station.ts index 6398a1365ff..e495c7762a1 100644 --- a/packages/transaction-pay-controller/src/utils/gas-station.ts +++ b/packages/transaction-pay-controller/src/utils/gas-station.ts @@ -4,14 +4,14 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import { projectLogger } from '../logger'; +import { projectLogger } from '../logger.js'; import type { Amount, QuoteRequest, TransactionPayControllerMessenger, -} from '../types'; -import { getFeatureFlags, isEIP7702Chain } from './feature-flags'; -import { calculateGasFeeTokenCost } from './gas'; +} from '../types.js'; +import { getFeatureFlags, isEIP7702Chain } from './feature-flags.js'; +import { calculateGasFeeTokenCost } from './gas.js'; const log = createModuleLogger(projectLogger, 'gas-station'); diff --git a/packages/transaction-pay-controller/src/utils/gas.test.ts b/packages/transaction-pay-controller/src/utils/gas.test.ts index 5023f93ffc6..83fb3ab603a 100644 --- a/packages/transaction-pay-controller/src/utils/gas.test.ts +++ b/packages/transaction-pay-controller/src/utils/gas.test.ts @@ -2,21 +2,21 @@ import { toHex } from '@metamask/controller-utils'; import type { Hex } from '@metamask/utils'; import { clone, cloneDeep } from 'lodash'; -import type { GasFeeEstimates } from '../../../gas-fee-controller/src'; +import type { GasFeeEstimates } from '../../../gas-fee-controller/src/index.js'; import type { GasFeeToken, TransactionMeta, -} from '../../../transaction-controller/src'; -import { getMessengerMock } from '../tests/messenger-mock'; -import { getFallbackGas, getGasBuffer } from './feature-flags'; +} from '../../../transaction-controller/src/index.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; +import { getFallbackGas, getGasBuffer } from './feature-flags.js'; import { calculateGasCost, calculateGasFeeTokenCost, calculateTransactionGasCost, estimateGasLimit, getGasFee, -} from './gas'; -import { getTokenBalance, getTokenFiatRate } from './token'; +} from './gas.js'; +import { getTokenBalance, getTokenFiatRate } from './token.js'; jest.mock('./token'); jest.mock('./feature-flags', () => ({ diff --git a/packages/transaction-pay-controller/src/utils/gas.ts b/packages/transaction-pay-controller/src/utils/gas.ts index 5d777d0395f..b60303e2f1f 100644 --- a/packages/transaction-pay-controller/src/utils/gas.ts +++ b/packages/transaction-pay-controller/src/utils/gas.ts @@ -7,12 +7,12 @@ import type { import type { Hex } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import type { TransactionPayControllerMessenger } from '..'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { Amount } from '../types'; -import { getFallbackGas, getGasBuffer } from './feature-flags'; -import { getNetworkClientId } from './provider'; -import { getNativeToken, getTokenBalance, getTokenFiatRate } from './token'; +import type { TransactionPayControllerMessenger } from '../index.js'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { Amount } from '../types.js'; +import { getFallbackGas, getGasBuffer } from './feature-flags.js'; +import { getNetworkClientId } from './provider.js'; +import { getNativeToken, getTokenBalance, getTokenFiatRate } from './token.js'; const log = createModuleLogger(projectLogger, 'gas'); diff --git a/packages/transaction-pay-controller/src/utils/ma-vault-deposit.test.ts b/packages/transaction-pay-controller/src/utils/ma-vault-deposit.test.ts index 6a24aac3c91..21d1085e8c1 100644 --- a/packages/transaction-pay-controller/src/utils/ma-vault-deposit.test.ts +++ b/packages/transaction-pay-controller/src/utils/ma-vault-deposit.test.ts @@ -2,16 +2,16 @@ import { TransactionType } from '@metamask/transaction-controller'; import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import type { TransactionPayControllerMessenger } from '../types'; -import { findRecentChompVaultDeposit } from './chomp'; -import { submitMoneyAccountVaultDeposit } from './ma-vault-deposit'; -import { getNetworkClientId } from './provider'; +import type { TransactionPayControllerMessenger } from '../types.js'; +import { findRecentChompVaultDeposit } from './chomp.js'; +import { submitMoneyAccountVaultDeposit } from './ma-vault-deposit.js'; +import { getNetworkClientId } from './provider.js'; import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed, -} from './transaction'; +} from './transaction.js'; jest.mock('./chomp'); jest.mock('./provider'); diff --git a/packages/transaction-pay-controller/src/utils/ma-vault-deposit.ts b/packages/transaction-pay-controller/src/utils/ma-vault-deposit.ts index ad2d02e39af..ebf85361fb6 100644 --- a/packages/transaction-pay-controller/src/utils/ma-vault-deposit.ts +++ b/packages/transaction-pay-controller/src/utils/ma-vault-deposit.ts @@ -4,18 +4,18 @@ import { TransactionType } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../logger'; -import { MUSD_MONAD_FIAT_ASSET } from '../strategy/fiat/constants'; -import type { TransactionPayControllerMessenger } from '../types'; -import { findRecentChompVaultDeposit } from './chomp'; -import { prefixError } from './error-prefix'; -import { getNetworkClientId } from './provider'; +import { projectLogger } from '../logger.js'; +import { MUSD_MONAD_FIAT_ASSET } from '../strategy/fiat/constants.js'; +import type { TransactionPayControllerMessenger } from '../types.js'; +import { findRecentChompVaultDeposit } from './chomp.js'; +import { prefixError } from './error-prefix.js'; +import { getNetworkClientId } from './provider.js'; import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed, -} from './transaction'; +} from './transaction.js'; const log = createModuleLogger(projectLogger, 'ma-vault-deposit'); diff --git a/packages/transaction-pay-controller/src/utils/no-op-quote.test.ts b/packages/transaction-pay-controller/src/utils/no-op-quote.test.ts index 0997e584ca4..b955bcb3148 100644 --- a/packages/transaction-pay-controller/src/utils/no-op-quote.test.ts +++ b/packages/transaction-pay-controller/src/utils/no-op-quote.test.ts @@ -1,8 +1,8 @@ import type { Hex } from '@metamask/utils'; -import { TransactionPayStrategy } from '../constants'; -import type { TransactionPaymentToken } from '../types'; -import { buildNoOpQuote } from './no-op-quote'; +import { TransactionPayStrategy } from '../constants.js'; +import type { TransactionPaymentToken } from '../types.js'; +import { buildNoOpQuote } from './no-op-quote.js'; const FROM_MOCK = '0xabc' as Hex; diff --git a/packages/transaction-pay-controller/src/utils/no-op-quote.ts b/packages/transaction-pay-controller/src/utils/no-op-quote.ts index 35e5a4368e6..a4bcec8d4fd 100644 --- a/packages/transaction-pay-controller/src/utils/no-op-quote.ts +++ b/packages/transaction-pay-controller/src/utils/no-op-quote.ts @@ -1,12 +1,12 @@ import type { Hex, Json } from '@metamask/utils'; -import { TransactionPayStrategy } from '../constants'; +import { TransactionPayStrategy } from '../constants.js'; import type { Amount, FiatValue, TransactionPaymentToken, TransactionPayQuote, -} from '../types'; +} from '../types.js'; function zeroFiat(): FiatValue { return { fiat: '0', usd: '0' }; diff --git a/packages/transaction-pay-controller/src/utils/provider.test.ts b/packages/transaction-pay-controller/src/utils/provider.test.ts index 8510fd91795..8258c944cbd 100644 --- a/packages/transaction-pay-controller/src/utils/provider.test.ts +++ b/packages/transaction-pay-controller/src/utils/provider.test.ts @@ -4,8 +4,8 @@ import { RpcEndpointType } from '@metamask/network-controller'; import type { NetworkConfiguration } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; -import { getMessengerMock } from '../tests/messenger-mock'; -import { getNetworkClientId, rpcRequest } from './provider'; +import { getMessengerMock } from '../tests/messenger-mock.js'; +import { getNetworkClientId, rpcRequest } from './provider.js'; const CHAIN_ID_MOCK = '0x1' as Hex; const DEFAULT_NETWORK_CLIENT_ID_MOCK = 'default-client-id'; diff --git a/packages/transaction-pay-controller/src/utils/provider.ts b/packages/transaction-pay-controller/src/utils/provider.ts index ed793fb3fcd..28fb54f8bb3 100644 --- a/packages/transaction-pay-controller/src/utils/provider.ts +++ b/packages/transaction-pay-controller/src/utils/provider.ts @@ -10,8 +10,8 @@ import { import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../logger'; -import type { TransactionPayControllerMessenger } from '../types'; +import { projectLogger } from '../logger.js'; +import type { TransactionPayControllerMessenger } from '../types.js'; const log = createModuleLogger(projectLogger, 'provider'); diff --git a/packages/transaction-pay-controller/src/utils/quote-gas.test.ts b/packages/transaction-pay-controller/src/utils/quote-gas.test.ts index 64cef9bccae..dd6d61bdccc 100644 --- a/packages/transaction-pay-controller/src/utils/quote-gas.test.ts +++ b/packages/transaction-pay-controller/src/utils/quote-gas.test.ts @@ -1,9 +1,9 @@ import type { Hex } from '@metamask/utils'; -import { getMessengerMock } from '../tests/messenger-mock'; -import { getGasBuffer } from './feature-flags'; -import { estimateGasLimit } from './gas'; -import { estimateQuoteGasLimits } from './quote-gas'; +import { getMessengerMock } from '../tests/messenger-mock.js'; +import { getGasBuffer } from './feature-flags.js'; +import { estimateGasLimit } from './gas.js'; +import { estimateQuoteGasLimits } from './quote-gas.js'; jest.mock('./feature-flags', () => ({ ...jest.requireActual('./feature-flags'), diff --git a/packages/transaction-pay-controller/src/utils/quote-gas.ts b/packages/transaction-pay-controller/src/utils/quote-gas.ts index 25c2823c1d3..0fef76029e0 100644 --- a/packages/transaction-pay-controller/src/utils/quote-gas.ts +++ b/packages/transaction-pay-controller/src/utils/quote-gas.ts @@ -4,10 +4,10 @@ import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import type { TransactionPayControllerMessenger } from '..'; -import { projectLogger } from '../logger'; -import { getGasBuffer } from './feature-flags'; -import { estimateGasLimit } from './gas'; +import type { TransactionPayControllerMessenger } from '../index.js'; +import { projectLogger } from '../logger.js'; +import { getGasBuffer } from './feature-flags.js'; +import { estimateGasLimit } from './gas.js'; const log = createModuleLogger(projectLogger, 'quote-gas'); diff --git a/packages/transaction-pay-controller/src/utils/quotes.test.ts b/packages/transaction-pay-controller/src/utils/quotes.test.ts index f414b8fe2fc..cb17de81f6d 100644 --- a/packages/transaction-pay-controller/src/utils/quotes.test.ts +++ b/packages/transaction-pay-controller/src/utils/quotes.test.ts @@ -4,8 +4,8 @@ import type { BatchTransaction } from '@metamask/transaction-controller'; import type { Hex, Json } from '@metamask/utils'; import { cloneDeep } from 'lodash'; -import { TransactionPayStrategy } from '../constants'; -import { getMessengerMock } from '../tests/messenger-mock'; +import { TransactionPayStrategy } from '../constants.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; import type { TransactionPaySourceAmount, TransactionData, @@ -13,26 +13,27 @@ import type { TransactionPayTotals, TransactionPaymentToken, TransactionPayRequiredToken, -} from '../types'; -import type { UpdateQuotesRequest } from './quotes'; -import { refreshQuotes, updateQuotes } from './quotes'; +} from '../types.js'; +import type { UpdateQuotesRequest } from './quotes.js'; +import { refreshQuotes, updateQuotes } from './quotes.js'; import { checkStrategyQuoteSupport, checkStrategySupport, getStrategiesByName, getStrategyByName, -} from './strategy'; -import { getLiveTokenBalance, getTokenFiatRate } from './token'; -import { calculateTotals } from './totals'; -import { getTransaction, updateTransaction } from './transaction'; +} from './strategy.js'; +import { getLiveTokenBalance, getTokenFiatRate } from './token.js'; +import { calculateTotals } from './totals.js'; +import { getTransaction, updateTransaction } from './transaction.js'; jest.mock('./strategy'); jest.mock('./transaction'); jest.mock('./totals'); jest.mock('./token', () => ({ - ...jest.createMockFromModule('./token'), + ...jest.createMockFromModule('./token'), computeTokenAmounts: - jest.requireActual('./token').computeTokenAmounts, + jest.requireActual('./token') + .computeTokenAmounts, })); jest.useFakeTimers(); diff --git a/packages/transaction-pay-controller/src/utils/quotes.ts b/packages/transaction-pay-controller/src/utils/quotes.ts index 7ae137bdc7f..4d8b8b9f28a 100644 --- a/packages/transaction-pay-controller/src/utils/quotes.ts +++ b/packages/transaction-pay-controller/src/utils/quotes.ts @@ -4,8 +4,8 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex, Json } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { PaymentOverride, TransactionPayStrategy } from '../constants'; -import { projectLogger } from '../logger'; +import { PaymentOverride, TransactionPayStrategy } from '../constants.js'; +import { projectLogger } from '../logger.js'; import type { QuoteRequest, TransactionData, @@ -16,22 +16,22 @@ import type { TransactionPayTotals, TransactionPaymentToken, UpdateTransactionDataCallback, -} from '../types'; -import { accountSupports7702 } from './7702'; -import { buildNoOpQuote } from './no-op-quote'; +} from '../types.js'; +import { accountSupports7702 } from './7702.js'; +import { buildNoOpQuote } from './no-op-quote.js'; import { checkStrategyQuoteSupport, checkStrategySupport, getStrategiesByName, getStrategyByName, -} from './strategy'; +} from './strategy.js'; import { computeTokenAmounts, getLiveTokenBalance, getTokenFiatRate, -} from './token'; -import { calculateTotals } from './totals'; -import { getTransaction, updateTransaction } from './transaction'; +} from './token.js'; +import { calculateTotals } from './totals.js'; +import { getTransaction, updateTransaction } from './transaction.js'; const DEFAULT_REFRESH_INTERVAL = 30 * 1000; // 30 Seconds diff --git a/packages/transaction-pay-controller/src/utils/required-tokens.test.ts b/packages/transaction-pay-controller/src/utils/required-tokens.test.ts index 2bbc3cd676c..b205dd6bcb7 100644 --- a/packages/transaction-pay-controller/src/utils/required-tokens.test.ts +++ b/packages/transaction-pay-controller/src/utils/required-tokens.test.ts @@ -1,10 +1,10 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; -import { toHex } from '../../../controller-utils/src'; -import type { TransactionPayControllerMessenger } from '../types'; -import { parseRequiredTokens } from './required-tokens'; -import { getTokenBalance, getTokenFiatRate, getTokenInfo } from './token'; +import { toHex } from '../../../controller-utils/src/index.js'; +import type { TransactionPayControllerMessenger } from '../types.js'; +import { parseRequiredTokens } from './required-tokens.js'; +import { getTokenBalance, getTokenFiatRate, getTokenInfo } from './token.js'; jest.mock('./token', () => ({ ...jest.requireActual('./token'), diff --git a/packages/transaction-pay-controller/src/utils/required-tokens.ts b/packages/transaction-pay-controller/src/utils/required-tokens.ts index 9103a6c1cec..f5667304422 100644 --- a/packages/transaction-pay-controller/src/utils/required-tokens.ts +++ b/packages/transaction-pay-controller/src/utils/required-tokens.ts @@ -5,17 +5,17 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { createModuleLogger } from '@metamask/utils'; -import { projectLogger } from '../logger'; +import { projectLogger } from '../logger.js'; import type { TransactionPayControllerMessenger, TransactionPayRequiredToken, -} from '../types'; +} from '../types.js'; import { computeTokenAmounts, getTokenBalance, getTokenFiatRate, getTokenInfo, -} from './token'; +} from './token.js'; const log = createModuleLogger(projectLogger, 'required-tokens'); diff --git a/packages/transaction-pay-controller/src/utils/source-amounts.test.ts b/packages/transaction-pay-controller/src/utils/source-amounts.test.ts index 87458d9ce31..7c36a4673e0 100644 --- a/packages/transaction-pay-controller/src/utils/source-amounts.test.ts +++ b/packages/transaction-pay-controller/src/utils/source-amounts.test.ts @@ -1,13 +1,13 @@ import { TransactionType } from '@metamask/transaction-controller'; -import { TransactionPayStrategy } from '..'; -import type { TransactionPaymentToken } from '..'; -import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM } from '../constants'; -import { getMessengerMock } from '../tests/messenger-mock'; -import type { TransactionData, TransactionPayRequiredToken } from '../types'; -import { updateSourceAmounts } from './source-amounts'; -import { getTokenFiatRate } from './token'; -import { getTransaction } from './transaction'; +import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM } from '../constants.js'; +import { TransactionPayStrategy } from '../index.js'; +import type { TransactionPaymentToken } from '../index.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; +import type { TransactionData, TransactionPayRequiredToken } from '../types.js'; +import { updateSourceAmounts } from './source-amounts.js'; +import { getTokenFiatRate } from './token.js'; +import { getTransaction } from './transaction.js'; jest.mock('./token', () => ({ ...jest.requireActual('./token'), diff --git a/packages/transaction-pay-controller/src/utils/source-amounts.ts b/packages/transaction-pay-controller/src/utils/source-amounts.ts index f2bcd31a501..00954453747 100644 --- a/packages/transaction-pay-controller/src/utils/source-amounts.ts +++ b/packages/transaction-pay-controller/src/utils/source-amounts.ts @@ -5,24 +5,24 @@ import type { import { createModuleLogger } from '@metamask/utils'; import { BigNumber } from 'bignumber.js'; -import type { - TransactionPayControllerMessenger, - TransactionPaymentToken, -} from '..'; -import { TransactionPayStrategy } from '..'; import { ARBITRUM_USDC_ADDRESS, CHAIN_ID_ARBITRUM, PERPS_DEPOSIT_TYPES, -} from '../constants'; -import { projectLogger } from '../logger'; +} from '../constants.js'; +import type { + TransactionPayControllerMessenger, + TransactionPaymentToken, +} from '../index.js'; +import { TransactionPayStrategy } from '../index.js'; +import { projectLogger } from '../logger.js'; import type { TransactionPaySourceAmount, TransactionData, TransactionPayRequiredToken, -} from '../types'; -import { getTokenFiatRate, isSameToken } from './token'; -import { getTransaction } from './transaction'; +} from '../types.js'; +import { getTokenFiatRate, isSameToken } from './token.js'; +import { getTransaction } from './transaction.js'; const log = createModuleLogger(projectLogger, 'source-amounts'); diff --git a/packages/transaction-pay-controller/src/utils/strategy.test.ts b/packages/transaction-pay-controller/src/utils/strategy.test.ts index d2c7da2084c..bc2d61d0f81 100644 --- a/packages/transaction-pay-controller/src/utils/strategy.test.ts +++ b/packages/transaction-pay-controller/src/utils/strategy.test.ts @@ -1,15 +1,15 @@ -import { TransactionPayStrategy } from '../constants'; -import { AcrossStrategy } from '../strategy/across/AcrossStrategy'; -import { FiatStrategy } from '../strategy/fiat/FiatStrategy'; -import { RelayStrategy } from '../strategy/relay/RelayStrategy'; -import { ServerStrategy } from '../strategy/server/ServerStrategy'; -import type { PayStrategyGetQuotesRequest } from '../types'; +import { TransactionPayStrategy } from '../constants.js'; +import { AcrossStrategy } from '../strategy/across/AcrossStrategy.js'; +import { FiatStrategy } from '../strategy/fiat/FiatStrategy.js'; +import { RelayStrategy } from '../strategy/relay/RelayStrategy.js'; +import { ServerStrategy } from '../strategy/server/ServerStrategy.js'; +import type { PayStrategyGetQuotesRequest } from '../types.js'; import { checkStrategyQuoteSupport, checkStrategySupport, getStrategiesByName, getStrategyByName, -} from './strategy'; +} from './strategy.js'; describe('Strategy Utils', () => { describe('getStrategyByName', () => { diff --git a/packages/transaction-pay-controller/src/utils/strategy.ts b/packages/transaction-pay-controller/src/utils/strategy.ts index 3026874d71a..97bd8cbdfa5 100644 --- a/packages/transaction-pay-controller/src/utils/strategy.ts +++ b/packages/transaction-pay-controller/src/utils/strategy.ts @@ -1,13 +1,13 @@ -import { TransactionPayStrategy } from '../constants'; -import { AcrossStrategy } from '../strategy/across/AcrossStrategy'; -import { FiatStrategy } from '../strategy/fiat/FiatStrategy'; -import { RelayStrategy } from '../strategy/relay/RelayStrategy'; -import { ServerStrategy } from '../strategy/server/ServerStrategy'; +import { TransactionPayStrategy } from '../constants.js'; +import { AcrossStrategy } from '../strategy/across/AcrossStrategy.js'; +import { FiatStrategy } from '../strategy/fiat/FiatStrategy.js'; +import { RelayStrategy } from '../strategy/relay/RelayStrategy.js'; +import { ServerStrategy } from '../strategy/server/ServerStrategy.js'; import type { PayStrategy, PayStrategyCheckQuoteSupportRequest, PayStrategyGetQuotesRequest, -} from '../types'; +} from '../types.js'; export type NamedStrategy = { name: TransactionPayStrategy; diff --git a/packages/transaction-pay-controller/src/utils/token.test.ts b/packages/transaction-pay-controller/src/utils/token.test.ts index e23dbd9e485..cb30aa2c542 100644 --- a/packages/transaction-pay-controller/src/utils/token.test.ts +++ b/packages/transaction-pay-controller/src/utils/token.test.ts @@ -7,13 +7,13 @@ import { RpcEndpointType } from '@metamask/network-controller'; import type { NetworkConfiguration } from '@metamask/network-controller'; import type { Hex } from '@metamask/utils'; -import { getDefaultRemoteFeatureFlagControllerState } from '../../../remote-feature-flag-controller/src/remote-feature-flag-controller'; +import { getDefaultRemoteFeatureFlagControllerState } from '../../../remote-feature-flag-controller/src/remote-feature-flag-controller.js'; import { CHAIN_ID_POLYGON, NATIVE_TOKEN_ADDRESS, POLYGON_USDCE_ADDRESS, -} from '../constants'; -import { getMessengerMock } from '../tests/messenger-mock'; +} from '../constants.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; import { buildCaipAssetType, computeRawFromFiatAmount, @@ -26,7 +26,7 @@ import { getLiveTokenBalance, normalizeTokenAddress, TokenAddressTarget, -} from './token'; +} from './token.js'; const TOKEN_ADDRESS_MOCK = '0x559B65722aD62AD6DAC4Fa5a1c6B23A2e8ce57Ec' as Hex; const TOKEN_ADDRESS_2_MOCK = '0x123456789abcdef1234567890abcdef12345678' as Hex; diff --git a/packages/transaction-pay-controller/src/utils/token.ts b/packages/transaction-pay-controller/src/utils/token.ts index 0f0f66b88c6..66ea9ac4541 100644 --- a/packages/transaction-pay-controller/src/utils/token.ts +++ b/packages/transaction-pay-controller/src/utils/token.ts @@ -10,14 +10,14 @@ import { CHAIN_ID_POLYGON, NATIVE_TOKEN_ADDRESS, SLIP44_COIN_TYPE_BY_CHAIN, -} from '../constants'; -import type { FiatRates, TransactionPayControllerMessenger } from '../types'; +} from '../constants.js'; +import type { FiatRates, TransactionPayControllerMessenger } from '../types.js'; import { getAssetsUnifyStateFeature, getStablecoins, isChainExcludedFromInfura, -} from './feature-flags'; -import { getNetworkClientId, rpcRequest } from './provider'; +} from './feature-flags.js'; +import { getNetworkClientId, rpcRequest } from './provider.js'; /** * Check if two tokens are the same (same address and chain). diff --git a/packages/transaction-pay-controller/src/utils/totals.test.ts b/packages/transaction-pay-controller/src/utils/totals.test.ts index 1fc2ec4a5ec..963acd8fb30 100644 --- a/packages/transaction-pay-controller/src/utils/totals.test.ts +++ b/packages/transaction-pay-controller/src/utils/totals.test.ts @@ -1,14 +1,14 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; -import { TransactionPayStrategy } from '..'; -import type { TransactionPayControllerMessenger } from '..'; +import { TransactionPayStrategy } from '../index.js'; +import type { TransactionPayControllerMessenger } from '../index.js'; import type { QuoteRequest, TransactionPayQuote, TransactionPayRequiredToken, -} from '../types'; -import { calculateTransactionGasCost } from './gas'; -import { calculateTotals } from './totals'; +} from '../types.js'; +import { calculateTransactionGasCost } from './gas.js'; +import { calculateTotals } from './totals.js'; jest.mock('./gas'); diff --git a/packages/transaction-pay-controller/src/utils/totals.ts b/packages/transaction-pay-controller/src/utils/totals.ts index 62978191795..26d587de3e8 100644 --- a/packages/transaction-pay-controller/src/utils/totals.ts +++ b/packages/transaction-pay-controller/src/utils/totals.ts @@ -1,16 +1,16 @@ import type { TransactionMeta } from '@metamask/transaction-controller'; import { BigNumber } from 'bignumber.js'; -import { TransactionPayStrategy } from '../constants'; +import { TransactionPayStrategy } from '../constants.js'; import type { FiatValue, TransactionPayControllerMessenger, TransactionPayQuote, TransactionPayRequiredToken, TransactionPayTotals, -} from '../types'; -import { sumAmounts } from './amounts'; -import { calculateTransactionGasCost } from './gas'; +} from '../types.js'; +import { sumAmounts } from './amounts.js'; +import { calculateTransactionGasCost } from './gas.js'; /** * Calculate totals for a list of quotes and tokens. diff --git a/packages/transaction-pay-controller/src/utils/transaction.test.ts b/packages/transaction-pay-controller/src/utils/transaction.test.ts index 2010ea67b29..8db399076d4 100644 --- a/packages/transaction-pay-controller/src/utils/transaction.test.ts +++ b/packages/transaction-pay-controller/src/utils/transaction.test.ts @@ -10,14 +10,14 @@ import type { TransactionControllerState } from '@metamask/transaction-controlle import type { Hex } from '@metamask/utils'; import { noop } from 'lodash'; -import { NATIVE_TOKEN_ADDRESS } from '../constants'; -import { getMessengerMock } from '../tests/messenger-mock'; +import { NATIVE_TOKEN_ADDRESS } from '../constants.js'; +import { getMessengerMock } from '../tests/messenger-mock.js'; import type { TransactionData, TransactionPayControllerState, TransactionPayRequiredToken, -} from '../types'; -import { parseRequiredTokens } from './required-tokens'; +} from '../types.js'; +import { parseRequiredTokens } from './required-tokens.js'; import { FINALIZED_STATUSES, collectTransactionIds, @@ -27,7 +27,7 @@ import { subscribeTransactionChanges, updateTransaction, waitForTransactionConfirmed, -} from './transaction'; +} from './transaction.js'; jest.mock('./required-tokens'); diff --git a/packages/transaction-pay-controller/src/utils/transaction.ts b/packages/transaction-pay-controller/src/utils/transaction.ts index 02cdb779c2e..5713675a37c 100644 --- a/packages/transaction-pay-controller/src/utils/transaction.ts +++ b/packages/transaction-pay-controller/src/utils/transaction.ts @@ -8,15 +8,15 @@ import { BigNumber } from 'bignumber.js'; import type { Patch } from 'immer'; import { cloneDeep } from 'lodash'; -import { projectLogger } from '../logger'; +import { projectLogger } from '../logger.js'; import type { TransactionPayControllerMessenger, TransactionPayControllerState, UpdateTransactionDataCallback, -} from '../types'; -import { rpcRequest } from './provider'; -import { parseRequiredTokens } from './required-tokens'; -import { getNativeToken } from './token'; +} from '../types.js'; +import { rpcRequest } from './provider.js'; +import { parseRequiredTokens } from './required-tokens.js'; +import { getNativeToken } from './token.js'; const log = createModuleLogger(projectLogger, 'transaction'); From eb91453172d7e344bc688df7ba36f07bb63ac68d Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Tue, 21 Jul 2026 16:45:30 +0200 Subject: [PATCH 11/11] Add .js import extensions to user-operation-controller --- eslint.config.mjs | 1 + .../user-operation-controller/package.json | 4 ++-- ...OperationController-method-action-types.ts | 2 +- .../src/UserOperationController.test.ts | 24 +++++++++---------- .../src/UserOperationController.ts | 24 +++++++++---------- .../src/helpers/Bundler.test.ts | 4 ++-- .../src/helpers/Bundler.ts | 4 ++-- .../PendingUserOperationTracker.test.ts | 10 ++++---- .../helpers/PendingUserOperationTracker.ts | 10 ++++---- .../helpers/SnapSmartContractAccount.test.ts | 12 +++++----- .../src/helpers/SnapSmartContractAccount.ts | 8 +++---- .../user-operation-controller/src/index.ts | 6 ++--- .../src/utils/chain-id.test.ts | 2 +- .../src/utils/gas-fees.test.ts | 4 ++-- .../src/utils/gas-fees.ts | 8 +++---- .../src/utils/gas.test.ts | 10 ++++---- .../src/utils/gas.ts | 8 +++---- .../src/utils/transaction.test.ts | 14 +++++------ .../src/utils/transaction.ts | 6 ++--- .../src/utils/validation.test.ts | 6 ++--- .../src/utils/validation.ts | 6 ++--- 21 files changed, 87 insertions(+), 86 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 8884621626d..d822f50c029 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -427,6 +427,7 @@ const config = createConfig([ 'packages/snap-account-service/**', 'packages/transaction-controller/**', 'packages/transaction-pay-controller/**', + 'packages/user-operation-controller/**', 'packages/wallet/**', 'packages/wallet-cli/**', 'packages/wallet-framework-docs/**', diff --git a/packages/user-operation-controller/package.json b/packages/user-operation-controller/package.json index 401b6e338d7..5ab0fbae9e6 100644 --- a/packages/user-operation-controller/package.json +++ b/packages/user-operation-controller/package.json @@ -46,8 +46,8 @@ "changelog:validate": "../../scripts/validate-changelog.sh @metamask/user-operation-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", "prepare-manifest:preview": "../../scripts/prepare-preview-manifest.sh", "since-latest-release": "../../scripts/since-latest-release.sh", "test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter", diff --git a/packages/user-operation-controller/src/UserOperationController-method-action-types.ts b/packages/user-operation-controller/src/UserOperationController-method-action-types.ts index aeb25ac0a87..a1377907657 100644 --- a/packages/user-operation-controller/src/UserOperationController-method-action-types.ts +++ b/packages/user-operation-controller/src/UserOperationController-method-action-types.ts @@ -3,7 +3,7 @@ * Do not edit manually. */ -import type { UserOperationController } from './UserOperationController'; +import type { UserOperationController } from './UserOperationController.js'; /** * Create and submit a user operation. diff --git a/packages/user-operation-controller/src/UserOperationController.test.ts b/packages/user-operation-controller/src/UserOperationController.test.ts index cc946555099..c3d20618e32 100644 --- a/packages/user-operation-controller/src/UserOperationController.test.ts +++ b/packages/user-operation-controller/src/UserOperationController.test.ts @@ -5,33 +5,33 @@ import { TransactionType } from '@metamask/transaction-controller'; import type { TransactionParams } from '@metamask/transaction-controller'; import { EventEmitter } from 'stream'; -import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from './constants'; -import * as BundlerHelper from './helpers/Bundler'; -import * as PendingUserOperationTrackerHelper from './helpers/PendingUserOperationTracker'; -import { SnapSmartContractAccount } from './helpers/SnapSmartContractAccount'; -import { UserOperationStatus } from './types'; -import type { UserOperationMetadata } from './types'; +import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from './constants.js'; +import * as BundlerHelper from './helpers/Bundler.js'; +import * as PendingUserOperationTrackerHelper from './helpers/PendingUserOperationTracker.js'; +import { SnapSmartContractAccount } from './helpers/SnapSmartContractAccount.js'; +import { UserOperationStatus } from './types.js'; +import type { UserOperationMetadata } from './types.js'; import type { PrepareUserOperationResponse, SignUserOperationResponse, SmartContractAccount, UpdateUserOperationResponse, -} from './types'; +} from './types.js'; import type { AddUserOperationOptions, AddUserOperationRequest, UserOperationControllerMessenger, -} from './UserOperationController'; -import { UserOperationController } from './UserOperationController'; -import { updateGas } from './utils/gas'; -import { updateGasFees } from './utils/gas-fees'; +} from './UserOperationController.js'; +import { UserOperationController } from './UserOperationController.js'; +import { updateGasFees } from './utils/gas-fees.js'; +import { updateGas } from './utils/gas.js'; import { validateAddUserOperationRequest, validateAddUserOperationOptions, validatePrepareUserOperationResponse, validateSignUserOperationResponse, validateUpdateUserOperationResponse, -} from './utils/validation'; +} from './utils/validation.js'; jest.mock('./utils/gas'); jest.mock('./utils/gas-fees'); diff --git a/packages/user-operation-controller/src/UserOperationController.ts b/packages/user-operation-controller/src/UserOperationController.ts index c0fc7150f63..f3785ec2b46 100644 --- a/packages/user-operation-controller/src/UserOperationController.ts +++ b/packages/user-operation-controller/src/UserOperationController.ts @@ -33,28 +33,28 @@ import EventEmitter from 'events'; import { cloneDeep } from 'lodash'; import { v1 as random } from 'uuid'; -import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from './constants'; -import { Bundler } from './helpers/Bundler'; -import { PendingUserOperationTracker } from './helpers/PendingUserOperationTracker'; -import { SnapSmartContractAccount } from './helpers/SnapSmartContractAccount'; -import { projectLogger as log } from './logger'; +import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from './constants.js'; +import { Bundler } from './helpers/Bundler.js'; +import { PendingUserOperationTracker } from './helpers/PendingUserOperationTracker.js'; +import { SnapSmartContractAccount } from './helpers/SnapSmartContractAccount.js'; +import { projectLogger as log } from './logger.js'; import type { SmartContractAccount, UserOperation, UserOperationMetadata, -} from './types'; -import { UserOperationStatus } from './types'; -import type { UserOperationControllerMethodActions } from './UserOperationController-method-action-types'; -import { updateGas } from './utils/gas'; -import { updateGasFees } from './utils/gas-fees'; -import { getTransactionMetadata } from './utils/transaction'; +} from './types.js'; +import { UserOperationStatus } from './types.js'; +import type { UserOperationControllerMethodActions } from './UserOperationController-method-action-types.js'; +import { updateGasFees } from './utils/gas-fees.js'; +import { updateGas } from './utils/gas.js'; +import { getTransactionMetadata } from './utils/transaction.js'; import { validateAddUserOperationOptions, validateAddUserOperationRequest, validatePrepareUserOperationResponse, validateSignUserOperationResponse, validateUpdateUserOperationResponse, -} from './utils/validation'; +} from './utils/validation.js'; const controllerName = 'UserOperationController'; diff --git a/packages/user-operation-controller/src/helpers/Bundler.test.ts b/packages/user-operation-controller/src/helpers/Bundler.test.ts index 2beb90c8abe..d3ea8a8c74c 100644 --- a/packages/user-operation-controller/src/helpers/Bundler.test.ts +++ b/packages/user-operation-controller/src/helpers/Bundler.test.ts @@ -1,5 +1,5 @@ -import type { UserOperation } from '../types'; -import { Bundler } from './Bundler'; +import type { UserOperation } from '../types.js'; +import { Bundler } from './Bundler.js'; const URL_MOCK = 'http://test.com'; const ENTRYPOINT_MOCK = '0x123'; diff --git a/packages/user-operation-controller/src/helpers/Bundler.ts b/packages/user-operation-controller/src/helpers/Bundler.ts index 7e66581aeed..2f62701588c 100644 --- a/packages/user-operation-controller/src/helpers/Bundler.ts +++ b/packages/user-operation-controller/src/helpers/Bundler.ts @@ -1,5 +1,5 @@ -import { createModuleLogger, projectLogger } from '../logger'; -import type { UserOperation, UserOperationReceipt } from '../types'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { UserOperation, UserOperationReceipt } from '../types.js'; const log = createModuleLogger(projectLogger, 'bundler'); diff --git a/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.test.ts b/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.test.ts index 36a66efd467..bd084a603f8 100644 --- a/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.test.ts +++ b/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.test.ts @@ -1,11 +1,11 @@ import { query } from '@metamask/controller-utils'; import type { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller'; -import type { UserOperationMetadata, UserOperationReceipt } from '../types'; -import { UserOperationStatus } from '../types'; -import type { UserOperationControllerMessenger } from '../UserOperationController'; -import * as BundlerHelper from './Bundler'; -import { PendingUserOperationTracker } from './PendingUserOperationTracker'; +import type { UserOperationMetadata, UserOperationReceipt } from '../types.js'; +import { UserOperationStatus } from '../types.js'; +import type { UserOperationControllerMessenger } from '../UserOperationController.js'; +import * as BundlerHelper from './Bundler.js'; +import { PendingUserOperationTracker } from './PendingUserOperationTracker.js'; const CHAIN_ID_MOCK = '0x5'; const NETWORK_CLIENT_ID_MOCK = 'testNetworkClientId'; diff --git a/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.ts b/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.ts index 99124feeb0a..f887a7e4050 100644 --- a/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.ts +++ b/packages/user-operation-controller/src/helpers/PendingUserOperationTracker.ts @@ -12,11 +12,11 @@ import type { Hex } from '@metamask/utils'; // eslint-disable-next-line import-x/no-nodejs-modules import EventEmitter from 'events'; -import { projectLogger } from '../logger'; -import type { UserOperationMetadata, UserOperationReceipt } from '../types'; -import { UserOperationStatus } from '../types'; -import type { UserOperationControllerMessenger } from '../UserOperationController'; -import { Bundler } from './Bundler'; +import { projectLogger } from '../logger.js'; +import type { UserOperationMetadata, UserOperationReceipt } from '../types.js'; +import { UserOperationStatus } from '../types.js'; +import type { UserOperationControllerMessenger } from '../UserOperationController.js'; +import { Bundler } from './Bundler.js'; const log = createModuleLogger(projectLogger, 'pending-user-operations'); diff --git a/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.test.ts b/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.test.ts index 28b48d0a27c..77aaaf50b2a 100644 --- a/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.test.ts +++ b/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.test.ts @@ -1,17 +1,17 @@ import type { KeyringController } from '@metamask/keyring-controller'; -import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from '../constants'; +import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from '../constants.js'; import type { PrepareUserOperationResponse, SignUserOperationRequest, SignUserOperationResponse, UpdateUserOperationRequest, UpdateUserOperationResponse, -} from '../types'; -import type { PrepareUserOperationRequest } from '../types'; -import type { UserOperationControllerMessenger } from '../UserOperationController'; -import { toEip155ChainId } from '../utils/chain-id'; -import { SnapSmartContractAccount } from './SnapSmartContractAccount'; +} from '../types.js'; +import type { PrepareUserOperationRequest } from '../types.js'; +import type { UserOperationControllerMessenger } from '../UserOperationController.js'; +import { toEip155ChainId } from '../utils/chain-id.js'; +import { SnapSmartContractAccount } from './SnapSmartContractAccount.js'; const PREPARE_USER_OPERATION_REQUEST_MOCK: PrepareUserOperationRequest = { chainId: '0x1', diff --git a/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.ts b/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.ts index 78cddc4ccd7..54ae14a07d3 100644 --- a/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.ts +++ b/packages/user-operation-controller/src/helpers/SnapSmartContractAccount.ts @@ -1,4 +1,4 @@ -import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from '../constants'; +import { ADDRESS_ZERO, EMPTY_BYTES, VALUE_ZERO } from '../constants.js'; import type { PrepareUserOperationRequest, PrepareUserOperationResponse, @@ -7,9 +7,9 @@ import type { SmartContractAccount, UpdateUserOperationRequest, UpdateUserOperationResponse, -} from '../types'; -import type { UserOperationControllerMessenger } from '../UserOperationController'; -import { toEip155ChainId } from '../utils/chain-id'; +} from '../types.js'; +import type { UserOperationControllerMessenger } from '../UserOperationController.js'; +import { toEip155ChainId } from '../utils/chain-id.js'; export class SnapSmartContractAccount implements SmartContractAccount { readonly #messenger: UserOperationControllerMessenger; diff --git a/packages/user-operation-controller/src/index.ts b/packages/user-operation-controller/src/index.ts index a6a4fee803a..64c6fffa00b 100644 --- a/packages/user-operation-controller/src/index.ts +++ b/packages/user-operation-controller/src/index.ts @@ -1,7 +1,7 @@ -export * from './UserOperationController'; +export * from './UserOperationController.js'; export type { UserOperationControllerAddUserOperationAction, UserOperationControllerAddUserOperationFromTransactionAction, UserOperationControllerStartPollingByNetworkClientIdAction, -} from './UserOperationController-method-action-types'; -export * from './types'; +} from './UserOperationController-method-action-types.js'; +export * from './types.js'; diff --git a/packages/user-operation-controller/src/utils/chain-id.test.ts b/packages/user-operation-controller/src/utils/chain-id.test.ts index 1efa378c3bc..47f8f0f42aa 100644 --- a/packages/user-operation-controller/src/utils/chain-id.test.ts +++ b/packages/user-operation-controller/src/utils/chain-id.test.ts @@ -1,4 +1,4 @@ -import { toEip155ChainId } from './chain-id'; +import { toEip155ChainId } from './chain-id.js'; describe('chain-id', () => { describe('toEip155ChainId', () => { diff --git a/packages/user-operation-controller/src/utils/gas-fees.test.ts b/packages/user-operation-controller/src/utils/gas-fees.test.ts index 794c98870e7..3aaddfdbb7b 100644 --- a/packages/user-operation-controller/src/utils/gas-fees.test.ts +++ b/packages/user-operation-controller/src/utils/gas-fees.test.ts @@ -5,8 +5,8 @@ import { UserFeeLevel } from '@metamask/transaction-controller'; import type { TransactionParams } from '@metamask/transaction-controller'; import { cloneDeep } from 'lodash'; -import type { UpdateGasFeesRequest } from './gas-fees'; -import { updateGasFees } from './gas-fees'; +import type { UpdateGasFeesRequest } from './gas-fees.js'; +import { updateGasFees } from './gas-fees.js'; jest.mock('@metamask/controller-utils', () => ({ ...jest.requireActual('@metamask/controller-utils'), diff --git a/packages/user-operation-controller/src/utils/gas-fees.ts b/packages/user-operation-controller/src/utils/gas-fees.ts index 45ebaaaa274..ee7d86d1f2e 100644 --- a/packages/user-operation-controller/src/utils/gas-fees.ts +++ b/packages/user-operation-controller/src/utils/gas-fees.ts @@ -13,10 +13,10 @@ import { UserFeeLevel } from '@metamask/transaction-controller'; import type { Hex } from '@metamask/utils'; import { add0x } from '@metamask/utils'; -import { EMPTY_BYTES } from '../constants'; -import { createModuleLogger, projectLogger } from '../logger'; -import type { UserOperation, UserOperationMetadata } from '../types'; -import type { AddUserOperationRequest } from '../UserOperationController'; +import { EMPTY_BYTES } from '../constants.js'; +import { createModuleLogger, projectLogger } from '../logger.js'; +import type { UserOperation, UserOperationMetadata } from '../types.js'; +import type { AddUserOperationRequest } from '../UserOperationController.js'; const log = createModuleLogger(projectLogger, 'gas-fees'); diff --git a/packages/user-operation-controller/src/utils/gas.test.ts b/packages/user-operation-controller/src/utils/gas.test.ts index b8df1c484f4..04bbdaf9529 100644 --- a/packages/user-operation-controller/src/utils/gas.test.ts +++ b/packages/user-operation-controller/src/utils/gas.test.ts @@ -1,13 +1,13 @@ import { cloneDeep } from 'lodash'; -import { VALUE_ZERO } from '../constants'; -import type { BundlerEstimateUserOperationGasResponse } from '../helpers/Bundler'; -import { Bundler } from '../helpers/Bundler'; +import { VALUE_ZERO } from '../constants.js'; +import type { BundlerEstimateUserOperationGasResponse } from '../helpers/Bundler.js'; +import { Bundler } from '../helpers/Bundler.js'; import type { PrepareUserOperationResponse, UserOperationMetadata, -} from '../types'; -import { updateGas } from './gas'; +} from '../types.js'; +import { updateGas } from './gas.js'; jest.mock('../helpers/Bundler', () => ({ Bundler: jest.fn(), diff --git a/packages/user-operation-controller/src/utils/gas.ts b/packages/user-operation-controller/src/utils/gas.ts index 3d5715832fc..ebc26d74402 100644 --- a/packages/user-operation-controller/src/utils/gas.ts +++ b/packages/user-operation-controller/src/utils/gas.ts @@ -2,13 +2,13 @@ import { hexToBN } from '@metamask/controller-utils'; import { add0x } from '@metamask/utils'; import BN from 'bn.js'; -import { VALUE_ZERO } from '../constants'; -import { Bundler } from '../helpers/Bundler'; -import { createModuleLogger, projectLogger } from '../logger'; +import { VALUE_ZERO } from '../constants.js'; +import { Bundler } from '../helpers/Bundler.js'; +import { createModuleLogger, projectLogger } from '../logger.js'; import type { PrepareUserOperationResponse, UserOperationMetadata, -} from '../types'; +} from '../types.js'; const log = createModuleLogger(projectLogger, 'gas'); diff --git a/packages/user-operation-controller/src/utils/transaction.test.ts b/packages/user-operation-controller/src/utils/transaction.test.ts index ee7e49561fb..565678d4a88 100644 --- a/packages/user-operation-controller/src/utils/transaction.test.ts +++ b/packages/user-operation-controller/src/utils/transaction.test.ts @@ -1,14 +1,14 @@ -import type { TransactionParams } from '../../../transaction-controller/src'; +import type { TransactionParams } from '../../../transaction-controller/src/index.js'; import { TransactionStatus, TransactionType, UserFeeLevel, -} from '../../../transaction-controller/src'; -import { EMPTY_BYTES, VALUE_ZERO } from '../constants'; -import { UserOperationStatus } from '../types'; -import type { UserOperation } from '../types'; -import type { UserOperationMetadata } from '../types'; -import { getTransactionMetadata } from './transaction'; +} from '../../../transaction-controller/src/index.js'; +import { EMPTY_BYTES, VALUE_ZERO } from '../constants.js'; +import { UserOperationStatus } from '../types.js'; +import type { UserOperation } from '../types.js'; +import type { UserOperationMetadata } from '../types.js'; +import { getTransactionMetadata } from './transaction.js'; const USER_OPERATION_METADATA_MOCK: UserOperationMetadata = { id: 'testUserOperationId', diff --git a/packages/user-operation-controller/src/utils/transaction.ts b/packages/user-operation-controller/src/utils/transaction.ts index 72e90be3cec..f945ab2898b 100644 --- a/packages/user-operation-controller/src/utils/transaction.ts +++ b/packages/user-operation-controller/src/utils/transaction.ts @@ -11,9 +11,9 @@ import type { Hex } from '@metamask/utils'; import { add0x, remove0x } from '@metamask/utils'; import BN from 'bn.js'; -import { EMPTY_BYTES, VALUE_ZERO } from '../constants'; -import { UserOperationStatus } from '../types'; -import type { UserOperationMetadata } from '../types'; +import { EMPTY_BYTES, VALUE_ZERO } from '../constants.js'; +import { UserOperationStatus } from '../types.js'; +import type { UserOperationMetadata } from '../types.js'; /** * Converts a user operation metadata object into a transaction metadata object. diff --git a/packages/user-operation-controller/src/utils/validation.test.ts b/packages/user-operation-controller/src/utils/validation.test.ts index e6537f0f422..ac45e248373 100644 --- a/packages/user-operation-controller/src/utils/validation.test.ts +++ b/packages/user-operation-controller/src/utils/validation.test.ts @@ -7,18 +7,18 @@ import type { PrepareUserOperationResponse, SignUserOperationResponse, UpdateUserOperationResponse, -} from '../types'; +} from '../types.js'; import type { AddUserOperationOptions, AddUserOperationRequest, -} from '../UserOperationController'; +} from '../UserOperationController.js'; import { validateAddUserOperationOptions, validateAddUserOperationRequest, validatePrepareUserOperationResponse, validateSignUserOperationResponse, validateUpdateUserOperationResponse, -} from './validation'; +} from './validation.js'; const ADD_USER_OPERATION_REQUEST_MOCK: AddUserOperationRequest = { data: '0x1', diff --git a/packages/user-operation-controller/src/utils/validation.ts b/packages/user-operation-controller/src/utils/validation.ts index 3e06d4b500f..221575f264d 100644 --- a/packages/user-operation-controller/src/utils/validation.ts +++ b/packages/user-operation-controller/src/utils/validation.ts @@ -14,16 +14,16 @@ import { import { TransactionType } from '@metamask/transaction-controller'; import { isStrictHexString } from '@metamask/utils'; -import { EMPTY_BYTES } from '../constants'; +import { EMPTY_BYTES } from '../constants.js'; import type { PrepareUserOperationResponse, SignUserOperationResponse, UpdateUserOperationResponse, -} from '../types'; +} from '../types.js'; import type { AddUserOperationOptions, AddUserOperationRequest, -} from '../UserOperationController'; +} from '../UserOperationController.js'; /** * Validate a request to add a user operation.