@metamask-previews/smart-transactions-controller 19.2.1-preview-54c655a → 19.2.1-preview-520a56d

package/dist/SmartTransactionsController.mjs

@@ -1,4 +1,3 @@
-"use strict";
 var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
     if (kind === "m") throw new TypeError("Private method is not writable");
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
@@ -10,32 +9,27 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 var _SmartTransactionsController_instances, _SmartTransactionsController_interval, _SmartTransactionsController_clientId, _SmartTransactionsController_chainId, _SmartTransactionsController_supportedChainIds, _SmartTransactionsController_ethQuery, _SmartTransactionsController_trackMetaMetricsEvent, _SmartTransactionsController_getMetaMetricsProps, _SmartTransactionsController_getFeatureFlags, _SmartTransactionsController_trace, _SmartTransactionsController_fetch, _SmartTransactionsController_updateSmartTransaction, _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction, _SmartTransactionsController_createOrUpdateSmartTransaction, _SmartTransactionsController_doesTransactionNeedConfirmation, _SmartTransactionsController_confirmSmartTransaction, _SmartTransactionsController_addNonceToTransaction, _SmartTransactionsController_getChainId, _SmartTransactionsController_getChainIds, _SmartTransactionsController_getNetworkClientId, _SmartTransactionsController_getEthQuery, _SmartTransactionsController_getCurrentSmartTransactions, _SmartTransactionsController_wipeSmartTransactionsPerChainId;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SmartTransactionsController = exports.getDefaultSmartTransactionsControllerState = exports.DEFAULT_INTERVAL = void 0;
 function $importDefault(module) {
     if (module === null || module === void 0 ? void 0 : module.__esModule) {
         return module.default;
     }
     return module;
 }
-const bytes_1 = require("@ethersproject/bytes");
-const controller_utils_1 = require("@metamask/controller-utils");
-const eth_query_1 = __importDefault(require("@metamask/eth-query"));
+import { hexlify } from "@ethersproject/bytes";
+import { query, safelyExecute, ChainId, isSafeDynamicKey } from "@metamask/controller-utils";
+import $EthQuery from "@metamask/eth-query";
 const EthQuery = $importDefault($EthQuery);
-const polling_controller_1 = require("@metamask/polling-controller");
-const transaction_controller_1 = require("@metamask/transaction-controller");
-const bignumber_js_1 = require("bignumber.js");
-const cloneDeep_1 = __importDefault(require("lodash/cloneDeep.js"));
+import { StaticIntervalPollingController } from "@metamask/polling-controller";
+import { TransactionStatus } from "@metamask/transaction-controller";
+import { BigNumber } from "bignumber.js";
+import $cloneDeep from "lodash/cloneDeep.js";
 const cloneDeep = $importDefault($cloneDeep);
-const constants_1 = require("./constants.mjs");
-const types_1 = require("./types.mjs");
-const utils_1 = require("./utils.mjs");
+import { MetaMetricsEventCategory, MetaMetricsEventName, SmartTransactionsTraceName } from "./constants.mjs";
+import { APIType, SmartTransactionStatuses } from "./types.mjs";
+import { calculateStatus, generateHistoryEntry, getAPIRequestURL, handleFetch, incrementNonceInHex, isSmartTransactionCancellable, isSmartTransactionPending, replayHistory, snapshotFromTxMeta, getTxHash, getSmartTransactionMetricsProperties, getSmartTransactionMetricsSensitiveProperties, shouldMarkRegularTransactionAsFailed, markRegularTransactionAsFailed } from "./utils.mjs";
 const SECOND = 1000;
-exports.DEFAULT_INTERVAL = SECOND * 5;
+export const DEFAULT_INTERVAL = SECOND * 5;
 const ETH_QUERY_ERROR_MSG = '`ethQuery` is not defined on SmartTransactionsController';
 /**
  * The name of the {@link SmartTransactionsController}
@@ -54,7 +48,7 @@ const controllerMetadata = {
  *
  * @returns The default {@link SmartTransactionsController} state.
  */
