@metamask-previews/transaction-controller 21.1.0-preview.d392f46 → 21.2.0-preview.280e51c7

package/dist/TransactionController.js

@@ -8,9 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _TransactionController_instances, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_multichainTrackingHelper, _TransactionController_createNonceTracker, _TransactionController_createIncomingTransactionHelper, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_removeIncomingTransactionHelperListeners, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions;
 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");
@@ -18,6 +30,7 @@ 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");
@@ -28,6 +41,7 @@ const nonce_tracker_1 = require("nonce-tracker");
 const uuid_1 = require("uuid");
 const EtherscanRemoteTransactionSource_1 = require("./helpers/EtherscanRemoteTransactionSource");
 const IncomingTransactionHelper_1 = require("./helpers/IncomingTransactionHelper");
+const MultichainTrackingHelper_1 = require("./helpers/MultichainTrackingHelper");
 const PendingTransactionTracker_1 = require("./helpers/PendingTransactionTracker");
 const logger_1 = require("./logger");
 const types_1 = require("./types");
@@ -44,7 +58,7 @@ exports.HARDFORK = common_1.Hardfork.London;
 /**
  * Multiplier used to determine a transaction's increased gas fee during cancellation
  */
-exports.CANCEL_RATE = 1.5;
+exports.CANCEL_RATE = 1.1;
 /**
  * Multiplier used to determine a transaction's increased gas fee during speed up
  */
@@ -57,50 +71,16 @@ const controllerName = 'TransactionController';
  * Controller responsible for submitting and managing transactions.
  */
 class TransactionController extends base_controller_1.BaseControllerV1 {
-    /**
-     * Creates a TransactionController instance.
-     *
-     * @param options - The controller options.
-     * @param options.blockTracker - The block tracker used to poll for new blocks data.
-     * @param options.cancelMultiplier - Multiplier used to determine a transaction's increased gas fee during cancellation.
-     * @param options.disableHistory - Whether to disable storing history in transaction metadata.
-     * @param options.disableSendFlowHistory - Explicitly disable transaction metadata history.
-     * @param options.disableSwaps - Whether to disable additional processing on swaps transactions.
-     * @param options.getCurrentAccountEIP1559Compatibility - Whether or not the account supports EIP-1559.
-     * @param options.getCurrentNetworkEIP1559Compatibility - Whether or not the network supports EIP-1559.
-     * @param options.getExternalPendingTransactions - Callback to retrieve pending transactions from external sources.
-     * @param options.getGasFeeEstimates - Callback to retrieve gas fee estimates.
-     * @param options.getNetworkState - Gets the state of the network controller.
-     * @param options.getPermittedAccounts - Get accounts that a given origin has permissions for.
-     * @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.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 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, hooks = {}, }, config, state) {
-        var _a, _b, _c, _d, _e;
+    constructor({ blockTracker, disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkState, getPermittedAccounts, getSavedGasFees, getSelectedAddress, incomingTransactions = {}, messenger, onNetworkStateChange, pendingTransactions = {}, provider, securityProviderRequest, getNetworkClientRegistry, isMultichainEnabled = false, 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();
+        _TransactionController_incomingTransactionOptions.set(this, void 0);
+        _TransactionController_pendingTransactionOptions.set(this, void 0);
         this.signAbortCallbacks = new Map();
+        _TransactionController_multichainTrackingHelper.set(this, void 0);
         /**
          * EventEmitter instance used to listen to specific transactional events
          */
@@ -109,6 +89,11 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
          * Name of this controller used during composition
          */
         this.name = 'TransactionController';
+        _TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
+            // PendingTransactionTracker reads state through its getTransactions hook
+            this.pendingTransactionTracker.startIfPendingTransactions();
+            __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
+        });
         this.defaultConfig = {
             txHistoryLimit: 40,
         };
@@ -118,10 +103,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             lastFetchedBlockNumbers: {},
         };
         this.initialize();
-        this.provider = provider;
         this.messagingSystem = messenger;
         this.getNetworkState = getNetworkState;
-        this.ethQuery = new eth_query_1.default(provider);
         this.isSendFlowHistoryDisabled = disableSendFlowHistory !== null && disableSendFlowHistory !== void 0 ? disableSendFlowHistory : false;
         this.isHistoryDisabled = disableHistory !== null && disableHistory !== void 0 ? disableHistory : false;
         this.isSwapsDisabled = disableSwaps !== null && disableSwaps !== void 0 ? disableSwaps : false;
@@ -139,8 +122,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         this.getExternalPendingTransactions =
             getExternalPendingTransactions !== null && getExternalPendingTransactions !== void 0 ? getExternalPendingTransactions : (() => []);
         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;
