@metamask/smart-transactions-controller 12.0.1 → 13.1.0

package/dist/SmartTransactionsController.js

@@ -1,4 +1,10 @@
 "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");
+    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");
@@ -7,90 +13,106 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _SmartTransactionsController_instances, _SmartTransactionsController_updateSmartTransaction, _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction, _SmartTransactionsController_createOrUpdateSmartTransaction, _SmartTransactionsController_doesTransactionNeedConfirmation, _SmartTransactionsController_confirmSmartTransaction, _SmartTransactionsController_getChainId, _SmartTransactionsController_getEthQuery, _SmartTransactionsController_getCurrentSmartTransactions, _SmartTransactionsController_wipeSmartTransactionsPerChainId;
+var _SmartTransactionsController_instances, _SmartTransactionsController_interval, _SmartTransactionsController_clientId, _SmartTransactionsController_chainId, _SmartTransactionsController_supportedChainIds, _SmartTransactionsController_getNonceLock, _SmartTransactionsController_ethQuery, _SmartTransactionsController_confirmExternalTransaction, _SmartTransactionsController_getRegularTransactions, _SmartTransactionsController_trackMetaMetricsEvent, _SmartTransactionsController_getMetaMetricsProps, _SmartTransactionsController_fetch, _SmartTransactionsController_updateSmartTransaction, _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction, _SmartTransactionsController_createOrUpdateSmartTransaction, _SmartTransactionsController_doesTransactionNeedConfirmation, _SmartTransactionsController_confirmSmartTransaction, _SmartTransactionsController_getChainId, _SmartTransactionsController_getEthQuery, _SmartTransactionsController_getCurrentSmartTransactions, _SmartTransactionsController_wipeSmartTransactionsPerChainId;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_INTERVAL = void 0;
-// eslint-disable-next-line import/no-nodejs-modules
+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");
-// eslint-disable-next-line import/no-nodejs-modules
-const events_1 = __importDefault(require("events"));
 const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
 const constants_1 = require("./constants");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
 const SECOND = 1000;
 exports.DEFAULT_INTERVAL = SECOND * 5;
+const DEFAULT_CLIENT_ID = 'default';
 const ETH_QUERY_ERROR_MSG = '`ethQuery` is not defined on SmartTransactionsController';
