@metamask-previews/transaction-controller 21.1.0-preview.cbe2fbb7 → 21.2.0-preview.08978bf

package/dist/TransactionController.js

@@ -8,15 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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 _TransactionController_instances, _TransactionController_acquireNonceLockForChainIdKey, _TransactionController_getEthQuery, _TransactionController_refreshEtherscanRemoteTransactionSources, _TransactionController_refreshTrackingMap, _TransactionController_initTrackingMap, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopTrackingByNetworkClientId, _TransactionController_stopAllTracking, _TransactionController_startTrackingByNetworkClientId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionController = exports.SPEED_UP_RATE = exports.CANCEL_RATE = exports.HARDFORK = void 0;
 const common_1 = require("@ethereumjs/common");
@@ -24,7 +18,6 @@ const tx_1 = require("@ethereumjs/tx");
 const base_controller_1 = require("@metamask/base-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const eth_query_1 = __importDefault(require("@metamask/eth-query"));
-const network_controller_1 = require("@metamask/network-controller");
 const rpc_errors_1 = require("@metamask/rpc-errors");
 const async_mutex_1 = require("async-mutex");
 const eth_method_registry_1 = require("eth-method-registry");
@@ -82,33 +75,32 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * @param options.getSavedGasFees - Gets the saved gas fee config.
      * @param options.getSelectedAddress - Gets the address of the currently selected account.
      * @param options.incomingTransactions - Configuration options for incoming transaction support.
+     * @param options.incomingTransactions.includeTokenTransfers - Whether or not to include ERC20 token transfers.
+     * @param options.incomingTransactions.isEnabled - Whether or not incoming transaction retrieval is enabled.
+     * @param options.incomingTransactions.queryEntireHistory - Whether to initially query the entire transaction history or only recent blocks.
+     * @param options.incomingTransactions.updateTransactions - Whether to update local transactions using remote transaction data.
      * @param options.messenger - The controller messenger.
      * @param options.onNetworkStateChange - Allows subscribing to network controller state changes.
      * @param options.pendingTransactions - Configuration options for pending transaction support.
+     * @param options.pendingTransactions.isResubmitEnabled - Whether transaction publishing is automatically retried.
      * @param options.provider - The provider used to create the underlying EthQuery instance.
      * @param options.securityProviderRequest - A function for verifying a transaction, whether it is malicious or not.
      * @param options.speedUpMultiplier - Multiplier used to determine a transaction's increased gas fee during speed up.
-     * @param options.findNetworkClientIdByChainId - Finds a networkClientId with the given chainId from the NetworkController.
-     * @param options.getNetworkClientById - Gets the network client with the given id from the NetworkController.
      * @param options.hooks - The controller hooks.
      * @param options.hooks.afterSign - Additional logic to execute after signing a transaction. Return false to not change the status to signed.
      * @param options.hooks.beforeApproveOnInit - Additional logic to execute before starting an approval flow for a transaction during initialization. Return false to skip the transaction.
      * @param options.hooks.beforeCheckPendingTransaction - Additional logic to execute before checking pending transactions. Return false to prevent the broadcast of the transaction.
      * @param options.hooks.beforePublish - Additional logic to execute before publishing a transaction. Return false to prevent the broadcast of the transaction.
      * @param options.hooks.getAdditionalSignArguments - Returns additional arguments required to sign a transaction.
-     * @param options.hub - Use a different event emitter for the hub.
-     * @param options.getNetworkClientRegistry - Gets the network client registry.
-     * @param options.enableMultichain - Enable multichain support.
+     * @param options.hooks.publish - Alternate logic to publish a transaction.
      * @param config - Initial options used to configure this controller.
      * @param state - Initial state to set on this controller.
      */
-    constructor({ blockTracker, cancelMultiplier, disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkState, getPermittedAccounts, getSavedGasFees, getSelectedAddress, incomingTransactions = {}, messenger, onNetworkStateChange, pendingTransactions = {}, provider, securityProviderRequest, speedUpMultiplier, findNetworkClientIdByChainId, getNetworkClientById, getNetworkClientRegistry, hub, enableMultichain = false, hooks = {}, }, config, state) {
-        var _a, _b, _c, _d, _e;
+    constructor({ blockTracker, cancelMultiplier, disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkState, getPermittedAccounts, getSavedGasFees, getSelectedAddress, incomingTransactions = {}, messenger, onNetworkStateChange, pendingTransactions = {}, provider, securityProviderRequest, speedUpMultiplier, hooks = {}, }, config, state) {
+        var _a, _b, _c, _d, _e, _f;
         super(config, state);
-        _TransactionController_instances.add(this);
         this.inProcessOfSigning = new Set();
         this.mutex = new async_mutex_1.Mutex();
-        this.nonceMutexesByChainId = new Map();
         this.signAbortCallbacks = new Map();
         /**
          * EventEmitter instance used to listen to specific transactional events
@@ -118,50 +110,6 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
          * Name of this controller used during composition
          */
         this.name = 'TransactionController';
-        this.trackingMap = new Map();
-        this.etherscanRemoteTransactionSourcesMap = new Map();
-        _TransactionController_refreshEtherscanRemoteTransactionSources.set(this, (networkClients) => {
-            // this will be prettier when we have consolidated network clients with a single chainId:
-            // check if there are still other network clients using the same chainId
-            // if not remove the etherscanRemoteTransaction source from the map
-            const chainIdsInRegistry = new Set();
-            Object.values(networkClients).forEach((networkClient) => chainIdsInRegistry.add(networkClient.configuration.chainId));
-            const existingChainIds = Array.from(this.etherscanRemoteTransactionSourcesMap.keys());
-            const chainIdsToRemove = existingChainIds.filter((chainId) => !chainIdsInRegistry.has(chainId));
-            chainIdsToRemove.forEach((chainId) => {
-                this.etherscanRemoteTransactionSourcesMap.delete(chainId);
-            });
-        });
-        _TransactionController_refreshTrackingMap.set(this, (networkClients) => {
-            __classPrivateFieldGet(this, _TransactionController_refreshEtherscanRemoteTransactionSources, "f").call(this, networkClients);
-            const networkClientIds = Object.keys(networkClients);
-            const existingNetworkClientIds = Array.from(this.trackingMap.keys());
-            // Remove tracking for NetworkClientIds that no longer exist
-            const networkClientIdsToRemove = existingNetworkClientIds.filter((id) => !networkClientIds.includes(id));
-            networkClientIdsToRemove.forEach((id) => {
-                __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_stopTrackingByNetworkClientId).call(this, id);
-            });
-            // Start tracking new NetworkClientIds from the registry
-            const networkClientIdsToAdd = networkClientIds.filter((id) => !existingNetworkClientIds.includes(id));
-            networkClientIdsToAdd.forEach((id) => {
-                __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_startTrackingByNetworkClientId).call(this, id);
-            });
-        });
-        _TransactionController_initTrackingMap.set(this, () => {
-            const networkClients = this.getNetworkClientRegistry();
-            const networkClientIds = Object.keys(networkClients);
-            networkClientIds.map((id) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_startTrackingByNetworkClientId).call(this, id));
-            this.hub.emit('tracking-map-init', networkClientIds);
-        });
-        _TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
-            // PendingTransactionTracker reads state through its getTransactions hook
-            this.pendingTransactionTracker.startIfPendingTransactions();
-            if (this.enableMultichain) {
-                for (const [, trackingMap] of this.trackingMap) {
-                    trackingMap.pendingTransactionTracker.startIfPendingTransactions();
-                }
-            }
-        });
         this.defaultConfig = {
             txHistoryLimit: 40,
         };