+        __classPrivateFieldSet(this, _TransactionController_incomingTransactionOptions, incomingTransactions, "f");
+        __classPrivateFieldSet(this, _TransactionController_pendingTransactionOptions, pendingTransactions, "f");
         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 =
@@ -150,50 +133,53 @@ 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.nonceTracker = new nonce_tracker_1.NonceTracker({
-            // @ts-expect-error provider types misaligned: SafeEventEmitterProvider vs Record<string,string>
+        this.publish =
+            (_f = hooks === null || hooks === void 0 ? void 0 : hooks.publish) !== null && _f !== void 0 ? _f : (() => Promise.resolve({ transactionHash: undefined }));
+        this.nonceTracker = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createNonceTracker).call(this, {
             provider,
             blockTracker,
-            getPendingTransactions: this.getNonceTrackerPendingTransactions.bind(this),
-            getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, types_1.TransactionStatus.confirmed),
         });
-        this.incomingTransactionHelper = new IncomingTransactionHelper_1.IncomingTransactionHelper({
-            blockTracker,
-            getCurrentAccount: getSelectedAddress,
-            getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
-            getNetworkState,
-            isEnabled: incomingTransactions.isEnabled,
-            queryEntireHistory: incomingTransactions.queryEntireHistory,
-            remoteTransactionSource: new EtherscanRemoteTransactionSource_1.EtherscanRemoteTransactionSource({
-                includeTokenTransfers: incomingTransactions.includeTokenTransfers,
-            }),
-            transactionLimit: this.config.txHistoryLimit,
-            updateTransactions: incomingTransactions.updateTransactions,
-        });
-        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,
-            getChainId: this.getChainId.bind(this),
-            getEthQuery: () => this.ethQuery,
-            getTransactions: () => this.state.transactions,
-            isResubmitEnabled: pendingTransactions.isResubmitEnabled,
+        __classPrivateFieldSet(this, _TransactionController_multichainTrackingHelper, new MultichainTrackingHelper_1.MultichainTrackingHelper({
+            isMultichainEnabled,
+            provider,
             nonceTracker: this.nonceTracker,
-            onStateChange: (listener) => {
-                this.subscribe(listener);
-                onNetworkStateChange(listener);
-                listener();
+            incomingTransactionOptions: incomingTransactions,
+            findNetworkClientIdByChainId: (chainId) => {
+                return this.messagingSystem.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
             },
-            publishTransaction: this.publishTransaction.bind(this),
-            hooks: {
-                beforeCheckPendingTransaction: this.beforeCheckPendingTransaction.bind(this),
-                beforePublish: this.beforePublish.bind(this),
+            getNetworkClientById: ((networkClientId) => {
+                return this.messagingSystem.call(`NetworkController:getNetworkClientById`, networkClientId);
+            }),
+            getNetworkClientRegistry,
+            removeIncomingTransactionHelperListeners: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removeIncomingTransactionHelperListeners).bind(this),
+            removePendingTransactionTrackerListeners: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removePendingTransactionTrackerListeners).bind(this),
+            createNonceTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createNonceTracker).bind(this),
+            createIncomingTransactionHelper: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createIncomingTransactionHelper).bind(this),
+            createPendingTransactionTracker: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).bind(this),
+            onNetworkStateChange: (listener) => {
+                this.messagingSystem.subscribe('NetworkController:stateChange', listener);
             },
+        }), "f");
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").initialize();
+        const etherscanRemoteTransactionSource = new EtherscanRemoteTransactionSource_1.EtherscanRemoteTransactionSource({
+            includeTokenTransfers: incomingTransactions.includeTokenTransfers,
+        });
+        this.incomingTransactionHelper = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createIncomingTransactionHelper).call(this, {
+            blockTracker,
+            etherscanRemoteTransactionSource,
+        });
+        this.pendingTransactionTracker = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createPendingTransactionTracker).call(this, {
+            provider,
+            blockTracker,
         });
-        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();
@@ -216,6 +202,12 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             return { registryMethod, parsedRegistryMethod };
         });
     }
