@metamask-previews/transaction-controller 39.0.0-preview-e6757fdb → 39.0.0-preview-98c8c66

package/dist/TransactionController.mjs

@@ -9,7 +9,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     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 _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_isSimulationEnabled, _TransactionController_testGasFeeFlows, _TransactionController_multichainTrackingHelper, _TransactionController_retryTransaction, _TransactionController_getChainId, _TransactionController_getNetworkClientId, _TransactionController_getEthQuery, _TransactionController_getProvider, _TransactionController_createNonceTracker, _TransactionController_createIncomingTransactionHelper, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_removeIncomingTransactionHelperListeners, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_getSelectedAccount, _TransactionController_updateSubmitHistory;
+var _TransactionController_instances, _TransactionController_internalEvents, _TransactionController_incomingTransactionOptions, _TransactionController_pendingTransactionOptions, _TransactionController_trace, _TransactionController_transactionHistoryLimit, _TransactionController_isSimulationEnabled, _TransactionController_testGasFeeFlows, _TransactionController_multichainTrackingHelper, _TransactionController_retryTransaction, _TransactionController_createNonceTracker, _TransactionController_createIncomingTransactionHelper, _TransactionController_createPendingTransactionTracker, _TransactionController_checkForPendingTransactionAndStartPolling, _TransactionController_stopAllTracking, _TransactionController_removeIncomingTransactionHelperListeners, _TransactionController_addIncomingTransactionHelperListeners, _TransactionController_removePendingTransactionTrackerListeners, _TransactionController_addPendingTransactionTrackerListeners, _TransactionController_getNonceTrackerPendingTransactions, _TransactionController_getGasFeeFlows, _TransactionController_getLayer1GasFeeFlows, _TransactionController_updateTransactionInternal, _TransactionController_updateSimulationData, _TransactionController_onGasFeePollerTransactionUpdate, _TransactionController_getNetworkClientId, _TransactionController_getGlobalNetworkClientId, _TransactionController_getGlobalChainId, _TransactionController_isCustomNetwork, _TransactionController_getSelectedAccount, _TransactionController_updateSubmitHistory;
 function $importDefault(module) {
     if (module?.__esModule) {
         return module.default;
@@ -22,7 +22,7 @@ import { TransactionFactory } from "@ethereumjs/tx";
 import $ethereumjsutil from "@ethereumjs/util";
 const { bufferToHex } = $ethereumjsutil;
 import { BaseController } from "@metamask/base-controller";
-import { query, ApprovalType, ORIGIN_METAMASK, convertHexToDecimal } from "@metamask/controller-utils";
+import { query, ApprovalType, ORIGIN_METAMASK, convertHexToDecimal, isInfuraNetworkType } from "@metamask/controller-utils";
 import $EthQuery from "@metamask/eth-query";
 const EthQuery = $importDefault($EthQuery);
 import { NetworkClientType } from "@metamask/network-controller";
@@ -30,6 +30,7 @@ import { NonceTracker } from "@metamask/nonce-tracker";
 import { errorCodes, rpcErrors, providerErrors } from "@metamask/rpc-errors";
 import { add0x } from "@metamask/utils";
 import { Mutex } from "async-mutex";
+import { MethodRegistry } from "eth-method-registry";
 import { EventEmitter } from "events";
 import $lodash from "lodash";
 const { cloneDeep, mapValues, merge, pickBy, sortBy } = $lodash;
@@ -39,6 +40,7 @@ import { LineaGasFeeFlow } from "./gas-flows/LineaGasFeeFlow.mjs";
 import { OptimismLayer1GasFeeFlow } from "./gas-flows/OptimismLayer1GasFeeFlow.mjs";
 import { ScrollLayer1GasFeeFlow } from "./gas-flows/ScrollLayer1GasFeeFlow.mjs";
 import { TestGasFeeFlow } from "./gas-flows/TestGasFeeFlow.mjs";
+import { EtherscanRemoteTransactionSource } from "./helpers/EtherscanRemoteTransactionSource.mjs";
 import { GasFeePoller } from "./helpers/GasFeePoller.mjs";
 import { IncomingTransactionHelper } from "./helpers/IncomingTransactionHelper.mjs";
 import { MultichainTrackingHelper } from "./helpers/MultichainTrackingHelper.mjs";
@@ -150,10 +152,22 @@ export class TransactionController extends BaseController {
         this.messagingSystem.publish(`${controllerName}:transactionFinished`, newTransactionMeta);
         __classPrivateFieldGet(this, _TransactionController_internalEvents, "f").emit(`${transactionMeta.id}:finished`, newTransactionMeta);
     }
+    async registryLookup(fourBytePrefix) {
+        const registryMethod = await this.registry.lookup(fourBytePrefix);
+        if (!registryMethod) {
+            return {
+                registryMethod: '',
+                parsedRegistryMethod: { name: undefined, args: undefined },
+            };
+        }
+        const parsedRegistryMethod = this.registry.parse(registryMethod);
+        return { registryMethod, parsedRegistryMethod };
+    }
     /**
      * Constructs a TransactionController.
      *
      * @param options - The controller options.
+     * @param options.blockTracker - The block tracker used to poll for new blocks data.
      * @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.
@@ -166,9 +180,12 @@ export class TransactionController extends BaseController {
      * @param options.getPermittedAccounts - Get accounts that a given origin has permissions for.
      * @param options.getSavedGasFees - Gets the saved gas fee config.
      * @param options.incomingTransactions - Configuration options for incoming transaction support.
+     * @param options.isMultichainEnabled - Enable multichain support.
      * @param options.isSimulationEnabled - Whether new transactions will be automatically simulated.
      * @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.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.sign - Function used to sign transactions.
      * @param options.state - Initial state to set on this controller.
@@ -177,7 +194,7 @@ export class TransactionController extends BaseController {
      * @param options.transactionHistoryLimit - Transaction history limit.
      * @param options.hooks - The controller hooks.
      */
-    constructor({ disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, incomingTransactions = {}, isSimulationEnabled, messenger, pendingTransactions = {}, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, hooks, }) {
+    constructor({ blockTracker, disableHistory, disableSendFlowHistory, disableSwaps, getCurrentAccountEIP1559Compatibility, getCurrentNetworkEIP1559Compatibility, getExternalPendingTransactions, getGasFeeEstimates, getNetworkClientRegistry, getNetworkState, getPermittedAccounts, getSavedGasFees, incomingTransactions = {}, isMultichainEnabled = false, isSimulationEnabled, messenger, onNetworkStateChange, pendingTransactions = {}, provider, securityProviderRequest, sign, state, testGasFeeFlows, trace, transactionHistoryLimit = 40, hooks, }) {
         super({
             name: controllerName,
             metadata,
@@ -198,19 +215,10 @@ export class TransactionController extends BaseController {
         _TransactionController_transactionHistoryLimit.set(this, void 0);
         _TransactionController_isSimulationEnabled.set(this, void 0);
         _TransactionController_testGasFeeFlows.set(this, void 0);
-        // private async registryLookup(fourBytePrefix: string): Promise<MethodData> {
-        //   const registryMethod = await this.registry.lookup(fourBytePrefix);
-        //   if (!registryMethod) {
-        //     return {
-        //       registryMethod: '',
-        //       parsedRegistryMethod: { name: undefined, args: undefined },
-        //     };
-        //   }
-        //   const parsedRegistryMethod = this.registry.parse(registryMethod);
-        //   return { registryMethod, parsedRegistryMethod };
-        // }
         _TransactionController_multichainTrackingHelper.set(this, void 0);
         _TransactionController_checkForPendingTransactionAndStartPolling.set(this, () => {
+            // PendingTransactionTracker reads state through its getTransactions hook
+            this.pendingTransactionTracker.startIfPendingTransactions();
             __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").checkForPendingTransactionAndStartPolling();
         });
         this.messagingSystem = messenger;
@@ -219,6 +227,8 @@ export class TransactionController extends BaseController {
         this.isHistoryDisabled = disableHistory ?? false;
         this.isSwapsDisabled = disableSwaps ?? false;
         __classPrivateFieldSet(this, _TransactionController_isSimulationEnabled, isSimulationEnabled ?? (() => true), "f");
+        // @ts-expect-error the type in eth-method-registry is inappropriate and should be changed
+        this.registry = new MethodRegistry({ provider });
         this.getSavedGasFees = getSavedGasFees ?? ((_chainId) => undefined);
         this.getCurrentAccountEIP1559Compatibility =
             getCurrentAccountEIP1559Compatibility ?? (() => Promise.resolve(true));
@@ -246,10 +256,17 @@ export class TransactionController extends BaseController {
             hooks?.getAdditionalSignArguments ?? (() => []);
         this.publish =
             hooks?.publish ?? (() => Promise.resolve({ transactionHash: undefined }));
+        this.nonceTracker = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_createNonceTracker).call(this, {
+            provider,
+            blockTracker,
+        });
         const findNetworkClientIdByChainId = (chainId) => {
             return this.messagingSystem.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
         };
         __classPrivateFieldSet(this, _TransactionController_multichainTrackingHelper, new MultichainTrackingHelper({
+            isMultichainEnabled,
+            provider,
+            nonceTracker: this.nonceTracker,
             incomingTransactionOptions: incomingTransactions,
             findNetworkClientIdByChainId,
             getNetworkClientById: ((networkClientId) => {
@@ -266,13 +283,28 @@ export class TransactionController extends BaseController {
             },
         }), "f");
         __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").initialize();
+        const etherscanRemoteTransactionSource = new EtherscanRemoteTransactionSource({
+            apiKeysByChainId: incomingTransactions.etherscanApiKeysByChainId,
+            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.gasFeeFlows = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGasFeeFlows).call(this);
         this.layer1GasFeeFlows = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getLayer1GasFeeFlows).call(this);
         const gasFeePoller = new GasFeePoller({
             findNetworkClientIdByChainId,
             gasFeeFlows: this.gasFeeFlows,
             getGasFeeControllerEstimates: this.getGasFeeEstimates,
-            getProvider: (networkClientId) => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId }),
+            getProvider: (chainId, networkClientId) => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getProvider({
+                networkClientId,
+                chainId,
+            }),
             getTransactions: () => this.state.transactions,
             layer1GasFeeFlows: this.layer1GasFeeFlows,
             onStateChange: (listener) => {
@@ -283,6 +315,12 @@ export class TransactionController extends BaseController {
         // when transactionsController state changes
         // check for pending transactions and start polling if there are any
         this.messagingSystem.subscribe('TransactionController:stateChange', __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f"));
+        // TODO once v2 is merged make sure this only runs when
+        // selectedNetworkClientId changes
+        onNetworkStateChange(() => {
+            log('Detected network change', this.getChainId());
+            this.pendingTransactionTracker.startIfPendingTransactions();
+        });
         this.onBootCleanup();
         __classPrivateFieldGet(this, _TransactionController_checkForPendingTransactionAndStartPolling, "f").call(this);
     }
@@ -295,11 +333,26 @@ export class TransactionController extends BaseController {
     /**
      * Handle new method data request.
      *
-     * @param _fourBytePrefix - The method prefix.
+     * @param fourBytePrefix - The method prefix.
      * @returns The method data object corresponding to the given signature prefix.
      */
-    async handleMethodData(_fourBytePrefix) {
-        throw new Error('Method not implemented.');
+    async handleMethodData(fourBytePrefix) {
+        const releaseLock = await this.mutex.acquire();
+        try {
+            const { methodData } = this.state;
+            const knownMethod = Object.keys(methodData).find((knownFourBytePrefix) => fourBytePrefix === knownFourBytePrefix);
+            if (knownMethod) {
+                return methodData[fourBytePrefix];
+            }
+            const registry = await this.registryLookup(fourBytePrefix);
+            this.update((state) => {
+                state.methodData[fourBytePrefix] = registry;
+            });
+            return registry;
+        }
+        finally {
+            releaseLock();
+        }
     }
     /**
      * Add a new unapproved transaction to state. Parameters will be validated, a
@@ -307,38 +360,40 @@ export class TransactionController extends BaseController {
      * if not provided. If A `<tx.id>:unapproved` hub event will be emitted once added.
      *
      * @param txParams - Standard parameters for an Ethereum transaction.
-     * @param options - Additional options to control how the transaction is added.
-     * @param options.actionId - Unique ID to prevent duplicate requests.
-     * @param options.deviceConfirmedOn - An enum to indicate what device confirmed the transaction.
-     * @param options.method - RPC method that requested the transaction.
-     * @param options.origin - The origin of the transaction request, such as a dApp hostname.
-     * @param options.requireApproval - Whether the transaction requires approval by the user, defaults to true unless explicitly disabled.
-     * @param options.securityAlertResponse - Response from security validator.
-     * @param options.sendFlowHistory - The sendFlowHistory entries to add.
-     * @param options.type - Type of transaction to add, such as 'cancel' or 'swap'.
-     * @param options.swaps - Options for swaps transactions.
-     * @param options.swaps.hasApproveTx - Whether the transaction has an approval transaction.
-     * @param options.swaps.meta - Metadata for swap transaction.
-     * @param options.networkClientId - The id of the network client for this transaction.
-     * @param options.traceContext - The parent context for any new traces.
+     * @param opts - Additional options to control how the transaction is added.
+     * @param opts.actionId - Unique ID to prevent duplicate requests.
+     * @param opts.deviceConfirmedOn - An enum to indicate what device confirmed the transaction.
+     * @param opts.method - RPC method that requested the transaction.
+     * @param opts.origin - The origin of the transaction request, such as a dApp hostname.
+     * @param opts.requireApproval - Whether the transaction requires approval by the user, defaults to true unless explicitly disabled.
+     * @param opts.securityAlertResponse - Response from security validator.
+     * @param opts.sendFlowHistory - The sendFlowHistory entries to add.
+     * @param opts.type - Type of transaction to add, such as 'cancel' or 'swap'.
+     * @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.
+     * @param opts.traceContext - The parent context for any new traces.
      * @returns Object containing a promise resolving to the transaction hash if approved.
      */
-    async addTransaction(txParams, options) {
-        log('Adding transaction', txParams, options);
-        const { actionId, deviceConfirmedOn, method, networkClientId, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, } = options;
+    async addTransaction(txParams, { actionId, deviceConfirmedOn, method, origin, requireApproval, securityAlertResponse, sendFlowHistory, swaps = {}, traceContext, type, networkClientId: requestNetworkClientId, } = {}) {
+        log('Adding transaction', txParams);
         txParams = normalizeTransactionParams(txParams);
-        if (!__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(networkClientId)) {
-            throw new Error(`Network client not found - ${networkClientId}`);
+        if (requestNetworkClientId &&
+            !__classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").has(requestNetworkClientId)) {
+            throw new Error('The networkClientId for this transaction could not be found');
         }
+        const networkClientId = requestNetworkClientId ?? __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGlobalNetworkClientId).call(this);
         const isEIP1559Compatible = await this.getEIP1559Compatibility(networkClientId);
         validateTxParams(txParams, isEIP1559Compatible);
         if (origin && this.getPermittedAccounts) {
             await validateTransactionOrigin(await this.getPermittedAccounts(origin), __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this).address, txParams.from, origin);
         }
         const dappSuggestedGasFees = this.generateDappSuggestedGasFees(txParams, origin);
-        const chainId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getChainId).call(this, networkClientId);
-        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+        const chainId = this.getChainId(networkClientId);
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
             networkClientId,
+            chainId,
         });
         const transactionType = type ?? (await determineTransactionType(txParams, ethQuery)).type;
         const existingTransactionMeta = this.getTransactionWithActionId(actionId);
@@ -409,13 +464,29 @@ export class TransactionController extends BaseController {
             transactionMeta: addedTransactionMeta,
         };
     }
-    startIncomingTransactionPolling(networkClientIds) {
+    startIncomingTransactionPolling(networkClientIds = []) {
+        if (networkClientIds.length === 0) {
+            this.incomingTransactionHelper.start();
+            return;
+        }
         __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").startIncomingTransactionPolling(networkClientIds);
     }
-    stopIncomingTransactionPolling(networkClientIds) {
+    stopIncomingTransactionPolling(networkClientIds = []) {
+        if (networkClientIds.length === 0) {
+            this.incomingTransactionHelper.stop();
+            return;
+        }
         __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopIncomingTransactionPolling(networkClientIds);
     }
+    stopAllIncomingTransactionPolling() {
+        this.incomingTransactionHelper.stop();
+        __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").stopAllIncomingTransactionPolling();
+    }
     async updateIncomingTransactions(networkClientIds = []) {
+        if (networkClientIds.length === 0) {
+            await this.incomingTransactionHelper.update();
+            return;
+        }
         await __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").updateIncomingTransactions(networkClientIds);
     }
     /**
@@ -479,7 +550,7 @@ export class TransactionController extends BaseController {
      * @returns The gas and gas price.
      */
     async estimateGas(transaction, networkClientId) {
-        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
             networkClientId,
         });
         const { estimatedGas, simulationFails } = await estimateGas(transaction, ethQuery);
@@ -493,7 +564,7 @@ export class TransactionController extends BaseController {
      * @param networkClientId - The network client id to use for the estimate.
      */
     async estimateGasBuffered(transaction, multiplier, networkClientId) {
-        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, {
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
             networkClientId,
         });
         const { blockGasLimit, estimatedGas, simulationFails } = await estimateGas(transaction, ethQuery);
@@ -536,21 +607,24 @@ export class TransactionController extends BaseController {
         this.updateTransaction(updatedTransactionMeta, `${controllerName}:updatesecurityAlertResponse - securityAlertResponse updated`);
     }
     /**
-     * Remove transactions from state.
+     * Removes all transactions from state, optionally based on the current network.
      *
-     * @param options - The options bag.
-     * @param options.address - Remove transactions from this account only. Defaults to all accounts.
-     * @param options.chainId - Remove transactions for the specified chain only. Defaults to all chains.
+     * @param ignoreNetwork - Determines whether to wipe all transactions, or just those on the
+     * current network. If `true`, all transactions are wiped.
+     * @param address - If specified, only transactions originating from this address will be
+     * wiped on current network.
      */
-    wipeTransactions({ address, chainId, } = {}) {
-        if (!chainId && !address) {
+    wipeTransactions(ignoreNetwork, address) {
+        /* istanbul ignore next */
+        if (ignoreNetwork && !address) {
             this.update((state) => {
                 state.transactions = [];
             });
             return;
         }
-        const newTransactions = this.state.transactions.filter(({ chainId: txChainId, txParams }) => {
-            const isMatchingNetwork = !chainId || chainId === txChainId;
+        const currentChainId = this.getChainId();
+        const newTransactions = this.state.transactions.filter(({ chainId, txParams }) => {
+            const isMatchingNetwork = ignoreNetwork || chainId === currentChainId;
             if (!isMatchingNetwork) {
                 return true;
             }
@@ -740,8 +814,10 @@ export class TransactionController extends BaseController {
         };
         editableParams.txParams = pickBy(editableParams.txParams);
         const updatedTransaction = merge({}, transactionMeta, editableParams);
-        const { networkClientId } = transactionMeta;
-        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
+        const provider = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getProvider({
+            chainId: transactionMeta.chainId,
+            networkClientId: transactionMeta.networkClientId,
+        });
         const ethQuery = new EthQuery(provider);
         const { type } = await determineTransactionType(updatedTransaction.txParams, ethQuery);
         updatedTransaction.type = type;
@@ -769,9 +845,19 @@ export class TransactionController extends BaseController {
             return '';
         }
         const initialTx = listOfTxParams[0];
-        const { chainId } = initialTx;
-        const common = this.getCommonConfiguration(chainId);
-        const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, { chainId });
+        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) {
+            log('failed to find networkClientId from chainId', err);
+        }
         const initialTxAsEthTx = TransactionFactory.fromTxData(initialTx, {
             common,
         });
@@ -853,12 +939,14 @@ export class TransactionController extends BaseController {
      * Search transaction metadata for matching entries.
      *
      * @param opts - Options bag.
+     * @param opts.searchCriteria - An object containing values or functions for transaction properties to filter transactions with.
      * @param opts.initialList - The transactions to search. Defaults to the current state.
+     * @param opts.filterToCurrentNetwork - Whether to filter the results to the current network. Defaults to true.
      * @param opts.limit - The maximum number of transactions to return. No limit by default.
-     * @param opts.searchCriteria - An object containing values or functions for transaction properties to filter transactions with.
      * @returns An array of transactions matching the provided options.
      */
-    getTransactions({ initialList, limit, searchCriteria = {}, } = {}) {
+    getTransactions({ searchCriteria = {}, initialList, filterToCurrentNetwork = true, limit, } = {}) {
+        const chainId = this.getChainId();
         // searchCriteria is an object that might have values that aren't predicate
         // methods. When providing any other value type (string, number, etc), we
         // consider this shorthand for "check the value at key for strict equality
@@ -876,6 +964,9 @@ export class TransactionController extends BaseController {
         // Combine sortBy and pickBy to transform our state object into an array of
         // matching transactions that are sorted by time.
         const filteredTransactions = sortBy(pickBy(transactionsToFilter, (transaction) => {
+            if (filterToCurrentNetwork && transaction.chainId !== chainId) {
+                return false;
+            }
             // iterate over the predicateMethods keys to check if the transaction
             // matches the searchCriteria
             for (const [key, predicate] of Object.entries(predicateMethods)) {
@@ -931,9 +1022,9 @@ export class TransactionController extends BaseController {
         return filteredTransactions;
     }
     async estimateGasFee({ transactionParams, chainId, networkClientId: requestNetworkClientId, }) {
-        const { id: networkClientId, provider } = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
-            chainId,
+        const networkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNetworkClientId).call(this, {
             networkClientId: requestNetworkClientId,
+            chainId,
         });
         const transactionMeta = {
             txParams: transactionParams,
@@ -942,7 +1033,10 @@ export class TransactionController extends BaseController {
         };
         // Guaranteed as the default gas fee flow matches all transactions.
         const gasFeeFlow = getGasFeeFlow(transactionMeta, this.gasFeeFlows);
-        const ethQuery = new EthQuery(provider);
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+            networkClientId,
+            chainId,
+        });
         const gasFeeControllerData = await this.getGasFeeEstimates({
             networkClientId,
         });
@@ -961,9 +1055,9 @@ export class TransactionController extends BaseController {
      * @param request.networkClientId - The ID of a specific network client to process the transaction.
      */
     async getLayer1GasFee({ transactionParams, chainId, networkClientId, }) {
-        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, {
-            chainId,
+        const provider = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getProvider({
             networkClientId,
+            chainId,
         });
         return await getTransactionLayer1GasFee({
             layer1GasFeeFlows: this.layer1GasFeeFlows,
@@ -1034,10 +1128,15 @@ export class TransactionController extends BaseController {
         const isEIP1559Compatible = transactionMeta.txParams.type !== TransactionEnvelopeType.legacy &&
             (await this.getEIP1559Compatibility(transactionMeta.networkClientId));
         const { networkClientId, chainId } = transactionMeta;
-        const isCustomNetwork = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
-            .configuration.type === NetworkClientType.Custom;
-        const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
-        const provider = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { networkClientId });
+        const isCustomNetwork = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_isCustomNetwork).call(this, networkClientId);
+        const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+            networkClientId,
+            chainId,
+        });
+        const provider = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getProvider({
+            networkClientId,
+            chainId,
+        });
         await __classPrivateFieldGet(this, _TransactionController_trace, "f").call(this, { name: 'Update Gas', parentContext: traceContext }, async () => {
             await updateGas({
                 ethQuery,
@@ -1195,8 +1294,10 @@ export class TransactionController extends BaseController {
             if (!rawTx) {
                 return ApprovalState.NotApproved;
             }
-            const { networkClientId } = transactionMeta;
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+            const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId: transactionMeta.networkClientId,
+                chainId: transactionMeta.chainId,
+            });
             let preTxBalance;
             const shouldUpdatePreTxBalance = transactionMeta.type === TransactionType.swap;
             if (shouldUpdatePreTxBalance) {
@@ -1390,6 +1491,14 @@ export class TransactionController extends BaseController {
         const isCompleted = this.isLocalFinalState(transaction.status);
         return { meta: transaction, isCompleted };
     }
+    getChainId(networkClientId) {
+        const globalChainId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGlobalChainId).call(this);
+        const globalNetworkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGlobalNetworkClientId).call(this);
+        if (!networkClientId || networkClientId === globalNetworkClientId) {
+            return globalChainId;
+        }
+        return this.messagingSystem.call(`NetworkController:getNetworkClientById`, networkClientId).configuration.chainId;
+    }
     prepareUnsignedEthTx(chainId, txParams) {
         return TransactionFactory.fromTxData(txParams, {
             freeze: false,
@@ -1615,7 +1724,7 @@ export class TransactionController extends BaseController {
             transactionMeta,
         });
     }
-    getNonceTrackerTransactions(status, address, chainId) {
+    getNonceTrackerTransactions(status, address, chainId = this.getChainId()) {
         return getAndFormatTransactionsForNonceTracker(chainId, address, status, this.state.transactions);
     }
     onConfirmedTransaction(transactionMeta) {
@@ -1631,11 +1740,13 @@ export class TransactionController extends BaseController {
     }
     async updatePostBalance(transactionMeta) {
         try {
-            const { networkClientId, type } = transactionMeta;
-            if (type !== TransactionType.swap) {
+            if (transactionMeta.type !== TransactionType.swap) {
                 return;
             }
-            const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+            const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+                networkClientId: transactionMeta.networkClientId,
+                chainId: transactionMeta.chainId,
+            });
             const { updatedTransactionMeta, approvalTransactionMeta } = await updatePostTransactionBalance(transactionMeta, {
                 ethQuery,
                 getTransaction: this.getTransaction.bind(this),
@@ -1657,6 +1768,7 @@ export class TransactionController extends BaseController {
         }
         catch (error) {
             if (this.isTransactionAlreadyConfirmedError(error)) {
+                await this.pendingTransactionTracker.forceCheckTransaction(transactionMeta);
                 throw new Error('Previous transaction is already confirmed');
             }
             throw error;
@@ -1711,8 +1823,10 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
         newFee,
         txParams: newTxParams,
     });
-    const { networkClientId } = transactionMeta;
-    const ethQuery = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getEthQuery).call(this, { networkClientId });
+    const ethQuery = __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getEthQuery({
+        networkClientId: transactionMeta.networkClientId,
+        chainId: transactionMeta.chainId,
+    });
     const newTransactionMeta = {
         ...transactionMetaWithRsv,
         actionId,
@@ -1741,23 +1855,6 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
         actionId,
     });
     afterSubmit?.(newTransactionMeta);
-}, _TransactionController_getChainId = function _TransactionController_getChainId(networkClientId) {
-    return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({ networkClientId })
-        .configuration.chainId;
-}, _TransactionController_getNetworkClientId = function _TransactionController_getNetworkClientId({ chainId, networkClientId, }) {
-    if (networkClientId) {
-        return networkClientId;
-    }
-    return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
-        chainId,
-    }).id;
-}, _TransactionController_getEthQuery = function _TransactionController_getEthQuery({ chainId, networkClientId, }) {
-    return new EthQuery(__classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getProvider).call(this, { chainId, networkClientId }));
-}, _TransactionController_getProvider = function _TransactionController_getProvider({ chainId, networkClientId, }) {
-    return __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").getNetworkClient({
-        chainId,
-        networkClientId,
-    }).provider;
 }, _TransactionController_createNonceTracker = function _TransactionController_createNonceTracker({ provider, blockTracker, chainId, }) {
     return new NonceTracker({
         // TODO: Fix types
@@ -1766,7 +1863,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
         // TODO: Fix types
         blockTracker,
         getPendingTransactions: __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getNonceTrackerPendingTransactions).bind(this, chainId),
-        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, TransactionStatus.confirmed, chainId),
+        getConfirmedTransactions: this.getNonceTrackerTransactions.bind(this, TransactionStatus.confirmed),
     });
 }, _TransactionController_createIncomingTransactionHelper = function _TransactionController_createIncomingTransactionHelper({ blockTracker, etherscanRemoteTransactionSource, chainId, }) {
     const incomingTransactionHelper = new IncomingTransactionHelper({
@@ -1774,7 +1871,7 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
         getCurrentAccount: () => __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getSelectedAccount).call(this),
         getLastFetchedBlockNumbers: () => this.state.lastFetchedBlockNumbers,
         getLocalTransactions: () => this.state.transactions,
-        getChainId: () => chainId,
+        getChainId: chainId ? () => chainId : this.getChainId.bind(this),
         isEnabled: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").isEnabled,
         queryEntireHistory: __classPrivateFieldGet(this, _TransactionController_incomingTransactionOptions, "f").queryEntireHistory,
         remoteTransactionSource: etherscanRemoteTransactionSource,
@@ -1785,14 +1882,15 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
     return incomingTransactionHelper;
 }, _TransactionController_createPendingTransactionTracker = function _TransactionController_createPendingTransactionTracker({ provider, blockTracker, chainId, }) {
     const ethQuery = new EthQuery(provider);
+    const getChainId = chainId ? () => chainId : this.getChainId.bind(this);
     const pendingTransactionTracker = new PendingTransactionTracker({
         blockTracker,
-        getChainId: () => chainId,
+        getChainId,
         getEthQuery: () => ethQuery,
         getTransactions: () => this.state.transactions,
         isResubmitEnabled: __classPrivateFieldGet(this, _TransactionController_pendingTransactionOptions, "f").isResubmitEnabled,
         getGlobalLock: () => __classPrivateFieldGet(this, _TransactionController_multichainTrackingHelper, "f").acquireNonceLockForChainIdKey({
-            chainId,
+            chainId: getChainId(),
         }),
         publishTransaction: (_ethQuery, transactionMeta) => this.publishTransaction(_ethQuery, transactionMeta, {
             skipSubmitHistory: true,
@@ -1805,6 +1903,10 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
     __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');
@@ -1919,6 +2021,26 @@ _TransactionController_internalEvents = new WeakMap(), _TransactionController_in
             txMeta.layer1GasFee = layer1GasFee;
         }
     });
+}, _TransactionController_getNetworkClientId = function _TransactionController_getNetworkClientId({ networkClientId: requestNetworkClientId, chainId, }) {
+    const globalChainId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGlobalChainId).call(this);
+    const globalNetworkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGlobalNetworkClientId).call(this);
+    if (requestNetworkClientId) {
+        return requestNetworkClientId;
+    }
+    if (!chainId || chainId === globalChainId) {
+        return globalNetworkClientId;
+    }
+    return this.messagingSystem.call(`NetworkController:findNetworkClientIdByChainId`, chainId);
+}, _TransactionController_getGlobalNetworkClientId = function _TransactionController_getGlobalNetworkClientId() {
+    return this.getNetworkState().selectedNetworkClientId;
+}, _TransactionController_getGlobalChainId = function _TransactionController_getGlobalChainId() {
+    return this.messagingSystem.call(`NetworkController:getNetworkClientById`, this.getNetworkState().selectedNetworkClientId).configuration.chainId;
+}, _TransactionController_isCustomNetwork = function _TransactionController_isCustomNetwork(networkClientId) {
+    const globalNetworkClientId = __classPrivateFieldGet(this, _TransactionController_instances, "m", _TransactionController_getGlobalNetworkClientId).call(this);
+    if (!networkClientId || networkClientId === globalNetworkClientId) {
+        return !isInfuraNetworkType(this.getNetworkState().selectedNetworkClientId);
+    }
+    return (this.messagingSystem.call(`NetworkController:getNetworkClientById`, networkClientId).configuration.type === NetworkClientType.Custom);
 }, _TransactionController_getSelectedAccount = function _TransactionController_getSelectedAccount() {
     return this.messagingSystem.call('AccountsController:getSelectedAccount');
 }, _TransactionController_updateSubmitHistory = function _TransactionController_updateSubmitHistory(transactionMeta, hash) {