@@ -171,11 +119,6 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             lastFetchedBlockNumbers: {},
         };
         this.initialize();
-        this.hub = hub !== null && hub !== void 0 ? hub : this.hub;
-        this.enableMultichain = enableMultichain;
-        this.findNetworkClientIdByChainId = findNetworkClientIdByChainId;
-        this.getNetworkClientById = getNetworkClientById;
-        this.getNetworkClientRegistry = getNetworkClientRegistry;
         this.provider = provider;
         this.messagingSystem = messenger;
         this.getNetworkState = getNetworkState;
@@ -199,8 +142,6 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         this.securityProviderRequest = securityProviderRequest;
         this.cancelMultiplier = cancelMultiplier !== null && cancelMultiplier !== void 0 ? cancelMultiplier : exports.CANCEL_RATE;
         this.speedUpMultiplier = speedUpMultiplier !== null && speedUpMultiplier !== void 0 ? speedUpMultiplier : exports.SPEED_UP_RATE;
-        this.incomingTransactionOptions = incomingTransactions;
-        this.pendingTransactionOptions = pendingTransactions;
         this.afterSign = (_a = hooks === null || hooks === void 0 ? void 0 : hooks.afterSign) !== null && _a !== void 0 ? _a : (() => true);
         this.beforeApproveOnInit = (_b = hooks === null || hooks === void 0 ? void 0 : hooks.beforeApproveOnInit) !== null && _b !== void 0 ? _b : (() => true);
         this.beforeCheckPendingTransaction =
@@ -210,28 +151,30 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         this.beforePublish = (_d = hooks === null || hooks === void 0 ? void 0 : hooks.beforePublish) !== null && _d !== void 0 ? _d : (() => true);
         this.getAdditionalSignArguments =
             (_e = hooks === null || hooks === void 0 ? void 0 : hooks.getAdditionalSignArguments) !== null && _e !== void 0 ? _e : (() => []);
+        this.publish =
+            (_f = hooks === null || hooks === void 0 ? void 0 : hooks.publish) !== null && _f !== void 0 ? _f : (() => Promise.resolve({ transactionHash: undefined }));
         this.nonceTracker = new nonce_tracker_1.NonceTracker({
             // @ts-expect-error provider types misaligned: SafeEventEmitterProvider vs Record<string,string>
             provider,
             blockTracker,
-            getPendingTransactions: this.getNonceTrackerPendingTransactions.bind(this, undefined),
+            getPendingTransactions: this.getNonceTrackerPendingTransactions.bind(this),
             getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, types_1.TransactionStatus.confirmed),
         });
-        const etherscanRemoteTransactionSource = new EtherscanRemoteTransactionSource_1.EtherscanRemoteTransactionSource({
-            includeTokenTransfers: incomingTransactions.includeTokenTransfers,
-        });
         this.incomingTransactionHelper = new IncomingTransactionHelper_1.IncomingTransactionHelper({
             blockTracker,
             getCurrentAccount: getSelectedAddress,
             getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
-            getChainId: this.getChainId.bind(this),
+            getNetworkState,
             isEnabled: incomingTransactions.isEnabled,
             queryEntireHistory: incomingTransactions.queryEntireHistory,
-            remoteTransactionSource: etherscanRemoteTransactionSource,
+            remoteTransactionSource: new EtherscanRemoteTransactionSource_1.EtherscanRemoteTransactionSource({
+                includeTokenTransfers: incomingTransactions.includeTokenTransfers,
+            }),
             transactionLimit: this.config.txHistoryLimit,
             updateTransactions: incomingTransactions.updateTransactions,
         });
-        this.addIncomingTransactionHelperListeners();
+        this.incomingTransactionHelper.hub.on('transactions', this.onIncomingTransactions.bind(this));
+        this.incomingTransactionHelper.hub.on('updatedLastFetchedBlockNumbers', this.onUpdatedLastFetchedBlockNumbers.bind(this));
         this.pendingTransactionTracker = new PendingTransactionTracker_1.PendingTransactionTracker({
             approveTransaction: this.approveTransaction.bind(this),
             blockTracker,
@@ -239,11 +182,12 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             getEthQuery: () => this.ethQuery,
             getTransactions: () => this.state.transactions,
             isResubmitEnabled: pendingTransactions.isResubmitEnabled,
-            getGlobalLock: () => __awaiter(this, void 0, void 0, function* () {
-                return __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_acquireNonceLockForChainIdKey).call(this, {
-                    chainId: this.getChainId(),
-                });
-            }),
+            nonceTracker: this.nonceTracker,
+            onStateChange: (listener) => {
+                this.subscribe(listener);
+                onNetworkStateChange(listener);
+                listener();
+            },
             publishTransaction: this.publishTransaction.bind(this),
             hooks: {
                 beforeCheckPendingTransaction: this.beforeCheckPendingTransaction.bind(this),
@@ -251,32 +195,11 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             },
         });
         this.addPendingTransactionTrackerListeners();