+    /**
+     * 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.
      *
@@ -260,21 +252,30 @@ 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, } = {}) {
+    addTransaction(txParams, { actionId, deviceConfirmedOn, method, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, type, networkClientId, } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, logger_1.projectLogger)('Adding transaction', txParams);
             txParams = (0, utils_1.normalizeTxParams)(txParams);
-            const isEIP1559Compatible = yield this.getEIP1559Compatibility();
+            if (networkClientId &&
+                !__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
+                throw new Error('The networkClientId for this transaction could not be found');
+            }
+            const isEIP1559Compatible = yield this.getEIP1559Compatibility(networkClientId);
             (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 transactionType = type !== null && type !== void 0 ? type : (yield (0, transaction_type_1.determineTransactionType)(txParams, this.ethQuery)).type;
+            const chainId = this.getChainId(networkClientId);
+            const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId,
+                chainId,
+            });
+            const transactionType = type !== null && type !== void 0 ? type : (yield (0, transaction_type_1.determineTransactionType)(txParams, 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
@@ -291,6 +292,7 @@ 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
@@ -327,15 +329,31 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             };
         });
     }
-    startIncomingTransactionPolling() {
-        this.incomingTransactionHelper.start();
+    startIncomingTransactionPolling(networkClientIds = []) {
+        if (networkClientIds.length === 0) {
+            this.incomingTransactionHelper.start();
+            return;
+        }
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").startIncomingTransactionPolling(networkClientIds);
+    }
+    stopIncomingTransactionPolling(networkClientIds = []) {
+        if (networkClientIds.length === 0) {
+            this.incomingTransactionHelper.stop();
+            return;
+        }
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopIncomingTransactionPolling(networkClientIds);
     }
-    stopIncomingTransactionPolling() {
+    stopAllIncomingTransactionPolling() {
         this.incomingTransactionHelper.stop();
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllIncomingTransactionPolling();
     }
-    updateIncomingTransactions() {
+    updateIncomingTransactions(networkClientIds = []) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.incomingTransactionHelper.update();
+            if (networkClientIds.length === 0) {
+                yield this.incomingTransactionHelper.update();
+                return;
+            }
+            yield __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").updateIncomingTransactions(networkClientIds);
         });
     }
     /**
@@ -369,21 +387,21 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 throw new Error('No sign method defined.');
             }
             // gasPrice (legacy non EIP1559)
-            const minGasPrice = (0, utils_1.getIncreasedPriceFromExisting)(transactionMeta.txParams.gasPrice, this.cancelMultiplier);
+            const minGasPrice = (0, utils_1.getIncreasedPriceFromExisting)(transactionMeta.txParams.gasPrice, exports.CANCEL_RATE);
             const gasPriceFromValues = (0, utils_1.isGasPriceValue)(gasValues) && gasValues.gasPrice;
             const newGasPrice = (gasPriceFromValues &&
                 (0, utils_1.validateMinimumIncrease)(gasPriceFromValues, minGasPrice)) ||
                 minGasPrice;
             // maxFeePerGas (EIP1559)
             const existingMaxFeePerGas = (_a = transactionMeta.txParams) === null || _a === void 0 ? void 0 : _a.maxFeePerGas;
-            const minMaxFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxFeePerGas, this.cancelMultiplier);
+            const minMaxFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxFeePerGas, exports.CANCEL_RATE);
             const maxFeePerGasValues = (0, utils_1.isFeeMarketEIP1559Values)(gasValues) && gasValues.maxFeePerGas;
             const newMaxFeePerGas = (maxFeePerGasValues &&
                 (0, utils_1.validateMinimumIncrease)(maxFeePerGasValues, minMaxFeePerGas)) ||
                 (existingMaxFeePerGas && minMaxFeePerGas);
             // maxPriorityFeePerGas (EIP1559)
             const existingMaxPriorityFeePerGas = (_b = transactionMeta.txParams) === null || _b === void 0 ? void 0 : _b.maxPriorityFeePerGas;
-            const minMaxPriorityFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxPriorityFeePerGas, this.cancelMultiplier);
+            const minMaxPriorityFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxPriorityFeePerGas, exports.CANCEL_RATE);
             const maxPriorityFeePerGasValues = (0, utils_1.isFeeMarketEIP1559Values)(gasValues) && gasValues.maxPriorityFeePerGas;
             const newMaxPriorityFeePerGas = (maxPriorityFeePerGasValues &&
                 (0, utils_1.validateMinimumIncrease)(maxPriorityFeePerGasValues, minMaxPriorityFeePerGas)) ||
@@ -407,7 +425,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     to: transactionMeta.txParams.from,
                     value: '0x0',
                 };
-            const unsignedEthTx = this.prepareUnsignedEthTx(newTxParams);
+            const unsignedEthTx = this.prepareUnsignedEthTx(transactionMeta.chainId, 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;
@@ -419,10 +437,15 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 newFee,
                 txParams: newTxParams,
             });
-            const hash = yield this.publishTransaction(rawTx);
+            const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId: transactionMeta.networkClientId,
+                chainId: transactionMeta.chainId,
+            });
+            const hash = yield this.publishTransactionForRetry(ethQuery, rawTx, transactionMeta);
             const cancelTransactionMeta = {
                 actionId,
                 chainId: transactionMeta.chainId,
+                networkClientId: transactionMeta.networkClientId,
                 estimatedBaseFee,
                 hash,
                 id: (0, uuid_1.v1)(),
@@ -477,28 +500,28 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 throw new Error('No sign method defined.');
             }
             // gasPrice (legacy non EIP1559)
-            const minGasPrice = (0, utils_1.getIncreasedPriceFromExisting)(transactionMeta.txParams.gasPrice, this.speedUpMultiplier);
+            const minGasPrice = (0, utils_1.getIncreasedPriceFromExisting)(transactionMeta.txParams.gasPrice, exports.SPEED_UP_RATE);
             const gasPriceFromValues = (0, utils_1.isGasPriceValue)(gasValues) && gasValues.gasPrice;
             const newGasPrice = (gasPriceFromValues &&
                 (0, utils_1.validateMinimumIncrease)(gasPriceFromValues, minGasPrice)) ||
                 minGasPrice;
             // maxFeePerGas (EIP1559)
             const existingMaxFeePerGas = (_a = transactionMeta.txParams) === null || _a === void 0 ? void 0 : _a.maxFeePerGas;
-            const minMaxFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxFeePerGas, this.speedUpMultiplier);
+            const minMaxFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxFeePerGas, exports.SPEED_UP_RATE);
             const maxFeePerGasValues = (0, utils_1.isFeeMarketEIP1559Values)(gasValues) && gasValues.maxFeePerGas;
             const newMaxFeePerGas = (maxFeePerGasValues &&
                 (0, utils_1.validateMinimumIncrease)(maxFeePerGasValues, minMaxFeePerGas)) ||
                 (existingMaxFeePerGas && minMaxFeePerGas);
             // maxPriorityFeePerGas (EIP1559)
             const existingMaxPriorityFeePerGas = (_b = transactionMeta.txParams) === null || _b === void 0 ? void 0 : _b.maxPriorityFeePerGas;
-            const minMaxPriorityFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxPriorityFeePerGas, this.speedUpMultiplier);
+            const minMaxPriorityFeePerGas = (0, utils_1.getIncreasedPriceFromExisting)(existingMaxPriorityFeePerGas, exports.SPEED_UP_RATE);
             const maxPriorityFeePerGasValues = (0, utils_1.isFeeMarketEIP1559Values)(gasValues) && gasValues.maxPriorityFeePerGas;
             const newMaxPriorityFeePerGas = (maxPriorityFeePerGasValues &&
                 (0, utils_1.validateMinimumIncrease)(maxPriorityFeePerGasValues, minMaxPriorityFeePerGas)) ||
                 (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(txParams);
+            const unsignedEthTx = this.prepareUnsignedEthTx(transactionMeta.chainId, txParams);
             const signedTx = yield this.sign(unsignedEthTx, transactionMeta.txParams.from);
             yield this.updateTransactionMetaRSV(transactionMeta, signedTx);
             const rawTx = (0, ethereumjs_util_1.bufferToHex)(signedTx.serialize());
@@ -507,7 +530,11 @@ 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 hash = yield (0, controller_utils_1.query)(this.ethQuery, 'sendRawTransaction', [rawTx]);
+            const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId: transactionMeta.networkClientId,
+                chainId: transactionMeta.chainId,
+            });
+            const hash = yield this.publishTransactionForRetry(ethQuery, rawTx, transactionMeta);
             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
@@ -529,11 +556,15 @@ 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) {
+    estimateGas(transaction, networkClientId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, this.ethQuery);
+            const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId,
+            });
+            const { estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, ethQuery);
             return { gas: estimatedGas, simulationFails };
         });
     }
@@ -542,10 +573,14 @@ 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) {
+    estimateGasBuffered(transaction, multiplier, networkClientId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { blockGasLimit, estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, this.ethQuery);
+            const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId,
+            });
+            const { blockGasLimit, estimatedGas, simulationFails } = yield (0, gas_1.estimateGas)(transaction, ethQuery);
             const gas = (0, gas_1.addGasBuffer)(estimatedGas, blockGasLimit, multiplier);
             return {
                 gas,
@@ -615,12 +650,6 @@ 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.
      *
@@ -766,16 +795,9 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         this.updateTransaction(updatedMeta, 'TransactionController:updatePreviousGasParams - Previous gas values updated');
         return this.getTransaction(transactionId);
     }
-    /**
-     * Gets the next nonce according to the nonce-tracker.
-     * Ensure `releaseLock` is called once processing of the `nonce` value is complete.
-     *
-     * @param address - The hex string address for the transaction.
-     * @returns object with the `nextNonce` `nonceDetails`, and the releaseLock.
-     */
-    getNonceLock(address) {
+    getNonceLock(address, networkClientId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.nonceTracker.getNonceLock(address);
+            return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, networkClientId);
         });
     }
     /**
@@ -810,7 +832,10 @@ 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, this.ethQuery);
+            const { type } = yield (0, transaction_type_1.determineTransactionType)(updatedTransaction.txParams, __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId: transactionMeta.networkClientId,
+                chainId: transactionMeta.chainId,
+            }));
             updatedTransaction.type = type;
             this.updateTransaction(updatedTransaction, `Update Editable Params for ${txId}`);
             return this.getTransaction(txId);
@@ -820,9 +845,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,
@@ -831,7 +858,19 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 return '';
             }
             const initialTx = listOfTxParams[0];
-            const common = this.getCommonConfiguration();
+            const common = this.getCommonConfiguration(initialTx.chainId);
+            // We need to ensure we get the nonce using the the NonceTracker on the chain matching
+            // the txParams. In this context we only have chainId available to us, but the
+            // NonceTrackers are keyed by networkClientId. To workaround this, we attempt to find
+            // a networkClientId that matches the chainId. As a fallback, the globally selected
+            // network's NonceTracker will be used instead.
+            let networkClientId;
+            try {
+                networkClientId = this.messagingSystem.call(`NetworkController:findNetworkClientIdByChainId`, initialTx.chainId);
+            }
+            catch (err) {
+                (0, logger_1.projectLogger)('failed to find networkClientId from chainId', err);
+            }
             const initialTxAsEthTx = tx_1.TransactionFactory.fromTxData(initialTx, {
                 common,
             });
@@ -844,12 +883,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.nonceTracker.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.getNonceLock(fromAddress, networkClientId)
+                    : 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);
+                    txParams.nonce = nonce;
+                    return this.signExternalTransaction(txParams.chainId, txParams);
                 }));
             }
             catch (err) {
@@ -859,9 +905,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;
@@ -1009,19 +1053,18 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         }
         return filteredTransactions;
     }
-    signExternalTransaction(transactionParams) {
+    signExternalTransaction(chainId, 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();
+            const common = this.getCommonConfiguration(chainId);
             const unsignedTransaction = tx_1.TransactionFactory.fromTxData(updatedTransactionParams, { common });
             const signedTransaction = yield this.sign(unsignedTransaction, from);
             const rawTransaction = (0, ethereumjs_util_1.bufferToHex)(signedTransaction.serialize());
@@ -1059,35 +1102,41 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     }
     updateGasProperties(transactionMeta) {
         return __awaiter(this, void 0, void 0, function* () {
-            const isEIP1559Compatible = (yield this.getEIP1559Compatibility()) &&
+            const isEIP1559Compatible = (yield this.getEIP1559Compatibility(transactionMeta.networkClientId)) &&
                 transactionMeta.txParams.type !== types_1.TransactionEnvelopeType.legacy;
-            const chainId = this.getChainId();
+            const { networkClientId, chainId } = transactionMeta;
+            const isCustomNetwork = networkClientId
+                ? this.messagingSystem.call(`NetworkController:getNetworkClientById`, networkClientId).configuration.type === network_controller_1.NetworkClientType.Custom
+                : this.getNetworkState().providerConfig.type === controller_utils_1.NetworkType.rpc;
             yield (0, gas_1.updateGas)({
-                ethQuery: this.ethQuery,
-                providerConfig: this.getNetworkState().providerConfig,
+                ethQuery: __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                    networkClientId,
+                    chainId,
+                }),
+                chainId,
+                isCustomNetwork,
                 txMeta: transactionMeta,
             });
             yield (0, gas_fees_1.updateGasFees)({
                 eip1559: isEIP1559Compatible,
-                ethQuery: this.ethQuery,
-                getSavedGasFees: this.getSavedGasFees.bind(this, chainId),
+                ethQuery: __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                    networkClientId,
+                    chainId,
+                }),
+                getSavedGasFees: this.getSavedGasFees.bind(this),
                 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 to submit approved transactions on current chain.
+     * Force submit approved transactions for all chains.
      */
     submitApprovedTransactions() {
-        const approvedTransactions = this.getCurrentChainTransactionsByStatus(types_1.TransactionStatus.approved);
+        const approvedTransactions = this.state.transactions.filter((transaction) => transaction.status === types_1.TransactionStatus.approved);
         for (const transactionMeta of approvedTransactions) {
             if (this.beforeApproveOnInit(transactionMeta)) {
                 this.approveTransaction(transactionMeta.id).catch((error) => {
@@ -1181,10 +1230,9 @@ 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 }, } = transactionMeta;
+            const { txParams: { from }, networkClientId, } = transactionMeta;
             let releaseNonceLock;
             try {
                 if (!this.sign) {
@@ -1192,7 +1240,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                     this.failTransaction(transactionMeta, new Error('No sign method defined.'));
                     return;
                 }
-                else if (!chainId) {
+                else if (!transactionMeta.chainId) {
                     releaseLock();
                     this.failTransaction(transactionMeta, new Error('No chainId defined.'));
                     return;
@@ -1201,11 +1249,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, this.nonceTracker);
+                const [nonce, releaseNonce] = yield (0, nonce_1.getNextNonce)(transactionMeta, (address) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNonceLock(address, networkClientId));
                 releaseNonceLock = releaseNonce;
                 transactionMeta.status = types_1.TransactionStatus.approved;
                 transactionMeta.txParams.nonce = nonce;
-                transactionMeta.txParams.chainId = chainId;
+                transactionMeta.txParams.chainId = transactionMeta.chainId;
                 const baseTxParams = Object.assign(Object.assign({}, transactionMeta.txParams), { gasLimit: transactionMeta.txParams.gas });
                 this.updateTransaction(transactionMeta, 'TransactionController#approveTransaction - Transaction approved');
                 this.onTransactionStatusChange(transactionMeta);
@@ -1221,14 +1269,21 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 if (!rawTx) {
                     return;
                 }
+                const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                    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)(this.ethQuery, 'getBalance', [from]);
+                    const preTxBalance = yield (0, controller_utils_1.query)(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(rawTx);
+                let { transactionHash: hash } = yield this.publish(transactionMeta, rawTx);
+                if (hash === undefined) {
+                    hash = yield this.publishTransaction(ethQuery, rawTx);
+                }
                 (0, logger_1.projectLogger)('Publish successful', hash);
                 transactionMeta.hash = hash;
                 transactionMeta.status = types_1.TransactionStatus.submitted;
@@ -1253,9 +1308,9 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             }
         });
     }
-    publishTransaction(rawTransaction) {
+    publishTransaction(ethQuery, rawTransaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield (0, controller_utils_1.query)(this.ethQuery, 'sendRawTransaction', [rawTransaction]);
+            return yield (0, controller_utils_1.query)(ethQuery, 'sendRawTransaction', [rawTransaction]);
         });
     }
     /**
@@ -1371,14 +1426,17 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
         const isCompleted = this.isLocalFinalState(transaction.status);
         return { meta: transaction, isCompleted };
     }
-    getChainId() {
+    getChainId(networkClientId) {
+        if (networkClientId) {
+            return this.messagingSystem.call(`NetworkController:getNetworkClientById`, networkClientId).configuration.chainId;
+        }
         const { providerConfig } = this.getNetworkState();
         return providerConfig.chainId;
     }
-    prepareUnsignedEthTx(txParams) {
+    prepareUnsignedEthTx(chainId, txParams) {
         return tx_1.TransactionFactory.fromTxData(txParams, {
-            common: this.getCommonConfiguration(),
             freeze: false,
+            common: this.getCommonConfiguration(chainId),
         });
     }
     /**
@@ -1388,17 +1446,11 @@ 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() {
-        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 });
-        }
+    getCommonConfiguration(chainId) {
         const customChainParams = {
-            name,
             chainId: parseInt(chainId, 16),
             defaultHardfork: exports.HARDFORK,
         };
@@ -1453,7 +1505,7 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      */
     addExternalTransaction(transactionMeta) {
         var _a, _b;
-        const chainId = this.getChainId();
+        const { chainId } = transactionMeta;
         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 &&
@@ -1480,10 +1532,13 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
      */
     markNonceDuplicatesDropped(transactionId) {
         var _a, _b;
-        const chainId = this.getChainId();
         const transactionMeta = this.getTransaction(transactionId);
-        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;
+        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 sameNonceTxs = this.state.transactions.filter((transaction) => transaction.id !== transactionId &&
             transaction.txParams.from === from &&
             transaction.txParams.nonce === nonce &&
@@ -1494,8 +1549,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 === null || transactionMeta === void 0 ? void 0 : transactionMeta.hash;
-            transaction.replacedById = transactionMeta === null || transactionMeta === void 0 ? void 0 : transactionMeta.id;
+            transaction.replacedBy = transactionMeta.hash;
+            transaction.replacedById = transactionMeta.id;
             // Drop any transaction that wasn't previously failed (off chain failure)
             if (transaction.status !== types_1.TransactionStatus.failed) {
                 this.setTransactionStatusDropped(transaction);
@@ -1551,23 +1606,17 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             }
         });
     }