-function getDefaultSmartTransactionsControllerState() {
+export function getDefaultSmartTransactionsControllerState() {
     return {
         smartTransactionsState: {
             smartTransactions: {},
@@ -66,15 +60,15 @@ function getDefaultSmartTransactionsControllerState() {
             },
             liveness: true,
             livenessByChainId: {
-                [controller_utils_1.ChainId.mainnet]: true,
-                [controller_utils_1.ChainId.sepolia]: true,
+                [ChainId.mainnet]: true,
+                [ChainId.sepolia]: true,
             },
             feesByChainId: {
-                [controller_utils_1.ChainId.mainnet]: {
+                [ChainId.mainnet]: {
                     approvalTxFees: null,
                     tradeTxFees: null,
                 },
-                [controller_utils_1.ChainId.sepolia]: {
+                [ChainId.sepolia]: {
                     approvalTxFees: null,
                     tradeTxFees: null,
                 },
@@ -82,9 +76,8 @@ function getDefaultSmartTransactionsControllerState() {
         },
     };
 }
-exports.getDefaultSmartTransactionsControllerState = getDefaultSmartTransactionsControllerState;
-class SmartTransactionsController extends (0, polling_controller_1.StaticIntervalPollingController)() {
-    constructor({ interval = exports.DEFAULT_INTERVAL, clientId, chainId: InitialChainId = controller_utils_1.ChainId.mainnet, supportedChainIds = [controller_utils_1.ChainId.mainnet, controller_utils_1.ChainId.sepolia], trackMetaMetricsEvent, state = {}, messenger, getMetaMetricsProps, getFeatureFlags, trace, }) {
+export class SmartTransactionsController extends StaticIntervalPollingController() {
+    constructor({ interval = DEFAULT_INTERVAL, clientId, chainId: InitialChainId = ChainId.mainnet, supportedChainIds = [ChainId.mainnet, ChainId.sepolia], trackMetaMetricsEvent, state = {}, messenger, getMetaMetricsProps, getFeatureFlags, trace, }) {
         super({
             name: controllerName,
             metadata: controllerMetadata,
@@ -115,7 +108,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         this.messenger.subscribe('NetworkController:stateChange', ({ selectedNetworkClientId }) => {
             const { configuration: { chainId }, provider, } = this.messenger.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
             __classPrivateFieldSet(this, _SmartTransactionsController_chainId, chainId, "f");
-            __classPrivateFieldSet(this, _SmartTransactionsController_ethQuery, new eth_query_1.default(provider), "f");
+            __classPrivateFieldSet(this, _SmartTransactionsController_ethQuery, new EthQuery(provider), "f");
             this.initializeSmartTransactionsForChainId();
             this.checkPoll(this.state);
         });
@@ -134,7 +127,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
     }
     checkPoll({ smartTransactionsState: { smartTransactions }, }) {
         const smartTransactionsForAllChains = Object.values(smartTransactions).flat();
-        const pendingTransactions = smartTransactionsForAllChains === null || smartTransactionsForAllChains === void 0 ? void 0 : smartTransactionsForAllChains.filter(utils_1.isSmartTransactionPending);
+        const pendingTransactions = smartTransactionsForAllChains === null || smartTransactionsForAllChains === void 0 ? void 0 : smartTransactionsForAllChains.filter(isSmartTransactionPending);
         if (!this.timeoutHandle && (pendingTransactions === null || pendingTransactions === void 0 ? void 0 : pendingTransactions.length) > 0) {
             this.poll();
         }
@@ -160,9 +153,9 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             return;
         }
         this.timeoutHandle = setInterval(() => {
-            (0, controller_utils_1.safelyExecute)(async () => this.updateSmartTransactions());
+            safelyExecute(async () => this.updateSmartTransactions());
         }, __classPrivateFieldGet(this, _SmartTransactionsController_interval, "f"));
-        await (0, controller_utils_1.safelyExecute)(async () => this.updateSmartTransactions());
+        await safelyExecute(async () => this.updateSmartTransactions());
     }
     async stop() {
         this.timeoutHandle && clearInterval(this.timeoutHandle);
@@ -174,16 +167,16 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         });
     }
     trackStxStatusChange(smartTransaction, prevSmartTransaction) {
-        let updatedSmartTransaction = (0, cloneDeep_1.default)(smartTransaction);
-        updatedSmartTransaction = Object.assign(Object.assign({}, (0, cloneDeep_1.default)(prevSmartTransaction)), updatedSmartTransaction);
+        let updatedSmartTransaction = cloneDeep(smartTransaction);
+        updatedSmartTransaction = Object.assign(Object.assign({}, cloneDeep(prevSmartTransaction)), updatedSmartTransaction);
         if (updatedSmartTransaction.status === (prevSmartTransaction === null || prevSmartTransaction === void 0 ? void 0 : prevSmartTransaction.status)) {
             return; // If status hasn't changed, don't track it again.
         }
         __classPrivateFieldGet(this, _SmartTransactionsController_trackMetaMetricsEvent, "f").call(this, {
-            event: constants_1.MetaMetricsEventName.StxStatusUpdated,
-            category: constants_1.MetaMetricsEventCategory.Transactions,
-            properties: (0, utils_1.getSmartTransactionMetricsProperties)(updatedSmartTransaction),
-            sensitiveProperties: (0, utils_1.getSmartTransactionMetricsSensitiveProperties)(updatedSmartTransaction),
+            event: MetaMetricsEventName.StxStatusUpdated,
+            category: MetaMetricsEventCategory.Transactions,
+            properties: getSmartTransactionMetricsProperties(updatedSmartTransaction),
+            sensitiveProperties: getSmartTransactionMetricsSensitiveProperties(updatedSmartTransaction),
         });
     }
     isNewSmartTransaction(smartTransactionUuid, chainId) {
@@ -198,7 +191,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         if (networkClientId) {
             const { configuration, provider } = this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
             chainId = configuration.chainId;
-            ethQuery = new eth_query_1.default(provider);
+            ethQuery = new EthQuery(provider);
         }
         __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_createOrUpdateSmartTransaction).call(this, smartTransaction, {
             chainId,
@@ -216,7 +209,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             }
             // Filter pending transactions and map them to the desired shape
             const pendingTransactions = transactions
-                .filter(utils_1.isSmartTransactionPending)
+                .filter(isSmartTransactionPending)
                 .map((pendingSmartTransaction) => {
                 // Use the transaction's chainId (from the key) to derive a networkClientId
                 const networkClientIdToUse = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getNetworkClientId).call(this, {
@@ -246,7 +239,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             networkClientId: transactions[0].networkClientId,
         });
         // Construct the URL and fetch the data
-        const url = `${(0, utils_1.getAPIRequestURL)(types_1.APIType.BATCH_STATUS, chainId)}?${params.toString()}`;
+        const url = `${getAPIRequestURL(APIType.BATCH_STATUS, chainId)}?${params.toString()}`;
         const data = (await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, url));
         // Process each returned status
         for (const [uuid, stxStatus] of Object.entries(data)) {
@@ -257,8 +250,8 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             }
             const smartTransaction = {
                 statusMetadata: stxStatus,
-                status: (0, utils_1.calculateStatus)(stxStatus),
-                cancellable: (0, utils_1.isSmartTransactionCancellable)(stxStatus),
+                status: calculateStatus(stxStatus),
+                cancellable: isSmartTransactionCancellable(stxStatus),
                 uuid,
                 networkClientId: matchingTx.networkClientId,
             };
@@ -291,7 +284,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             transactions.push(unsignedApprovalTransactionWithNonce);
             unsignedTradeTransactionWithNonce = Object.assign(Object.assign({}, tradeTx), { 
                 // If there is an approval tx, the trade tx's nonce is increased by 1.
-                nonce: (0, utils_1.incrementNonceInHex)(unsignedApprovalTransactionWithNonce.nonce) });
+                nonce: incrementNonceInHex(unsignedApprovalTransactionWithNonce.nonce) });
         }
         else if (tradeTx.nonce) {
             unsignedTradeTransactionWithNonce = tradeTx;
@@ -300,7 +293,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             unsignedTradeTransactionWithNonce = await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_addNonceToTransaction).call(this, tradeTx, selectedNetworkClientId);
         }
         transactions.push(unsignedTradeTransactionWithNonce);
-        const data = await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: constants_1.SmartTransactionsTraceName.GetFees }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, (0, utils_1.getAPIRequestURL)(types_1.APIType.GET_FEES, chainId), {
+        const data = await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: SmartTransactionsTraceName.GetFees }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, getAPIRequestURL(APIType.GET_FEES, chainId), {
             method: 'POST',
             body: JSON.stringify({
                 txs: transactions,
@@ -344,7 +337,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         const ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getEthQuery).call(this, {
             networkClientId: selectedNetworkClientId,
         });
-        const data = await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: constants_1.SmartTransactionsTraceName.SubmitTransactions }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, (0, utils_1.getAPIRequestURL)(types_1.APIType.SUBMIT_TRANSACTIONS, chainId), {
+        const data = await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: SmartTransactionsTraceName.SubmitTransactions }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, getAPIRequestURL(APIType.SUBMIT_TRANSACTIONS, chainId), {
             method: 'POST',
             body: JSON.stringify({
                 rawTxs: signedTransactions,
@@ -355,10 +348,10 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         let preTxBalance;
         try {
             if (txParams === null || txParams === void 0 ? void 0 : txParams.from) {
-                const preTxBalanceBN = await (0, controller_utils_1.query)(ethQuery, 'getBalance', [
+                const preTxBalanceBN = await query(ethQuery, 'getBalance', [
                     txParams.from,
                 ]);
-                preTxBalance = new bignumber_js_1.BigNumber(preTxBalanceBN).toString(16);
+                preTxBalance = new BigNumber(preTxBalanceBN).toString(16);
             }
         }
         catch (error) {
@@ -372,7 +365,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         if (requiresNonce) {
             try {
                 nonceLock = await this.messenger.call('TransactionController:getNonceLock', txParams.from, selectedNetworkClientId);
-                nonce = (0, bytes_1.hexlify)(nonceLock.nextNonce);
+                nonce = hexlify(nonceLock.nextNonce);
                 nonceDetails = nonceLock.nonceDetails;
                 (_a = txParams.nonce) !== null && _a !== void 0 ? _a : (txParams.nonce = nonce);
             }
@@ -381,7 +374,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
                 throw error;
             }
         }
-        const txHashes = signedTransactions.map((tx) => (0, utils_1.getTxHash)(tx));
+        const txHashes = signedTransactions.map((tx) => getTxHash(tx));
         const submitTransactionResponse = Object.assign(Object.assign({}, data), { txHash: txHashes[txHashes.length - 1], // For backward compatibility - use the last tx hash
             txHashes });
         try {
@@ -389,7 +382,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
                 chainId,
                 nonceDetails,
                 preTxBalance,
-                status: types_1.SmartTransactionStatuses.PENDING,
+                status: SmartTransactionStatuses.PENDING,
                 time,
                 txParams,
                 uuid: submitTransactionResponse.uuid,
@@ -417,7 +410,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
     // in transaction controller external transactions list
     async cancelSmartTransaction(uuid, { networkClientId, } = {}) {
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
-        await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: constants_1.SmartTransactionsTraceName.CancelTransaction }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, (0, utils_1.getAPIRequestURL)(types_1.APIType.CANCEL, chainId), {
+        await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: SmartTransactionsTraceName.CancelTransaction }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, getAPIRequestURL(APIType.CANCEL, chainId), {
             method: 'POST',
             body: JSON.stringify({ uuid }),
         }));
@@ -426,7 +419,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
         let liveness = false;
         try {
-            const response = await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: constants_1.SmartTransactionsTraceName.FetchLiveness }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, (0, utils_1.getAPIRequestURL)(types_1.APIType.LIVENESS, chainId)));
+            const response = await __classPrivateFieldGet(this, _SmartTransactionsController_trace, "f").call(this, { name: SmartTransactionsTraceName.FetchLiveness }, async () => await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, getAPIRequestURL(APIType.LIVENESS, chainId)));
             liveness = Boolean(response.smartTransactions);
         }
         catch (error) {
@@ -485,12 +478,11 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         }
     }
 }
-exports.SmartTransactionsController = SmartTransactionsController;
 _SmartTransactionsController_interval = new WeakMap(), _SmartTransactionsController_clientId = new WeakMap(), _SmartTransactionsController_chainId = new WeakMap(), _SmartTransactionsController_supportedChainIds = new WeakMap(), _SmartTransactionsController_ethQuery = new WeakMap(), _SmartTransactionsController_trackMetaMetricsEvent = new WeakMap(), _SmartTransactionsController_getMetaMetricsProps = new WeakMap(), _SmartTransactionsController_getFeatureFlags = new WeakMap(), _SmartTransactionsController_trace = new WeakMap(), _SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsController_fetch = 
 /* istanbul ignore next */
 async function _SmartTransactionsController_fetch(request, options) {
     const fetchOptions = Object.assign(Object.assign({}, options), { headers: Object.assign({ 'Content-Type': 'application/json' }, (__classPrivateFieldGet(this, _SmartTransactionsController_clientId, "f") && { 'X-Client-Id': __classPrivateFieldGet(this, _SmartTransactionsController_clientId, "f") })) });
-    return (0, utils_1.handleFetch)(request, fetchOptions);
+    return handleFetch(request, fetchOptions);
 }, _SmartTransactionsController_updateSmartTransaction = function _SmartTransactionsController_updateSmartTransaction(smartTransaction, { chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"), }) {
     var _a;
     const { smartTransactionsState: { smartTransactions }, } = this.state;
@@ -499,7 +491,7 @@ async function _SmartTransactionsController_fetch(request, options) {
     if (currentIndex === -1) {
         return; // Smart transaction not found, don't update anything.
     }
-    if (!(0, controller_utils_1.isSafeDynamicKey)(chainId)) {
+    if (!isSafeDynamicKey(chainId)) {
         return;
     }
     this.update((state) => {
@@ -539,7 +531,7 @@ async function _SmartTransactionsController_fetch(request, options) {
             return ((_a = stx.txParams) === null || _a === void 0 ? void 0 : _a.nonce) === ((_b = smartTransaction.txParams) === null || _b === void 0 ? void 0 : _b.nonce) &&
                 ((_c = stx.status) === null || _c === void 0 ? void 0 : _c.startsWith('cancelled'));
         });
-        const snapshot = (0, cloneDeep_1.default)(smartTransaction);
+        const snapshot = cloneDeep(smartTransaction);
         const history = [snapshot];
         const historifiedSmartTransaction = Object.assign(Object.assign({}, smartTransaction), { history });
         const nextSmartTransactions = cancelledNonceIndex > -1
@@ -559,19 +551,19 @@ async function _SmartTransactionsController_fetch(request, options) {
     // We have to emit this event here, because then a txHash is returned to the TransactionController once it's available
     // and the #doesTransactionNeedConfirmation function will work properly, since it will find the txHash in the regular transactions list.
     this.messenger.publish(`SmartTransactionsController:smartTransaction`, nextSmartTransaction);
-    if ((0, utils_1.shouldMarkRegularTransactionAsFailed)({
+    if (shouldMarkRegularTransactionAsFailed({
         smartTransaction: nextSmartTransaction,
         clientId: __classPrivateFieldGet(this, _SmartTransactionsController_clientId, "f"),
         getFeatureFlags: __classPrivateFieldGet(this, _SmartTransactionsController_getFeatureFlags, "f"),
     })) {
-        (0, utils_1.markRegularTransactionAsFailed)({
+        markRegularTransactionAsFailed({
             smartTransaction: nextSmartTransaction,
             getRegularTransactions: () => this.messenger.call('TransactionController:getTransactions'),
             updateTransaction: (transactionMeta, note) => this.messenger.call('TransactionController:updateTransaction', transactionMeta, note),
         });
     }
-    if ((smartTransaction.status === types_1.SmartTransactionStatuses.SUCCESS ||
-        smartTransaction.status === types_1.SmartTransactionStatuses.REVERTED) &&
+    if ((smartTransaction.status === SmartTransactionStatuses.SUCCESS ||
+        smartTransaction.status === SmartTransactionStatuses.REVERTED) &&
         !smartTransaction.confirmed) {
         await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_confirmSmartTransaction).call(this, nextSmartTransaction, {
             chainId,
@@ -598,7 +590,7 @@ async function _SmartTransactionsController_fetch(request, options) {
     // If a found transaction is either confirmed or submitted, it doesn't need confirmation from the STX controller.
     // When it's in the submitted state, the TransactionController checks its status and confirms it,
     // so no need to confirm it again here.
-    return ![transaction_controller_1.TransactionStatus.confirmed, transaction_controller_1.TransactionStatus.submitted].includes(foundTransaction.status);
+    return ![TransactionStatus.confirmed, TransactionStatus.submitted].includes(foundTransaction.status);
 }, _SmartTransactionsController_confirmSmartTransaction = async function _SmartTransactionsController_confirmSmartTransaction(smartTransaction, { chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"), ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f"), }) {
     var _a;
     if (ethQuery === undefined) {
@@ -606,23 +598,23 @@ async function _SmartTransactionsController_fetch(request, options) {
     }
     const txHash = (_a = smartTransaction.statusMetadata) === null || _a === void 0 ? void 0 : _a.minedHash;
     try {
-        const transactionReceipt = await (0, controller_utils_1.query)(ethQuery, 'getTransactionReceipt', [txHash]);
-        const transaction = await (0, controller_utils_1.query)(ethQuery, 'getTransactionByHash', [txHash]);
+        const transactionReceipt = await query(ethQuery, 'getTransactionReceipt', [txHash]);
+        const transaction = await query(ethQuery, 'getTransactionByHash', [txHash]);
         const maxFeePerGas = transaction === null || transaction === void 0 ? void 0 : transaction.maxFeePerGas;
         const maxPriorityFeePerGas = transaction === null || transaction === void 0 ? void 0 : transaction.maxPriorityFeePerGas;
         if (transactionReceipt === null || transactionReceipt === void 0 ? void 0 : transactionReceipt.blockNumber) {
-            const blockData = await (0, controller_utils_1.query)(ethQuery, 'getBlockByNumber', [transactionReceipt === null || transactionReceipt === void 0 ? void 0 : transactionReceipt.blockNumber, false]);
+            const blockData = await query(ethQuery, 'getBlockByNumber', [transactionReceipt === null || transactionReceipt === void 0 ? void 0 : transactionReceipt.blockNumber, false]);
             const baseFeePerGas = blockData === null || blockData === void 0 ? void 0 : blockData.baseFeePerGas;
             const updatedTxParams = Object.assign(Object.assign({}, smartTransaction.txParams), { maxFeePerGas,
                 maxPriorityFeePerGas });
             // call confirmExternalTransaction
-            const originalTxMeta = Object.assign(Object.assign({}, smartTransaction), { id: smartTransaction.uuid, status: transaction_controller_1.TransactionStatus.confirmed, hash: txHash, txParams: updatedTxParams });
+            const originalTxMeta = Object.assign(Object.assign({}, smartTransaction), { id: smartTransaction.uuid, status: TransactionStatus.confirmed, hash: txHash, txParams: updatedTxParams });
             // create txMeta snapshot for history
-            const snapshot = (0, utils_1.snapshotFromTxMeta)(originalTxMeta);
+            const snapshot = snapshotFromTxMeta(originalTxMeta);
             // recover previous tx state obj
-            const previousState = (0, utils_1.replayHistory)(originalTxMeta.history);
+            const previousState = replayHistory(originalTxMeta.history);
             // generate history entry and add to history
-            const entry = (0, utils_1.generateHistoryEntry)(previousState, snapshot, 'txStateManager: setting status to confirmed');
+            const entry = generateHistoryEntry(previousState, snapshot, 'txStateManager: setting status to confirmed');
             const txMeta = entry.length > 0
                 ? Object.assign(Object.assign({}, originalTxMeta), { history: originalTxMeta.history.concat(entry) }) : originalTxMeta;
             if (__classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_doesTransactionNeedConfirmation).call(this, txHash)) {
@@ -633,10 +625,10 @@ async function _SmartTransactionsController_fetch(request, options) {
                 baseFeePerGas);
             }
             __classPrivateFieldGet(this, _SmartTransactionsController_trackMetaMetricsEvent, "f").call(this, {
-                event: constants_1.MetaMetricsEventName.StxConfirmed,
-                category: constants_1.MetaMetricsEventCategory.Transactions,
-                properties: (0, utils_1.getSmartTransactionMetricsProperties)(smartTransaction),
-                sensitiveProperties: (0, utils_1.getSmartTransactionMetricsSensitiveProperties)(smartTransaction),
+                event: MetaMetricsEventName.StxConfirmed,
+                category: MetaMetricsEventCategory.Transactions,
+                properties: getSmartTransactionMetricsProperties(smartTransaction),
+                sensitiveProperties: getSmartTransactionMetricsSensitiveProperties(smartTransaction),
             });
             __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_updateSmartTransaction).call(this, Object.assign(Object.assign({}, smartTransaction), { confirmed: true }), {
                 chainId,
@@ -645,8 +637,8 @@ async function _SmartTransactionsController_fetch(request, options) {
     }
     catch (error) {
         __classPrivateFieldGet(this, _SmartTransactionsController_trackMetaMetricsEvent, "f").call(this, {
-            event: constants_1.MetaMetricsEventName.StxConfirmationFailed,
-            category: constants_1.MetaMetricsEventCategory.Transactions,
+            event: MetaMetricsEventName.StxConfirmationFailed,
+            category: MetaMetricsEventCategory.Transactions,
         });
         console.error('confirm error', error);
     }
@@ -672,7 +664,7 @@ async function _SmartTransactionsController_fetch(request, options) {
 }, _SmartTransactionsController_getEthQuery = function _SmartTransactionsController_getEthQuery({ networkClientId, } = {}) {
     if (networkClientId) {
         const { provider } = this.messenger.call('NetworkController:getNetworkClientById', networkClientId);
-        return new eth_query_1.default(provider);
+        return new EthQuery(provider);
     }
     if (__classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f") === undefined) {
         throw new Error(ETH_QUERY_ERROR_MSG);