-        // when transactionsController state changes
-        // check for pending transactions and start polling if there are any
-        this.subscribe(__classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
-        // TODO once v2 is merged make sure this only runs when
-        // selectedNetworkClientId changes
         onNetworkStateChange(() => {
             (0, logger_1.projectLogger)('Detected network change', this.getChainId());
-            this.pendingTransactionTracker.startIfPendingTransactions();
             this.onBootCleanup();
         });
         this.onBootCleanup();
-        this.messagingSystem.subscribe('NetworkController:stateChange', (_, patches) => {
-            if (this.enableMultichain) {
-                const networkClients = this.getNetworkClientRegistry();
-                patches.forEach(({ op, path }) => {
-                    if (op === 'remove' && path[0] === 'networkConfigurations') {
-                        const networkClientId = path[1];
-                        delete networkClients[networkClientId];
-                    }
-                });
-                __classPrivateFieldGet(this, _TransactionController_refreshTrackingMap, "f").call(this, networkClients);
-            }
-        });
-        if (this.enableMultichain) {
-            __classPrivateFieldGet(this, _TransactionController_initTrackingMap, "f").call(this);
-        }
     }
     failTransaction(transactionMeta, error, actionId) {
         const newTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { error: (0, utils_1.normalizeTxError)(error), status: types_1.TransactionStatus.failed });
@@ -296,18 +219,6 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             return { registryMethod, parsedRegistryMethod };
         });
     }
-    setEnableMultichain(enableMultichain) {
-        this.enableMultichain = enableMultichain;
-        if (enableMultichain) {
-            __classPrivateFieldGet(this, _TransactionController_initTrackingMap, "f").call(this);
-        }
-    }
-    /**
-     * Stops polling and removes listeners to prepare the controller for garbage collection.
-     */
-    destroy() {
-        __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_stopAllTracking).call(this);
-    }
     /**
      * Handle new method data request.
      *
@@ -352,26 +263,21 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * @param opts.swaps - Options for swaps transactions.
      * @param opts.swaps.hasApproveTx - Whether the transaction has an approval transaction.
      * @param opts.swaps.meta - Metadata for swap transaction.
-     * @param opts.networkClientId - The id of the network client for this transaction.
      * @returns Object containing a promise resolving to the transaction hash if approved.
      */
-    addTransaction(txParams, { actionId, deviceConfirmedOn, method, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, type, networkClientId, } = {}) {
+    addTransaction(txParams, { actionId, deviceConfirmedOn, method, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, type, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, logger_1.projectLogger)('Adding transaction', txParams);
             txParams = (0, utils_1.normalizeTxParams)(txParams);
-            if (networkClientId && !this.trackingMap.has(networkClientId)) {
-                throw new Error('The networkClientId for this transaction could not be found');
-            }
-            const isEIP1559Compatible = yield this.getEIP1559Compatibility(networkClientId);
+            const isEIP1559Compatible = yield this.getEIP1559Compatibility();
             (0, validation_1.validateTxParams)(txParams, isEIP1559Compatible);
             if (origin) {
                 yield (0, validation_1.validateTransactionOrigin)(yield this.getPermittedAccounts(origin), this.getSelectedAddress(), txParams.from, origin);
             }
             const dappSuggestedGasFees = this.generateDappSuggestedGasFees(txParams, origin);
-            const chainId = this.getChainId(networkClientId);
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId, chainId });
-            const transactionType = type !== null && type !== void 0 ? type : (yield (0, transaction_type_1.determineTransactionType)(txParams, ethQuery)).type;
+            const transactionType = type !== null && type !== void 0 ? type : (yield (0, transaction_type_1.determineTransactionType)(txParams, this.ethQuery)).type;
             const existingTransactionMeta = this.getTransactionWithActionId(actionId);
+            const chainId = this.getChainId();
             // If a request to add a transaction with the same actionId is submitted again, a new transaction will not be created for it.
             const transactionMeta = existingTransactionMeta || {
                 // Add actionId to txMeta to check if same actionId is seen again
@@ -388,7 +294,6 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 userEditedGasLimit: false,
                 verifiedOnBlockchain: false,
                 type: transactionType,
-                networkClientId,
             };
             yield this.updateGasProperties(transactionMeta);
             // Checks if a transaction already exists with a given actionId
@@ -425,45 +330,15 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             };
         });
     }