-    getEIP1559Compatibility() {
+    getEIP1559Compatibility(networkClientId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const currentNetworkIsEIP1559Compatible = yield this.getCurrentNetworkEIP1559Compatibility();
+            const currentNetworkIsEIP1559Compatible = yield this.getCurrentNetworkEIP1559Compatibility(networkClientId);
             const currentAccountIsEIP1559Compatible = yield this.getCurrentAccountEIP1559Compatibility();
             return (currentNetworkIsEIP1559Compatible && currentAccountIsEIP1559Compatible);
         });
     }
-    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(txParams);
+            const unsignedEthTx = this.prepareUnsignedEthTx(transactionMeta.chainId, txParams);
             this.inProcessOfSigning.add(transactionMeta.id);
             const signedTx = yield new Promise((resolve, reject) => {
                 var _a;
@@ -1597,14 +1646,8 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
     onTransactionStatusChange(transactionMeta) {
         this.hub.emit('transaction-status-update', { transactionMeta });
     }
-    getNonceTrackerPendingTransactions(address) {
-        const standardPendingTransactions = this.getNonceTrackerTransactions(types_1.TransactionStatus.submitted, address);
-        const externalPendingTransactions = this.getExternalPendingTransactions(address);
-        return [...standardPendingTransactions, ...externalPendingTransactions];
-    }
-    getNonceTrackerTransactions(status, address) {
-        const currentChainId = this.getChainId();
-        return (0, nonce_1.getAndFormatTransactionsForNonceTracker)(currentChainId, address, status, this.state.transactions);
+    getNonceTrackerTransactions(status, address, chainId = this.getChainId()) {
+        return (0, nonce_1.getAndFormatTransactionsForNonceTracker)(chainId, address, status, this.state.transactions);
     }
     onConfirmedTransaction(transactionMeta) {
         (0, logger_1.projectLogger)('Processing confirmed transaction', transactionMeta.id);
@@ -1622,8 +1665,12 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
                 if (transactionMeta.type !== types_1.TransactionType.swap) {
                     return;
                 }
+                const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                    networkClientId: transactionMeta.networkClientId,
+                    chainId: transactionMeta.chainId,
+                });
                 const { updatedTransactionMeta, approvalTransactionMeta } = yield (0, swaps_1.updatePostTransactionBalance)(transactionMeta, {
-                    ethQuery: this.ethQuery,
+                    ethQuery,
                     getTransaction: this.getTransaction.bind(this),
                     updateTransaction: this.updateTransaction.bind(this),
                 });
@@ -1638,6 +1685,106 @@ class TransactionController extends base_controller_1.BaseControllerV1 {
             }
         });
     }
