@metamask-previews/smart-transactions-controller 19.2.1-preview-520a56d → 24.2.1-preview-be04faa3e

package/dist/SmartTransactionsController.cjs

@@ -1,29 +1,30 @@
 "use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 __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");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    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;
+var _SmartTransactionsController_instances, _SmartTransactionsController_interval, _SmartTransactionsController_clientId, _SmartTransactionsController_chainId, _SmartTransactionsController_supportedChainIds, _SmartTransactionsController_ethQuery, _SmartTransactionsController_trackMetaMetricsEvent, _SmartTransactionsController_getMetaMetricsProps, _SmartTransactionsController_trace, _SmartTransactionsController_isStxMigrationFlagEnabled, _SmartTransactionsController_validateAndReportFeatureFlags, _SmartTransactionsController_fetch, _SmartTransactionsController_updateSmartTransaction, _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction, _SmartTransactionsController_createOrUpdateSmartTransaction, _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;
 const bytes_1 = require("@ethersproject/bytes");
 const controller_utils_1 = require("@metamask/controller-utils");
 const eth_query_1 = __importDefault(require("@metamask/eth-query"));
 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"));
 const constants_1 = require("./constants.cjs");
+const feature_flags_1 = require("./featureFlags/feature-flags.cjs");
+const validators_1 = require("./featureFlags/validators.cjs");
 const types_1 = require("./types.cjs");
 const utils_1 = require("./utils.cjs");
 const SECOND = 1000;
@@ -56,6 +57,7 @@ function getDefaultSmartTransactionsControllerState() {
                 approvalTxFees: null,
                 tradeTxFees: null,
             },
+            // TODO: set this to false once the clients are all refreshing the liveness state.
             liveness: true,
             livenessByChainId: {
                 [controller_utils_1.ChainId.mainnet]: true,
@@ -75,13 +77,38 @@ function getDefaultSmartTransactionsControllerState() {
     };
 }
 exports.getDefaultSmartTransactionsControllerState = getDefaultSmartTransactionsControllerState;