-    startIncomingTransactionPolling(networkClientIds = []) {
-        if (networkClientIds.length === 0 || !this.enableMultichain) {
-            this.incomingTransactionHelper.start();
-            return;
-        }
-        networkClientIds.forEach((networkClientId) => {
-            var _a;
-            (_a = this.trackingMap.get(networkClientId)) === null || _a === void 0 ? void 0 : _a.incomingTransactionHelper.start();
-        });
-    }
-    stopIncomingTransactionPolling(networkClientIds = []) {
-        if (networkClientIds.length === 0 || !this.enableMultichain) {
-            this.incomingTransactionHelper.stop();
-            return;
-        }
-        networkClientIds.forEach((networkClientId) => {
-            var _a;
-            (_a = this.trackingMap.get(networkClientId)) === null || _a === void 0 ? void 0 : _a.incomingTransactionHelper.stop();
-        });
+    startIncomingTransactionPolling() {
+        this.incomingTransactionHelper.start();
     }
-    stopAllIncomingTransactionPolling() {
+    stopIncomingTransactionPolling() {
         this.incomingTransactionHelper.stop();
-        if (this.enableMultichain) {
-            for (const [, trackingMap] of this.trackingMap) {
-                trackingMap.incomingTransactionHelper.stop();
-            }
-        }
     }
-    updateIncomingTransactions(networkClientIds = []) {
+    updateIncomingTransactions() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (networkClientIds.length === 0 || !this.enableMultichain) {
-                yield this.incomingTransactionHelper.update();
-                return;
-            }
-            yield Promise.allSettled(networkClientIds.map((networkClientId) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                return yield ((_a = this.trackingMap
-                    .get(networkClientId)) === null || _a === void 0 ? void 0 : _a.incomingTransactionHelper.update());
-            })));
+            yield this.incomingTransactionHelper.update();
         });
     }
     /**
@@ -535,7 +410,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     to: transactionMeta.txParams.from,
                     value: '0x0',
                 };
-            const unsignedEthTx = this.prepareUnsignedEthTx(transactionMeta.chainId, newTxParams);
+            const unsignedEthTx = this.prepareUnsignedEthTx(newTxParams);
             const signedTx = yield this.sign(unsignedEthTx, transactionMeta.txParams.from);
             const rawTx = (0, ethereumjs_util_1.bufferToHex)(signedTx.serialize());
             const newFee = (_c = newTxParams.maxFeePerGas) !== null && _c !== void 0 ? _c : newTxParams.gasPrice;
@@ -547,15 +422,10 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 newFee,
                 txParams: newTxParams,
             });
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
-                networkClientId: transactionMeta.networkClientId,
-                chainId: transactionMeta.chainId,
-            });
-            const hash = yield this.publishTransaction(ethQuery, rawTx);
+            const hash = yield this.publishTransaction(rawTx);
             const cancelTransactionMeta = {
                 actionId,
                 chainId: transactionMeta.chainId,
-                networkClientId: transactionMeta.networkClientId,
                 estimatedBaseFee,
                 hash,
                 id: (0, uuid_1.v1)(),
@@ -631,7 +501,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 (existingMaxPriorityFeePerGas && minMaxPriorityFeePerGas);
             const txParams = newMaxFeePerGas && newMaxPriorityFeePerGas
                 ? Object.assign(Object.assign({}, transactionMeta.txParams), { gasLimit: transactionMeta.txParams.gas, maxFeePerGas: newMaxFeePerGas, maxPriorityFeePerGas: newMaxPriorityFeePerGas, type: types_1.TransactionEnvelopeType.feeMarket }) : Object.assign(Object.assign({}, transactionMeta.txParams), { gasLimit: transactionMeta.txParams.gas, gasPrice: newGasPrice });
-            const unsignedEthTx = this.prepareUnsignedEthTx(transactionMeta.chainId, txParams);
+            const unsignedEthTx = this.prepareUnsignedEthTx(txParams);
             const signedTx = yield this.sign(unsignedEthTx, transactionMeta.txParams.from);
             yield this.updateTransactionMetaRSV(transactionMeta, signedTx);
             const rawTx = (0, ethereumjs_util_1.bufferToHex)(signedTx.serialize());
@@ -640,11 +510,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 ? transactionMeta.txParams.maxFeePerGas
                 : transactionMeta.txParams.gasPrice;
             (0, logger_1.projectLogger)('Submitting speed up transaction', { oldFee, newFee, txParams });
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
-                networkClientId: transactionMeta.networkClientId,
-                chainId: transactionMeta.chainId,
-            });
-            const hash = yield this.publishTransaction(ethQuery, rawTx);
+            const hash = yield (0, controller_utils_1.query)(this.ethQuery, 'sendRawTransaction', [rawTx]);
             const baseTransactionMeta = Object.assign(Object.assign({}, transactionMeta), { estimatedBaseFee, id: (0, uuid_1.v1)(), time: Date.now(), hash,
                 actionId, originalGasEstimate: transactionMeta.txParams.gas, type: types_1.TransactionType.retry, originalType: transactionMeta.type });
             const newTransactionMeta = newMaxFeePerGas && newMaxPriorityFeePerGas
@@ -666,13 +532,11 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * Estimates required gas for a given transaction.
      *
      * @param transaction - The transaction to estimate gas for.
-     * @param networkClientId - The network client id to use for the estimate.
      * @returns The gas and gas price.
      */
-    estimateGas(transaction, networkClientId) {
+    estimateGas(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
-            const { estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, ethQuery);
+            const { estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, this.ethQuery);
             return { gas: estimatedGas, simulationFails };
         });
     }
@@ -681,12 +545,10 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      *
      * @param transaction - The transaction params to estimate gas for.
      * @param multiplier - The multiplier to use for the gas buffer.
-     * @param networkClientId - The network client id to use for the estimate.
      */
-    estimateGasBuffered(transaction, multiplier, networkClientId) {
+    estimateGasBuffered(transaction, multiplier) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
-            const { blockGasLimit, estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, ethQuery);
+            const { blockGasLimit, estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, this.ethQuery);
             const gas = (0, gas_1.addGasBuffer)(estimatedGas, blockGasLimit, multiplier);
             return {
                 gas,
@@ -756,6 +618,12 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             transactions: this.trimTransactionsForState(newTransactions),
         });
     }
+    startIncomingTransactionProcessing() {
+        this.incomingTransactionHelper.start();
+    }
+    stopIncomingTransactionProcessing() {
+        this.incomingTransactionHelper.stop();
+    }
     /**
      * Adds external provided transaction to state as confirmed transaction.
      *
@@ -906,40 +774,11 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * Ensure `releaseLock` is called once processing of the `nonce` value is complete.
      *
      * @param address - The hex string address for the transaction.
-     * @param networkClientId - The network client ID for the transaction, used to fetch the correct nonce tracker.
      * @returns object with the `nextNonce` `nonceDetails`, and the releaseLock.
      */
-    getNonceLock(address, networkClientId) {
+    getNonceLock(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            let releaseLockForChainIdKey;
-            let { nonceTracker } = this;
-            if (networkClientId && this.enableMultichain) {
-                const networkClient = this.getNetworkClientById(networkClientId);
-                releaseLockForChainIdKey = yield __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_acquireNonceLockForChainIdKey).call(this, {
-                    chainId: networkClient.configuration.chainId,
-                    key: address,
-                });
-                const trackers = this.trackingMap.get(networkClientId);
-                if (!trackers) {
-                    throw new Error('missing nonceTracker for networkClientId');
-                }
-                nonceTracker = trackers === null || trackers === void 0 ? void 0 : trackers.nonceTracker;
-            }
-            // Acquires the lock for the chainId + address and the nonceLock from the nonceTracker, then
-            // couples them together by replacing the nonceLock's releaseLock method with
-            // an anonymous function that calls releases both the original nonceLock and the
-            // lock for the chainId.
-            try {
-                const nonceLock = yield nonceTracker.getNonceLock(address);
-                return Object.assign(Object.assign({}, nonceLock), { releaseLock: () => {
-                        nonceLock.releaseLock();
-                        releaseLockForChainIdKey === null || releaseLockForChainIdKey === void 0 ? void 0 : releaseLockForChainIdKey();
-                    } });
-            }
-            catch (err) {
-                releaseLockForChainIdKey === null || releaseLockForChainIdKey === void 0 ? void 0 : releaseLockForChainIdKey();
-                throw err;
-            }
+            return this.nonceTracker.getNonceLock(address);
         });
     }
     /**
@@ -974,10 +813,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             };
             editableParams.txParams = (0, lodash_1.pickBy)(editableParams.txParams);
             const updatedTransaction = (0, lodash_1.merge)(transactionMeta, editableParams);
-            const { type } = yield (0, transaction_type_1.determineTransactionType)(updatedTransaction.txParams, __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
-                networkClientId: transactionMeta.networkClientId,
-                chainId: transactionMeta.chainId,
-            }));
+            const { type } = yield (0, transaction_type_1.determineTransactionType)(updatedTransaction.txParams, this.ethQuery);
             updatedTransaction.type = type;
             this.updateTransaction(updatedTransaction, `Update Editable Params for ${txId}`);
             return this.getTransaction(txId);
@@ -987,9 +823,11 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * Signs and returns the raw transaction data for provided transaction params list.
      *
      * @param listOfTxParams - The list of transaction params to approve.
+     * @param opts - Options bag.
+     * @param opts.hasNonce - Whether the transactions already have a nonce.
      * @returns The raw transactions.
      */