-class SmartTransactionsController extends polling_controller_1.StaticIntervalPollingControllerV1 {
-    constructor({ onNetworkStateChange, getNonceLock, confirmExternalTransaction, getTransactions, trackMetaMetricsEvent, getNetworkClientById, getMetaMetricsProps, }, config, state) {
-        super(config, state);
-        _SmartTransactionsController_instances.add(this);
-        /**
-         * Name of this controller used during composition
-         */
-        this.name = 'SmartTransactionsController';
-        this.defaultConfig = {
-            interval: exports.DEFAULT_INTERVAL,
-            chainId: controller_utils_1.ChainId.mainnet,
-            clientId: 'default',
-            supportedChainIds: [controller_utils_1.ChainId.mainnet, controller_utils_1.ChainId.sepolia],
-        };
-        this.defaultState = {
-            smartTransactionsState: {
-                smartTransactions: {},
-                userOptIn: undefined,
-                userOptInV2: undefined,
-                fees: {
-                    approvalTxFees: undefined,
-                    tradeTxFees: undefined,
-                },
-                liveness: true,
-                livenessByChainId: {
-                    [controller_utils_1.ChainId.mainnet]: true,
-                    [controller_utils_1.ChainId.sepolia]: true,
+/**
+ * The name of the {@link SmartTransactionsController}
+ */
+const controllerName = 'SmartTransactionsController';
+const controllerMetadata = {
+    smartTransactionsState: {
+        persist: false,
+        anonymous: true,
+    },
+};
+/**
+ * Get the default {@link SmartTransactionsController} state.
+ *
+ * @returns The default {@link SmartTransactionsController} state.
+ */
+function getDefaultSmartTransactionsControllerState() {
+    return {
+        smartTransactionsState: {
+            smartTransactions: {},
+            userOptIn: null,
+            userOptInV2: null,
+            fees: {
+                approvalTxFees: null,
+                tradeTxFees: null,
+            },
+            liveness: true,
+            livenessByChainId: {
+                [controller_utils_1.ChainId.mainnet]: true,
+                [controller_utils_1.ChainId.sepolia]: true,
+            },
+            feesByChainId: {
+                [controller_utils_1.ChainId.mainnet]: {
+                    approvalTxFees: null,
+                    tradeTxFees: null,
                 },
-                feesByChainId: {
-                    [controller_utils_1.ChainId.mainnet]: {
-                        approvalTxFees: undefined,
-                        tradeTxFees: undefined,
-                    },
-                    [controller_utils_1.ChainId.sepolia]: {
-                        approvalTxFees: undefined,
-                        tradeTxFees: undefined,
-                    },
+                [controller_utils_1.ChainId.sepolia]: {
+                    approvalTxFees: null,
+                    tradeTxFees: null,
                 },
             },
-        };
-        this.initialize();
-        this.setIntervalLength(this.config.interval);
-        this.getNonceLock = getNonceLock;
-        this.ethQuery = undefined;
-        this.confirmExternalTransaction = confirmExternalTransaction;
-        this.getRegularTransactions = getTransactions;
-        this.trackMetaMetricsEvent = trackMetaMetricsEvent;
-        this.getNetworkClientById = getNetworkClientById;
-        this.getMetaMetricsProps = getMetaMetricsProps;
+        },
+    };
+}
+exports.getDefaultSmartTransactionsControllerState = getDefaultSmartTransactionsControllerState;
+class SmartTransactionsController extends polling_controller_1.StaticIntervalPollingController {
+    constructor({ interval = exports.DEFAULT_INTERVAL, clientId = DEFAULT_CLIENT_ID, chainId: InitialChainId = controller_utils_1.ChainId.mainnet, supportedChainIds = [controller_utils_1.ChainId.mainnet, controller_utils_1.ChainId.sepolia], getNonceLock, confirmExternalTransaction, trackMetaMetricsEvent, state = {}, messenger, getTransactions, getMetaMetricsProps, }) {
+        super({
+            name: controllerName,
+            metadata: controllerMetadata,
+            messenger,
+            state: Object.assign(Object.assign({}, getDefaultSmartTransactionsControllerState()), state),
+        });
+        _SmartTransactionsController_instances.add(this);
+        _SmartTransactionsController_interval.set(this, void 0);
+        _SmartTransactionsController_clientId.set(this, void 0);
+        _SmartTransactionsController_chainId.set(this, void 0);
+        _SmartTransactionsController_supportedChainIds.set(this, void 0);
+        _SmartTransactionsController_getNonceLock.set(this, void 0);
+        _SmartTransactionsController_ethQuery.set(this, void 0);
+        _SmartTransactionsController_confirmExternalTransaction.set(this, void 0);
+        _SmartTransactionsController_getRegularTransactions.set(this, void 0);
+        _SmartTransactionsController_trackMetaMetricsEvent.set(this, void 0);
+        _SmartTransactionsController_getMetaMetricsProps.set(this, void 0);
+        __classPrivateFieldSet(this, _SmartTransactionsController_interval, interval, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_clientId, clientId, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_chainId, InitialChainId, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_supportedChainIds, supportedChainIds, "f");
+        this.setIntervalLength(interval);
+        __classPrivateFieldSet(this, _SmartTransactionsController_getNonceLock, getNonceLock, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_ethQuery, undefined, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_confirmExternalTransaction, confirmExternalTransaction, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_getRegularTransactions, getTransactions, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_trackMetaMetricsEvent, trackMetaMetricsEvent, "f");
+        __classPrivateFieldSet(this, _SmartTransactionsController_getMetaMetricsProps, getMetaMetricsProps, "f");
         this.initializeSmartTransactionsForChainId();
-        onNetworkStateChange(({ selectedNetworkClientId }) => {
-            const { configuration: { chainId }, provider, } = this.getNetworkClientById(selectedNetworkClientId);
-            this.configure({ chainId });
-            this.ethQuery = new eth_query_1.default(provider);
+        this.messagingSystem.subscribe('NetworkController:stateChange', ({ selectedNetworkClientId }) => {
+            const { configuration: { chainId }, provider, } = this.messagingSystem.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
+            __classPrivateFieldSet(this, _SmartTransactionsController_chainId, chainId, "f");
+            __classPrivateFieldSet(this, _SmartTransactionsController_ethQuery, new eth_query_1.default(provider), "f");
             this.initializeSmartTransactionsForChainId();
             this.checkPoll(this.state);
         });
-        this.subscribe((currentState) => this.checkPoll(currentState));
-        this.eventEmitter = new events_1.default();
-    }
-    /* istanbul ignore next */
-    async fetch(request, options) {
-        const { clientId } = this.config;
-        const fetchOptions = Object.assign(Object.assign({}, options), { headers: Object.assign({ 'Content-Type': 'application/json' }, (clientId && { 'X-Client-Id': clientId })) });
-        return (0, utils_1.handleFetch)(request, fetchOptions);
+        this.messagingSystem.subscribe(`${controllerName}:stateChange`, (currentState) => this.checkPoll(currentState));
     }
     async _executePoll(networkClientId) {
         // if this is going to be truly UI driven polling we shouldn't really reach here
@@ -98,14 +120,13 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         // wondering if we should add some kind of predicate to the polling controller to check whether
         // we should poll or not
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
-        if (!this.config.supportedChainIds.includes(chainId)) {
+        if (!__classPrivateFieldGet(this, _SmartTransactionsController_supportedChainIds, "f").includes(chainId)) {
             return Promise.resolve();
         }
         return this.updateSmartTransactions({ networkClientId });
     }
-    checkPoll(state) {
-        const { smartTransactions } = state.smartTransactionsState;
-        const currentSmartTransactions = smartTransactions[this.config.chainId];
+    checkPoll({ smartTransactionsState: { smartTransactions }, }) {
+        const currentSmartTransactions = smartTransactions[__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")];
         const pendingTransactions = currentSmartTransactions === null || currentSmartTransactions === void 0 ? void 0 : currentSmartTransactions.filter(utils_1.isSmartTransactionPending);
         if (!this.timeoutHandle && (pendingTransactions === null || pendingTransactions === void 0 ? void 0 : pendingTransactions.length) > 0) {
             this.poll();
@@ -115,33 +136,34 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         }
     }
     initializeSmartTransactionsForChainId() {
-        var _a;
-        if (this.config.supportedChainIds.includes(this.config.chainId)) {
-            const { smartTransactionsState } = this.state;
-            this.update({
-                smartTransactionsState: Object.assign(Object.assign({}, smartTransactionsState), { smartTransactions: Object.assign(Object.assign({}, smartTransactionsState.smartTransactions), { [this.config.chainId]: (_a = smartTransactionsState.smartTransactions[this.config.chainId]) !== null && _a !== void 0 ? _a : [] }) }),
+        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 : [];
             });
         }
     }
     async poll(interval) {
-        const { chainId, supportedChainIds } = this.config;
-        interval && this.configure({ interval }, false, false);
+        if (interval) {
+            __classPrivateFieldSet(this, _SmartTransactionsController_interval, interval, "f");
+        }
         this.timeoutHandle && clearInterval(this.timeoutHandle);
-        if (!supportedChainIds.includes(chainId)) {
+        if (!__classPrivateFieldGet(this, _SmartTransactionsController_supportedChainIds, "f").includes(__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"))) {
             return;
         }
         this.timeoutHandle = setInterval(() => {
             (0, controller_utils_1.safelyExecute)(async () => this.updateSmartTransactions());
-        }, this.config.interval);
+        }, __classPrivateFieldGet(this, _SmartTransactionsController_interval, "f"));
         await (0, controller_utils_1.safelyExecute)(async () => this.updateSmartTransactions());
     }
     async stop() {
         this.timeoutHandle && clearInterval(this.timeoutHandle);
         this.timeoutHandle = undefined;
     }
-    setOptInState(state) {
-        this.update({
-            smartTransactionsState: Object.assign(Object.assign({}, this.state.smartTransactionsState), { userOptInV2: state }),
+    setOptInState(optInState) {
+        this.update((state) => {
+            state.smartTransactionsState.userOptInV2 = optInState;
         });
     }
     trackStxStatusChange(smartTransaction, prevSmartTransaction) {
@@ -150,7 +172,7 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         if (updatedSmartTransaction.status === (prevSmartTransaction === null || prevSmartTransaction === void 0 ? void 0 : prevSmartTransaction.status)) {
             return; // If status hasn't changed, don't track it again.
         }
-        this.trackMetaMetricsEvent({
+        __classPrivateFieldGet(this, _SmartTransactionsController_trackMetaMetricsEvent, "f").call(this, {
             event: constants_1.MetaMetricsEventName.StxStatusUpdated,
             category: constants_1.MetaMetricsEventCategory.Transactions,
             properties: (0, utils_1.getSmartTransactionMetricsProperties)(updatedSmartTransaction),
@@ -158,19 +180,18 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         });
     }
     isNewSmartTransaction(smartTransactionUuid) {
-        const { chainId } = this.config;
-        const { smartTransactionsState } = this.state;
-        const { smartTransactions } = smartTransactionsState;
-        const currentSmartTransactions = smartTransactions[chainId];
+        const { smartTransactionsState: { smartTransactions }, } = this.state;
+        const currentSmartTransactions = smartTransactions[__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")];
         const currentIndex = currentSmartTransactions === null || currentSmartTransactions === void 0 ? void 0 : currentSmartTransactions.findIndex((stx) => stx.uuid === smartTransactionUuid);
         return currentIndex === -1 || currentIndex === undefined;
     }
     updateSmartTransaction(smartTransaction, { networkClientId } = {}) {
-        let { ethQuery, config: { chainId }, } = this;
+        let ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f");
+        let chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f");
         if (networkClientId) {
-            const networkClient = this.getNetworkClientById(networkClientId);
-            chainId = networkClient.configuration.chainId;
-            ethQuery = new eth_query_1.default(networkClient.provider);
+            const { configuration, provider } = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId);
+            chainId = configuration.chainId;
+            ethQuery = new eth_query_1.default(provider);
         }
         __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_createOrUpdateSmartTransaction).call(this, smartTransaction, {
             chainId,
@@ -178,7 +199,7 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         });
     }
     async updateSmartTransactions({ networkClientId, } = {}) {
-        const { smartTransactions } = this.state.smartTransactionsState;
+        const { smartTransactionsState: { smartTransactions }, } = this.state;
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
         const smartTransactionsForChainId = smartTransactions[chainId];
         const transactionsToUpdate = smartTransactionsForChainId
@@ -198,7 +219,7 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
         const ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getEthQuery).call(this, { networkClientId });
         const url = `${(0, utils_1.getAPIRequestURL)(types_1.APIType.BATCH_STATUS, chainId)}?${params.toString()}`;
-        const data = (await this.fetch(url));
+        const data = (await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, url));
         for (const [uuid, stxStatus] of Object.entries(data)) {
             const smartTransaction = {
                 statusMetadata: stxStatus,
@@ -214,18 +235,18 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         return data;
     }
     async addNonceToTransaction(transaction) {
-        const nonceLock = await this.getNonceLock(transaction.from);
+        const nonceLock = await __classPrivateFieldGet(this, _SmartTransactionsController_getNonceLock, "f").call(this, transaction.from);
         const nonce = nonceLock.nextNonce;
         nonceLock.releaseLock();
         return Object.assign(Object.assign({}, transaction), { nonce: `0x${nonce.toString(16)}` });
     }
     clearFees() {
         const fees = {
-            approvalTxFees: undefined,
-            tradeTxFees: undefined,
+            approvalTxFees: null,
+            tradeTxFees: null,
         };
-        this.update({
-            smartTransactionsState: Object.assign(Object.assign({}, this.state.smartTransactionsState), { fees }),
+        this.update((state) => {
+            state.smartTransactionsState.fees = fees;
         });
         return fees;
     }
@@ -247,7 +268,7 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
             unsignedTradeTransactionWithNonce = await this.addNonceToTransaction(tradeTx);
         }
         transactions.push(unsignedTradeTransactionWithNonce);
-        const data = await this.fetch((0, utils_1.getAPIRequestURL)(types_1.APIType.GET_FEES, chainId), {
+        const data = await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, (0, utils_1.getAPIRequestURL)(types_1.APIType.GET_FEES, chainId), {
             method: 'POST',
             body: JSON.stringify({
                 txs: transactions,
@@ -260,18 +281,20 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
             tradeTxFees = data === null || data === void 0 ? void 0 : data.txs[1];
         }
         else {
+            approvalTxFees = null;
             tradeTxFees = data === null || data === void 0 ? void 0 : data.txs[0];
         }
-        this.update({
-            smartTransactionsState: Object.assign(Object.assign(Object.assign({}, this.state.smartTransactionsState), (chainId === this.config.chainId && {
-                fees: {
+        this.update((state) => {
+            if (chainId === __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")) {
+                state.smartTransactionsState.fees = {
                     approvalTxFees,
                     tradeTxFees,
-                },
-            })), { feesByChainId: Object.assign(Object.assign({}, this.state.smartTransactionsState.feesByChainId), { [chainId]: {
-                        approvalTxFees,
-                        tradeTxFees,
-                    } }) }),
+                };
+            }
+            state.smartTransactionsState.feesByChainId[chainId] = {
+                approvalTxFees,
+                tradeTxFees,
+            };
         });
         return {
             approvalTxFees,
@@ -281,10 +304,10 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
     // * 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;
+        var _a, _b;
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
         const ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getEthQuery).call(this, { networkClientId });
-        const data = await this.fetch((0, utils_1.getAPIRequestURL)(types_1.APIType.SUBMIT_TRANSACTIONS, chainId), {
+        const data = await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, (0, utils_1.getAPIRequestURL)(types_1.APIType.SUBMIT_TRANSACTIONS, chainId), {
             method: 'POST',
             body: JSON.stringify({
                 rawTxs: signedTransactions,
@@ -302,17 +325,15 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         catch (error) {
             console.error('provider error', error);
         }
-        const requiresNonce = !txParams.nonce;
+        const requiresNonce = txParams && !txParams.nonce;
         let nonce;
         let nonceLock;
         let nonceDetails = {};
         if (requiresNonce) {
-            nonceLock = await this.getNonceLock(txParams === null || txParams === void 0 ? void 0 : txParams.from);
+            nonceLock = await __classPrivateFieldGet(this, _SmartTransactionsController_getNonceLock, "f").call(this, txParams.from);
             nonce = (0, bytes_1.hexlify)(nonceLock.nextNonce);
             nonceDetails = nonceLock.nonceDetails;
-            if (txParams) {
-                (_a = txParams.nonce) !== null && _a !== void 0 ? _a : (txParams.nonce = nonce);
-            }
+            (_a = txParams.nonce) !== null && _a !== void 0 ? _a : (txParams.nonce = nonce);
         }
         const submitTransactionResponse = Object.assign(Object.assign({}, data), { txHash: (0, utils_1.getTxHash)(signedTransactions[0]) });
         try {
@@ -326,7 +347,7 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
                 uuid: submitTransactionResponse.uuid,
                 txHash: submitTransactionResponse.txHash,
                 cancellable: true,
-                type: (transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.type) || 'swap',
+                type: (_b = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.type) !== null && _b !== void 0 ? _b : 'swap',
             }, { chainId, ethQuery });
         }
         finally {
@@ -339,7 +360,7 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
     // in transaction controller external transactions list
     async cancelSmartTransaction(uuid, { networkClientId, } = {}) {
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
-        await this.fetch((0, utils_1.getAPIRequestURL)(types_1.APIType.CANCEL, chainId), {
+        await __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_fetch).call(this, (0, utils_1.getAPIRequestURL)(types_1.APIType.CANCEL, chainId), {
             method: 'POST',
             body: JSON.stringify({ uuid }),
         });
@@ -348,20 +369,23 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         const chainId = __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_getChainId).call(this, { networkClientId });
         let liveness = false;
         try {
-            const response = await this.fetch((0, utils_1.getAPIRequestURL)(types_1.APIType.LIVENESS, chainId));
-            liveness = Boolean(response.lastBlock);
+            const response = 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) {
             console.log('"fetchLiveness" API call failed');
         }
-        this.update({
-            smartTransactionsState: Object.assign(Object.assign(Object.assign({}, this.state.smartTransactionsState), (chainId === this.config.chainId && { liveness })), { livenessByChainId: Object.assign(Object.assign({}, this.state.smartTransactionsState.livenessByChainId), { [chainId]: liveness }) }),
+        this.update((state) => {
+            if (chainId === __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")) {
+                state.smartTransactionsState.liveness = liveness;
+            }
+            state.smartTransactionsState.livenessByChainId[chainId] = liveness;
         });
         return liveness;
     }
     async setStatusRefreshInterval(interval) {
-        if (interval !== this.config.interval) {
-            this.configure({ interval }, false, false);
+        if (interval !== __classPrivateFieldGet(this, _SmartTransactionsController_interval, "f")) {
+            __classPrivateFieldSet(this, _SmartTransactionsController_interval, interval, "f");
         }
     }
     getTransactions({ addressFrom, status, }) {
@@ -388,53 +412,55 @@ class SmartTransactionsController extends polling_controller_1.StaticIntervalPol
         }
         const addressLowerCase = address.toLowerCase();
         if (ignoreNetwork) {
-            const { smartTransactions } = this.state.smartTransactionsState;
+            const { smartTransactionsState: { smartTransactions }, } = this.state;
             Object.keys(smartTransactions).forEach((chainId) => {
-                const chainIdHex = chainId;
                 __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_wipeSmartTransactionsPerChainId).call(this, {
-                    chainId: chainIdHex,
+                    chainId,
                     addressLowerCase,
                 });
             });
         }
         else {
             __classPrivateFieldGet(this, _SmartTransactionsController_instances, "m", _SmartTransactionsController_wipeSmartTransactionsPerChainId).call(this, {
-                chainId: this.config.chainId,
+                chainId: __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"),
                 addressLowerCase,
             });
         }
     }
 }
 exports.default = SmartTransactionsController;
-_SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsController_updateSmartTransaction = function _SmartTransactionsController_updateSmartTransaction(smartTransaction, { chainId = this.config.chainId, }) {
+_SmartTransactionsController_interval = new WeakMap(), _SmartTransactionsController_clientId = new WeakMap(), _SmartTransactionsController_chainId = new WeakMap(), _SmartTransactionsController_supportedChainIds = new WeakMap(), _SmartTransactionsController_getNonceLock = new WeakMap(), _SmartTransactionsController_ethQuery = new WeakMap(), _SmartTransactionsController_confirmExternalTransaction = new WeakMap(), _SmartTransactionsController_getRegularTransactions = new WeakMap(), _SmartTransactionsController_trackMetaMetricsEvent = new WeakMap(), _SmartTransactionsController_getMetaMetricsProps = 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);
+}, _SmartTransactionsController_updateSmartTransaction = function _SmartTransactionsController_updateSmartTransaction(smartTransaction, { chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"), }) {
     var _a;
-    const { smartTransactionsState } = this.state;
-    const { smartTransactions } = smartTransactionsState;
+    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);
     if (currentIndex === -1) {
         return; // Smart transaction not found, don't update anything.
     }
-    this.update({
-        smartTransactionsState: Object.assign(Object.assign({}, smartTransactionsState), { smartTransactions: Object.assign(Object.assign({}, smartTransactionsState.smartTransactions), { [chainId]: smartTransactionsState.smartTransactions[chainId].map((existingSmartTransaction, index) => {
-                    return index === currentIndex
-                        ? Object.assign(Object.assign({}, existingSmartTransaction), smartTransaction) : existingSmartTransaction;
-                }) }) }),
+    if (!(0, controller_utils_1.isSafeDynamicKey)(chainId)) {
+        return;
+    }
+    this.update((state) => {
+        state.smartTransactionsState.smartTransactions[chainId][currentIndex] = Object.assign(Object.assign({}, state.smartTransactionsState.smartTransactions[chainId][currentIndex]), smartTransaction);
     });
 }, _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction = async function _SmartTransactionsController_addMetaMetricsPropsToNewSmartTransaction(smartTransaction) {
-    const metaMetricsProps = await this.getMetaMetricsProps();
+    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;
-}, _SmartTransactionsController_createOrUpdateSmartTransaction = async function _SmartTransactionsController_createOrUpdateSmartTransaction(smartTransaction, { chainId = this.config.chainId, ethQuery = this.ethQuery, }) {
+}, _SmartTransactionsController_createOrUpdateSmartTransaction = async function _SmartTransactionsController_createOrUpdateSmartTransaction(smartTransaction, { chainId = __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f"), ethQuery = __classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f"), }) {
     var _a;
-    const { smartTransactionsState } = this.state;
-    const { smartTransactions } = smartTransactionsState;
+    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 isNewSmartTransaction = this.isNewSmartTransaction(smartTransaction.uuid);
-    if (this.ethQuery === undefined) {
+    if (__classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f") === undefined) {
         throw new Error(ETH_QUERY_ERROR_MSG);
     }
     if (isNewSmartTransaction) {
@@ -459,14 +485,15 @@ _SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsContro
                 .concat(currentSmartTransactions.slice(cancelledNonceIndex + 1))
                 .concat(historifiedSmartTransaction)
             : currentSmartTransactions.concat(historifiedSmartTransaction);
-        this.update({
-            smartTransactionsState: Object.assign(Object.assign({}, smartTransactionsState), { smartTransactions: Object.assign(Object.assign({}, smartTransactionsState.smartTransactions), { [chainId]: nextSmartTransactions }) }),
+        this.update((state) => {
+            state.smartTransactionsState.smartTransactions[__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")] =
+                nextSmartTransactions;
         });
         return;
     }
     // 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.eventEmitter.emit(`${smartTransaction.uuid}:smartTransaction`, smartTransaction);
+    this.messagingSystem.publish(`SmartTransactionsController:smartTransaction`, smartTransaction);
     if ((smartTransaction.status === types_1.SmartTransactionStatuses.SUCCESS ||
         smartTransaction.status === types_1.SmartTransactionStatuses.REVERTED) &&
         !smartTransaction.confirmed) {
@@ -487,7 +514,7 @@ _SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsContro
     if (!txHash) {
         return true;
     }
-    const transactions = this.getRegularTransactions();
+    const transactions = __classPrivateFieldGet(this, _SmartTransactionsController_getRegularTransactions, "f").call(this);
     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();
@@ -499,7 +526,7 @@ _SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsContro
     // 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 = this.config.chainId, ethQuery = this.ethQuery, }) {
+}, _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);
@@ -526,9 +553,13 @@ _SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsContro
             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.confirmExternalTransaction(txMeta, transactionReceipt, baseFeePerGas);
+                __classPrivateFieldGet(this, _SmartTransactionsController_confirmExternalTransaction, "f").call(this, 
+                // TODO: Replace 'as' assertion with correct typing for `txMeta`
+                txMeta, transactionReceipt, 
+                // TODO: Replace 'as' assertion with correct typing for `baseFeePerGas`
+                baseFeePerGas);
             }
-            this.trackMetaMetricsEvent({
+            __classPrivateFieldGet(this, _SmartTransactionsController_trackMetaMetricsEvent, "f").call(this, {
                 event: constants_1.MetaMetricsEventName.StxConfirmed,
                 category: constants_1.MetaMetricsEventCategory.Transactions,
                 properties: (0, utils_1.getSmartTransactionMetricsProperties)(smartTransaction),
@@ -540,42 +571,47 @@ _SmartTransactionsController_instances = new WeakSet(), _SmartTransactionsContro
         }
     }
     catch (error) {
-        this.trackMetaMetricsEvent({
+        __classPrivateFieldGet(this, _SmartTransactionsController_trackMetaMetricsEvent, "f").call(this, {
             event: constants_1.MetaMetricsEventName.StxConfirmationFailed,
             category: constants_1.MetaMetricsEventCategory.Transactions,
         });
         console.error('confirm error', error);
     }
+    finally {
+        this.messagingSystem.publish(`SmartTransactionsController:smartTransactionConfirmationDone`, smartTransaction);
+    }
 }, _SmartTransactionsController_getChainId = function _SmartTransactionsController_getChainId({ networkClientId, } = {}) {
-    return networkClientId
-        ? this.getNetworkClientById(networkClientId).configuration.chainId
-        : this.config.chainId;
+    if (networkClientId) {
+        return this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId).configuration.chainId;
+    }
+    return __classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f");
 }, _SmartTransactionsController_getEthQuery = function _SmartTransactionsController_getEthQuery({ networkClientId, } = {}) {
     if (networkClientId) {
-        return new eth_query_1.default(this.getNetworkClientById(networkClientId).provider);
+        const { provider } = this.messagingSystem.call('NetworkController:getNetworkClientById', networkClientId);
+        return new eth_query_1.default(provider);
     }
-    if (this.ethQuery === undefined) {
+    if (__classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f") === undefined) {
         throw new Error(ETH_QUERY_ERROR_MSG);
     }
-    return this.ethQuery;
+    return __classPrivateFieldGet(this, _SmartTransactionsController_ethQuery, "f");
 }, _SmartTransactionsController_getCurrentSmartTransactions = function _SmartTransactionsController_getCurrentSmartTransactions() {
-    const { smartTransactions } = this.state.smartTransactionsState;
-    const { chainId } = this.config;
-    const currentSmartTransactions = smartTransactions === null || smartTransactions === void 0 ? void 0 : smartTransactions[chainId];
+    const { smartTransactionsState: { smartTransactions }, } = this.state;
+    const currentSmartTransactions = smartTransactions === null || smartTransactions === void 0 ? void 0 : smartTransactions[__classPrivateFieldGet(this, _SmartTransactionsController_chainId, "f")];
     if (!currentSmartTransactions || currentSmartTransactions.length === 0) {
         return [];
     }
     return currentSmartTransactions;
 }, _SmartTransactionsController_wipeSmartTransactionsPerChainId = function _SmartTransactionsController_wipeSmartTransactionsPerChainId({ chainId, addressLowerCase, }) {
-    const { smartTransactions } = this.state.smartTransactionsState;
+    const { smartTransactionsState: { smartTransactions }, } = this.state;
     const smartTransactionsForSelectedChain = smartTransactions === null || smartTransactions === void 0 ? void 0 : 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; });
-    this.update({
-        smartTransactionsState: Object.assign(Object.assign({}, this.state.smartTransactionsState), { smartTransactions: Object.assign(Object.assign({}, smartTransactions), { [chainId]: newSmartTransactionsForSelectedChain }) }),
+    this.update((state) => {
+        state.smartTransactionsState.smartTransactions[chainId] =
+            newSmartTransactionsForSelectedChain;
     });
 };
 //# sourceMappingURL=SmartTransactionsController.js.map