+// === MESSENGER ===
+const MESSENGER_EXPOSED_METHODS = [
+    'cancelSmartTransaction',
+    'checkPoll',
+    'clearFees',
+    'fetchLiveness',
+    'fetchSmartTransactionsStatus',
+    'getFees',
+    'getSmartTransactionByMinedTxHash',
+    'getTransactions',
+    'initializeSmartTransactionsForChainId',
+    'isNewSmartTransaction',
+    'poll',
+    'setOptInState',
+    'setStatusRefreshInterval',
+    'stop',
+    'submitSignedTransactions',
+    'trackStxStatusChange',
+    'updateSmartTransaction',
+    'updateSmartTransactions',
+    'wipeSmartTransactions',
+];
 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, }) {
+    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, trace, }) {
         super({
             name: controllerName,
             metadata: controllerMetadata,
             messenger,
-            state: Object.assign(Object.assign({}, getDefaultSmartTransactionsControllerState()), state),
+            state: {
+                ...getDefaultSmartTransactionsControllerState(),
+                ...state,
+            },
         });
         _SmartTransactionsController_instances.add(this);
         _SmartTransactionsController_interval.set(this, void 0);
@@ -91,7 +118,6 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         _SmartTransactionsController_ethQuery.set(this, void 0);
         _SmartTransactionsController_trackMetaMetricsEvent.set(this, void 0);
         _SmartTransactionsController_getMetaMetricsProps.set(this, void 0);
-        _SmartTransactionsController_getFeatureFlags.set(this, void 0);
         _SmartTransactionsController_trace.set(this, void 0);
         __classPrivateFieldSet(this, _SmartTransactionsController_interval, interval, "f");
         __classPrivateFieldSet(this, _SmartTransactionsController_clientId, clientId, "f");
@@ -101,8 +127,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         __classPrivateFieldSet(this, _SmartTransactionsController_ethQuery, undefined, "f");
         __classPrivateFieldSet(this, _SmartTransactionsController_trackMetaMetricsEvent, trackMetaMetricsEvent, "f");
         __classPrivateFieldSet(this, _SmartTransactionsController_getMetaMetricsProps, getMetaMetricsProps, "f");
-        __classPrivateFieldSet(this, _SmartTransactionsController_getFeatureFlags, getFeatureFlags, "f");
-        __classPrivateFieldSet(this, _SmartTransactionsController_trace, trace !== null && trace !== void 0 ? trace : ((_request, fn) => fn === null || fn === void 0 ? void 0 : fn()), "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_trace, trace ?? ((_request, fn) => fn?.()), "f");
         this.initializeSmartTransactionsForChainId();
         this.messenger.subscribe('NetworkController:stateChange', ({ selectedNetworkClientId }) => {
             const { configuration: { chainId }, provider, } = this.messenger.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
@@ -112,13 +137,18 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             this.checkPoll(this.state);
         });
         this.messenger.subscribe(`${controllerName}:stateChange`, (currentState) => this.checkPoll(currentState));
+        // Validate feature flags on changes
+        this.messenger.subscribe('RemoteFeatureFlagController:stateChange', () => {
+            __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_validateAndReportFeatureFlags).call(this);
+        });
+        this.messenger.registerMethodActionHandlers(this, MESSENGER_EXPOSED_METHODS);
     }
     async _executePoll({ chainIds, }) {
         // if this is going to be truly UI driven polling we shouldn't really reach here
         // with a networkClientId that is not supported, but for now I'll add a check in case
         // wondering if we should add some kind of predicate to the polling controller to check whether
         // we should poll or not
-        const filteredChainIds = (chainIds !== null && chainIds !== void 0 ? chainIds : []).filter((chainId) => __classPrivateFieldGet(this, _SmartTransactionsController_supportedChainIds, "f").includes(chainId));
+        const filteredChainIds = (chainIds ?? []).filter((chainId) => __classPrivateFieldGet(this, _SmartTransactionsController_supportedChainIds, "f").includes(chainId));
         if (filteredChainIds.length === 0) {
             return Promise.resolve();
         }
@@ -126,20 +156,19 @@ 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);
-        if (!this.timeoutHandle && (pendingTransactions === null || pendingTransactions === void 0 ? void 0 : pendingTransactions.length) > 0) {
+        const pendingTransactions = smartTransactionsForAllChains?.filter(utils_1.isSmartTransactionPending);
+        if (!this.timeoutHandle && pendingTransactions?.length > 0) {
             this.poll();
         }
-        else if (this.timeoutHandle && (pendingTransactions === null || pendingTransactions === void 0 ? void 0 : pendingTransactions.length) === 0) {
+        else if (this.timeoutHandle && pendingTransactions?.length === 0) {
             this.stop();
         }
     }
     initializeSmartTransactionsForChainId() {
         if (__classPrivateFieldGet(this, _SmartTransactionsController_supportedChainIds, "f").includes(__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"))) {
             this.update((state) => {
-                var _a;
                 state.smartTransactionsState.smartTransactions[__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")] =
-                    (_a = state.smartTransactionsState.smartTransactions[__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")]) !== null && _a !== void 0 ? _a : [];
+                    state.smartTransactionsState.smartTransactions[__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")] ?? [];
             });
         }
     }
@@ -167,8 +196,11 @@ 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);
-        if (updatedSmartTransaction.status === (prevSmartTransaction === null || prevSmartTransaction === void 0 ? void 0 : prevSmartTransaction.status)) {
+        updatedSmartTransaction = {
+            ...(0, cloneDeep_1.default)(prevSmartTransaction),
+            ...updatedSmartTransaction,
+        };
+        if (updatedSmartTransaction.status === prevSmartTransaction?.status) {
             return; // If status hasn't changed, don't track it again.
         }
         __classPrivateFieldGet(this, _SmartTransactionsController_trackMetaMetricsEvent, "f").call(this, {
@@ -180,8 +212,8 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
     }
     isNewSmartTransaction(smartTransactionUuid, chainId) {
         const { smartTransactionsState: { smartTransactions }, } = this.state;
-        const currentSmartTransactions = smartTransactions[chainId !== null && chainId !== void 0 ? chainId : __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")];
-        const currentIndex = currentSmartTransactions === null || currentSmartTransactions === void 0 ? void 0 : currentSmartTransactions.findIndex((stx) => stx.uuid === smartTransactionUuid);
+        const currentSmartTransactions = smartTransactions[chainId ?? __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")];
+        const currentIndex = currentSmartTransactions?.findIndex((stx) => stx.uuid === smartTransactionUuid);
         return currentIndex === -1 || currentIndex === undefined;
     }
     updateSmartTransaction(smartTransaction, { networkClientId } = {}) {
@@ -212,7 +244,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
                 .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, {
-                    chainId: chainId,
+                    chainId,
                 });
                 return {
                     uuid: pendingSmartTransaction.uuid,
@@ -238,7 +270,8 @@ 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 useSentinelForBatchStatus = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_isStxMigrationFlagEnabled).call(this, 'stxMigrationBatchStatus');
+        const url = `${(0, utils_1.getAPIRequestURL)(types_1.APIType.BATCH_STATUS, chainId, useSentinelForBatchStatus)}?${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)) {
@@ -272,7 +305,8 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         return fees;
     }
     async getFees(tradeTx, approvalTx, { networkClientId } = {}) {
-        const selectedNetworkClientId = networkClientId !== null && networkClientId !== void 0 ? networkClientId : this.messenger.call('NetworkController:getState').selectedNetworkClientId;
+        const selectedNetworkClientId = networkClientId ??
+            this.messenger.call('NetworkController:getState').selectedNetworkClientId;
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, {
             networkClientId: selectedNetworkClientId,
         });
@@ -281,9 +315,11 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         if (approvalTx) {
             const unsignedApprovalTransactionWithNonce = await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_addNonceToTransaction).call(this, approvalTx, selectedNetworkClientId);
             transactions.push(unsignedApprovalTransactionWithNonce);
-            unsignedTradeTransactionWithNonce = Object.assign(Object.assign({}, tradeTx), { 
+            unsignedTradeTransactionWithNonce = {
+                ...tradeTx,
                 // If there is an approval tx, the trade tx's nonce is increased by 1.
-                nonce: (0, utils_1.incrementNonceInHex)(unsignedApprovalTransactionWithNonce.nonce) });
+                nonce: (0, utils_1.incrementNonceInHex)(unsignedApprovalTransactionWithNonce.nonce),
+            };
         }
         else if (tradeTx.nonce) {
             unsignedTradeTransactionWithNonce = tradeTx;
@@ -292,7 +328,8 @@ 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 useSentinelForGetFees = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_isStxMigrationFlagEnabled).call(this, 'stxMigrationGetFees');
+        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, useSentinelForGetFees), {
             method: 'POST',
             body: JSON.stringify({
                 txs: transactions,
@@ -301,12 +338,12 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         let approvalTxFees;
         let tradeTxFees;
         if (approvalTx) {
-            approvalTxFees = data === null || data === void 0 ? void 0 : data.txs[0];
-            tradeTxFees = data === null || data === void 0 ? void 0 : data.txs[1];
+            approvalTxFees = data?.txs[0];
+            tradeTxFees = data?.txs[1];
         }
         else {
             approvalTxFees = null;
-            tradeTxFees = data === null || data === void 0 ? void 0 : data.txs[0];
+            tradeTxFees = data?.txs[0];
         }
         this.update((state) => {
             if (chainId === __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")) {
@@ -327,26 +364,28 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
     }
     // * After this successful call client must add a nonce representative to
     // * transaction controller external transactions list
-    async submitSignedTransactions({ transactionMeta, txParams, signedTransactions, signedCanceledTransactions = [], networkClientId, }) {
-        var _a, _b;
-        const selectedNetworkClientId = networkClientId !== null && networkClientId !== void 0 ? networkClientId : this.messenger.call('NetworkController:getState').selectedNetworkClientId;
+    async submitSignedTransactions({ transactionMeta, txParams, signedTransactions, signedCanceledTransactions = [], signedTransactionsWithMetadata, networkClientId, }) {
+        const selectedNetworkClientId = networkClientId ??
+            this.messenger.call('NetworkController:getState').selectedNetworkClientId;
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, {
             networkClientId: selectedNetworkClientId,
         });
         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 useSentinelForSubmitTransactions = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_isStxMigrationFlagEnabled).call(this, 'stxMigrationSubmitTransactions');
+        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, useSentinelForSubmitTransactions), {
             method: 'POST',
             body: JSON.stringify({
                 rawTxs: signedTransactions,
                 rawCancelTxs: signedCanceledTransactions,
+                rawTxsWithMetadata: signedTransactionsWithMetadata,
             }),
         }));
         const time = Date.now();
         let preTxBalance;
         try {
-            if (txParams === null || txParams === void 0 ? void 0 : txParams.from) {
+            if (txParams?.from) {
                 const preTxBalanceBN = await (0, controller_utils_1.query)(ethQuery, 'getBalance', [
                     txParams.from,
                 ]);
@@ -366,7 +405,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
                 nonceLock = await this.messenger.call('TransactionController:getNonceLock', txParams.from, selectedNetworkClientId);
                 nonce = (0, bytes_1.hexlify)(nonceLock.nextNonce);
                 nonceDetails = nonceLock.nonceDetails;
-                (_a = txParams.nonce) !== null && _a !== void 0 ? _a : (txParams.nonce = nonce);
+                txParams.nonce ?? (txParams.nonce = nonce);
             }
             catch (error) {
                 console.error('Failed to acquire nonce lock:', error);
@@ -374,8 +413,11 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
             }
         }
         const txHashes = signedTransactions.map((tx) => (0, utils_1.getTxHash)(tx));
-        const submitTransactionResponse = Object.assign(Object.assign({}, data), { txHash: txHashes[txHashes.length - 1], // For backward compatibility - use the last tx hash
-            txHashes });
+        const submitTransactionResponse = {
+            ...data,
+            txHash: txHashes[txHashes.length - 1], // For backward compatibility - use the last tx hash
+            txHashes,
+        };
         try {
             await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_createOrUpdateSmartTransaction).call(this, {
                 chainId,
@@ -387,8 +429,8 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
                 uuid: submitTransactionResponse.uuid,
                 txHash: submitTransactionResponse.txHash,
                 cancellable: true,
-                type: (_b = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.type) !== null && _b !== void 0 ? _b : 'swap',
-                transactionId: transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.id,
+                type: transactionMeta?.type ?? 'swap',
+                transactionId: transactionMeta?.id,
                 networkClientId: selectedNetworkClientId,
                 txHashes, // Add support for multiple transaction hashes
             }, { chainId, ethQuery });
@@ -409,19 +451,29 @@ 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), {
+        const useSentinelForCancel = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_isStxMigrationFlagEnabled).call(this, 'stxMigrationCancel');
+        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, useSentinelForCancel), {
             method: 'POST',
             body: JSON.stringify({ uuid }),
         }));
     }
-    async fetchLiveness({ networkClientId, } = {}) {
-        const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
+    /**
+     * Fetches the liveness status of Smart Transactions for a given chain.
+     *
+     * @param options - The options object.
+     * @param options.chainId - The chain ID to fetch liveness for. Preferred over networkClientId.
+     * @param options.networkClientId - The network client ID to derive chain ID from.
+     * @returns A promise that resolves to the liveness status.
+     */
+    async fetchLiveness({ networkClientId, chainId: chainIdArg, } = {}) {
+        // Use chainId directly if provided, otherwise derive from networkClientId
+        const chainId = chainIdArg ?? __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)));
             liveness = Boolean(response.smartTransactions);
         }
-        catch (error) {
+        catch {
             console.log('"fetchLiveness" API call failed');
         }
         this.update((state) => {
@@ -440,8 +492,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
     getTransactions({ addressFrom, status, }) {
         const currentSmartTransactions = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getCurrentSmartTransactions).call(this);
         return currentSmartTransactions.filter((stx) => {
-            var _a;
-            return stx.status === status && ((_a = stx.txParams) === null || _a === void 0 ? void 0 : _a.from) === addressFrom;
+            return stx.status === status && stx.txParams?.from === addressFrom;
         });
     }
     getSmartTransactionByMinedTxHash(txHash) {
@@ -450,8 +501,7 @@ class SmartTransactionsController extends (0, polling_controller_1.StaticInterva
         }
         const currentSmartTransactions = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getCurrentSmartTransactions).call(this);
         return currentSmartTransactions.find((smartTransaction) => {
-            var _a, _b;
-            return (((_b = (_a = smartTransaction.statusMetadata) === null || _a === void 0 ? void 0 : _a.minedHash) === null || _b === void 0 ? void 0 : _b.toLowerCase()) ===
+            return (smartTransaction.statusMetadata?.minedHash?.toLowerCase() ===
                 txHash.toLowerCase());
         });
     }
@@ -478,16 +528,46 @@ 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 = 
+_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_trace = new WeakMap(), _SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsController_isStxMigrationFlagEnabled = function _SmartTransactionsController_isStxMigrationFlagEnabled(flagName) {
+    const flag = this.messenger.call('RemoteFeatureFlagController:getState')
+        ?.remoteFeatureFlags?.[flagName];
+    return Boolean(flag && typeof flag === 'object' && 'value' in flag && flag.value);
+}, _SmartTransactionsController_validateAndReportFeatureFlags = function _SmartTransactionsController_validateAndReportFeatureFlags() {
+    const remoteFeatureFlagControllerState = this.messenger.call('RemoteFeatureFlagController:getState');
+    const rawFlags = remoteFeatureFlagControllerState?.remoteFeatureFlags
+        ?.smartTransactionsNetworks;
+    const { errors } = (0, validators_1.validateSmartTransactionsFeatureFlags)(rawFlags);
+    // Report each validation error to Sentry
+    for (const error of errors) {
+        this.messenger.captureException?.(new Error(`[SmartTransactionsController] Feature flag validation failed: ${error.message}. Please check the SmartTransactionNetworks feature flag in Remote Config. Smart transactions are disabled for this network. Default disabled config: ${JSON.stringify(constants_1.DEFAULT_DISABLED_SMART_TRANSACTIONS_FEATURE_FLAGS.default)}`));
+    }
+}, _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") })) });
+    const headers = {
+        'Content-Type': 'application/json',
+        ...(__classPrivateFieldGet(this, _SmartTransactionsController_clientId, "f") && { 'X-Client-Id': __classPrivateFieldGet(this, _SmartTransactionsController_clientId, "f") }),
+    };
+    const urlMatches = request.startsWith(constants_1.API_BASE_URL) ||
+        Object.values(constants_1.SENTINEL_API_BASE_URL_MAP).some((baseUrl) => request.startsWith(baseUrl));
+    if (urlMatches) {
+        const token = await this.messenger.call('AuthenticationController:getBearerToken');
+        if (token) {
+            headers.Authorization = `Bearer ${token}`;
+        }
+    }
+    const fetchOptions = {
+        ...options,
+        headers: {
+            ...headers,
+            ...options?.headers,
+        },
+    };
     return (0, utils_1.handleFetch)(request, fetchOptions);
 }, _SmartTransactionsController_updateSmartTransaction = function _SmartTransactionsController_updateSmartTransaction(smartTransaction, { chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"), }) {
-    var _a;
     const { smartTransactionsState: { smartTransactions }, } = this.state;
-    const currentSmartTransactions = (_a = smartTransactions[chainId]) !== null && _a !== void 0 ? _a : [];
-    const currentIndex = currentSmartTransactions === null || currentSmartTransactions === void 0 ? void 0 : currentSmartTransactions.findIndex((stx) => stx.uuid === smartTransaction.uuid);
+    const currentSmartTransactions = smartTransactions[chainId] ?? [];
+    const currentIndex = currentSmartTransactions?.findIndex((stx) => stx.uuid === smartTransaction.uuid);
     if (currentIndex === -1) {
         return; // Smart transaction not found, don't update anything.
     }
@@ -495,19 +575,21 @@ async function _SmartTransactionsController_fetch(request, options) {
         return;
     }
     this.update((state) => {
-        state.smartTransactionsState.smartTransactions[chainId][currentIndex] = Object.assign(Object.assign({}, state.smartTransactionsState.smartTransactions[chainId][currentIndex]), smartTransaction);
+        state.smartTransactionsState.smartTransactions[chainId][currentIndex] = {
+            ...state.smartTransactionsState.smartTransactions[chainId][currentIndex],
+            ...smartTransaction,
+        };
     });
 }, _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction = async function _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction(smartTransaction) {
     const metaMetricsProps = await __classPrivateFieldGet(this, _SmartTransactionsController_getMetaMetricsProps, "f").call(this);
     smartTransaction.accountHardwareType =
-        metaMetricsProps === null || metaMetricsProps === void 0 ? void 0 : metaMetricsProps.accountHardwareType;
-    smartTransaction.accountType = metaMetricsProps === null || metaMetricsProps === void 0 ? void 0 : metaMetricsProps.accountType;
-    smartTransaction.deviceModel = metaMetricsProps === null || metaMetricsProps === void 0 ? void 0 : metaMetricsProps.deviceModel;
+        metaMetricsProps?.accountHardwareType;
+    smartTransaction.accountType = metaMetricsProps?.accountType;
+    smartTransaction.deviceModel = metaMetricsProps?.deviceModel;
 }, _SmartTransactionsController_createOrUpdateSmartTransaction = async function _SmartTransactionsController_createOrUpdateSmartTransaction(smartTransaction, { chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"), ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f"), }) {
-    var _a;
     const { smartTransactionsState: { smartTransactions }, } = this.state;
-    const currentSmartTransactions = (_a = smartTransactions[chainId]) !== null && _a !== void 0 ? _a : [];
-    const currentIndex = currentSmartTransactions === null || currentSmartTransactions === void 0 ? void 0 : currentSmartTransactions.findIndex((stx) => stx.uuid === smartTransaction.uuid);
+    const currentSmartTransactions = smartTransactions[chainId] ?? [];
+    const currentIndex = currentSmartTransactions?.findIndex((stx) => stx.uuid === smartTransaction.uuid);
     const isNewSmartTransaction = this.isNewSmartTransaction(smartTransaction.uuid, chainId);
     if (ethQuery === undefined) {
         throw new Error(ETH_QUERY_ERROR_MSG);
@@ -526,14 +608,11 @@ async function _SmartTransactionsController_fetch(request, options) {
         : currentSmartTransactions[currentIndex]);
     if (isNewSmartTransaction) {
         // add smart transaction
-        const cancelledNonceIndex = currentSmartTransactions === null || currentSmartTransactions === void 0 ? void 0 : currentSmartTransactions.findIndex((stx) => {
-            var _a, _b, _c;
-            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 cancelledNonceIndex = currentSmartTransactions?.findIndex((stx) => stx.txParams?.nonce === smartTransaction.txParams?.nonce &&
+            stx.status?.startsWith('cancelled'));
         const snapshot = (0, cloneDeep_1.default)(smartTransaction);
         const history = [snapshot];
-        const historifiedSmartTransaction = Object.assign(Object.assign({}, smartTransaction), { history });
+        const historifiedSmartTransaction = { ...smartTransaction, history };
         const nextSmartTransactions = cancelledNonceIndex > -1
             ? currentSmartTransactions
                 .slice(0, cancelledNonceIndex)
@@ -547,16 +626,19 @@ async function _SmartTransactionsController_fetch(request, options) {
         return;
     }
     const currentSmartTransaction = currentSmartTransactions[currentIndex];
-    const nextSmartTransaction = Object.assign(Object.assign({}, currentSmartTransaction), smartTransaction);
-    // 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.
+    const nextSmartTransaction = {
+        ...currentSmartTransaction,
+        ...smartTransaction,
+    };
+    // We have to emit this event here, so a txHash is returned to the TransactionController once it's available.
     this.messenger.publish(`SmartTransactionsController:smartTransaction`, nextSmartTransaction);
-    if ((0, utils_1.shouldMarkRegularTransactionAsFailed)({
+    const featureFlags = (0, feature_flags_1.getSmartTransactionsFeatureFlagsForChain)((0, feature_flags_1.getSmartTransactionsFeatureFlags)(this.messenger), chainId);
+    if ((0, utils_1.shouldMarkRegularTransactionsAsFailed)({
         smartTransaction: nextSmartTransaction,
         clientId: __classPrivateFieldGet(this, _SmartTransactionsController_clientId, "f"),
-        getFeatureFlags: __classPrivateFieldGet(this, _SmartTransactionsController_getFeatureFlags, "f"),
+        featureFlags,
     })) {
-        (0, utils_1.markRegularTransactionAsFailed)({
+        (0, utils_1.markRegularTransactionsAsFailed)({
             smartTransaction: nextSmartTransaction,
             getRegularTransactions: () => this.messenger.call('TransactionController:getTransactions'),
             updateTransaction: (transactionMeta, note) => this.messenger.call('TransactionController:updateTransaction', transactionMeta, note),
@@ -575,62 +657,21 @@ async function _SmartTransactionsController_fetch(request, options) {
             chainId,
         });
     }
-}, _SmartTransactionsController_doesTransactionNeedConfirmation = function _SmartTransactionsController_doesTransactionNeedConfirmation(txHash) {
-    if (!txHash) {
-        return true;
-    }
-    const transactions = this.messenger.call('TransactionController:getTransactions');
-    const foundTransaction = transactions === null || transactions === void 0 ? void 0 : transactions.find((tx) => {
-        var _a;
-        return ((_a = tx.hash) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === txHash.toLowerCase();
-    });
-    if (!foundTransaction) {
-        return true;
-    }
-    // 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);
 }, _SmartTransactionsController_confirmSmartTransaction = async function _SmartTransactionsController_confirmSmartTransaction(smartTransaction, { chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"), ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f"), }) {
-    var _a;
     if (ethQuery === undefined) {
         throw new Error(ETH_QUERY_ERROR_MSG);
     }
-    const txHash = (_a = smartTransaction.statusMetadata) === null || _a === void 0 ? void 0 : _a.minedHash;
+    const txHash = smartTransaction.statusMetadata?.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 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 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 });
-            // create txMeta snapshot for history
-            const snapshot = (0, utils_1.snapshotFromTxMeta)(originalTxMeta);
-            // recover previous tx state obj
-            const previousState = (0, utils_1.replayHistory)(originalTxMeta.history);
-            // generate history entry and add to history
-            const entry = (0, utils_1.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)) {
-                this.messenger.call('TransactionController:confirmExternalTransaction', 
-                // TODO: Replace 'as' assertion with correct typing for `txMeta`
-                txMeta, transactionReceipt, 
-                // TODO: Replace 'as' assertion with correct typing for `baseFeePerGas`
-                baseFeePerGas);
-            }
+        if (transactionReceipt?.blockNumber) {
             __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),
             });
-            __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_updateSmartTransaction).call(this, Object.assign(Object.assign({}, smartTransaction), { confirmed: true }), {
+            __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_updateSmartTransaction).call(this, { ...smartTransaction, confirmed: true }, {
                 chainId,
             });
         }
@@ -649,7 +690,10 @@ async function _SmartTransactionsController_fetch(request, options) {
     const nonceLock = await this.messenger.call('TransactionController:getNonceLock', transaction.from, networkClientId);
     const nonce = nonceLock.nextNonce;
     nonceLock.releaseLock();
-    return Object.assign(Object.assign({}, transaction), { nonce: `0x${nonce.toString(16)}` });
+    return {
+        ...transaction,
+        nonce: `0x${nonce.toString(16)}`,
+    };
 }, _SmartTransactionsController_getChainId = function _SmartTransactionsController_getChainId({ networkClientId, } = {}) {
     if (networkClientId) {
         return this.messenger.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
@@ -680,12 +724,12 @@ async function _SmartTransactionsController_fetch(request, options) {
     return smartTransactionsForAllChains;
 }, _SmartTransactionsController_wipeSmartTransactionsPerChainId = function _SmartTransactionsController_wipeSmartTransactionsPerChainId({ chainId, addressLowerCase, }) {
     const { smartTransactionsState: { smartTransactions }, } = this.state;
-    const smartTransactionsForSelectedChain = smartTransactions === null || smartTransactions === void 0 ? void 0 : smartTransactions[chainId];
+    const smartTransactionsForSelectedChain = smartTransactions?.[chainId];
     if (!smartTransactionsForSelectedChain ||
         smartTransactionsForSelectedChain.length === 0) {
         return;
     }
-    const newSmartTransactionsForSelectedChain = smartTransactionsForSelectedChain.filter((smartTransaction) => { var _a; return ((_a = smartTransaction.txParams) === null || _a === void 0 ? void 0 : _a.from) !== addressLowerCase; });
+    const newSmartTransactionsForSelectedChain = smartTransactionsForSelectedChain.filter((smartTransaction) => smartTransaction.txParams?.from !== addressLowerCase);
     this.update((state) => {
         state.smartTransactionsState.smartTransactions[chainId] =
             newSmartTransactionsForSelectedChain;