-    approveTransactionsWithSameNonce(listOfTxParams = []) {
+    approveTransactionsWithSameNonce(listOfTxParams = [], { hasNonce } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, logger_1.projectLogger)('Approving transactions with same nonce', {
                 transactions: listOfTxParams,
@@ -998,7 +836,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 return '';
             }
             const initialTx = listOfTxParams[0];
-            const common = this.getCommonConfiguration(initialTx.chainId);
+            const common = this.getCommonConfiguration();
             const initialTxAsEthTx = tx_1.TransactionFactory.fromTxData(initialTx, {
                 common,
             });
@@ -1011,12 +849,19 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             try {
                 // TODO: we should add a check to verify that all transactions have the same from address
                 const fromAddress = initialTx.from;
-                nonceLock = yield this.getNonceLock(fromAddress);
-                const nonce = nonceLock.nextNonce;
-                (0, logger_1.projectLogger)('Using nonce from nonce tracker', nonce, nonceLock.nonceDetails);
+                const requiresNonce = hasNonce !== true;
+                nonceLock = requiresNonce
+                    ? yield this.nonceTracker.getNonceLock(fromAddress)
+                    : undefined;
+                const nonce = nonceLock
+                    ? (0, ethereumjs_util_1.addHexPrefix)(nonceLock.nextNonce.toString(16))
+                    : initialTx.nonce;
+                if (nonceLock) {
+                    (0, logger_1.projectLogger)('Using nonce from nonce tracker', nonce, nonceLock.nonceDetails);
+                }
                 rawTransactions = yield Promise.all(listOfTxParams.map((txParams) => {
-                    txParams.nonce = (0, ethereumjs_util_1.addHexPrefix)(nonce.toString(16));
-                    return this.signExternalTransaction(txParams.chainId, txParams);
+                    txParams.nonce = nonce;
+                    return this.signExternalTransaction(txParams);
                 }));
             }
             catch (err) {
@@ -1026,9 +871,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 throw err;
             }
             finally {
-                if (nonceLock) {
-                    nonceLock.releaseLock();
-                }
+                nonceLock === null || nonceLock === void 0 ? void 0 : nonceLock.releaseLock();
                 this.inProcessOfSigning.delete(initialTxAsSerializedHex);
             }
             return rawTransactions;
@@ -1176,18 +1019,19 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         }
         return filteredTransactions;
     }
-    signExternalTransaction(chainId, transactionParams) {
+    signExternalTransaction(transactionParams) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.sign) {
                 throw new Error('No sign method defined.');
             }
             const normalizedTransactionParams = (0, utils_1.normalizeTxParams)(transactionParams);
+            const chainId = this.getChainId();
             const type = (0, utils_1.isEIP1559Transaction)(normalizedTransactionParams)
                 ? types_1.TransactionEnvelopeType.feeMarket
                 : types_1.TransactionEnvelopeType.legacy;
             const updatedTransactionParams = Object.assign(Object.assign({}, normalizedTransactionParams), { type, gasLimit: normalizedTransactionParams.gas, chainId });
             const { from } = updatedTransactionParams;
-            const common = this.getCommonConfiguration(chainId);
+            const common = this.getCommonConfiguration();
             const unsignedTransaction = tx_1.TransactionFactory.fromTxData(updatedTransactionParams, { common });
             const signedTransaction = yield this.sign(unsignedTransaction, from);
             const rawTransaction = (0, ethereumjs_util_1.bufferToHex)(signedTransaction.serialize());
@@ -1225,36 +1069,35 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     }
     updateGasProperties(transactionMeta) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isEIP1559Compatible = (yield this.getEIP1559Compatibility(transactionMeta.networkClientId)) &&
+            const isEIP1559Compatible = (yield this.getEIP1559Compatibility()) &&
                 transactionMeta.txParams.type !== types_1.TransactionEnvelopeType.legacy;
-            const { networkClientId, chainId } = transactionMeta;
-            const isCustomNetwork = networkClientId
-                ? this.getNetworkClientById(networkClientId).configuration.type ===
-                    network_controller_1.NetworkClientType.Custom
-                : this.getNetworkState().providerConfig.type === controller_utils_1.NetworkType.rpc;
+            const chainId = this.getChainId();
             yield (0, gas_1.updateGas)({
-                ethQuery: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId, chainId }),
-                chainId,
-                isCustomNetwork,
+                ethQuery: this.ethQuery,
+                providerConfig: this.getNetworkState().providerConfig,
                 txMeta: transactionMeta,
             });
             yield (0, gas_fees_1.updateGasFees)({
                 eip1559: isEIP1559Compatible,
-                ethQuery: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId, chainId }),
-                getSavedGasFees: this.getSavedGasFees.bind(this),
+                ethQuery: this.ethQuery,
+                getSavedGasFees: this.getSavedGasFees.bind(this, chainId),
                 getGasFeeEstimates: this.getGasFeeEstimates.bind(this),
                 txMeta: transactionMeta,
             });
         });
     }