+    publishTransactionForRetry(ethQuery, rawTx, transactionMeta) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const hash = yield this.publishTransaction(ethQuery, rawTx);
+                return hash;
+            }
+            catch (error) {
+                if (this.isTransactionAlreadyConfirmedError(error)) {
+                    yield this.pendingTransactionTracker.forceCheckTransaction(transactionMeta);
+                    throw new Error('Previous transaction is already confirmed');
+                }
+                throw error;
+            }
+        });
+    }
+    /**
+     * Ensures that error is a nonce issue
+     *
+     * @param error - The error to check
+     * @returns Whether or not the error is a nonce issue
+     */
+    // TODO: Replace `any` with type
+    // Some networks are returning original error in the data field
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    isTransactionAlreadyConfirmedError(error) {
+        var _a, _b, _c;
+        return (((_a = error === null || error === void 0 ? void 0 : error.message) === null || _a === void 0 ? void 0 : _a.includes('nonce too low')) ||
+            ((_c = (_b = error === null || error === void 0 ? void 0 : error.data) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.includes('nonce too low')));
+    }
 }
 exports.TransactionController = TransactionController;
+_TransactionController_incomingTransactionOptions = new WeakMap(), _TransactionController_pendingTransactionOptions = new WeakMap(), _TransactionController_multichainTrackingHelper = new WeakMap(), _TransactionController_checkForPendingTransactionAndStartPolling = new WeakMap(), _TransactionController_instances = new WeakSet(), _TransactionController_createNonceTracker = function _TransactionController_createNonceTracker({ provider, blockTracker, chainId, }) {
+    return new nonce_tracker_1.NonceTracker({
+        // TODO: Replace `any` with type
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        provider: provider,
+        blockTracker,
+        getPendingTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerPendingTransactions).bind(this, chainId),
+        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, types_1.TransactionStatus.confirmed),
+    });
+}, _TransactionController_createIncomingTransactionHelper = function _TransactionController_createIncomingTransactionHelper({ blockTracker, etherscanRemoteTransactionSource, chainId, }) {
+    const incomingTransactionHelper = new IncomingTransactionHelper_1.IncomingTransactionHelper({
+        blockTracker,
+        getCurrentAccount: this.getSelectedAddress,
+        getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
+        getChainId: chainId ? () => chainId : this.getChainId.bind(this),
+        isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
+        queryEntireHistory: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").queryEntireHistory,
+        remoteTransactionSource: etherscanRemoteTransactionSource,
+        transactionLimit: this.config.txHistoryLimit,
+        updateTransactions: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").updateTransactions,
+    });
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addIncomingTransactionHelperListeners).call(this, incomingTransactionHelper);
+    return incomingTransactionHelper;
+}, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ provider, blockTracker, chainId, }) {
+    const ethQuery = new eth_query_1.default(provider);
+    const getChainId = chainId ? () => chainId : this.getChainId.bind(this);
+    const pendingTransactionTracker = new PendingTransactionTracker_1.PendingTransactionTracker({
+        approveTransaction: this.approveTransaction.bind(this),
+        blockTracker,
+        getChainId,
+        getEthQuery: () => ethQuery,
+        getTransactions: () => this.state.transactions,
+        isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
+        getGlobalLock: () => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").acquireNonceLockForChainIdKey({
+            chainId: getChainId(),
+        }),
+        publishTransaction: this.publishTransaction.bind(this),
+        hooks: {
+            beforeCheckPendingTransaction: this.beforeCheckPendingTransaction.bind(this),
+            beforePublish: this.beforePublish.bind(this),
+        },
+    });
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_addPendingTransactionTrackerListeners).call(this, pendingTransactionTracker);
+    return pendingTransactionTracker;
+}, _TransactionController_stopAllTracking = function _TransactionController_stopAllTracking() {
+    this.pendingTransactionTracker.stop();
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removePendingTransactionTrackerListeners).call(this, this.pendingTransactionTracker);
+    this.incomingTransactionHelper.stop();
+    __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_removeIncomingTransactionHelperListeners).call(this, this.incomingTransactionHelper);
+    __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllTracking();
+}, _TransactionController_removeIncomingTransactionHelperListeners = function _TransactionController_removeIncomingTransactionHelperListeners(incomingTransactionHelper) {
+    incomingTransactionHelper.hub.removeAllListeners('transactions');
+    incomingTransactionHelper.hub.removeAllListeners('updatedLastFetchedBlockNumbers');
+}, _TransactionController_addIncomingTransactionHelperListeners = function _TransactionController_addIncomingTransactionHelperListeners(incomingTransactionHelper) {
+    incomingTransactionHelper.hub.on('transactions', this.onIncomingTransactions.bind(this));
+    incomingTransactionHelper.hub.on('updatedLastFetchedBlockNumbers', this.onUpdatedLastFetchedBlockNumbers.bind(this));
+}, _TransactionController_removePendingTransactionTrackerListeners = function _TransactionController_removePendingTransactionTrackerListeners(pendingTransactionTracker) {
+    pendingTransactionTracker.hub.removeAllListeners('transaction-confirmed');
+    pendingTransactionTracker.hub.removeAllListeners('transaction-dropped');
+    pendingTransactionTracker.hub.removeAllListeners('transaction-failed');
+    pendingTransactionTracker.hub.removeAllListeners('transaction-updated');
+}, _TransactionController_addPendingTransactionTrackerListeners = function _TransactionController_addPendingTransactionTrackerListeners(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));
+}, _TransactionController_getNonceTrackerPendingTransactions = function _TransactionController_getNonceTrackerPendingTransactions(chainId, address) {
+    const standardPendingTransactions = this.getNonceTrackerTransactions(types_1.TransactionStatus.submitted, address, chainId);
+    const externalPendingTransactions = this.getExternalPendingTransactions(address, chainId);
+    return [...standardPendingTransactions, ...externalPendingTransactions];
+};
 //# sourceMappingURL=TransactionController.js.map