+    getCurrentChainTransactionsByStatus(status) {
+        const chainId = this.getChainId();
+        return this.state.transactions.filter((transaction) => transaction.status === status && transaction.chainId === chainId);
+    }
     onBootCleanup() {
         this.submitApprovedTransactions();
     }
     /**
-     * Force submit approved transactions for all chains.
+     * Force to submit approved transactions on current chain.
      */
     submitApprovedTransactions() {
-        const approvedTransactions = this.state.transactions.filter((transaction) => transaction.status === types_1.TransactionStatus.approved);
+        const approvedTransactions = this.getCurrentChainTransactionsByStatus(types_1.TransactionStatus.approved);
         for (const transactionMeta of approvedTransactions) {
             if (this.beforeApproveOnInit(transactionMeta)) {
                 this.approveTransaction(transactionMeta.id).catch((error) => {
@@ -1348,9 +1191,10 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         return __awaiter(this, void 0, void 0, function* () {
             const { transactions } = this.state;
             const releaseLock = yield this.mutex.acquire();
+            const chainId = this.getChainId();
             const index = transactions.findIndex(({ id }) => transactionId === id);
             const transactionMeta = transactions[index];
-            const { txParams: { from }, networkClientId, } = transactionMeta;
+            const { txParams: { from }, } = transactionMeta;
             let releaseNonceLock;
             try {
                 if (!this.sign) {
@@ -1358,7 +1202,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     this.failTransaction(transactionMeta, new Error('No sign method defined.'));
                     return;
                 }
-                else if (!transactionMeta.chainId) {
+                else if (!chainId) {
                     releaseLock();
                     this.failTransaction(transactionMeta, new Error('No chainId defined.'));
                     return;
@@ -1367,11 +1211,11 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     (0, logger_1.projectLogger)('Skipping approval as signing in progress', transactionId);
                     return;
                 }
-                const [nonce, releaseNonce] = yield (0, nonce_1.getNextNonce)(transactionMeta, (address) => this.getNonceLock(address, networkClientId));
+                const [nonce, releaseNonce] = yield (0, nonce_1.getNextNonce)(transactionMeta, this.nonceTracker);
                 releaseNonceLock = releaseNonce;
                 transactionMeta.status = types_1.TransactionStatus.approved;
                 transactionMeta.txParams.nonce = nonce;
-                transactionMeta.txParams.chainId = transactionMeta.chainId;
+                transactionMeta.txParams.chainId = chainId;
                 const baseTxParams = Object.assign(Object.assign({}, transactionMeta.txParams), { gasLimit: transactionMeta.txParams.gas });
                 this.updateTransaction(transactionMeta, 'TransactionController#approveTransaction - Transaction approved');
                 this.onTransactionStatusChange(transactionMeta);
@@ -1387,18 +1231,17 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 if (!rawTx) {
                     return;
                 }
-                const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
-                    networkClientId: transactionMeta.networkClientId,
-                    chainId: transactionMeta.chainId,
-                });
                 if (transactionMeta.type === types_1.TransactionType.swap) {
                     (0, logger_1.projectLogger)('Determining pre-transaction balance');
-                    const preTxBalance = yield (0, controller_utils_1.query)(ethQuery, 'getBalance', [from]);
+                    const preTxBalance = yield (0, controller_utils_1.query)(this.ethQuery, 'getBalance', [from]);
                     transactionMeta.preTxBalance = preTxBalance;
                     (0, logger_1.projectLogger)('Updated pre-transaction balance', transactionMeta.preTxBalance);
                 }
                 (0, logger_1.projectLogger)('Publishing transaction', txParams);
-                const hash = yield this.publishTransaction(ethQuery, rawTx);
+                let { transactionHash: hash } = yield this.publish(transactionMeta, rawTx);
+                if (hash === undefined) {
+                    hash = yield this.publishTransaction(rawTx);
+                }
                 (0, logger_1.projectLogger)('Publish successful', hash);
                 transactionMeta.hash = hash;
                 transactionMeta.status = types_1.TransactionStatus.submitted;
@@ -1423,9 +1266,9 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             }
         });
     }
-    publishTransaction(ethQuery, rawTransaction) {
+    publishTransaction(rawTransaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, controller_utils_1.query)(ethQuery, 'sendRawTransaction', [rawTransaction]);
+            return yield (0, controller_utils_1.query)(this.ethQuery, 'sendRawTransaction', [rawTransaction]);
         });
     }
     /**
@@ -1541,17 +1384,14 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         const isCompleted = this.isLocalFinalState(transaction.status);
         return { meta: transaction, isCompleted };
     }
-    getChainId(networkClientId) {
-        if (networkClientId) {
-            return this.getNetworkClientById(networkClientId).configuration.chainId;
-        }
+    getChainId() {
         const { providerConfig } = this.getNetworkState();
         return providerConfig.chainId;
     }
-    prepareUnsignedEthTx(chainId, txParams) {
+    prepareUnsignedEthTx(txParams) {
         return tx_1.TransactionFactory.fromTxData(txParams, {
+            common: this.getCommonConfiguration(),
             freeze: false,
-            common: this.getCommonConfiguration(chainId),
         });
     }
     /**
@@ -1561,11 +1401,17 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      * specified in txParams, @ethereumjs/tx is able to determine which EIP-2718
      * transaction type to use.
      *
-     * @param chainId - The chainId to use for the configuration.
      * @returns common configuration object
      */
-    getCommonConfiguration(chainId) {
+    getCommonConfiguration() {
+        const { providerConfig: { type: chain, chainId, nickname: name }, } = this.getNetworkState();
+        if (chain !== controller_utils_1.RPC &&
+            chain !== controller_utils_1.NetworkType['linea-goerli'] &&
+            chain !== controller_utils_1.NetworkType['linea-mainnet']) {
+            return new common_1.Common({ chain, hardfork: exports.HARDFORK });
+        }
         const customChainParams = {
+            name,
             chainId: parseInt(chainId, 16),
             defaultHardfork: exports.HARDFORK,
         };
@@ -1620,7 +1466,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      */
     addExternalTransaction(transactionMeta) {
         var _a, _b;
-        const { chainId } = transactionMeta;
+        const chainId = this.getChainId();
         const { transactions } = this.state;
         const fromAddress = (_a = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.txParams) === null || _a === void 0 ? void 0 : _a.from;
         const sameFromAndNetworkTransactions = transactions.filter((transaction) => transaction.txParams.from === fromAddress &&
@@ -1647,13 +1493,10 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      */
     markNonceDuplicatesDropped(transactionId) {
         var _a, _b;
+        const chainId = this.getChainId();
         const transactionMeta = this.getTransaction(transactionId);
-        if (!transactionMeta) {
-            return;
-        }
-        const nonce = (_a = transactionMeta.txParams) === null || _a === void 0 ? void 0 : _a.nonce;
-        const from = (_b = transactionMeta.txParams) === null || _b === void 0 ? void 0 : _b.from;
-        const { chainId } = transactionMeta;
+        const nonce = (_a = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.txParams) === null || _a === void 0 ? void 0 : _a.nonce;
+        const from = (_b = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.txParams) === null || _b === void 0 ? void 0 : _b.from;
         const sameNonceTxs = this.state.transactions.filter((transaction) => transaction.id !== transactionId &&
             transaction.txParams.from === from &&
             transaction.txParams.nonce === nonce &&
@@ -1664,8 +1507,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         }
         // Mark all same nonce transactions as dropped and give it a replacedBy hash
         for (const transaction of sameNonceTxs) {
-            transaction.replacedBy = transactionMeta.hash;
-            transaction.replacedById = transactionMeta.id;
+            transaction.replacedBy = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.hash;
+            transaction.replacedById = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.id;
             // Drop any transaction that wasn't previously failed (off chain failure)
             if (transaction.status !== types_1.TransactionStatus.failed) {
                 this.setTransactionStatusDropped(transaction);
@@ -1721,37 +1564,23 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             }
         });
     }
-    getEIP1559Compatibility(networkClientId) {
+    getEIP1559Compatibility() {
         return __awaiter(this, void 0, void 0, function* () {
-            const currentNetworkIsEIP1559Compatible = yield this.getCurrentNetworkEIP1559Compatibility(networkClientId);
+            const currentNetworkIsEIP1559Compatible = yield this.getCurrentNetworkEIP1559Compatibility();
             const currentAccountIsEIP1559Compatible = yield this.getCurrentAccountEIP1559Compatibility();
             return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
         });
     }
-    removeIncomingTransactionHelperListeners(incomingTransactionHelper = this.incomingTransactionHelper) {
-        incomingTransactionHelper.hub.removeAllListeners('transactions');
-        incomingTransactionHelper.hub.removeAllListeners('updatedLastFetchedBlockNumbers');
-    }
-    addIncomingTransactionHelperListeners(incomingTransactionHelper = this.incomingTransactionHelper) {
-        incomingTransactionHelper.hub.on('transactions', this.onIncomingTransactions.bind(this));
-        incomingTransactionHelper.hub.on('updatedLastFetchedBlockNumbers', this.onUpdatedLastFetchedBlockNumbers.bind(this));
-    }
-    removePendingTransactionTrackerListeners(pendingTransactionTracker = this.pendingTransactionTracker) {
-        pendingTransactionTracker.hub.removeAllListeners('transaction-confirmed');
-        pendingTransactionTracker.hub.removeAllListeners('transaction-dropped');
-        pendingTransactionTracker.hub.removeAllListeners('transaction-failed');
-        pendingTransactionTracker.hub.removeAllListeners('transaction-updated');
-    }
-    addPendingTransactionTrackerListeners(pendingTransactionTracker = this.pendingTransactionTracker) {
-        pendingTransactionTracker.hub.on('transaction-confirmed', this.onConfirmedTransaction.bind(this));
-        pendingTransactionTracker.hub.on('transaction-dropped', this.setTransactionStatusDropped.bind(this));
-        pendingTransactionTracker.hub.on('transaction-failed', this.failTransaction.bind(this));
-        pendingTransactionTracker.hub.on('transaction-updated', this.updateTransaction.bind(this));
+    addPendingTransactionTrackerListeners() {
+        this.pendingTransactionTracker.hub.on('transaction-confirmed', this.onConfirmedTransaction.bind(this));
+        this.pendingTransactionTracker.hub.on('transaction-dropped', this.setTransactionStatusDropped.bind(this));
+        this.pendingTransactionTracker.hub.on('transaction-failed', this.failTransaction.bind(this));
+        this.pendingTransactionTracker.hub.on('transaction-updated', this.updateTransaction.bind(this));
     }
     signTransaction(transactionMeta, txParams) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, logger_1.projectLogger)('Signing transaction', txParams);
-            const unsignedEthTx = this.prepareUnsignedEthTx(transactionMeta.chainId, txParams);
+            const unsignedEthTx = this.prepareUnsignedEthTx(txParams);
             this.inProcessOfSigning.add(transactionMeta.id);
             const signedTx = yield new Promise((resolve, reject) => {
                 var _a;
@@ -1781,13 +1610,14 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     onTransactionStatusChange(transactionMeta) {
         this.hub.emit('transaction-status-update', { transactionMeta });
     }
-    getNonceTrackerPendingTransactions(chainId, address) {
-        const standardPendingTransactions = this.getNonceTrackerTransactions(types_1.TransactionStatus.submitted, address, chainId);
-        const externalPendingTransactions = this.getExternalPendingTransactions(address, chainId);
+    getNonceTrackerPendingTransactions(address) {
+        const standardPendingTransactions = this.getNonceTrackerTransactions(types_1.TransactionStatus.submitted, address);
+        const externalPendingTransactions = this.getExternalPendingTransactions(address);
         return [...standardPendingTransactions, ...externalPendingTransactions];
     }
-    getNonceTrackerTransactions(status, address, chainId = this.getChainId()) {
-        return (0, nonce_1.getAndFormatTransactionsForNonceTracker)(chainId, address, status, this.state.transactions);
+    getNonceTrackerTransactions(status, address) {
+        const currentChainId = this.getChainId();
+        return (0, nonce_1.getAndFormatTransactionsForNonceTracker)(currentChainId, address, status, this.state.transactions);
     }
     onConfirmedTransaction(transactionMeta) {
         (0, logger_1.projectLogger)('Processing confirmed transaction', transactionMeta.id);
@@ -1805,12 +1635,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 if (transactionMeta.type !== types_1.TransactionType.swap) {
                     return;
                 }
-                const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
-                    networkClientId: transactionMeta.networkClientId,
-                    chainId: transactionMeta.chainId,
-                });
                 const { updatedTransactionMeta, approvalTransactionMeta } = yield (0, swaps_1.updatePostTransactionBalance)(transactionMeta, {
-                    ethQuery,
+                    ethQuery: this.ethQuery,
                     getTransaction: this.getTransaction.bind(this),
                     updateTransaction: this.updateTransaction.bind(this),
                 });
@@ -1827,127 +1653,4 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     }
 }
 exports.TransactionController = TransactionController;
-_TransactionController_refreshEtherscanRemoteTransactionSources = new WeakMap(), _TransactionController_refreshTrackingMap = new WeakMap(), _TransactionController_initTrackingMap = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_acquireNonceLockForChainIdKey = function _TransactionController_acquireNonceLockForChainIdKey({ chainId, key = 'global', }) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let nonceMutexesForChainId = this.nonceMutexesByChainId.get(chainId);
-        if (!nonceMutexesForChainId) {
-            nonceMutexesForChainId = new Map();
-            this.nonceMutexesByChainId.set(chainId, nonceMutexesForChainId);
-        }
-        let nonceMutexForKey = nonceMutexesForChainId.get(key);
-        if (!nonceMutexForKey) {
-            nonceMutexForKey = new async_mutex_1.Mutex();
-            nonceMutexesForChainId.set(key, nonceMutexForKey);
-        }
-        return yield nonceMutexForKey.acquire();
-    });
-}, _TransactionController_getEthQuery = function _TransactionController_getEthQuery({ networkClientId, chainId, }) {
-    // if multichain is disabled, use the global ethQuery
-    if (!this.enableMultichain) {
-        return this.ethQuery;
-    }
-    let networkClient;
-    if (networkClientId) {
-        try {
-            networkClient = this.getNetworkClientById(networkClientId);
-        }
-        catch (err) {
-            (0, logger_1.projectLogger)('failed to get network client by networkClientId');
-        }
-    }
-    if (!networkClient && chainId) {
-        try {
-            networkClientId = this.findNetworkClientIdByChainId(chainId);
-            networkClient = this.getNetworkClientById(networkClientId);
-        }
-        catch (err) {
-            (0, logger_1.projectLogger)('failed to get network client by chainId');
-        }
-    }
-    if (networkClient) {
-        return new eth_query_1.default(networkClient.provider);
-    }
-    // NOTE(JL): we're not ready to drop globally selected ethQuery yet.
-    // Some calls to getEthQuery only have access to optional networkClientId
-    // throw new Error('failed to get eth query instance');
-    return this.ethQuery;
-}, _TransactionController_stopTrackingByNetworkClientId = function _TransactionController_stopTrackingByNetworkClientId(networkClientId) {
-    const trackers = this.trackingMap.get(networkClientId);
-    if (trackers) {
-        trackers.pendingTransactionTracker.stop();
-        this.removePendingTransactionTrackerListeners(trackers.pendingTransactionTracker);
-        trackers.incomingTransactionHelper.stop();
-        this.removeIncomingTransactionHelperListeners(trackers.incomingTransactionHelper);
-        this.trackingMap.delete(networkClientId);
-        this.hub.emit('tracking-map-remove', networkClientId);
-    }
-}, _TransactionController_stopAllTracking = function _TransactionController_stopAllTracking() {
-    this.pendingTransactionTracker.stop();
-    this.removePendingTransactionTrackerListeners();
-    this.incomingTransactionHelper.stop();
-    this.removeIncomingTransactionHelperListeners();
-    if (this.enableMultichain) {
-        for (const [networkClientId] of this.trackingMap) {
-            __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_stopTrackingByNetworkClientId).call(this, networkClientId);
-        }
-    }
-}, _TransactionController_startTrackingByNetworkClientId = function _TransactionController_startTrackingByNetworkClientId(networkClientId) {
-    const trackers = this.trackingMap.get(networkClientId);
-    if (trackers) {
-        return;
-    }
-    const networkClient = this.getNetworkClientById(networkClientId);
-    const { chainId } = networkClient.configuration;
-    let etherscanRemoteTransactionSource = this.etherscanRemoteTransactionSourcesMap.get(chainId);
-    if (!etherscanRemoteTransactionSource) {
-        etherscanRemoteTransactionSource = new EtherscanRemoteTransactionSource_1.EtherscanRemoteTransactionSource({
-            includeTokenTransfers: this.incomingTransactionOptions.includeTokenTransfers,
-        });
-        this.etherscanRemoteTransactionSourcesMap.set(chainId, etherscanRemoteTransactionSource);
-    }
-    const ethQuery = new eth_query_1.default(networkClient.provider);
-    const nonceTracker = new nonce_tracker_1.NonceTracker({
-        // TODO: Replace `any` with type
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        provider: networkClient.provider,
-        blockTracker: networkClient.blockTracker,
-        getPendingTransactions: this.getNonceTrackerPendingTransactions.bind(this, chainId),
-        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, types_1.TransactionStatus.confirmed),
-    });
-    const incomingTransactionHelper = new IncomingTransactionHelper_1.IncomingTransactionHelper({
-        blockTracker: networkClient.blockTracker,
-        getCurrentAccount: this.getSelectedAddress,
-        getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
-        getChainId: () => chainId,
-        isEnabled: this.incomingTransactionOptions.isEnabled,
-        queryEntireHistory: this.incomingTransactionOptions.queryEntireHistory,
-        remoteTransactionSource: etherscanRemoteTransactionSource,
-        transactionLimit: this.config.txHistoryLimit,
-        updateTransactions: this.incomingTransactionOptions.updateTransactions,
-    });
-    this.addIncomingTransactionHelperListeners(incomingTransactionHelper);
-    const pendingTransactionTracker = new PendingTransactionTracker_1.PendingTransactionTracker({
-        approveTransaction: this.approveTransaction.bind(this),
-        blockTracker: networkClient.blockTracker,
-        getChainId: () => chainId,
-        getEthQuery: () => ethQuery,
-        getTransactions: () => this.state.transactions,
-        isResubmitEnabled: this.pendingTransactionOptions.isResubmitEnabled,
-        getGlobalLock: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_acquireNonceLockForChainIdKey).bind(this, {
-            chainId,
-        }),
-        publishTransaction: this.publishTransaction.bind(this),
-        hooks: {
-            beforeCheckPendingTransaction: this.beforeCheckPendingTransaction.bind(this),
-            beforePublish: this.beforePublish.bind(this),
-        },
-    });
-    this.addPendingTransactionTrackerListeners(pendingTransactionTracker);
-    this.trackingMap.set(networkClientId, {
-        nonceTracker,
-        incomingTransactionHelper,
-        pendingTransactionTracker,
-    });
-    this.hub.emit('tracking-map-add', networkClientId);
-};
 //# sourceMappingURL=TransactionController.js.map